diff --git a/build/patches/00Add-a-flag-to-disable-GamePad-API.patch b/build/patches/00Add-a-flag-to-disable-GamePad-API.patch index d46ca5aa..03dc65a0 100644 --- a/build/patches/00Add-a-flag-to-disable-GamePad-API.patch +++ b/build/patches/00Add-a-flag-to-disable-GamePad-API.patch @@ -7,9 +7,9 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html --- chrome/browser/flag-metadata.json | 4 ++-- chrome/browser/flag_descriptions.cc | 2 +- - device/gamepad/public/cpp/gamepad_features.cc | 4 ++-- + device/gamepad/public/cpp/gamepad_features.cc | 1 + .../blink/renderer/modules/gamepad/navigator_gamepad.cc | 6 ++++++ - 4 files changed, 11 insertions(+), 5 deletions(-) + 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json --- a/chrome/browser/flag-metadata.json @@ -41,17 +41,12 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/device/gamepad/public/cpp/gamepad_features.cc b/device/gamepad/public/cpp/gamepad_features.cc --- a/device/gamepad/public/cpp/gamepad_features.cc +++ b/device/gamepad/public/cpp/gamepad_features.cc -@@ -27,8 +27,8 @@ BASE_FEATURE(kEnableWindowsGamingInputDataFetcher, - base::FEATURE_ENABLED_BY_DEFAULT); +@@ -65,4 +65,5 @@ bool IsGamepadMultitouchEnabled() { + return false; + } - BASE_FEATURE(kRestrictGamepadAccess, -- "RestrictGamepadAccess", -- base::FEATURE_DISABLED_BY_DEFAULT); -+ "RestrictGamepadAccess", // enabled -+ base::FEATURE_ENABLED_BY_DEFAULT); // in bromite - - // Enables gamepad multitouch - BASE_FEATURE(kEnableGamepadMultitouch, ++SET_CROMITE_FEATURE_ENABLED(kRestrictGamepadAccess); + } // namespace features diff --git a/third_party/blink/renderer/modules/gamepad/navigator_gamepad.cc b/third_party/blink/renderer/modules/gamepad/navigator_gamepad.cc --- a/third_party/blink/renderer/modules/gamepad/navigator_gamepad.cc +++ b/third_party/blink/renderer/modules/gamepad/navigator_gamepad.cc diff --git a/build/patches/00Disable-privacy-issues-in-password-manager.patch b/build/patches/00Disable-privacy-issues-in-password-manager.patch index b4aa4303..5f52c538 100644 --- a/build/patches/00Disable-privacy-issues-in-password-manager.patch +++ b/build/patches/00Disable-privacy-issues-in-password-manager.patch @@ -9,10 +9,10 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html .../affiliation/affiliation_backend.cc | 1 + .../affiliation/affiliation_service_impl.cc | 4 ++++ .../core/browser/affiliation/facet_manager.cc | 23 +++---------------- - .../browser/features/password_features.cc | 12 +++++----- + .../browser/features/password_features.cc | 4 ++++ .../leak_detection_check_factory_impl.cc | 5 ++++ .../leak_detection_check_impl.cc | 4 +--- - 8 files changed, 21 insertions(+), 40 deletions(-) + 8 files changed, 19 insertions(+), 34 deletions(-) diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml --- a/chrome/android/java/AndroidManifest.xml @@ -114,36 +114,15 @@ diff --git a/components/password_manager/core/browser/affiliation/facet_manager. diff --git a/components/password_manager/core/browser/features/password_features.cc b/components/password_manager/core/browser/features/password_features.cc --- a/components/password_manager/core/browser/features/password_features.cc +++ b/components/password_manager/core/browser/features/password_features.cc -@@ -61,8 +61,8 @@ BASE_FEATURE(kFillingAcrossGroupedSites, - // Enables the experiment for the password manager to only fill on account - // selection, rather than autofilling on page load, with highlighting of fields. - BASE_FEATURE(kFillOnAccountSelect, -- "fill-on-account-select", -- base::FEATURE_DISABLED_BY_DEFAULT); -+ "fill-on-account-select", // always enabled -+ base::FEATURE_ENABLED_BY_DEFAULT); // by default +@@ -120,4 +120,8 @@ BASE_FEATURE(kUseExtensionListForPSLMatching, + base::FEATURE_ENABLED_BY_DEFAULT); + #endif - #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS) - // Enables new confirmation bubble flow if generated password was used in a -@@ -88,14 +88,14 @@ BASE_FEATURE(kSharedPasswordNotificationUI, - // Enables password receiving service including incoming password sharing - // invitation sync data type. - BASE_FEATURE(kPasswordManagerEnableReceiverService, -- "PasswordManagerEnableReceiverService", -- base::FEATURE_DISABLED_BY_DEFAULT); -+ "PasswordManagerEnableReceiverService", // must disable -+ base::FEATURE_DISABLED_BY_DEFAULT); // by default - - // Enables password sender service including outgoing password sharing - // invitation sync data type. - BASE_FEATURE(kPasswordManagerEnableSenderService, -- "PasswordManagerEnableSenderService", -- base::FEATURE_DISABLED_BY_DEFAULT); -+ "PasswordManagerEnableSenderService", // must disable -+ base::FEATURE_DISABLED_BY_DEFAULT); // by default - - // Enables logging the content of chrome://password-manager-internals to the - // terminal. ++SET_CROMITE_FEATURE_ENABLED(kFillOnAccountSelect); ++SET_CROMITE_FEATURE_DISABLED(kPasswordManagerEnableReceiverService); ++SET_CROMITE_FEATURE_DISABLED(kPasswordManagerEnableSenderService); ++ + } // namespace password_manager::features diff --git a/components/password_manager/core/browser/leak_detection/leak_detection_check_factory_impl.cc b/components/password_manager/core/browser/leak_detection/leak_detection_check_factory_impl.cc --- a/components/password_manager/core/browser/leak_detection/leak_detection_check_factory_impl.cc +++ b/components/password_manager/core/browser/leak_detection/leak_detection_check_factory_impl.cc diff --git a/build/patches/00Disable-ranker-url-fetcher.patch b/build/patches/00Disable-ranker-url-fetcher.patch index 15f28e22..764fc16b 100644 --- a/build/patches/00Disable-ranker-url-fetcher.patch +++ b/build/patches/00Disable-ranker-url-fetcher.patch @@ -4,28 +4,12 @@ Subject: Disable ranker_url_fetcher License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html --- - .../translate/core/browser/translate_ranker_impl.cc | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) + components/translate/core/browser/translate_ranker_impl.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/components/translate/core/browser/translate_ranker_impl.cc b/components/translate/core/browser/translate_ranker_impl.cc --- a/components/translate/core/browser/translate_ranker_impl.cc +++ b/components/translate/core/browser/translate_ranker_impl.cc -@@ -94,11 +94,11 @@ const char kDefaultTranslateRankerModelURL[] = - #endif - - BASE_FEATURE(kTranslateRankerQuery, -- "TranslateRankerQuery", -- base::FEATURE_ENABLED_BY_DEFAULT); -+ "TranslateRankerQuery", // disable -+ base::FEATURE_DISABLED_BY_DEFAULT); // by default - BASE_FEATURE(kTranslateRankerEnforcement, -- "TranslateRankerEnforcement", -- base::FEATURE_ENABLED_BY_DEFAULT); -+ "TranslateRankerEnforcement", // disable -+ base::FEATURE_DISABLED_BY_DEFAULT); // by default - - BASE_FEATURE(kTranslateRankerPreviousLanguageMatchesOverride, - "TranslateRankerPreviousLanguageMatchesOverride", @@ -234,7 +234,7 @@ bool TranslateRankerImpl::ShouldOfferTranslation( // absence of a model or if enforcement is disabled. As this is ranker is // subsumed into a more general assist ranker, this default will go away @@ -35,5 +19,14 @@ diff --git a/components/translate/core/browser/translate_ranker_impl.cc b/compon translate_event->set_ranker_request_timestamp_sec( (base::TimeTicks::Now() - base::TimeTicks()).InSeconds()); +@@ -389,6 +389,8 @@ bool TranslateRankerImpl::ShouldOverrideMatchesPreviousLanguageDecision( + } + } + ++SET_CROMITE_FEATURE_DISABLED(kTranslateRankerQuery); ++SET_CROMITE_FEATURE_DISABLED(kTranslateRankerEnforcement); + } // namespace translate + + std::ostream& operator<<(std::ostream& stream, -- 2.25.1 diff --git a/build/patches/00Keep-Side-Panel-Companion-disabled.patch b/build/patches/00Keep-Side-Panel-Companion-disabled.patch index e2075f42..f5ec4dde 100644 --- a/build/patches/00Keep-Side-Panel-Companion-disabled.patch +++ b/build/patches/00Keep-Side-Panel-Companion-disabled.patch @@ -4,54 +4,28 @@ Subject: Keep Side Panel Companion disabled License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html --- - chrome/browser/companion/core/features.cc | 23 ++++++++++--------- - .../ui/side_search/side_search_prefs.cc | 2 +- - chrome/browser/ui/ui_features.cc | 2 +- - components/search_engines/template_url.cc | 2 +- - 4 files changed, 15 insertions(+), 14 deletions(-) + chrome/browser/companion/core/features.cc | 6 ++++++ + chrome/browser/ui/side_search/side_search_prefs.cc | 2 +- + chrome/browser/ui/ui_features.cc | 2 +- + components/search_engines/template_url.cc | 2 +- + 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/chrome/browser/companion/core/features.cc b/chrome/browser/companion/core/features.cc --- a/chrome/browser/companion/core/features.cc +++ b/chrome/browser/companion/core/features.cc -@@ -23,17 +23,17 @@ namespace internal { - // `kSidePanelCompanion2`. This makes it possible for Companion to be - // enabled via multiple field trials (e.g., one that's session consistent, other - // that's permanent consistent). --BASE_FEATURE(kSidePanelCompanion, -- "SidePanelCompanion", -- base::FEATURE_DISABLED_BY_DEFAULT); --BASE_FEATURE(kSidePanelCompanion2, -- "SidePanelCompanion2", -- base::FEATURE_DISABLED_BY_DEFAULT); -+BASE_FEATURE(kSidePanelCompanion, // keep -+ "SidePanelCompanion", // disabled -+ base::FEATURE_DISABLED_BY_DEFAULT); // in bromite -+BASE_FEATURE(kSidePanelCompanion2, // keep -+ "SidePanelCompanion2", // disabled -+ base::FEATURE_DISABLED_BY_DEFAULT); // in bromite - // Dynamically enables the search companion if the user has experiments - // enabled. --BASE_FEATURE(kCompanionEnabledByObservingExpsNavigations, -- "CompanionEnabledByObservingExpsNavigations", -- base::FEATURE_DISABLED_BY_DEFAULT); -+BASE_FEATURE(kCompanionEnabledByObservingExpsNavigations, // keep -+ "CompanionEnabledByObservingExpsNavigations", // disabled -+ base::FEATURE_DISABLED_BY_DEFAULT); // in bromite - } // namespace internal - - // When search companion is enabled, show a context menu item that allows the -@@ -53,8 +53,8 @@ BASE_FEATURE(kCompanionEnableNewBadgesInContextMenu, - // user had previously opted in. The user won't be able to opt in (or out) when - // this is disabled. +@@ -55,6 +55,11 @@ BASE_FEATURE(kCompanionEnableNewBadgesInContextMenu, BASE_FEATURE(kCompanionEnablePageContent, -- "CompanionEnablePageContent", -- base::FEATURE_DISABLED_BY_DEFAULT); -+ "CompanionEnablePageContent", // keep -+ base::FEATURE_DISABLED_BY_DEFAULT); // disabled + "CompanionEnablePageContent", + base::FEATURE_DISABLED_BY_DEFAULT); ++ ++SET_CROMITE_FEATURE_DISABLED_W_NAMESPACE(internal, kSidePanelCompanion); ++SET_CROMITE_FEATURE_DISABLED_W_NAMESPACE(internal, kSidePanelCompanion2); ++SET_CROMITE_FEATURE_DISABLED_W_NAMESPACE(internal, kCompanionEnabledByObservingExpsNavigations); ++SET_CROMITE_FEATURE_DISABLED(kCompanionEnablePageContent); } // namespace features namespace switches { -@@ -65,6 +65,7 @@ const char kDisableCheckUserPermissionsForCompanion[] = +@@ -65,6 +70,7 @@ const char kDisableCheckUserPermissionsForCompanion[] = const char kForceCompanionPinnedState[] = "force-companion-pinned-state"; bool ShouldOverrideCheckingUserPermissionsForCompanion() { diff --git a/build/patches/00Partition-MediaDeviceId-by-default.patch b/build/patches/00Partition-MediaDeviceId-by-default.patch index d859aaa8..21cf3eef 100644 --- a/build/patches/00Partition-MediaDeviceId-by-default.patch +++ b/build/patches/00Partition-MediaDeviceId-by-default.patch @@ -5,30 +5,24 @@ Subject: Partition MediaDeviceId by default and, in windows, hide the presence of the webcam if the user has not given permission License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html --- - components/media_device_salt/media_device_salt_service.cc | 8 ++++---- - .../browser/renderer_host/media/media_devices_manager.cc | 5 +++++ - content/common/features.cc | 4 ++-- - 3 files changed, 11 insertions(+), 6 deletions(-) + components/media_device_salt/media_device_salt_service.cc | 3 +++ + content/browser/renderer_host/media/media_devices_manager.cc | 5 +++++ + content/common/features.cc | 4 ++-- + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/components/media_device_salt/media_device_salt_service.cc b/components/media_device_salt/media_device_salt_service.cc --- a/components/media_device_salt/media_device_salt_service.cc +++ b/components/media_device_salt/media_device_salt_service.cc -@@ -23,11 +23,11 @@ - namespace media_device_salt { - - BASE_FEATURE(kMediaDeviceIdPartitioning, -- "MediaDeviceIdPartitioning", -- base::FEATURE_ENABLED_BY_DEFAULT); -+ "MediaDeviceIdPartitioning", // keep -+ base::FEATURE_ENABLED_BY_DEFAULT); // enabled - BASE_FEATURE(kMediaDeviceIdRandomSaltsPerStorageKey, -- "MediaDeviceIdRandomSaltsPerStorageKey", -- base::FEATURE_DISABLED_BY_DEFAULT); -+ "MediaDeviceIdRandomSaltsPerStorageKey", // enabled -+ base::FEATURE_ENABLED_BY_DEFAULT); // by default +@@ -29,6 +29,9 @@ BASE_FEATURE(kMediaDeviceIdRandomSaltsPerStorageKey, + "MediaDeviceIdRandomSaltsPerStorageKey", + base::FEATURE_DISABLED_BY_DEFAULT); ++SET_CROMITE_FEATURE_ENABLED(kMediaDeviceIdPartitioning); ++SET_CROMITE_FEATURE_ENABLED(kMediaDeviceIdRandomSaltsPerStorageKey); ++ namespace { + scoped_refptr CreateDatabaseTaskRunner() { diff --git a/content/browser/renderer_host/media/media_devices_manager.cc b/content/browser/renderer_host/media/media_devices_manager.cc --- a/content/browser/renderer_host/media/media_devices_manager.cc +++ b/content/browser/renderer_host/media/media_devices_manager.cc diff --git a/build/patches/00add-browser-policy.patch b/build/patches/00add-browser-policy.patch index da1e92ad..ca2aedce 100644 --- a/build/patches/00add-browser-policy.patch +++ b/build/patches/00add-browser-policy.patch @@ -15,7 +15,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html chrome/browser/signin/chrome_signin_client.cc | 7 +- .../ui/webui/policy/policy_ui_handler.cc | 104 ++++++++++++- .../ui/webui/policy/policy_ui_handler.h | 2 + - .../commerce/core/commerce_feature_list.cc | 24 +-- + .../commerce/core/commerce_feature_list.cc | 7 + .../core/browser/browser_policy_connector.cc | 3 + .../common/command_line_policy_provider.cc | 3 + .../core/common/policy_loader_command_line.cc | 140 ++++++++++++++++-- @@ -30,7 +30,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html components/policy_strings.grdp | 4 +- .../gaia_cookie_manager_service.cc | 4 + google_apis/gaia/gaia_auth_fetcher.cc | 1 + - 26 files changed, 311 insertions(+), 107 deletions(-) + 26 files changed, 306 insertions(+), 95 deletions(-) diff --git a/base/win/win_util.cc b/base/win/win_util.cc --- a/base/win/win_util.cc @@ -431,61 +431,20 @@ diff --git a/chrome/browser/ui/webui/policy/policy_ui_handler.h b/chrome/browser diff --git a/components/commerce/core/commerce_feature_list.cc b/components/commerce/core/commerce_feature_list.cc --- a/components/commerce/core/commerce_feature_list.cc +++ b/components/commerce/core/commerce_feature_list.cc -@@ -159,8 +159,8 @@ BASE_FEATURE(kCommercePriceTrackingChipExperiment, - - #if BUILDFLAG(IS_ANDROID) - BASE_FEATURE(kCommercePriceTrackingRegionLaunched, -- "CommercePriceTrackingRegionLaunched", -- base::FEATURE_ENABLED_BY_DEFAULT); -+ "CommercePriceTrackingRegionLaunched", // disabled -+ base::FEATURE_DISABLED_BY_DEFAULT); // by default - #else - BASE_FEATURE(kCommercePriceTrackingRegionLaunched, - "CommercePriceTrackingRegionLaunched", -@@ -227,8 +227,8 @@ BASE_FEATURE(kShoppingList, "ShoppingList", base::FEATURE_DISABLED_BY_DEFAULT); - #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) - BASE_FEATURE(kShoppingListRegionLaunched, -- "ShoppingListRegionLaunched", -- base::FEATURE_ENABLED_BY_DEFAULT); -+ "ShoppingListRegionLaunched", // disabled -+ base::FEATURE_DISABLED_BY_DEFAULT); // by default - #else - BASE_FEATURE(kShoppingListRegionLaunched, - "ShoppingListRegionLaunched", -@@ -273,12 +273,12 @@ BASE_FEATURE(kDiscountConsentV2, - base::FEATURE_ENABLED_BY_DEFAULT); - - BASE_FEATURE(kCommerceHintAndroid, -- "CommerceHintAndroid", -- base::FEATURE_DISABLED_BY_DEFAULT); -+ "CommerceHintAndroid", // disabled -+ base::FEATURE_DISABLED_BY_DEFAULT); // by default - - BASE_FEATURE(kMerchantWidePromotion, -- "MerchantWidePromotion", -- base::FEATURE_ENABLED_BY_DEFAULT); -+ "MerchantWidePromotion", // disabled -+ base::FEATURE_DISABLED_BY_DEFAULT); // by default - - BASE_FEATURE(kCodeBasedRBD, "CodeBasedRBD", base::FEATURE_ENABLED_BY_DEFAULT); - -@@ -287,11 +287,11 @@ BASE_FEATURE(kChromeCartDomBasedHeuristics, +@@ -293,6 +293,13 @@ BASE_FEATURE(kParcelTrackingRegionLaunched, + "ParcelTrackingRegionLaunched", base::FEATURE_DISABLED_BY_DEFAULT); - BASE_FEATURE(kParcelTracking, -- "ParcelTracking", -- base::FEATURE_ENABLED_BY_DEFAULT); -+ "ParcelTracking", // disabled -+ base::FEATURE_DISABLED_BY_DEFAULT); // by default - BASE_FEATURE(kParcelTrackingRegionLaunched, -- "ParcelTrackingRegionLaunched", -- base::FEATURE_DISABLED_BY_DEFAULT); -+ "ParcelTrackingRegionLaunched", // disabled -+ base::FEATURE_DISABLED_BY_DEFAULT); // by default - ++SET_CROMITE_FEATURE_DISABLED(kCommercePriceTrackingRegionLaunched); ++SET_CROMITE_FEATURE_DISABLED(kShoppingListRegionLaunched); ++SET_CROMITE_FEATURE_DISABLED(kCommerceHintAndroid); ++SET_CROMITE_FEATURE_DISABLED(kMerchantWidePromotion); ++SET_CROMITE_FEATURE_DISABLED(kParcelTracking); ++SET_CROMITE_FEATURE_DISABLED(kParcelTrackingRegionLaunched); ++ // Params for Discount Consent V2 in the NTP Cart module. const char kNtpChromeCartModuleDiscountConsentNtpVariationParam[] = + "discount-consent-ntp-variation"; diff --git a/components/policy/core/browser/browser_policy_connector.cc b/components/policy/core/browser/browser_policy_connector.cc --- a/components/policy/core/browser/browser_policy_connector.cc +++ b/components/policy/core/browser/browser_policy_connector.cc