PawletOS/cromite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[AUTO] Patches auto-rebase for master branch (#2160)

Browse Source 
[AUTO] Patches auto-rebase for master branch
This commit is contained in:
uazo
2025-06-11 18:18:29 +11:00
committed by GitHub
parent 18c6fc98d7 15c252a054
commit 600e69d9d9
21 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/patches/Add-bookmark-import-export-actions.patch
+2 -2
View File
@@ -256,7 +256,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"bookmarks/chrome_bookmark_client.cc",
"bookmarks/chrome_bookmark_client.h",
"bookmarks/managed_bookmark_service_factory.cc",
@@ -1729,6 +1731,13 @@ static_library("browser") {
@@ -1731,6 +1733,13 @@ static_library("browser") {
]
}
@@ -270,7 +270,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
configs += [
"//build/config/compiler:wexit_time_destructors",
"//build/config:precompiled_headers",
@@ -3581,8 +3590,6 @@ static_library("browser") {
@@ -3583,8 +3592,6 @@ static_library("browser") {
"bookmarks/bookmark_expanded_state_tracker.h",
"bookmarks/bookmark_expanded_state_tracker_factory.cc",
"bookmarks/bookmark_expanded_state_tracker_factory.h",
build/patches/Android-fonts-fingerprinting-mitigation.patch
+1 -1
View File
@@ -106,7 +106,7 @@ diff --git a/chrome/android/java/res/xml/developer_preferences.xml b/chrome/andr
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -7788,6 +7788,13 @@ static_library("browser") {
@@ -7790,6 +7790,13 @@ static_library("browser") {
}
}
build/patches/Bromite-auto-updater.patch
+1 -1
View File
@@ -676,7 +676,7 @@ new file mode 100644
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2578,6 +2578,12 @@ static_library("browser") {
@@ -2580,6 +2580,12 @@ static_library("browser") {
}
if (is_android) {
build/patches/Chrome-web-store-protection.patch
+1 -1
View File
@@ -300,7 +300,7 @@ diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/ext
ExtensionManagementFactory::GetForBrowserContext(profile_)->AddObserver(this);
if (autoupdate_enabled) {
@@ -756,7 +754,7 @@ void ExtensionService::OnExtensionManagementSettingsChanged() {
@@ -772,7 +770,7 @@ void ExtensionService::OnExtensionManagementSettingsChanged() {
// unpublished extensions should not be enabled. This update allows
// unpublished extensions to be disabled sooner rather than waiting till the
// next regularly scheduled fetch.
build/patches/Content-settings-infrastructure.patch
+2 -2
View File
@@ -710,7 +710,7 @@ diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -1816,6 +1816,7 @@ static_library("ui") {
@@ -1817,6 +1817,7 @@ static_library("ui") {
"//components/commerce/core/mojom:mojo_bindings",
"//components/commerce/core/webui",
"//components/endpoint_fetcher:endpoint_fetcher",
@@ -718,7 +718,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
"//components/enterprise/common:files_scan_data",
"//components/feedback/proto",
"//components/headless/policy",
@@ -5054,6 +5055,7 @@ static_library("ui") {
@@ -5055,6 +5056,7 @@ static_library("ui") {
"//components/power_bookmarks/storage",
"//components/prefs",
"//components/reading_list/features:flags",
build/patches/Cromite-Branding.patch
+1 -1
View File
@@ -13158,7 +13158,7 @@ e)fqMZZ`3a)Ds&5H<cfp<0000<MNUMnLSTYHt&Yn8
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -1879,6 +1879,7 @@ static_library("browser") {
@@ -1881,6 +1881,7 @@ static_library("browser") {
"//build/config/chromebox_for_meetings:buildflags",
"//build/config/compiler:compiler_buildflags",
"//build/config/linux/dbus:buildflags",
build/patches/Disable-Compose-feature.patch
+3 -3
View File
@@ -13,7 +13,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -8274,6 +8274,12 @@ static_library("browser") {
@@ -8276,6 +8276,12 @@ static_library("browser") {
deps += [ "//components/segmentation_platform/internal:optimization_guide_segmentation_handler" ]
}
@@ -26,7 +26,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
if (enable_compose) {
sources += [
"compose/chrome_compose_client.cc",
@@ -8289,7 +8295,6 @@ static_library("browser") {
@@ -8291,7 +8297,6 @@ static_library("browser") {
]
deps += [
@@ -34,7 +34,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"//chrome/common/compose",
"//chrome/common/compose:mojo_bindings",
"//components/autofill/content/browser:browser",
@@ -8737,7 +8742,7 @@ source_set("font_pref") {
@@ -8739,7 +8744,7 @@ source_set("font_pref") {
deps = [ "//chrome/common" ]
}
build/patches/Disable-all-predictors-code.patch
+3 -3
View File
@@ -66,7 +66,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -761,8 +761,6 @@ static_library("browser") {
@@ -763,8 +763,6 @@ static_library("browser") {
"navigation_predictor/navigation_predictor_keyed_service_factory.h",
"navigation_predictor/navigation_predictor_metrics_document_data.cc",
"navigation_predictor/navigation_predictor_metrics_document_data.h",
@@ -75,7 +75,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"navigation_predictor/preloading_model_keyed_service.cc",
"navigation_predictor/preloading_model_keyed_service.h",
"navigation_predictor/preloading_model_keyed_service_factory.cc",
@@ -2310,7 +2308,7 @@ static_library("browser") {
@@ -2312,7 +2310,7 @@ static_library("browser") {
"//components/resources",
"//components/safe_browsing/content/browser",
"//components/safe_browsing/content/browser:safe_browsing_service",
@@ -334,7 +334,7 @@ diff --git a/chrome/browser/safe_browsing/notification_content_detection/notific
diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
@@ -440,7 +440,6 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
@@ -442,7 +442,6 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
}
MixedContentSettingsTabHelper::CreateForWebContents(web_contents);
NavigationMetricsRecorder::CreateForWebContents(web_contents);
build/patches/Disable-safety-check.patch
+2 -2
View File
@@ -285,7 +285,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -3352,7 +3352,6 @@ static_library("browser") {
@@ -3354,7 +3354,6 @@ static_library("browser") {
"//chrome/browser/recent_tabs:jni_headers",
"//chrome/browser/regional_capabilities",
"//chrome/browser/safe_browsing/android:safe_browsing_enums",
@@ -349,7 +349,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
@@ -569,7 +569,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
@@ -571,7 +571,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
tpcd::trial::ValidityService::MaybeCreateForWebContents(web_contents);
TrustedVaultEncryptionKeysTabHelper::CreateForWebContents(web_contents);
#if BUILDFLAG(IS_ANDROID)
build/patches/Do-not-build-API-keys-infobar.patch
+1 -1
View File
@@ -11,7 +11,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -1203,8 +1203,6 @@ static_library("ui") {
@@ -1204,8 +1204,6 @@ static_library("ui") {
"startup/default_browser_prompt/default_browser_prompt_manager.h",
"startup/default_browser_prompt/default_browser_prompt_prefs.cc",
"startup/default_browser_prompt/default_browser_prompt_prefs.h",
build/patches/Enable-native-Android-autofill.patch
+1 -1
View File
@@ -540,7 +540,7 @@ diff --git a/chrome/browser/ui/autofill/autofill_client_provider.h b/chrome/brow
diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
@@ -382,9 +382,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
@@ -384,9 +384,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
web_contents);
ChainedBackNavigationTracker::CreateForWebContents(web_contents);
chrome_browser_net::NetErrorTabHelper::CreateForWebContents(web_contents);
build/patches/Enable-search-engine-settings-desktop-ui.patch
+2 -2
View File
@@ -419,7 +419,7 @@ new file mode 100644
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -3573,6 +3573,9 @@ static_library("browser") {
@@ -3575,6 +3575,9 @@ static_library("browser") {
"//components/user_scripts/android",
]
}
@@ -925,7 +925,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
if (is_chrome_branded) {
deps += [ "//components/plus_addresses/resources:vector_icons" ]
}
@@ -1000,6 +1006,25 @@ static_library("ui") {
@@ -1001,6 +1007,25 @@ static_library("ui") {
"android/toolbar/extension_actions_bridge_factory.h",
]
}
build/patches/Experimental-user-scripts-support.patch
+1 -1
View File
@@ -327,7 +327,7 @@ diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -3557,6 +3557,13 @@ static_library("browser") {
@@ -3559,6 +3559,13 @@ static_library("browser") {
]
deps += [ "//chrome/android/modules/dev_ui/provider:native" ]
}
build/patches/Eyeo-Adblock-for-Cromite.patch
+1 -1
View File
@@ -1772,7 +1772,7 @@ diff --git a/chrome/browser/resources/settings/settings_menu/settings_menu.html
diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
@@ -349,7 +349,8 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
@@ -351,7 +351,8 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
auto* original_profile = profile->GetOriginalProfile();
adblock::EnsureBackgroundServicesStarted(original_profile);
adblock::RegisterAdblockWebContentObserver<
build/patches/Internal-firewall.patch
+1 -1
View File
@@ -59,7 +59,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2497,6 +2497,7 @@ static_library("browser") {
@@ -2499,6 +2499,7 @@ static_library("browser") {
"//third_party/ungoogled:switches",
"//services/device/public/mojom",
"//services/device/public/mojom:usb",
build/patches/Multiple-fingerprinting-mitigations.patch
+1 -1
View File
@@ -63,7 +63,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2477,6 +2477,7 @@ static_library("browser") {
@@ -2479,6 +2479,7 @@ static_library("browser") {
"//services/device/public/cpp/bluetooth",
"//services/device/public/cpp/geolocation",
"//services/device/public/cpp/usb",
build/patches/Restore-LastTabStandingTracker.patch
+2 -2
View File
@@ -27,7 +27,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -1729,6 +1729,16 @@ static_library("browser") {
@@ -1731,6 +1731,16 @@ static_library("browser") {
]
}
@@ -409,7 +409,7 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
#include "chrome/browser/permissions/one_time_permissions_tracker_helper.h"
#include "chrome/browser/predictors/loading_predictor_factory.h"
#include "chrome/browser/predictors/loading_predictor_tab_helper.h"
@@ -426,6 +427,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
@@ -428,6 +429,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
HistoryEmbeddingsTabHelper::CreateForWebContents(web_contents);
HttpsOnlyModeTabHelper::CreateForWebContents(web_contents);
webapps::InstallableManager::CreateForWebContents(web_contents);
build/patches/eyeo-133.0.6943.49-android_api.patch
+2 -2
View File
@@ -207,7 +207,7 @@ new file mode 100644
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -3292,6 +3292,10 @@ static_library("browser") {
@@ -3294,6 +3294,10 @@ static_library("browser") {
"touch_to_fill/password_manager/touch_to_fill_controller_webauthn_delegate.h",
]
@@ -267,7 +267,7 @@ new file mode 100644
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -1029,6 +1029,12 @@ static_library("ui") {
@@ -1030,6 +1030,12 @@ static_library("ui") {
deps += [
"//components/themes:ntp_background_proto",
]
build/patches/eyeo-133.0.6943.49-chrome_integration.patch
+5 -5
View File
@@ -144,7 +144,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"after_startup_task_utils.cc",
"after_startup_task_utils.h",
"app_mode/app_mode_utils.cc",
@@ -2050,6 +2055,7 @@ static_library("browser") {
@@ -2052,6 +2057,7 @@ static_library("browser") {
"//chrome/common/notifications",
"//chrome/installer/util:with_no_strings",
"//chrome/services/speech/buildflags",
@@ -152,7 +152,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"//components/application_locale_storage",
"//components/assist_ranker",
"//components/autofill/core/browser",
@@ -3286,6 +3292,7 @@ static_library("browser") {
@@ -3288,6 +3294,7 @@ static_library("browser") {
"touch_to_fill/password_manager/touch_to_fill_controller_webauthn_delegate.h",
]
@@ -160,7 +160,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
deps += [
":delta_file_proto",
":profile_token",
@@ -8407,6 +8414,7 @@ static_library("browser_public_dependencies") {
@@ -8409,6 +8416,7 @@ static_library("browser_public_dependencies") {
"//chrome/services/file_util/public/mojom",
"//components/account_id",
"//components/autofill/content/browser",
@@ -3888,7 +3888,7 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
#include "components/autofill/content/browser/content_autofill_client.h"
#include "components/autofill/content/browser/content_autofill_driver_factory.h"
#include "components/autofill/core/browser/foundations/browser_autofill_manager.h"
@@ -339,6 +345,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
@@ -341,6 +347,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
optimization_guide_decider);
}
}
@@ -3901,7 +3901,7 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
autofill::AutofillClientProvider& autofill_client_provider =
autofill::AutofillClientProviderFactory::GetForProfile(profile);
autofill_client_provider.CreateClientForWebContents(web_contents);
@@ -376,6 +388,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
@@ -378,6 +390,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
ip_protection::IpProtectionStatus::CreateForWebContents(web_contents);
}
#endif // BUILDFLAG(IS_ANDROID)
build/patches/ungoogled-chromium-Disable-profile-avatar.patch
+1 -1
View File
@@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -1305,8 +1305,6 @@ static_library("browser") {
@@ -1307,8 +1307,6 @@ static_library("browser") {
"profiles/keep_alive/scoped_profile_keep_alive.h",
"profiles/off_the_record_profile_impl.cc",
"profiles/off_the_record_profile_impl.h",
build/patches/ungoogled-chromium-no-special-hosts-domains.patch
+5 -5
View File
@@ -93,7 +93,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -904,10 +904,6 @@ static_library("browser") {
@@ -906,10 +906,6 @@ static_library("browser") {
"page_info/privacy_policy_insights_service_factory.h",
"page_load_metrics/observers/bookmark_bar_page_load_metrics_observer.cc",
"page_load_metrics/observers/bookmark_bar_page_load_metrics_observer.h",
@@ -104,7 +104,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"page_load_metrics/observers/core/amp_page_load_metrics_observer.cc",
"page_load_metrics/observers/core/amp_page_load_metrics_observer.h",
"page_load_metrics/observers/core/ukm_page_load_metrics_observer.cc",
@@ -916,10 +912,6 @@ static_library("browser") {
@@ -918,10 +914,6 @@ static_library("browser") {
"page_load_metrics/observers/document_write_page_load_metrics_observer.h",
"page_load_metrics/observers/foreground_duration_ukm_observer.cc",
"page_load_metrics/observers/foreground_duration_ukm_observer.h",
@@ -115,7 +115,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"page_load_metrics/observers/histogram_suffixes.cc",
"page_load_metrics/observers/histogram_suffixes.h",
"page_load_metrics/observers/https_engagement_metrics/https_engagement_page_load_metrics_observer.cc",
@@ -1573,8 +1565,6 @@ static_library("browser") {
@@ -1575,8 +1567,6 @@ static_library("browser") {
"supervised_user/classify_url_navigation_throttle.h",
"supervised_user/supervised_user_browser_utils.cc",
"supervised_user/supervised_user_browser_utils.h",
@@ -124,7 +124,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"supervised_user/supervised_user_interstitial_tab_closer.cc",
"supervised_user/supervised_user_interstitial_tab_closer.h",
"supervised_user/supervised_user_metrics_service_factory.cc",
@@ -1764,10 +1754,7 @@ static_library("browser") {
@@ -1766,10 +1756,7 @@ static_library("browser") {
"//chrome/browser/content_settings:impl",
"//chrome/browser/devtools",
"//chrome/browser/favicon",
@@ -135,7 +135,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"//chrome/browser/ip_protection",
"//chrome/browser/media/webrtc",
"//chrome/browser/navigation_predictor:impl",
@@ -1850,7 +1837,6 @@ static_library("browser") {
@@ -1852,7 +1839,6 @@ static_library("browser") {
# New dependencies inside of //chrome/browser that generate header files
# should be added to browser_generated_files.
":browser_public_dependencies",