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 03dc65a04..fe60f4289 100644 --- a/build/patches/00Add-a-flag-to-disable-GamePad-API.patch +++ b/build/patches/00Add-a-flag-to-disable-GamePad-API.patch @@ -14,7 +14,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json --- a/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json -@@ -7341,9 +7341,9 @@ +@@ -7317,9 +7317,9 @@ "expiry_milestone": 121 }, { @@ -29,7 +29,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -3076,7 +3076,7 @@ const char kReduceAcceptLanguageDescription[] = +@@ -3017,7 +3017,7 @@ const char kReduceAcceptLanguageDescription[] = const char kRestrictGamepadAccessName[] = "Restrict gamepad access"; const char kRestrictGamepadAccessDescription[] = diff --git a/build/patches/00Add-cromite-flags-support.patch b/build/patches/00Add-cromite-flags-support.patch index 60ff5b249..95b0f7e69 100644 --- a/build/patches/00Add-cromite-flags-support.patch +++ b/build/patches/00Add-cromite-flags-support.patch @@ -15,12 +15,13 @@ Need: bromite-build-utils.patch License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html --- base/BUILD.gn | 4 +- - base/feature_list.cc | 56 ++++++++ - base/feature_list.h | 84 ++++++++++- - build/android/gyp/java_cpp_features.py | 17 +++ + base/feature_list.cc | 56 +++++++ + base/feature_list.h | 84 +++++++++- + build/android/gyp/java_cpp_features.py | 17 ++ chrome/android/java/res/values/values.xml | 3 + .../java/res/xml/privacy_preferences.xml | 4 + chrome/browser/about_flags.cc | 7 + + chrome/browser/browser_features.cc | 1 + .../flags/android/chrome_feature_list.cc | 1 + .../flags/android/chrome_feature_list.h | 1 + chrome/browser/ui/ui_features.cc | 1 + @@ -28,7 +29,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html .../content_settings/core/common/features.cc | 1 + components/flags_ui/flags_state.cc | 21 +++ components/flags_ui/resources/experiment.html | 7 +- - components/flags_ui/resources/experiment.ts | 16 +++ + components/flags_ui/resources/experiment.ts | 16 ++ components/flags_ui/resources/flags.css | 19 +++ components/flags_ui/resources/flags.html | 13 ++ components/flags_ui/resources/flags.ts | 36 ++++- @@ -39,8 +40,9 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html content/common/features.cc | 1 + content/public/common/content_features.cc | 1 + content/public/common/content_features.h | 1 + - cromite_flags/BUILD.gn | 132 ++++++++++++++++++ + cromite_flags/BUILD.gn | 150 ++++++++++++++++++ .../browser/about_flags_cc/placeholder.txt | 1 + + .../browser_features_cc/placeholder.txt | 1 + .../chrome_feature_list_cc/placeholder.txt | 1 + .../chrome_feature_list_h/placeholder.txt | 1 + .../browser/ui/ui_features_cc/placeholder.txt | 1 + @@ -57,17 +59,22 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html .../base/media_switches_h/placeholder.txt | 1 + .../net/base/features_cc/placeholder.txt | 1 + .../net/base/features_h/placeholder.txt | 1 + + .../public/cpp/features_cc/placeholder.txt | 1 + + .../public/cpp/features_h/placeholder.txt | 1 + .../blink/common/features_cc/placeholder.txt | 1 + .../blink/common/features_h/placeholder.txt | 1 + media/base/media_switches.cc | 2 +- media/base/media_switches.h | 2 +- net/base/features.cc | 1 + net/base/features.h | 1 + + services/network/public/cpp/features.cc | 1 + + services/network/public/cpp/features.h | 1 + third_party/blink/common/features.cc | 1 + third_party/blink/public/common/features.h | 1 + - 51 files changed, 450 insertions(+), 12 deletions(-) + 57 files changed, 474 insertions(+), 12 deletions(-) create mode 100755 cromite_flags/BUILD.gn create mode 100755 cromite_flags/chrome/browser/about_flags_cc/placeholder.txt + create mode 100755 cromite_flags/chrome/browser/browser_features_cc/placeholder.txt create mode 100755 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/placeholder.txt create mode 100755 cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/placeholder.txt create mode 100755 cromite_flags/chrome/browser/ui/ui_features_cc/placeholder.txt @@ -84,6 +91,8 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html create mode 100755 cromite_flags/media/base/media_switches_h/placeholder.txt create mode 100755 cromite_flags/net/base/features_cc/placeholder.txt create mode 100755 cromite_flags/net/base/features_h/placeholder.txt + create mode 100755 cromite_flags/services/network/public/cpp/features_cc/placeholder.txt + create mode 100755 cromite_flags/services/network/public/cpp/features_h/placeholder.txt create mode 100755 cromite_flags/third_party/blink/common/features_cc/placeholder.txt create mode 100755 cromite_flags/third_party/blink/common/features_h/placeholder.txt @@ -362,7 +371,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -4091,6 +4091,10 @@ const FeatureEntry::FeatureVariation kWebAuthnAndroidCredManVariations[] = { +@@ -4064,6 +4064,10 @@ const FeatureEntry::FeatureVariation kWebAuthnAndroidCredManVariations[] = { nullptr}}; #endif // BUILDFLAG(IS_ANDROID) @@ -373,7 +382,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc // RECORDING USER METRICS FOR FLAGS: // ----------------------------------------------------------------------------- // The first line of the entry is the internal name. -@@ -4117,6 +4121,9 @@ const FeatureEntry::FeatureVariation kWebAuthnAndroidCredManVariations[] = { +@@ -4090,6 +4094,9 @@ const FeatureEntry::FeatureVariation kWebAuthnAndroidCredManVariations[] = { const FeatureEntry kFeatureEntries[] = { // Include generated flags for flag unexpiry; see //docs/flag_expiry.md and // //tools/flags/generate_unexpire_flags.py. @@ -383,10 +392,19 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc #include "build/chromeos_buildflags.h" #include "chrome/browser/unexpire_flags_gen.inc" {variations::switches::kEnableBenchmarking, +diff --git a/chrome/browser/browser_features.cc b/chrome/browser/browser_features.cc +--- a/chrome/browser/browser_features.cc ++++ b/chrome/browser/browser_features.cc +@@ -310,4 +310,5 @@ BASE_FEATURE(kOmniboxTriggerForNoStatePrefetch, + "OmniboxTriggerForNoStatePrefetch", + base::FEATURE_DISABLED_BY_DEFAULT); + ++#include "cromite_flags/chrome_browser_browser_features_cc.inc" + } // namespace features diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -1223,5 +1223,6 @@ BASE_FEATURE(kWebApkInstallService, +@@ -1207,5 +1207,6 @@ BASE_FEATURE(kWebApkInstallService, "WebApkInstallService", base::FEATURE_DISABLED_BY_DEFAULT); @@ -396,7 +414,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h --- a/chrome/browser/flags/android/chrome_feature_list.h +++ b/chrome/browser/flags/android/chrome_feature_list.h -@@ -232,6 +232,7 @@ constexpr base::FeatureParam kAuxiliarySearchMaxTabsCountParam( +@@ -228,6 +228,7 @@ constexpr base::FeatureParam kAuxiliarySearchMaxTabsCountParam( "auxiliary_search_max_donation_tab", 100); @@ -416,7 +434,7 @@ diff --git a/chrome/browser/ui/ui_features.cc b/chrome/browser/ui/ui_features.cc diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc --- a/chrome/common/chrome_features.cc +++ b/chrome/common/chrome_features.cc -@@ -1653,4 +1653,5 @@ BASE_FEATURE(kSupportsRtcWakeOver24Hours, +@@ -1664,4 +1664,5 @@ BASE_FEATURE(kSupportsRtcWakeOver24Hours, base::FEATURE_ENABLED_BY_DEFAULT); #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -781,7 +799,7 @@ diff --git a/cromite_flags/BUILD.gn b/cromite_flags/BUILD.gn new file mode 100755 --- /dev/null +++ b/cromite_flags/BUILD.gn -@@ -0,0 +1,132 @@ +@@ -0,0 +1,150 @@ +# This file is part of Bromite. + +# Bromite is free software: you can redistribute it and/or modify @@ -847,6 +865,11 @@ new file mode 100755 + output_file = "chrome_browser_flags_android_chrome_feature_list_h.inc" +} + ++cpp_bromite_include("chrome_browser_browser_features_cc") { ++ inputs = [ "//cromite_flags/chrome/browser/browser_features_cc/placeholder.txt" ] ++ output_file = "chrome_browser_browser_features_cc.inc" ++} ++ +cpp_bromite_include("chrome_browser_ui_ui_features_cc") { + inputs = [ "//cromite_flags/chrome/browser/ui/ui_features_cc/placeholder.txt" ] + output_file = "chrome_browser_ui_ui_features_cc.inc" @@ -892,6 +915,16 @@ new file mode 100755 + output_file = "net_base_features_h.inc" +} + ++cpp_bromite_include("services_network_public_cpp_features_cc") { ++ inputs = [ "//cromite_flags/services/network/public/cpp/features_cc/placeholder.txt" ] ++ output_file = "services_network_public_cpp_features_cc.inc" ++} ++ ++cpp_bromite_include("services_network_public_cpp_features_h") { ++ inputs = [ "//cromite_flags/services/network/public/cpp/features_h/placeholder.txt" ] ++ output_file = "services_network_public_cpp_features_h.inc" ++} ++ +component("cromite_flags") { + deps = [ + ":content_common_features_cc", @@ -910,6 +943,9 @@ new file mode 100755 + ":chrome_browser_flags_android_chrome_feature_list_cc", + ":chrome_browser_flags_android_chrome_feature_list_h", + ":chrome_browser_ui_ui_features_cc", ++ ":chrome_browser_browser_features_cc", ++ ":services_network_public_cpp_features_cc", ++ ":services_network_public_cpp_features_h", + ":third_party_blink_common_features_cc", + ":third_party_blink_common_features_h", + ] @@ -920,6 +956,12 @@ new file mode 100755 +++ b/cromite_flags/chrome/browser/about_flags_cc/placeholder.txt @@ -0,0 +1 @@ +this file is intentionally empty +diff --git a/cromite_flags/chrome/browser/browser_features_cc/placeholder.txt b/cromite_flags/chrome/browser/browser_features_cc/placeholder.txt +new file mode 100755 +--- /dev/null ++++ b/cromite_flags/chrome/browser/browser_features_cc/placeholder.txt +@@ -0,0 +1 @@ ++this file is intentionally empty diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/placeholder.txt b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/placeholder.txt new file mode 100755 --- /dev/null @@ -1016,6 +1058,18 @@ new file mode 100755 +++ b/cromite_flags/net/base/features_h/placeholder.txt @@ -0,0 +1 @@ +this file is intentionally empty +diff --git a/cromite_flags/services/network/public/cpp/features_cc/placeholder.txt b/cromite_flags/services/network/public/cpp/features_cc/placeholder.txt +new file mode 100755 +--- /dev/null ++++ b/cromite_flags/services/network/public/cpp/features_cc/placeholder.txt +@@ -0,0 +1 @@ ++this file is intentionally empty +diff --git a/cromite_flags/services/network/public/cpp/features_h/placeholder.txt b/cromite_flags/services/network/public/cpp/features_h/placeholder.txt +new file mode 100755 +--- /dev/null ++++ b/cromite_flags/services/network/public/cpp/features_h/placeholder.txt +@@ -0,0 +1 @@ ++this file is intentionally empty diff --git a/cromite_flags/third_party/blink/common/features_cc/placeholder.txt b/cromite_flags/third_party/blink/common/features_cc/placeholder.txt new file mode 100755 --- /dev/null @@ -1051,7 +1105,7 @@ diff --git a/media/base/media_switches.h b/media/base/media_switches.h diff --git a/net/base/features.cc b/net/base/features.cc --- a/net/base/features.cc +++ b/net/base/features.cc -@@ -480,4 +480,5 @@ BASE_FEATURE(kSpdyHeadersToHttpResponseVerifyCorrectness, +@@ -469,4 +469,5 @@ BASE_FEATURE(kSpdyHeadersToHttpResponseVerifyCorrectness, "SpdyHeadersToHttpResponseVerifyCorrectness", base::FEATURE_DISABLED_BY_DEFAULT); @@ -1060,7 +1114,7 @@ diff --git a/net/base/features.cc b/net/base/features.cc diff --git a/net/base/features.h b/net/base/features.h --- a/net/base/features.h +++ b/net/base/features.h -@@ -475,6 +475,7 @@ NET_EXPORT BASE_DECLARE_FEATURE(kSpdyHeadersToHttpResponseUseBuilder); +@@ -467,6 +467,7 @@ NET_EXPORT BASE_DECLARE_FEATURE(kSpdyHeadersToHttpResponseUseBuilder); // for two weeks on Dev. NET_EXPORT BASE_DECLARE_FEATURE(kSpdyHeadersToHttpResponseVerifyCorrectness); @@ -1068,10 +1122,30 @@ diff --git a/net/base/features.h b/net/base/features.h } // namespace net::features #endif // NET_BASE_FEATURES_H_ +diff --git a/services/network/public/cpp/features.cc b/services/network/public/cpp/features.cc +--- a/services/network/public/cpp/features.cc ++++ b/services/network/public/cpp/features.cc +@@ -422,4 +422,5 @@ BASE_FEATURE(kVisibilityAwareResourceScheduler, + + BASE_FEATURE(kSharedZstd, "SharedZstd", base::FEATURE_ENABLED_BY_DEFAULT); + ++#include "cromite_flags/services_network_public_cpp_features_cc.inc" + } // namespace network::features +diff --git a/services/network/public/cpp/features.h b/services/network/public/cpp/features.h +--- a/services/network/public/cpp/features.h ++++ b/services/network/public/cpp/features.h +@@ -158,6 +158,7 @@ BASE_DECLARE_FEATURE(kVisibilityAwareResourceScheduler); + COMPONENT_EXPORT(NETWORK_CPP) + BASE_DECLARE_FEATURE(kSharedZstd); + ++#include "cromite_flags/services_network_public_cpp_features_h.inc" + } // namespace features + } // namespace network + diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc --- a/third_party/blink/common/features.cc +++ b/third_party/blink/common/features.cc -@@ -2187,5 +2187,6 @@ bool IsKeepAliveURLLoaderServiceEnabled() { +@@ -2168,5 +2168,6 @@ bool IsKeepAliveURLLoaderServiceEnabled() { base::FeatureList::IsEnabled(kFetchLaterAPI); } @@ -1081,7 +1155,7 @@ diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/fea diff --git a/third_party/blink/public/common/features.h b/third_party/blink/public/common/features.h --- a/third_party/blink/public/common/features.h +++ b/third_party/blink/public/common/features.h -@@ -1399,6 +1399,7 @@ BLINK_COMMON_EXPORT bool IsKeepAliveURLLoaderServiceEnabled(); +@@ -1388,6 +1388,7 @@ BLINK_COMMON_EXPORT bool IsKeepAliveURLLoaderServiceEnabled(); BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE( kRemoveAuthroizationOnCrossOriginRedirect); diff --git a/build/patches/00Add-setting-to-invert-tap-and-long-tap.patch b/build/patches/00Add-setting-to-invert-tap-and-long-tap.patch index 08d8bf095..f0b3182e1 100644 --- a/build/patches/00Add-setting-to-invert-tap-and-long-tap.patch +++ b/build/patches/00Add-setting-to-invert-tap-and-long-tap.patch @@ -13,25 +13,26 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html .../contextmenu/ChromeContextMenuItem.java | 5 ++- .../ChromeContextMenuPopulator.java | 5 +++ .../tab/TabContextMenuItemDelegate.java | 8 +++++ - chrome/browser/about_flags.cc | 5 +++ .../contextmenu/ContextMenuItemDelegate.java | 2 ++ - chrome/browser/flag_descriptions.cc | 4 +++ - chrome/browser/flag_descriptions.h | 3 ++ .../flags/android/chrome_feature_list.cc | 1 + .../browser/flags/ChromeFeatureList.java | 5 +++ .../strings/android_chrome_strings.grd | 9 +++++ .../res/xml/accessibility_preferences.xml | 5 +++ .../accessibility/AccessibilitySettings.java | 11 ++++++ .../AccessibilitySettingsDelegate.java | 2 ++ - third_party/blink/common/features.cc | 4 +++ - third_party/blink/public/common/features.h | 2 ++ + ...Add-setting-to-invert-tap-and-long-tap.inc | 8 +++++ + ...Add-setting-to-invert-tap-and-long-tap.inc | 3 ++ + ...Add-setting-to-invert-tap-and-long-tap.inc | 1 + .../renderer/core/html/html_anchor_element.cc | 35 +++++++++++++++---- .../renderer/core/html/html_anchor_element.h | 9 +++-- .../renderer/core/html/html_image_element.cc | 17 +++++++++ .../renderer/core/html/html_image_element.h | 2 ++ .../core/page/context_menu_controller.cc | 32 ++++++++++++----- .../core/page/context_menu_controller.h | 5 +-- - 23 files changed, 170 insertions(+), 20 deletions(-) + 21 files changed, 164 insertions(+), 20 deletions(-) + create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Add-setting-to-invert-tap-and-long-tap.inc + create mode 100644 cromite_flags/third_party/blink/common/features_cc/Add-setting-to-invert-tap-and-long-tap.inc + create mode 100644 cromite_flags/third_party/blink/common/features_h/Add-setting-to-invert-tap-and-long-tap.inc diff --git a/chrome/android/java/res/values/ids.xml b/chrome/android/java/res/values/ids.xml --- a/chrome/android/java/res/values/ids.xml @@ -142,21 +143,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextM @Override public void onOpenImageInNewTab(GURL url, Referrer referrer) { LoadUrlParams loadUrlParams = new LoadUrlParams(url.getSpec()); -diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc ---- a/chrome/browser/about_flags.cc -+++ b/chrome/browser/about_flags.cc -@@ -8406,6 +8406,11 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(features::kElasticOverscroll)}, - #endif - -+ {"show-always-context-menu-on-links", -+ flag_descriptions::kShowAlwaysContextMenuOnLinksName, -+ flag_descriptions::kShowAlwaysContextMenuOnLinksDescription, kOsAndroid, -+ FEATURE_VALUE_TYPE(blink::features::kShowAlwaysContextMenuOnLinks)}, -+ - {"device-posture", flag_descriptions::kDevicePostureName, - flag_descriptions::kDevicePostureDescription, kOsAll, - FEATURE_VALUE_TYPE(features::kDevicePosture)}, diff --git a/chrome/browser/contextmenu/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuItemDelegate.java b/chrome/browser/contextmenu/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuItemDelegate.java --- a/chrome/browser/contextmenu/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuItemDelegate.java +++ b/chrome/browser/contextmenu/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuItemDelegate.java @@ -169,33 +155,6 @@ diff --git a/chrome/browser/contextmenu/java/src/org/chromium/chrome/browser/con /** * Called when the {@code url} is of an image and should be opened in a new tab. * @param url The image URL to open. -diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc ---- a/chrome/browser/flag_descriptions.cc -+++ b/chrome/browser/flag_descriptions.cc -@@ -2056,6 +2056,10 @@ const char kMoveTopToolbarToBottomName[] = "Move top toolbar to bottom"; - const char kMoveTopToolbarToBottomDescription[] = - "Move the top toolbar to the bottom."; - -+const char kShowAlwaysContextMenuOnLinksName[] = "Always show contextmenu on links"; -+const char kShowAlwaysContextMenuOnLinksDescription[] = -+ "Use accessibility settings to set it."; -+ - const char kIncognitoDownloadsWarningName[] = - "Enable Incognito downloads warning"; - const char kIncognitoDownloadsWarningDescription[] = -diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h ---- a/chrome/browser/flag_descriptions.h -+++ b/chrome/browser/flag_descriptions.h -@@ -1165,6 +1165,9 @@ extern const char kImprovedKeyboardShortcutsDescription[]; - extern const char kMoveTopToolbarToBottomName[]; - extern const char kMoveTopToolbarToBottomDescription[]; - -+extern const char kShowAlwaysContextMenuOnLinksName[]; -+extern const char kShowAlwaysContextMenuOnLinksDescription[]; -+ - extern const char kIncognitoReauthenticationForAndroidName[]; - extern const char kIncognitoReauthenticationForAndroidDescription[]; - diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc @@ -331,32 +290,33 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c /** * @return The BrowserContextHandle that should be used to read and update settings. */ -diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc ---- a/third_party/blink/common/features.cc -+++ b/third_party/blink/common/features.cc -@@ -241,6 +241,10 @@ BASE_FEATURE(kBackgroundResourceFetch, - "BackgroundResourceFetch", - base::FEATURE_DISABLED_BY_DEFAULT); - -+BASE_FEATURE(kShowAlwaysContextMenuOnLinks, -+ "ShowAlwaysContextMenuOnLinks", -+ base::FEATURE_DISABLED_BY_DEFAULT); +diff --git a/cromite_flags/chrome/browser/about_flags_cc/Add-setting-to-invert-tap-and-long-tap.inc b/cromite_flags/chrome/browser/about_flags_cc/Add-setting-to-invert-tap-and-long-tap.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/chrome/browser/about_flags_cc/Add-setting-to-invert-tap-and-long-tap.inc +@@ -0,0 +1,8 @@ ++#ifdef FLAG_SECTION + - // Used to configure a per-origin allowlist of performance.mark events that are - // permitted to be included in slow reports traces. See crbug.com/1181774. - BASE_FEATURE(kBackgroundTracingPerformanceMark, -diff --git a/third_party/blink/public/common/features.h b/third_party/blink/public/common/features.h ---- a/third_party/blink/public/common/features.h -+++ b/third_party/blink/public/common/features.h -@@ -143,6 +143,8 @@ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kBackForwardCacheWithKeepaliveRequest); - - BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kBackgroundResourceFetch); - -+BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kShowAlwaysContextMenuOnLinks); ++ {"show-always-context-menu-on-links", ++ "Always show contextmenu on links", ++ "Use accessibility settings to set it.", kOsAndroid, ++ FEATURE_VALUE_TYPE(blink::features::kShowAlwaysContextMenuOnLinks)}, + - // Used to configure a per-origin allowlist of performance.mark events that are - // permitted to be included in slow reports traces. See crbug.com/1181774. - BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kBackgroundTracingPerformanceMark); ++#endif +diff --git a/cromite_flags/third_party/blink/common/features_cc/Add-setting-to-invert-tap-and-long-tap.inc b/cromite_flags/third_party/blink/common/features_cc/Add-setting-to-invert-tap-and-long-tap.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/third_party/blink/common/features_cc/Add-setting-to-invert-tap-and-long-tap.inc +@@ -0,0 +1,3 @@ ++CROMITE_FEATURE(kShowAlwaysContextMenuOnLinks, ++ "ShowAlwaysContextMenuOnLinks", ++ base::FEATURE_DISABLED_BY_DEFAULT); +diff --git a/cromite_flags/third_party/blink/common/features_h/Add-setting-to-invert-tap-and-long-tap.inc b/cromite_flags/third_party/blink/common/features_h/Add-setting-to-invert-tap-and-long-tap.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/third_party/blink/common/features_h/Add-setting-to-invert-tap-and-long-tap.inc +@@ -0,0 +1 @@ ++BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kShowAlwaysContextMenuOnLinks); diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third_party/blink/renderer/core/html/html_anchor_element.cc --- a/third_party/blink/renderer/core/html/html_anchor_element.cc +++ b/third_party/blink/renderer/core/html/html_anchor_element.cc diff --git a/build/patches/00Add-support-to-jxl.patch b/build/patches/00Add-support-to-jxl.patch index 355b0ab58..5cdd82d07 100644 --- a/build/patches/00Add-support-to-jxl.patch +++ b/build/patches/00Add-support-to-jxl.patch @@ -12,23 +12,20 @@ Enabled by default cc/base/devtools_instrumentation.h | 2 +- cc/paint/paint_image.h | 2 +- cc/tiles/image_decode_cache.h | 2 + - chrome/browser/about_flags.cc | 6 + - chrome/browser/flag-metadata.json | 5 + - chrome/browser/flag_descriptions.cc | 7 + - chrome/browser/flag_descriptions.h | 5 + content/common/content_constants_internal.cc | 11 +- content/common/content_constants_internal.h | 3 +- content/public/browser/frame_accept_header.cc | 13 +- + .../about_flags_cc/Add-support-to-jxl.inc | 13 + + .../common/features_cc/Add-support-to-jxl.inc | 4 + + .../common/features_h/Add-support-to-jxl.inc | 1 + media/BUILD.gn | 1 + media/media_options.gni | 3 + net/base/mime_util.cc | 2 + net/base/mime_util_unittest.cc | 3 + third_party/.gitignore | 1 + - third_party/blink/common/features.cc | 3 + .../blink/common/loader/network_utils.cc | 16 +- .../blink/common/mime_util/mime_util.cc | 7 + .../common/mime_util/mime_util_unittest.cc | 6 + - third_party/blink/public/common/features.h | 2 + .../devtools_protocol/browser_protocol.pdl | 1 + .../inspector/inspector_emulation_agent.cc | 7 +- .../inspector_emulation_agent_test.cc | 37 + @@ -60,8 +57,11 @@ Enabled by default third_party/libjxl/README.chromium | 15 + .../libjxl/gen_headers/jxl/jxl_export.h | 11 + tools/metrics/histograms/enums.xml | 3 +- - 55 files changed, 2005 insertions(+), 17 deletions(-) + 52 files changed, 1995 insertions(+), 17 deletions(-) create mode 100644 build/linux/unbundle/libjxl.gn + create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Add-support-to-jxl.inc + create mode 100644 cromite_flags/third_party/blink/common/features_cc/Add-support-to-jxl.inc + create mode 100644 cromite_flags/third_party/blink/common/features_h/Add-support-to-jxl.inc create mode 100644 third_party/blink/renderer/platform/image-decoders/jxl/jxl_image_decoder.cc create mode 100644 third_party/blink/renderer/platform/image-decoders/jxl/jxl_image_decoder.h create mode 100644 third_party/blink/renderer/platform/image-decoders/jxl/jxl_image_decoder_test.cc @@ -203,69 +203,6 @@ diff --git a/cc/tiles/image_decode_cache.h b/cc/tiles/image_decode_cache.h case ImageType::kAVIF: return ScopedImageType::kAvif; case ImageType::kBMP: -diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc ---- a/chrome/browser/about_flags.cc -+++ b/chrome/browser/about_flags.cc -@@ -8920,6 +8920,12 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(download::features::kSmartSuggestionForLargeDownloads)}, - #endif // BUILDFLAG(IS_ANDROID) - -+#if BUILDFLAG(ENABLE_JXL_DECODER) -+ {"enable-jxl", flag_descriptions::kEnableJXLName, -+ flag_descriptions::kEnableJXLDescription, kOsAll, -+ FEATURE_VALUE_TYPE(blink::features::kJXL)}, -+#endif // BUILDFLAG(ENABLE_JXL_DECODER) -+ - #if BUILDFLAG(IS_ANDROID) - {"messages-for-android-ads-blocked", - flag_descriptions::kMessagesForAndroidAdsBlockedName, -diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json ---- a/chrome/browser/flag-metadata.json -+++ b/chrome/browser/flag-metadata.json -@@ -3100,6 +3100,11 @@ - // This flag is used by web developers to test upcoming javascript features. - "expiry_milestone": -1 - }, -+ { -+ "name": "enable-jxl", -+ "owners": [ "eustas@chromium.org", "firsching", "sboukortt", "veluca" ], -+ "expiry_milestone": 150 -+ }, - { - "name": "enable-keyboard-backlight-toggle", - "owners": [ "rtinkoff" ], -diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc ---- a/chrome/browser/flag_descriptions.cc -+++ b/chrome/browser/flag_descriptions.cc -@@ -7715,6 +7715,13 @@ const char kDcheckIsFatalDescription[] = - "rather than crashing. If enabled, DCHECKs will crash the calling process."; - #endif // BUILDFLAG(DCHECK_IS_CONFIGURABLE) - -+#if BUILDFLAG(ENABLE_JXL_DECODER) -+const char kEnableJXLName[] = "Enable JXL image format"; -+const char kEnableJXLDescription[] = -+ "Adds image decoding support for the JPEG XL image format. NOTE: JPEG XL " -+ "format will be removed in Chrome 110 release."; -+#endif // BUILDFLAG(ENABLE_JXL_DECODER) -+ - #if BUILDFLAG(ENABLE_CARDBOARD) - const char kEnableCardboardName[] = "Enable Cardboard VR WebXR Runtime"; - const char kEnableCardboardDescription[] = -diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h ---- a/chrome/browser/flag_descriptions.h -+++ b/chrome/browser/flag_descriptions.h -@@ -4459,6 +4459,11 @@ extern const char kDcheckIsFatalName[]; - extern const char kDcheckIsFatalDescription[]; - #endif // BUILDFLAG(DCHECK_IS_CONFIGURABLE) - -+#if BUILDFLAG(ENABLE_JXL_DECODER) -+extern const char kEnableJXLName[]; -+extern const char kEnableJXLDescription[]; -+#endif // BUILDFLAG(ENABLE_JXL_DECODER) -+ - #if BUILDFLAG(ENABLE_CARDBOARD) - extern const char kEnableCardboardName[]; - extern const char kEnableCardboardDescription[]; diff --git a/content/common/content_constants_internal.cc b/content/common/content_constants_internal.cc --- a/content/common/content_constants_internal.cc +++ b/content/common/content_constants_internal.cc @@ -331,6 +268,39 @@ diff --git a/content/public/browser/frame_accept_header.cc b/content/public/brow if (allow_sxg_responses && content::signed_exchange_utils::IsSignedExchangeHandlingEnabled( browser_context)) { +diff --git a/cromite_flags/chrome/browser/about_flags_cc/Add-support-to-jxl.inc b/cromite_flags/chrome/browser/about_flags_cc/Add-support-to-jxl.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/chrome/browser/about_flags_cc/Add-support-to-jxl.inc +@@ -0,0 +1,13 @@ ++#if BUILDFLAG(ENABLE_JXL_DECODER) ++ ++#ifdef FLAG_SECTION ++ ++ {"enable-jxl", ++ "Enable JXL image format", ++ "Adds image decoding support for the JPEG XL image format. NOTE: JPEG XL " ++ "format will be removed in Chrome 110 release.", kOsAll, ++ FEATURE_VALUE_TYPE(blink::features::kJXL)}, ++ ++#endif ++ ++#endif // BUILDFLAG(ENABLE_JXL_DECODER) +diff --git a/cromite_flags/third_party/blink/common/features_cc/Add-support-to-jxl.inc b/cromite_flags/third_party/blink/common/features_cc/Add-support-to-jxl.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/third_party/blink/common/features_cc/Add-support-to-jxl.inc +@@ -0,0 +1,4 @@ ++// Enables the JPEG XL Image File Format (JXL). ++CROMITE_FEATURE(kJXL, ++ "JXL", ++ base::FEATURE_ENABLED_BY_DEFAULT); +diff --git a/cromite_flags/third_party/blink/common/features_h/Add-support-to-jxl.inc b/cromite_flags/third_party/blink/common/features_h/Add-support-to-jxl.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/third_party/blink/common/features_h/Add-support-to-jxl.inc +@@ -0,0 +1 @@ ++BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kJXL); diff --git a/media/BUILD.gn b/media/BUILD.gn --- a/media/BUILD.gn +++ b/media/BUILD.gn @@ -412,19 +382,6 @@ diff --git a/third_party/.gitignore b/third_party/.gitignore /llvm /llvm-allocated-type /llvm-bootstrap -diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc ---- a/third_party/blink/common/features.cc -+++ b/third_party/blink/common/features.cc -@@ -422,6 +422,9 @@ BASE_FEATURE(kCORSErrorsIssueOnly, - "CORSErrorsIssueOnly", - base::FEATURE_DISABLED_BY_DEFAULT); - -+// Enables the JPEG XL Image File Format (JXL). -+BASE_FEATURE(kJXL, "JXL", base::FEATURE_ENABLED_BY_DEFAULT); -+ - // When enabled, code cache is produced asynchronously from the script execution - // (https://crbug.com/1260908). - BASE_FEATURE(kCacheCodeOnIdle, diff --git a/third_party/blink/common/loader/network_utils.cc b/third_party/blink/common/loader/network_utils.cc --- a/third_party/blink/common/loader/network_utils.cc +++ b/third_party/blink/common/loader/network_utils.cc @@ -506,18 +463,6 @@ diff --git a/third_party/blink/common/mime_util/mime_util_unittest.cc b/third_pa EXPECT_EQ(IsSupportedImageMimeType("image/avif"), BUILDFLAG(ENABLE_AV1_DECODER)); EXPECT_FALSE(IsSupportedImageMimeType("image/lolcat")); -diff --git a/third_party/blink/public/common/features.h b/third_party/blink/public/common/features.h ---- a/third_party/blink/public/common/features.h -+++ b/third_party/blink/public/common/features.h -@@ -145,6 +145,8 @@ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kBackgroundResourceFetch); - - BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kShowAlwaysContextMenuOnLinks); - -+BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kJXL); -+ - // Used to configure a per-origin allowlist of performance.mark events that are - // permitted to be included in slow reports traces. See crbug.com/1181774. - BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kBackgroundTracingPerformanceMark); diff --git a/third_party/blink/public/devtools_protocol/browser_protocol.pdl b/third_party/blink/public/devtools_protocol/browser_protocol.pdl --- a/third_party/blink/public/devtools_protocol/browser_protocol.pdl +++ b/third_party/blink/public/devtools_protocol/browser_protocol.pdl diff --git a/build/patches/00Block-Intents-While-Locked.patch b/build/patches/00Block-Intents-While-Locked.patch index 1abf423e0..ef7c24bb3 100644 --- a/build/patches/00Block-Intents-While-Locked.patch +++ b/build/patches/00Block-Intents-While-Locked.patch @@ -4,22 +4,15 @@ Subject: Block Intents While Locked see https://source.chromium.org/chromium/chromium/src/+/c5b50f4c2d42e7b808fd3e6fb3545cdb3f4d82c9 --- - chrome/browser/flags/android/chrome_feature_list.cc | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + .../chrome_feature_list_cc/Block-Intents-While-Locked.inc | 1 + + 1 file changed, 1 insertion(+) + create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Block-Intents-While-Locked.inc -diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc ---- a/chrome/browser/flags/android/chrome_feature_list.cc -+++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -540,8 +540,8 @@ BASE_FEATURE(kBaselineGM3SurfaceColors, - base::FEATURE_ENABLED_BY_DEFAULT); - - BASE_FEATURE(kBlockIntentsWhileLocked, -- "BlockIntentsWhileLocked", -- base::FEATURE_DISABLED_BY_DEFAULT); -+ "BlockIntentsWhileLocked", // enabled -+ base::FEATURE_ENABLED_BY_DEFAULT); // by default - - BASE_FEATURE(kCacheActivityTaskID, - "CacheActivityTaskID", +diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Block-Intents-While-Locked.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Block-Intents-While-Locked.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Block-Intents-While-Locked.inc +@@ -0,0 +1 @@ ++SET_CROMITE_FEATURE_ENABLED(kBlockIntentsWhileLocked); -- 2.25.1 diff --git a/build/patches/00Deprecate-Data-URL-in-SVGUseElement.patch b/build/patches/00Deprecate-Data-URL-in-SVGUseElement.patch index effbd42b9..70a4725c3 100644 --- a/build/patches/00Deprecate-Data-URL-in-SVGUseElement.patch +++ b/build/patches/00Deprecate-Data-URL-in-SVGUseElement.patch @@ -10,7 +10,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -3159,8 +3159,8 @@ +@@ -3152,8 +3152,8 @@ status: "stable", }, { diff --git a/build/patches/00Disable-Compression-Dictionary-Transport.patch b/build/patches/00Disable-Compression-Dictionary-Transport.patch index 29bbb211c..4abcfdc02 100644 --- a/build/patches/00Disable-Compression-Dictionary-Transport.patch +++ b/build/patches/00Disable-Compression-Dictionary-Transport.patch @@ -10,7 +10,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -685,16 +685,18 @@ +@@ -678,16 +678,18 @@ status: "stable", }, { diff --git a/build/patches/00Disable-FedCm.patch b/build/patches/00Disable-FedCm.patch index c2ebc75e9..e618f0c61 100644 --- a/build/patches/00Disable-FedCm.patch +++ b/build/patches/00Disable-FedCm.patch @@ -18,7 +18,7 @@ new file mode 100644 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -1603,7 +1603,7 @@ +@@ -1596,7 +1596,7 @@ { name: "FedCm", public: true, diff --git a/build/patches/00Disable-GSA-by-default.patch b/build/patches/00Disable-GSA-by-default.patch index 2e47db49c..2af3d118b 100644 --- a/build/patches/00Disable-GSA-by-default.patch +++ b/build/patches/00Disable-GSA-by-default.patch @@ -6,9 +6,10 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html --- .../org/chromium/chrome/browser/IntentHandler.java | 5 ----- .../org/chromium/chrome/browser/share/LensUtils.java | 12 +----------- - chrome/browser/flags/android/chrome_feature_list.cc | 8 ++++---- .../org/chromium/chrome/browser/gsa/GSAState.java | 11 +++++------ - 4 files changed, 10 insertions(+), 26 deletions(-) + .../Disable-GSA-by-default.inc | 2 ++ + 4 files changed, 8 insertions(+), 22 deletions(-) + create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-GSA-by-default.inc diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java --- a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java @@ -76,31 +77,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils } public static boolean isGoogleLensFeatureEnabled(boolean isIncognito) { -diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc ---- a/chrome/browser/flags/android/chrome_feature_list.cc -+++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -725,8 +725,8 @@ BASE_FEATURE(kContextMenuGoogleLensSearchOptimizations, - base::FEATURE_DISABLED_BY_DEFAULT); - - BASE_FEATURE(kContextMenuSearchWithGoogleLens, -- "ContextMenuSearchWithGoogleLens", -- base::FEATURE_ENABLED_BY_DEFAULT); -+ "ContextMenuSearchWithGoogleLens", // always disabled -+ base::FEATURE_DISABLED_BY_DEFAULT); // in bromite - - BASE_FEATURE(kContextMenuShopWithGoogleLens, - "ContextMenuShopWithGoogleLens", -@@ -827,8 +827,8 @@ BASE_FEATURE(kOfflineIndicatorV2, - base::FEATURE_ENABLED_BY_DEFAULT); - - BASE_FEATURE(kExperimentsForAgsa, -- "ExperimentsForAgsa", -- base::FEATURE_ENABLED_BY_DEFAULT); -+ "ExperimentsForAgsa", // disabled by default -+ base::FEATURE_DISABLED_BY_DEFAULT); // in Bromite - - BASE_FEATURE(kExploreSites, "ExploreSites", base::FEATURE_DISABLED_BY_DEFAULT); - diff --git a/chrome/browser/gsa/java/src/org/chromium/chrome/browser/gsa/GSAState.java b/chrome/browser/gsa/java/src/org/chromium/chrome/browser/gsa/GSAState.java --- a/chrome/browser/gsa/java/src/org/chromium/chrome/browser/gsa/GSAState.java +++ b/chrome/browser/gsa/java/src/org/chromium/chrome/browser/gsa/GSAState.java @@ -157,5 +133,12 @@ diff --git a/chrome/browser/gsa/java/src/org/chromium/chrome/browser/gsa/GSAStat return packageInfo == null ? null : packageInfo.versionName; } +diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-GSA-by-default.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-GSA-by-default.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-GSA-by-default.inc +@@ -0,0 +1,2 @@ ++SET_CROMITE_FEATURE_DISABLED(kContextMenuSearchWithGoogleLens); ++SET_CROMITE_FEATURE_DISABLED(kExperimentsForAgsa); -- 2.25.1 diff --git a/build/patches/00Disable-GetInstalledRelatedApps-API.patch b/build/patches/00Disable-GetInstalledRelatedApps-API.patch index c17670efb..f1399efa4 100644 --- a/build/patches/00Disable-GetInstalledRelatedApps-API.patch +++ b/build/patches/00Disable-GetInstalledRelatedApps-API.patch @@ -43,7 +43,7 @@ new file mode 100644 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -2139,9 +2139,9 @@ +@@ -2132,9 +2132,9 @@ status: {"Android": "test", "default": "stable"}, }, { diff --git a/build/patches/00Disable-PrivateStateTokens-API.patch b/build/patches/00Disable-PrivateStateTokens-API.patch index e99f6972f..ab61971c5 100644 --- a/build/patches/00Disable-PrivateStateTokens-API.patch +++ b/build/patches/00Disable-PrivateStateTokens-API.patch @@ -4,27 +4,16 @@ Subject: Disable PrivateStateTokens API License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html --- - services/network/public/cpp/features.cc | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) + .../public/cpp/features_cc/Disable-PrivateStateTokens-API.inc | 2 ++ + 1 file changed, 2 insertions(+) + create mode 100644 cromite_flags/services/network/public/cpp/features_cc/Disable-PrivateStateTokens-API.inc -diff --git a/services/network/public/cpp/features.cc b/services/network/public/cpp/features.cc ---- a/services/network/public/cpp/features.cc -+++ b/services/network/public/cpp/features.cc -@@ -168,12 +168,12 @@ BASE_FEATURE(kAttributionReportingCrossAppWeb, // in bromite - // set, and handling their responses, according to the protocol. - // (See https://github.com/WICG/trust-token-api.) - BASE_FEATURE(kPrivateStateTokens, -- "PrivateStateTokens", -- base::FEATURE_ENABLED_BY_DEFAULT); -+ "PrivateStateTokens", // must be disabled -+ base::FEATURE_DISABLED_BY_DEFAULT); // in bromite - - // Secondary flag used by the FLEDGE ads experiment in the interim before - // PSTs are fully rolled out to stable. --BASE_FEATURE(kFledgePst, "TrustTokens", base::FEATURE_ENABLED_BY_DEFAULT); -+BASE_FEATURE(kFledgePst, "TrustTokens", base::FEATURE_DISABLED_BY_DEFAULT); // must be disabled - - // Determines which Trust Tokens operations require the TrustTokens origin trial - // active in order to be used. This is runtime-configurable so that the Trust +diff --git a/cromite_flags/services/network/public/cpp/features_cc/Disable-PrivateStateTokens-API.inc b/cromite_flags/services/network/public/cpp/features_cc/Disable-PrivateStateTokens-API.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/services/network/public/cpp/features_cc/Disable-PrivateStateTokens-API.inc +@@ -0,0 +1,2 @@ ++SET_CROMITE_FEATURE_DISABLED(kPrivateStateTokens); ++SET_CROMITE_FEATURE_DISABLED(kFledgePst); -- 2.25.1 diff --git a/build/patches/00Disable-SHA1-Server-Signature.patch b/build/patches/00Disable-SHA1-Server-Signature.patch index c2d4318df..0974b2dbb 100644 --- a/build/patches/00Disable-SHA1-Server-Signature.patch +++ b/build/patches/00Disable-SHA1-Server-Signature.patch @@ -4,22 +4,15 @@ Subject: Disable SHA1 Server Signature License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html --- - net/base/features.cc | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + .../net/base/features_cc/Disable-SHA1-Server-Signature.inc | 1 + + 1 file changed, 1 insertion(+) + create mode 100644 cromite_flags/net/base/features_cc/Disable-SHA1-Server-Signature.inc -diff --git a/net/base/features.cc b/net/base/features.cc ---- a/net/base/features.cc -+++ b/net/base/features.cc -@@ -88,8 +88,8 @@ BASE_FEATURE(kUseAlternativePortForGloballyReachableCheck, - base::FEATURE_DISABLED_BY_DEFAULT); - - BASE_FEATURE(kSHA1ServerSignature, -- "SHA1ServerSignature", -- base::FEATURE_DISABLED_BY_DEFAULT); -+ "SHA1ServerSignature", // disabled -+ base::FEATURE_DISABLED_BY_DEFAULT); // in bromite - - BASE_FEATURE(kEnableTLS13EarlyData, - "EnableTLS13EarlyData", +diff --git a/cromite_flags/net/base/features_cc/Disable-SHA1-Server-Signature.inc b/cromite_flags/net/base/features_cc/Disable-SHA1-Server-Signature.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/net/base/features_cc/Disable-SHA1-Server-Signature.inc +@@ -0,0 +1 @@ ++SET_CROMITE_FEATURE_DISABLED(kSHA1ServerSignature); -- 2.25.1 diff --git a/build/patches/00Disable-prefers-reduced-transparency-media-query.patch b/build/patches/00Disable-prefers-reduced-transparency-media-query.patch index dbb1ecca6..3e82a9de3 100644 --- a/build/patches/00Disable-prefers-reduced-transparency-media-query.patch +++ b/build/patches/00Disable-prefers-reduced-transparency-media-query.patch @@ -10,7 +10,7 @@ This feature can be used for fingerprinting as it exposes a user preference diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -3003,8 +3003,8 @@ +@@ -2996,8 +2996,8 @@ base_feature: "none", }, { diff --git a/build/patches/00Disable-speechSynthesis-getVoices-API.patch b/build/patches/00Disable-speechSynthesis-getVoices-API.patch index 788bc1323..7dee07d92 100644 --- a/build/patches/00Disable-speechSynthesis-getVoices-API.patch +++ b/build/patches/00Disable-speechSynthesis-getVoices-API.patch @@ -11,32 +11,21 @@ Require: Timezone-customization.patch License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html --- - chrome/browser/about_flags.cc | 5 +++++ .../renderer/chrome_content_renderer_client.cc | 2 +- .../renderer/content_settings_agent_impl.cc | 9 ++++++++- .../renderer/content_settings_agent_impl.h | 2 ++ - media/base/media_switches.cc | 8 ++++---- - third_party/blink/common/features.cc | 4 ++++ - third_party/blink/public/common/features.h | 2 ++ + .../Disable-speechSynthesis-getVoices-API.inc | 8 ++++++++ + .../Disable-speechSynthesis-getVoices-API.inc | 2 ++ + .../Disable-speechSynthesis-getVoices-API.inc | 3 +++ + .../Disable-speechSynthesis-getVoices-API.inc | 1 + .../platform/web_content_settings_client.h | 2 ++ .../renderer/modules/speech/speech_synthesis.cc | 17 ++++++++++++++--- - 9 files changed, 42 insertions(+), 9 deletions(-) + 9 files changed, 41 insertions(+), 5 deletions(-) + create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Disable-speechSynthesis-getVoices-API.inc + create mode 100644 cromite_flags/media/base/media_switches_cc/Disable-speechSynthesis-getVoices-API.inc + create mode 100644 cromite_flags/third_party/blink/common/features_cc/Disable-speechSynthesis-getVoices-API.inc + create mode 100644 cromite_flags/third_party/blink/common/features_h/Disable-speechSynthesis-getVoices-API.inc -diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc ---- a/chrome/browser/about_flags.cc -+++ b/chrome/browser/about_flags.cc -@@ -7946,6 +7946,11 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kFileSystemObserverDescription, kOsAll, - FEATURE_VALUE_TYPE(blink::features::kFileSystemObserver)}, - -+ {"disable-speechsynthesis-voice-list", -+ "Disable speechSynthesis.getVoices()", -+ "Disables access to the list of items installed on the device", kOsAll, -+ FEATURE_VALUE_TYPE(blink::features::kDisableSpeechSynthesisVoiceList)}, -+ - {"strict-origin-isolation", flag_descriptions::kStrictOriginIsolationName, - flag_descriptions::kStrictOriginIsolationDescription, kOsAll, - FEATURE_VALUE_TYPE(features::kStrictOriginIsolation)}, diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc @@ -87,57 +76,40 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.h protected: // Allow this to be overridden by tests. virtual void BindContentSettingsManager( -diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc ---- a/media/base/media_switches.cc -+++ b/media/base/media_switches.cc -@@ -919,7 +919,7 @@ const base::FeatureParam kMediaFoundationClearKeyCdmPathForTesting{ - #endif // BUILDFLAG(IS_WIN) - - // Enables the Live Caption feature on supported devices. --BASE_FEATURE(kLiveCaption, "LiveCaption", base::FEATURE_ENABLED_BY_DEFAULT); -+BASE_FEATURE(kLiveCaption, "LiveCaption", base::FEATURE_DISABLED_BY_DEFAULT); - - // Controls whether a "Share this tab instead" button should be shown for - // getDisplayMedia captures. Note: This flag does not control if the "Share this -@@ -978,9 +978,9 @@ BASE_FEATURE(kLiveCaptionRightClick, - base::FEATURE_DISABLED_BY_DEFAULT); - - // Enable or disable Live Caption support for WebAudio. --BASE_FEATURE(kLiveCaptionWebAudio, -- "LiveCaptionWebAudio", -- base::FEATURE_ENABLED_BY_DEFAULT); -+BASE_FEATURE(kLiveCaptionWebAudio, // disabled by -+ "LiveCaptionWebAudio", // default -+ base::FEATURE_DISABLED_BY_DEFAULT); // in bromite - - // Live Caption runs system-wide on ChromeOS, as opposed to just in the browser. - BASE_FEATURE(kLiveCaptionSystemWideOnChromeOS, -diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc ---- a/third_party/blink/common/features.cc -+++ b/third_party/blink/common/features.cc -@@ -653,6 +653,10 @@ BASE_FEATURE(kDirectCompositorThreadIpc, - "DirectCompositorThreadIpc", - base::FEATURE_DISABLED_BY_DEFAULT); - -+BASE_FEATURE(kDisableSpeechSynthesisVoiceList, -+ "DisableSpeechSynthesisVoiceList", -+ base::FEATURE_ENABLED_BY_DEFAULT); +diff --git a/cromite_flags/chrome/browser/about_flags_cc/Disable-speechSynthesis-getVoices-API.inc b/cromite_flags/chrome/browser/about_flags_cc/Disable-speechSynthesis-getVoices-API.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/chrome/browser/about_flags_cc/Disable-speechSynthesis-getVoices-API.inc +@@ -0,0 +1,8 @@ ++#ifdef FLAG_SECTION + - BASE_FEATURE(kDisableArrayBufferSizeLimitsForTesting, - "DisableArrayBufferSizeLimitsForTesting", - base::FEATURE_DISABLED_BY_DEFAULT); -diff --git a/third_party/blink/public/common/features.h b/third_party/blink/public/common/features.h ---- a/third_party/blink/public/common/features.h -+++ b/third_party/blink/public/common/features.h -@@ -330,6 +330,8 @@ extern const base::FeatureParam kCostReductionOfMultiplexedRequests; - // hopping through the IO thread first. - BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kDirectCompositorThreadIpc); - -+BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kDisableSpeechSynthesisVoiceList); ++ {"disable-speechsynthesis-voice-list", ++ "Disable speechSynthesis.getVoices()", ++ "Disables access to the list of items installed on the device", kOsAll, ++ FEATURE_VALUE_TYPE(blink::features::kDisableSpeechSynthesisVoiceList)}, + - // TODO(https://crbug.com/1201109): temporary flag to disable new ArrayBuffer - // size limits, so that tests can be written against code receiving these - // buffers. Remove when the bindings code instituting these limits is removed. ++#endif +diff --git a/cromite_flags/media/base/media_switches_cc/Disable-speechSynthesis-getVoices-API.inc b/cromite_flags/media/base/media_switches_cc/Disable-speechSynthesis-getVoices-API.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/media/base/media_switches_cc/Disable-speechSynthesis-getVoices-API.inc +@@ -0,0 +1,2 @@ ++SET_CROMITE_FEATURE_DISABLED(kLiveCaption); ++SET_CROMITE_FEATURE_DISABLED(kLiveCaptionWebAudio); +diff --git a/cromite_flags/third_party/blink/common/features_cc/Disable-speechSynthesis-getVoices-API.inc b/cromite_flags/third_party/blink/common/features_cc/Disable-speechSynthesis-getVoices-API.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/third_party/blink/common/features_cc/Disable-speechSynthesis-getVoices-API.inc +@@ -0,0 +1,3 @@ ++CROMITE_FEATURE(kDisableSpeechSynthesisVoiceList, ++ "DisableSpeechSynthesisVoiceList", ++ base::FEATURE_ENABLED_BY_DEFAULT); +diff --git a/cromite_flags/third_party/blink/common/features_h/Disable-speechSynthesis-getVoices-API.inc b/cromite_flags/third_party/blink/common/features_h/Disable-speechSynthesis-getVoices-API.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/third_party/blink/common/features_h/Disable-speechSynthesis-getVoices-API.inc +@@ -0,0 +1 @@ ++BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kDisableSpeechSynthesisVoiceList); diff --git a/third_party/blink/public/platform/web_content_settings_client.h b/third_party/blink/public/platform/web_content_settings_client.h --- a/third_party/blink/public/platform/web_content_settings_client.h +++ b/third_party/blink/public/platform/web_content_settings_client.h diff --git a/build/patches/00Enable-Document-Open-Inheritance-Removal.patch b/build/patches/00Enable-Document-Open-Inheritance-Removal.patch index c480385b8..721d5620c 100644 --- a/build/patches/00Enable-Document-Open-Inheritance-Removal.patch +++ b/build/patches/00Enable-Document-Open-Inheritance-Removal.patch @@ -85,7 +85,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -1441,7 +1441,6 @@ +@@ -1434,7 +1434,6 @@ { name: "DocumentOpenSandboxInheritanceRemoval", status: "stable", diff --git a/build/patches/00Enable-ImprovedBookmarks-by-default.patch b/build/patches/00Enable-ImprovedBookmarks-by-default.patch index d1633a0fc..c9fadacf5 100644 --- a/build/patches/00Enable-ImprovedBookmarks-by-default.patch +++ b/build/patches/00Enable-ImprovedBookmarks-by-default.patch @@ -9,8 +9,9 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html .../browser/bookmarks/BookmarkSearchBoxRowViewBinder.java | 2 ++ .../chromium/chrome/browser/bookmarks/BookmarkUiPrefs.java | 2 +- .../org/chromium/chrome/browser/bookmarks/BookmarkUtils.java | 3 ++- - chrome/browser/flags/android/chrome_feature_list.cc | 2 +- - 6 files changed, 9 insertions(+), 6 deletions(-) + .../Enable-ImprovedBookmarks-by-default.inc | 1 + + 6 files changed, 9 insertions(+), 5 deletions(-) + create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Enable-ImprovedBookmarks-by-default.inc diff --git a/chrome/android/java/res/layout/bookmark_search_box_row.xml b/chrome/android/java/res/layout/bookmark_search_box_row.xml --- a/chrome/android/java/res/layout/bookmark_search_box_row.xml @@ -89,17 +90,11 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm showBookmarkManagerOnTablet(context, activity == null ? null : activity.getComponentName(), url, isIncognito); } else { -diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc ---- a/chrome/browser/flags/android/chrome_feature_list.cc -+++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -509,7 +509,7 @@ BASE_FEATURE(kAndroidSearchEngineChoiceNotification, - - BASE_FEATURE(kAndroidImprovedBookmarks, - "AndroidImprovedBookmarks", -- base::FEATURE_DISABLED_BY_DEFAULT); -+ base::FEATURE_ENABLED_BY_DEFAULT); - - BASE_FEATURE(kAndroidNoVisibleHintForTablets, - "AndroidNoVisibleHintForTablets", +diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Enable-ImprovedBookmarks-by-default.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Enable-ImprovedBookmarks-by-default.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Enable-ImprovedBookmarks-by-default.inc +@@ -0,0 +1 @@ ++SET_CROMITE_FEATURE_ENABLED(kAndroidImprovedBookmarks); -- 2.25.1 diff --git a/build/patches/00Evict-the-entire-FrameTree-like-desktop.patch b/build/patches/00Evict-the-entire-FrameTree-like-desktop.patch index 4c5893b55..067d6e72e 100644 --- a/build/patches/00Evict-the-entire-FrameTree-like-desktop.patch +++ b/build/patches/00Evict-the-entire-FrameTree-like-desktop.patch @@ -4,9 +4,10 @@ Subject: Evict the entire FrameTree like desktop License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html --- - components/viz/common/features.cc | 2 +- - content/common/features.cc | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) + components/viz/common/features.cc | 2 +- + .../features_cc/Evict-the-entire-FrameTree-like-desktop.inc | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + create mode 100644 cromite_flags/content/common/features_cc/Evict-the-entire-FrameTree-like-desktop.inc diff --git a/components/viz/common/features.cc b/components/viz/common/features.cc --- a/components/viz/common/features.cc @@ -20,19 +21,11 @@ diff --git a/components/viz/common/features.cc b/components/viz/common/features. // If enabled, CompositorFrameSinkClient::OnBeginFrame is also treated as the // DidReceiveCompositorFrameAck. Both in providing the Ack for the previous -diff --git a/content/common/features.cc b/content/common/features.cc ---- a/content/common/features.cc -+++ b/content/common/features.cc -@@ -241,8 +241,8 @@ BASE_FEATURE(kInMemoryCodeCache, - // frames. Otherwise only toplevel frames and OOPIF are handled, and other - // cases, e.g. PDF tiles are ignored. See https://crbug.com/1360351 for details. - BASE_FEATURE(kInnerFrameCompositorSurfaceEviction, -- "InnerFrameCompositorSurfaceEviction", -- base::FEATURE_ENABLED_BY_DEFAULT); -+ "InnerFrameCompositorSurfaceEviction", // guard this -+ base::FEATURE_ENABLED_BY_DEFAULT); // guard this - - // Enable IOSurface based screen capturer. - #if BUILDFLAG(IS_MAC) +diff --git a/cromite_flags/content/common/features_cc/Evict-the-entire-FrameTree-like-desktop.inc b/cromite_flags/content/common/features_cc/Evict-the-entire-FrameTree-like-desktop.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/content/common/features_cc/Evict-the-entire-FrameTree-like-desktop.inc +@@ -0,0 +1 @@ ++SET_CROMITE_FEATURE_ENABLED(kInnerFrameCompositorSurfaceEviction); -- 2.25.1 diff --git a/build/patches/00Fonts-fingerprinting-mitigation.patch b/build/patches/00Fonts-fingerprinting-mitigation.patch index e4c6186a8..4167379eb 100644 --- a/build/patches/00Fonts-fingerprinting-mitigation.patch +++ b/build/patches/00Fonts-fingerprinting-mitigation.patch @@ -15,90 +15,53 @@ fonts-fingerprint-mitigation flag, which is active by default. License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html --- - chrome/browser/about_flags.cc | 5 + - chrome/browser/flag_descriptions.cc | 5 + - chrome/browser/flag_descriptions.h | 3 + - content/common/features.cc | 8 +- + .../Fonts-fingerprinting-mitigation.inc | 8 + + .../Fonts-fingerprinting-mitigation.inc | 2 + + .../Fonts-fingerprinting-mitigation.inc | 5 + skia/ext/skia_utils_win.cc | 20 ++ skia/ext/skia_utils_win.h | 3 + - third_party/blink/common/features.cc | 6 +- third_party/blink/public/common/features.h | 3 + third_party/blink/renderer/platform/BUILD.gn | 1 + .../renderer/platform/fonts/font_cache.h | 2 +- .../fonts/skia/bromite_allowed_fonts.h | 270 ++++++++++++++++++ .../platform/fonts/skia/font_cache_skia.cc | 44 ++- .../platform/fonts/win/font_cache_skia_win.cc | 7 +- - 13 files changed, 363 insertions(+), 14 deletions(-) + 11 files changed, 356 insertions(+), 9 deletions(-) + create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Fonts-fingerprinting-mitigation.inc + create mode 100644 cromite_flags/content/common/features_cc/Fonts-fingerprinting-mitigation.inc + create mode 100644 cromite_flags/third_party/blink/common/features_cc/Fonts-fingerprinting-mitigation.inc create mode 100644 third_party/blink/renderer/platform/fonts/skia/bromite_allowed_fonts.h -diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc ---- a/chrome/browser/about_flags.cc -+++ b/chrome/browser/about_flags.cc -@@ -10410,6 +10410,11 @@ const FeatureEntry kFeatureEntries[] = { - kClipboardMaximumAgeVariations, - "ClipboardMaximumAge")}, - +diff --git a/cromite_flags/chrome/browser/about_flags_cc/Fonts-fingerprinting-mitigation.inc b/cromite_flags/chrome/browser/about_flags_cc/Fonts-fingerprinting-mitigation.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/chrome/browser/about_flags_cc/Fonts-fingerprinting-mitigation.inc +@@ -0,0 +1,8 @@ ++#ifdef FLAG_SECTION ++ + {"fonts-fingerprint-mitigation", -+ flag_descriptions::kFontsFingerprintMitigationName, -+ flag_descriptions::kFontsFingerprintMitigationDescription, kOsAll, ++ "Enable fonts fingerprint mitigation", ++ "Filters the list of fonts allowing only standard ones to be used.", kOsAll, + FEATURE_VALUE_TYPE(blink::features::kFontsFingerprintMitigation)}, + - #if BUILDFLAG(IS_CHROMEOS_ASH) - {"enable-media-dynamic-cgroup", flag_descriptions::kMediaDynamicCgroupName, - flag_descriptions::kMediaDynamicCgroupDescription, kOsCrOS, -diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc ---- a/chrome/browser/flag_descriptions.cc -+++ b/chrome/browser/flag_descriptions.cc -@@ -159,6 +159,11 @@ const char kClipboardUnsanitizedContentDescription[] = - "Allows reading/writing unsanitized content from/to the clipboard. " - "Currently, it is only applicable to HTML format. See crbug.com/1268679."; - -+const char kFontsFingerprintMitigationName[] = -+ "Enable fonts fingerprint mitigation"; -+const char kFontsFingerprintMitigationDescription[] = -+ "Filters the list of fonts allowing only standard ones to be used."; -+ - const char kChromeRootStoreEnabledName[] = "Chrome Root Store"; - const char kChromeRootStoreEnabledDescription[] = - "Enable use of Chrome Root Store over platform roots. " -diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h ---- a/chrome/browser/flag_descriptions.h -+++ b/chrome/browser/flag_descriptions.h -@@ -131,6 +131,9 @@ extern const char kClickToCallDescription[]; - extern const char kClipboardUnsanitizedContentName[]; - extern const char kClipboardUnsanitizedContentDescription[]; - -+extern const char kFontsFingerprintMitigationName[]; -+extern const char kFontsFingerprintMitigationDescription[]; ++#endif +diff --git a/cromite_flags/content/common/features_cc/Fonts-fingerprinting-mitigation.inc b/cromite_flags/content/common/features_cc/Fonts-fingerprinting-mitigation.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/content/common/features_cc/Fonts-fingerprinting-mitigation.inc +@@ -0,0 +1,2 @@ ++SET_CROMITE_FEATURE_DISABLED(kAndroidDownloadableFontsMatching); ++SET_CROMITE_FEATURE_DISABLED(kFontSrcLocalMatching); +diff --git a/cromite_flags/third_party/blink/common/features_cc/Fonts-fingerprinting-mitigation.inc b/cromite_flags/third_party/blink/common/features_cc/Fonts-fingerprinting-mitigation.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/third_party/blink/common/features_cc/Fonts-fingerprinting-mitigation.inc +@@ -0,0 +1,5 @@ ++SET_CROMITE_FEATURE_DISABLED(kGMSCoreEmoji); + - extern const char kClipboardMaximumAgeName[]; - extern const char kClipboardMaximumAgeDescription[]; - -diff --git a/content/common/features.cc b/content/common/features.cc ---- a/content/common/features.cc -+++ b/content/common/features.cc -@@ -21,8 +21,8 @@ BASE_FEATURE(kAllowContentInitiatedDataUrlNavigations, - // Allows Blink to request fonts from the Android Downloadable Fonts API through - // the service implemented on the Java side. - BASE_FEATURE(kAndroidDownloadableFontsMatching, -- "AndroidDownloadableFontsMatching", -- base::FEATURE_ENABLED_BY_DEFAULT); -+ "AndroidDownloadableFontsMatching", // disabled -+ base::FEATURE_DISABLED_BY_DEFAULT); // by default - - // The following two features, when enabled, result in the browser process only - // asking the renderer process to run beforeunload handlers if it knows such -@@ -195,8 +195,8 @@ const base::FeatureParam kFledgeLimitNumAuctionsParam{ - // font name or postscript name. Rolling out behind a flag, as enabling this - // enables a font indexer on Android which we need to test in the field first. - BASE_FEATURE(kFontSrcLocalMatching, -- "FontSrcLocalMatching", -- base::FEATURE_ENABLED_BY_DEFAULT); -+ "FontSrcLocalMatching", // disable -+ base::FEATURE_DISABLED_BY_DEFAULT); // by default - - // Feature controlling whether or not memory pressure signals will be forwarded - // to the GPU process. ++CROMITE_FEATURE(kFontsFingerprintMitigation, ++ "FontsFingerprintMitigation", ++ base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/skia/ext/skia_utils_win.cc b/skia/ext/skia_utils_win.cc --- a/skia/ext/skia_utils_win.cc +++ b/skia/ext/skia_utils_win.cc @@ -149,33 +112,10 @@ diff --git a/skia/ext/skia_utils_win.h b/skia/ext/skia_utils_win.h // Creates an HBITMAP backed by 32-bits-per-pixel RGB data (the high bits are // unused in each pixel). SK_API base::win::ScopedBitmap CreateHBitmapXRGB8888( -diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc ---- a/third_party/blink/common/features.cc -+++ b/third_party/blink/common/features.cc -@@ -923,7 +923,7 @@ BASE_FEATURE(kFrequencyCappingForOverlayPopupDetection, - "FrequencyCappingForOverlayPopupDetection", - base::FEATURE_ENABLED_BY_DEFAULT); - --BASE_FEATURE(kGMSCoreEmoji, "GMSCoreEmoji", base::FEATURE_ENABLED_BY_DEFAULT); -+BASE_FEATURE(kGMSCoreEmoji, "GMSCoreEmoji", base::FEATURE_DISABLED_BY_DEFAULT); - - BASE_FEATURE(kGainmapHdrImages, - "GainmapHdrImages", -@@ -2036,6 +2036,10 @@ BASE_FEATURE(kWebRtcH264WithOpenH264FFmpeg, - base::FEATURE_ENABLED_BY_DEFAULT); - #endif // BUILDFLAG(RTC_USE_H264) && BUILDFLAG(ENABLE_FFMPEG_VIDEO_DECODERS) - -+BASE_FEATURE(kFontsFingerprintMitigation, -+ "FontsFingerprintMitigation", -+ base::FEATURE_ENABLED_BY_DEFAULT); -+ - // Exposes non-standard stats in the WebRTC getStats() API. - BASE_FEATURE(kWebRtcExposeNonStandardStats, - "WebRtc-ExposeNonStandardStats", diff --git a/third_party/blink/public/common/features.h b/third_party/blink/public/common/features.h --- a/third_party/blink/public/common/features.h +++ b/third_party/blink/public/common/features.h -@@ -249,6 +249,9 @@ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kCompressParkableStrings); +@@ -247,6 +247,9 @@ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kCompressParkableStrings); BLINK_COMMON_EXPORT extern const base::FeatureParam kMaxDiskDataAllocatorCapacityMB; diff --git a/build/patches/00Internal-firewall.patch b/build/patches/00Internal-firewall.patch index 75e641a5e..ff71dbc1e 100644 --- a/build/patches/00Internal-firewall.patch +++ b/build/patches/00Internal-firewall.patch @@ -10,10 +10,11 @@ in services/firewall/tools/rules.xml License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html --- chrome/browser/BUILD.gn | 1 + - chrome/browser/about_flags.cc | 6 + + chrome/browser/about_flags.cc | 1 + .../downloads/offline_page_download_bridge.cc | 32 +- .../content/internal/context_menu_download.cc | 32 +- .../android/webapk/webapk_icon_hasher.cc | 32 +- + .../about_flags_cc/Internal-firewall.inc | 8 + net/BUILD.gn | 1 + .../network_traffic_annotation.h | 4 - net/url_request/url_request_http_job.cc | 15 + @@ -38,7 +39,8 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html .../loader/fetch/url_loader/url_loader.cc | 4 +- .../scripts/auditor/auditor.py | 1 + .../scripts/auditor/util.py | 1 + - 29 files changed, 1566 insertions(+), 20 deletions(-) + 30 files changed, 1569 insertions(+), 20 deletions(-) + create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Internal-firewall.inc create mode 100644 services/firewall/public/BUILD.gn create mode 100644 services/firewall/public/firewall_features.cc create mode 100644 services/firewall/public/firewall_features.h @@ -75,18 +77,6 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc #include "services/media_session/public/cpp/features.h" #include "services/network/public/cpp/features.h" #include "services/network/public/cpp/network_switches.h" -@@ -8594,6 +8595,11 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(page_info::kPageInfoHideSiteSettings)}, - #endif // !BUILDFLAG(IS_ANDROID) - -+ {"enable-firewall", -+ "Enable internal firewall", -+ "Enable internal firewall", kOsDesktop | kOsAndroid, -+ FEATURE_VALUE_TYPE(firewall::features::kEnableFirewall)}, -+ - #if !BUILDFLAG(IS_ANDROID) - {"page-info-history-desktop", - flag_descriptions::kPageInfoHistoryDesktopName, diff --git a/chrome/browser/offline_pages/android/downloads/offline_page_download_bridge.cc b/chrome/browser/offline_pages/android/downloads/offline_page_download_bridge.cc --- a/chrome/browser/offline_pages/android/downloads/offline_page_download_bridge.cc +++ b/chrome/browser/offline_pages/android/downloads/offline_page_download_bridge.cc @@ -233,6 +223,19 @@ diff --git a/components/webapps/browser/android/webapk/webapk_icon_hasher.cc b/c simple_url_loader_->DownloadToStringOfUnboundedSizeUntilCrashAndDie( url_loader_factory, base::BindOnce(&WebApkIconHasher::OnSimpleLoaderComplete, +diff --git a/cromite_flags/chrome/browser/about_flags_cc/Internal-firewall.inc b/cromite_flags/chrome/browser/about_flags_cc/Internal-firewall.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/chrome/browser/about_flags_cc/Internal-firewall.inc +@@ -0,0 +1,8 @@ ++#ifdef FLAG_SECTION ++ ++ {"enable-firewall", ++ "Enable internal firewall", ++ "Enable internal firewall", kOsDesktop | kOsAndroid, ++ FEATURE_VALUE_TYPE(firewall::features::kEnableFirewall)}, ++ ++#endif diff --git a/net/BUILD.gn b/net/BUILD.gn --- a/net/BUILD.gn +++ b/net/BUILD.gn @@ -261,7 +264,7 @@ diff --git a/net/traffic_annotation/network_traffic_annotation.h b/net/traffic_a diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc --- a/net/url_request/url_request_http_job.cc +++ b/net/url_request/url_request_http_job.cc -@@ -261,6 +261,9 @@ URLRequestHttpJob::URLRequestHttpJob( +@@ -262,6 +262,9 @@ URLRequestHttpJob::URLRequestHttpJob( throttling_entry_ = manager->RegisterRequestUrl(request->url()); ResetTimer(); @@ -271,7 +274,7 @@ diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_reque } URLRequestHttpJob::~URLRequestHttpJob() { -@@ -555,6 +558,18 @@ void URLRequestHttpJob::MaybeStartTransactionInternal(int result) { +@@ -556,6 +559,18 @@ void URLRequestHttpJob::MaybeStartTransactionInternal(int result) { void URLRequestHttpJob::StartTransactionInternal() { DCHECK(!override_response_headers_); diff --git a/build/patches/00Keep-disabled-FetchLaterAPI.patch b/build/patches/00Keep-disabled-FetchLaterAPI.patch index bd092e74f..2fbbbb718 100644 --- a/build/patches/00Keep-disabled-FetchLaterAPI.patch +++ b/build/patches/00Keep-disabled-FetchLaterAPI.patch @@ -3,39 +3,23 @@ Date: Thu, 28 Sep 2023 08:11:00 +0000 Subject: Keep disabled FetchLaterAPI --- - third_party/blink/common/features.cc | 8 ++++---- - .../renderer/platform/runtime_enabled_features.json5 | 3 ++- - 2 files changed, 6 insertions(+), 5 deletions(-) + .../blink/common/features_cc/Keep-disabled-FetchLaterAPI.inc | 3 +++ + .../blink/renderer/platform/runtime_enabled_features.json5 | 3 ++- + 2 files changed, 5 insertions(+), 1 deletion(-) + create mode 100644 cromite_flags/third_party/blink/common/features_cc/Keep-disabled-FetchLaterAPI.inc -diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc ---- a/third_party/blink/common/features.cc -+++ b/third_party/blink/common/features.cc -@@ -1026,8 +1026,8 @@ BASE_FEATURE(kKalmanHeuristics, - base::FEATURE_DISABLED_BY_DEFAULT); - - BASE_FEATURE(kKeepAliveInBrowserMigration, -- "KeepAliveInBrowserMigration", -- base::FEATURE_DISABLED_BY_DEFAULT); -+ "KeepAliveInBrowserMigration", // keep -+ base::FEATURE_DISABLED_BY_DEFAULT); // disabled - - // Enables reporting as LCP of the time the first frame of an animated image was - // painted. -@@ -1278,8 +1278,8 @@ BASE_FEATURE(kPath2DPaintCache, - base::FEATURE_DISABLED_BY_DEFAULT); - - BASE_FEATURE(kPendingBeaconAPI, -- "PendingBeaconAPI", -- base::FEATURE_DISABLED_BY_DEFAULT); -+ "PendingBeaconAPI", // keep -+ base::FEATURE_DISABLED_BY_DEFAULT); // disabled - const base::FeatureParam kPendingBeaconAPIRequiresOriginTrial = { - &kPendingBeaconAPI, "requires_origin_trial", false}; - const base::FeatureParam kPendingBeaconAPIForcesSendingOnNavigation = { +diff --git a/cromite_flags/third_party/blink/common/features_cc/Keep-disabled-FetchLaterAPI.inc b/cromite_flags/third_party/blink/common/features_cc/Keep-disabled-FetchLaterAPI.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/third_party/blink/common/features_cc/Keep-disabled-FetchLaterAPI.inc +@@ -0,0 +1,3 @@ ++SET_CROMITE_FEATURE_DISABLED(kFetchLaterAPI); ++SET_CROMITE_FEATURE_DISABLED(kKeepAliveInBrowserMigration); ++SET_CROMITE_FEATURE_DISABLED(kPendingBeaconAPI); diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -1700,7 +1700,8 @@ +@@ -1693,7 +1693,8 @@ }, { // The Blink runtime-enabled feature name for the API's IDL. diff --git a/build/patches/00Keyboard-protection-flag.patch b/build/patches/00Keyboard-protection-flag.patch index 61829978b..aba8fcd2c 100644 --- a/build/patches/00Keyboard-protection-flag.patch +++ b/build/patches/00Keyboard-protection-flag.patch @@ -8,9 +8,7 @@ keyboard events. License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html --- - chrome/browser/about_flags.cc | 3 + - chrome/browser/flag_descriptions.cc | 6 ++ - chrome/browser/flag_descriptions.h | 3 + + .../Keyboard-protection-flag.inc | 10 +++ .../renderer/core/events/keyboard_event.cc | 66 +++++++++++++++++++ .../renderer/core/events/keyboard_event.h | 3 + ui/base/ui_base_features.cc | 8 +++ @@ -18,50 +16,24 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html .../dom/dom_keyboard_layout_map_win.cc | 13 ++++ .../keycodes/keyboard_code_conversion.cc | 10 ++- ui/events/keycodes/keyboard_code_conversion.h | 2 +- - 10 files changed, 113 insertions(+), 3 deletions(-) + 8 files changed, 111 insertions(+), 3 deletions(-) + create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Keyboard-protection-flag.inc -diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc ---- a/chrome/browser/about_flags.cc -+++ b/chrome/browser/about_flags.cc -@@ -5416,6 +5416,9 @@ const FeatureEntry kFeatureEntries[] = { - {"system-keyboard-lock", flag_descriptions::kSystemKeyboardLockName, - flag_descriptions::kSystemKeyboardLockDescription, kOsDesktop, - FEATURE_VALUE_TYPE(features::kSystemKeyboardLock)}, -+ {"system-keyboard-protection", flag_descriptions::kSystemKeyboardProtectionName, -+ flag_descriptions::kSystemKeyboardProtectionDescription, kOsAll, -+ FEATURE_VALUE_TYPE(features::kSystemKeyboardProtection)}, - #if BUILDFLAG(IS_ANDROID) - {"add-to-homescreen-iph", flag_descriptions::kAddToHomescreenIPHName, - flag_descriptions::kAddToHomescreenIPHDescription, kOsAndroid, -diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc ---- a/chrome/browser/flag_descriptions.cc -+++ b/chrome/browser/flag_descriptions.cc -@@ -3340,6 +3340,12 @@ const char kSystemKeyboardLockDescription[] = - "keyboard shortcuts and have the events routed directly to the website " - "when in fullscreen mode."; - -+const char kSystemKeyboardProtectionName[] = "System keyboard protection"; -+const char kSystemKeyboardProtectionDescription[] = -+ "Hides user preference on the system keyboard by setting the standard " -+ "eng layout and removing the layout information from the " -+ "javascript keyboard events."; +diff --git a/cromite_flags/chrome/browser/about_flags_cc/Keyboard-protection-flag.inc b/cromite_flags/chrome/browser/about_flags_cc/Keyboard-protection-flag.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/chrome/browser/about_flags_cc/Keyboard-protection-flag.inc +@@ -0,0 +1,10 @@ ++#ifdef FLAG_SECTION + - const char kSystemSoundsName[] = "Power Sounds"; - const char kSystemSoundsDescription[] = - "Enable device charging and low battery warning sounds."; -diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h ---- a/chrome/browser/flag_descriptions.h -+++ b/chrome/browser/flag_descriptions.h -@@ -1923,6 +1923,9 @@ extern const char kSuppressToolbarCapturesDescription[]; - extern const char kSystemKeyboardLockName[]; - extern const char kSystemKeyboardLockDescription[]; - -+extern const char kSystemKeyboardProtectionName[]; -+extern const char kSystemKeyboardProtectionDescription[]; ++ {"system-keyboard-protection", ++ "System keyboard protection", ++ "Hides user preference on the system keyboard by setting the standard " ++ "eng layout and removing the layout information from the " ++ "javascript keyboard events.", kOsAll, ++ FEATURE_VALUE_TYPE(features::kSystemKeyboardProtection)}, + - extern const char kSystemSoundsName[]; - extern const char kSystemSoundsDescription[]; - ++#endif diff --git a/third_party/blink/renderer/core/events/keyboard_event.cc b/third_party/blink/renderer/core/events/keyboard_event.cc --- a/third_party/blink/renderer/core/events/keyboard_event.cc +++ b/third_party/blink/renderer/core/events/keyboard_event.cc diff --git a/build/patches/00Lock-Profile-Cookie-Database.patch b/build/patches/00Lock-Profile-Cookie-Database.patch index 916e00939..0d8a3ffc4 100644 --- a/build/patches/00Lock-Profile-Cookie-Database.patch +++ b/build/patches/00Lock-Profile-Cookie-Database.patch @@ -4,22 +4,19 @@ Subject: Lock Profile Cookie Database License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html --- - chrome/browser/browser_features.cc | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + .../browser_features_cc/Lock-Profile-Cookie-Database.inc | 5 +++++ + 1 file changed, 5 insertions(+) + create mode 100644 cromite_flags/chrome/browser/browser_features_cc/Lock-Profile-Cookie-Database.inc -diff --git a/chrome/browser/browser_features.cc b/chrome/browser/browser_features.cc ---- a/chrome/browser/browser_features.cc -+++ b/chrome/browser/browser_features.cc -@@ -213,8 +213,8 @@ BASE_FEATURE(kAppBoundEncryptionMetrics, - // Enables locking the cookie database for profiles. - // TODO(crbug.com/1430226): Remove after fully launched. - BASE_FEATURE(kLockProfileCookieDatabase, -- "LockProfileCookieDatabase", -- base::FEATURE_ENABLED_BY_DEFAULT); -+ "LockProfileCookieDatabase", // enabled -+ base::FEATURE_ENABLED_BY_DEFAULT); // by default - - // Don't call the Win32 API PrefetchVirtualMemory when loading chrome.dll inside - // non-browser processes. This is done by passing flags to these processes. This +diff --git a/cromite_flags/chrome/browser/browser_features_cc/Lock-Profile-Cookie-Database.inc b/cromite_flags/chrome/browser/browser_features_cc/Lock-Profile-Cookie-Database.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/chrome/browser/browser_features_cc/Lock-Profile-Cookie-Database.inc +@@ -0,0 +1,5 @@ ++#if BUILDFLAG(IS_WIN) ++ ++SET_CROMITE_FEATURE_ENABLED(kLockProfileCookieDatabase); ++ ++#endif -- 2.25.1 diff --git a/build/patches/00Log-dangling-attributes-in-some-html-elements.patch b/build/patches/00Log-dangling-attributes-in-some-html-elements.patch index f13a8725e..36799908b 100644 --- a/build/patches/00Log-dangling-attributes-in-some-html-elements.patch +++ b/build/patches/00Log-dangling-attributes-in-some-html-elements.patch @@ -9,7 +9,7 @@ under enable-log-dangling-attributes about flag License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html --- - chrome/browser/about_flags.cc | 5 ++++- + ...gling-attributes-in-some-html-elements.inc | 8 +++++++ .../blink/renderer/core/dom/document.cc | 18 +++++++++++++++ .../blink/renderer/core/dom/element.cc | 20 ++++++++++++++++- third_party/blink/renderer/core/dom/element.h | 3 ++- @@ -22,23 +22,22 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html .../core/loader/frame_load_request.cc | 9 ++++++++ .../blink/renderer/core/page/frame_tree.cc | 22 +++++++++++++++++++ .../platform/runtime_enabled_features.json5 | 10 +++++++-- - 13 files changed, 127 insertions(+), 5 deletions(-) + 13 files changed, 131 insertions(+), 4 deletions(-) + create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Log-dangling-attributes-in-some-html-elements.inc -diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc ---- a/chrome/browser/about_flags.cc -+++ b/chrome/browser/about_flags.cc -@@ -5364,7 +5364,10 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kWebShareDescription, kOsWin | kOsCrOS | kOsMac, - FEATURE_VALUE_TYPE(features::kWebShare)}, - #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) -- +diff --git a/cromite_flags/chrome/browser/about_flags_cc/Log-dangling-attributes-in-some-html-elements.inc b/cromite_flags/chrome/browser/about_flags_cc/Log-dangling-attributes-in-some-html-elements.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/chrome/browser/about_flags_cc/Log-dangling-attributes-in-some-html-elements.inc +@@ -0,0 +1,8 @@ ++#ifdef FLAG_SECTION ++ + {"enable-log-dangling-attributes", + "Log some dangling attributes", + "NOTE: log only", kOsAll, + FEATURE_VALUE_TYPE(blink::features::kLogDanglingAttributes)}, - #if BUILDFLAG(IS_LINUX) - {"ozone-platform-hint", flag_descriptions::kOzonePlatformHintName, - flag_descriptions::kOzonePlatformHintDescription, kOsLinux, ++ ++#endif diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc --- a/third_party/blink/renderer/core/dom/document.cc +++ b/third_party/blink/renderer/core/dom/document.cc @@ -319,7 +318,7 @@ diff --git a/third_party/blink/renderer/core/page/frame_tree.cc b/third_party/bl diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -1525,8 +1525,8 @@ +@@ -1518,8 +1518,8 @@ // Experiment with preventing some instances of mutation XSS // by escaping "<" and ">" in attribute values. // See: crbug.com/1175016 @@ -330,7 +329,7 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 }, { name: "EventTimingInteractionCount", -@@ -2296,6 +2296,12 @@ +@@ -2289,6 +2289,12 @@ // Use LongAnimationFrameMonitor to emit longtask entries name: "LongTaskFromLongAnimationFrame" }, diff --git a/build/patches/00Partition-HSTS-cache-by-NAK.patch b/build/patches/00Partition-HSTS-cache-by-NAK.patch index 0c6332a5a..64553d902 100644 --- a/build/patches/00Partition-HSTS-cache-by-NAK.patch +++ b/build/patches/00Partition-HSTS-cache-by-NAK.patch @@ -504,7 +504,7 @@ diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_reque return std::make_unique( request, UpgradeSchemeToCryptographic(url), // Use status code 307 to preserve the method, so POST requests work. -@@ -1055,7 +1055,7 @@ void URLRequestHttpJob::ProcessStrictTransportSecurityHeader() { +@@ -1056,7 +1056,7 @@ void URLRequestHttpJob::ProcessStrictTransportSecurityHeader() { HttpResponseHeaders* headers = GetResponseHeaders(); std::string value; if (headers->EnumerateHeader(nullptr, "Strict-Transport-Security", &value)) @@ -513,7 +513,7 @@ diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_reque } void URLRequestHttpJob::OnStartCompleted(int result) { -@@ -1125,7 +1125,7 @@ void URLRequestHttpJob::OnStartCompleted(int result) { +@@ -1126,7 +1126,7 @@ void URLRequestHttpJob::OnStartCompleted(int result) { TransportSecurityState* state = context->transport_security_state(); NotifySSLCertificateError( result, transaction_->GetResponseInfo()->ssl_info, diff --git a/build/patches/00Partition-MediaDeviceId-by-default.patch b/build/patches/00Partition-MediaDeviceId-by-default.patch index 21cf3eefb..7880c3c1f 100644 --- a/build/patches/00Partition-MediaDeviceId-by-default.patch +++ b/build/patches/00Partition-MediaDeviceId-by-default.patch @@ -7,8 +7,9 @@ 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 | 3 +++ content/browser/renderer_host/media/media_devices_manager.cc | 5 +++++ - content/common/features.cc | 4 ++-- - 3 files changed, 10 insertions(+), 2 deletions(-) + .../features_cc/Partition-MediaDeviceId-by-default.inc | 1 + + 3 files changed, 9 insertions(+) + create mode 100644 cromite_flags/content/common/features_cc/Partition-MediaDeviceId-by-default.inc 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 @@ -38,19 +39,11 @@ diff --git a/content/browser/renderer_host/media/media_devices_manager.cc b/cont GetAudioInputCapabilities(video_input_capabilities_requested, audio_input_capabilities_requested, -diff --git a/content/common/features.cc b/content/common/features.cc ---- a/content/common/features.cc -+++ b/content/common/features.cc -@@ -164,8 +164,8 @@ BASE_FEATURE(kEnsureAllowBindingsIsAlwaysForWebUI, - // media-device enumeration will provide at most one device per type and the - // device IDs will not be available. - BASE_FEATURE(kEnumerateDevicesHideDeviceIDs, -- "EnumerateDevicesHideDeviceIDs", -- base::FEATURE_ENABLED_BY_DEFAULT); -+ "EnumerateDevicesHideDeviceIDs", // keep -+ base::FEATURE_ENABLED_BY_DEFAULT); // enabled - - // Content counterpart of ExperimentalContentSecurityPolicyFeatures in - // third_party/blink/renderer/platform/runtime_enabled_features.json5. Enables +diff --git a/cromite_flags/content/common/features_cc/Partition-MediaDeviceId-by-default.inc b/cromite_flags/content/common/features_cc/Partition-MediaDeviceId-by-default.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/content/common/features_cc/Partition-MediaDeviceId-by-default.inc +@@ -0,0 +1 @@ ++SET_CROMITE_FEATURE_ENABLED(kEnumerateDevicesHideDeviceIDs); -- 2.25.1 diff --git a/build/patches/00Partitioning-all-cookies-by-top-frame-domain.patch b/build/patches/00Partitioning-all-cookies-by-top-frame-domain.patch index 95f4902d9..bb811e05b 100644 --- a/build/patches/00Partitioning-all-cookies-by-top-frame-domain.patch +++ b/build/patches/00Partitioning-all-cookies-by-top-frame-domain.patch @@ -182,7 +182,7 @@ diff --git a/net/extras/sqlite/sqlite_persistent_cookie_store.cc b/net/extras/sq diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc --- a/net/url_request/url_request_http_job.cc +++ b/net/url_request/url_request_http_job.cc -@@ -758,7 +758,7 @@ void URLRequestHttpJob::SetCookieHeaderAndStart( +@@ -759,7 +759,7 @@ void URLRequestHttpJob::SetCookieHeaderAndStart( size_t n_partitioned_cookies = 0; bool may_set_sec_cookie_deprecation_header = diff --git a/build/patches/00Remove-auth-header-upon-cross-origin-redirect.patch b/build/patches/00Remove-auth-header-upon-cross-origin-redirect.patch index ed76e0776..75e72d3f4 100644 --- a/build/patches/00Remove-auth-header-upon-cross-origin-redirect.patch +++ b/build/patches/00Remove-auth-header-upon-cross-origin-redirect.patch @@ -4,25 +4,18 @@ Subject: Remove auth header upon cross origin redirect License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html --- - third_party/blink/common/features.cc | 4 ++-- + .../Remove-auth-header-upon-cross-origin-redirect.inc | 1 + .../blink/renderer/platform/loader/fetch/resource_loader.cc | 3 +++ .../platform/loader/fetch/url_loader/sync_load_context.cc | 4 ++++ - 3 files changed, 9 insertions(+), 2 deletions(-) + 3 files changed, 8 insertions(+) + create mode 100644 cromite_flags/third_party/blink/common/features_cc/Remove-auth-header-upon-cross-origin-redirect.inc -diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc ---- a/third_party/blink/common/features.cc -+++ b/third_party/blink/common/features.cc -@@ -1526,8 +1526,8 @@ BASE_FEATURE(kRemoteResourceCache, - base::FEATURE_DISABLED_BY_DEFAULT); - - BASE_FEATURE(kRemoveAuthroizationOnCrossOriginRedirect, -- "RemoveAutorizationOnCrossOriginRedirect", -- base::FEATURE_ENABLED_BY_DEFAULT); -+ "RemoveAutorizationOnCrossOriginRedirect", // guard -+ base::FEATURE_ENABLED_BY_DEFAULT); // this - - BASE_FEATURE(kRenderBlockingFonts, - "RenderBlockingFonts", +diff --git a/cromite_flags/third_party/blink/common/features_cc/Remove-auth-header-upon-cross-origin-redirect.inc b/cromite_flags/third_party/blink/common/features_cc/Remove-auth-header-upon-cross-origin-redirect.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/third_party/blink/common/features_cc/Remove-auth-header-upon-cross-origin-redirect.inc +@@ -0,0 +1 @@ ++SET_CROMITE_FEATURE_ENABLED(kRemoveAuthroizationOnCrossOriginRedirect); diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_loader.cc b/third_party/blink/renderer/platform/loader/fetch/resource_loader.cc --- a/third_party/blink/renderer/platform/loader/fetch/resource_loader.cc +++ b/third_party/blink/renderer/platform/loader/fetch/resource_loader.cc diff --git a/build/patches/00Remove-support-for-device-memory-and-cpu-recovery.patch b/build/patches/00Remove-support-for-device-memory-and-cpu-recovery.patch index 0a20178e0..00ee67884 100644 --- a/build/patches/00Remove-support-for-device-memory-and-cpu-recovery.patch +++ b/build/patches/00Remove-support-for-device-memory-and-cpu-recovery.patch @@ -4,15 +4,22 @@ Subject: Remove support for device memory and cpu recovery License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html --- + ...ort-for-device-memory-and-cpu-recovery.inc | 1 + .../browser/blob/blob_memory_controller.cc | 20 ++++++++++--------- .../browser/quota/quota_device_info_helper.cc | 17 ++++++++++++++-- .../approximated_device_memory.cc | 7 ++++++- - third_party/blink/common/features.cc | 4 ++-- .../frame/navigator_concurrent_hardware.cc | 8 ++++++-- .../blink/renderer/core/timing/memory_info.cc | 14 ++++++++++--- .../core/timing/window_performance.cc | 2 +- - 7 files changed, 52 insertions(+), 20 deletions(-) + 7 files changed, 51 insertions(+), 18 deletions(-) + create mode 100644 cromite_flags/third_party/blink/common/features_cc/Remove-support-for-device-memory-and-cpu-recovery.inc +diff --git a/cromite_flags/third_party/blink/common/features_cc/Remove-support-for-device-memory-and-cpu-recovery.inc b/cromite_flags/third_party/blink/common/features_cc/Remove-support-for-device-memory-and-cpu-recovery.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/third_party/blink/common/features_cc/Remove-support-for-device-memory-and-cpu-recovery.inc +@@ -0,0 +1 @@ ++SET_CROMITE_FEATURE_DISABLED(kWebMeasureMemoryViaPerformanceManager); diff --git a/storage/browser/blob/blob_memory_controller.cc b/storage/browser/blob/blob_memory_controller.cc --- a/storage/browser/blob/blob_memory_controller.cc +++ b/storage/browser/blob/blob_memory_controller.cc @@ -117,20 +124,6 @@ diff --git a/third_party/blink/common/device_memory/approximated_device_memory.c int64_t ApproximatedDeviceMemory::physical_memory_mb_ = 0; // static -diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc ---- a/third_party/blink/common/features.cc -+++ b/third_party/blink/common/features.cc -@@ -2034,8 +2034,8 @@ BASE_FEATURE(kWebFontsCacheAwareTimeoutAdaption, - // Controls whether the implementation of the performance.measureMemory - // web API uses PerformanceManager or not. - BASE_FEATURE(kWebMeasureMemoryViaPerformanceManager, -- "WebMeasureMemoryViaPerformanceManager", -- base::FEATURE_ENABLED_BY_DEFAULT); -+ "WebMeasureMemoryViaPerformanceManager", // need to be -+ base::FEATURE_DISABLED_BY_DEFAULT); // disabled by default - - BASE_FEATURE(kWebRtcCombinedNetworkAndWorkerThread, - "WebRtcCombinedNetworkAndWorkerThread", diff --git a/third_party/blink/renderer/core/frame/navigator_concurrent_hardware.cc b/third_party/blink/renderer/core/frame/navigator_concurrent_hardware.cc --- a/third_party/blink/renderer/core/frame/navigator_concurrent_hardware.cc +++ b/third_party/blink/renderer/core/frame/navigator_concurrent_hardware.cc diff --git a/build/patches/00Show-warnings-on-downloads-over-HTTP.patch b/build/patches/00Show-warnings-on-downloads-over-HTTP.patch index e9ea2bde0..5db4c6c61 100644 --- a/build/patches/00Show-warnings-on-downloads-over-HTTP.patch +++ b/build/patches/00Show-warnings-on-downloads-over-HTTP.patch @@ -4,24 +4,15 @@ Subject: Show warnings on downloads over HTTP License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html --- - chrome/common/chrome_features.cc | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) + .../chrome_features_cc/Show-warnings-on-downloads-over-HTTP.inc | 1 + + 1 file changed, 1 insertion(+) + create mode 100644 cromite_flags/chrome/common/chrome_features_cc/Show-warnings-on-downloads-over-HTTP.inc -diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc ---- a/chrome/common/chrome_features.cc -+++ b/chrome/common/chrome_features.cc -@@ -1228,9 +1228,9 @@ BASE_FEATURE(kTreatUnsafeDownloadsAsActive, - base::FEATURE_ENABLED_BY_DEFAULT); - - // Show warnings on downloads not delivered over HTTPS. --BASE_FEATURE(kInsecureDownloadWarnings, -- "InsecureDownloadWarnings", -- base::FEATURE_DISABLED_BY_DEFAULT); -+BASE_FEATURE(kInsecureDownloadWarnings, // enabled by -+ "InsecureDownloadWarnings", // default -+ base::FEATURE_ENABLED_BY_DEFAULT); // in bromite - - // TrustSafetySentimentSurvey - #if !BUILDFLAG(IS_ANDROID) +diff --git a/cromite_flags/chrome/common/chrome_features_cc/Show-warnings-on-downloads-over-HTTP.inc b/cromite_flags/chrome/common/chrome_features_cc/Show-warnings-on-downloads-over-HTTP.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/chrome/common/chrome_features_cc/Show-warnings-on-downloads-over-HTTP.inc +@@ -0,0 +1 @@ ++SET_CROMITE_FEATURE_ENABLED(kInsecureDownloadWarnings); -- 2.25.1 diff --git a/build/patches/Add-AllowUserCertificates-flag.patch b/build/patches/Add-AllowUserCertificates-flag.patch index 8ea3263f4..86e113f50 100644 --- a/build/patches/Add-AllowUserCertificates-flag.patch +++ b/build/patches/Add-AllowUserCertificates-flag.patch @@ -5,15 +5,17 @@ Subject: Add AllowUserCertificates flag Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - .../org/chromium/chrome/browser/app/ChromeActivity.java | 3 +++ - chrome/browser/about_flags.cc | 7 +++++++ - chrome/browser/flag_descriptions.cc | 5 +++++ - chrome/browser/flag_descriptions.h | 3 +++ - chrome/browser/flags/android/chrome_feature_list.cc | 5 +++++ - chrome/browser/flags/android/chrome_feature_list.h | 1 + - .../chromium/chrome/browser/flags/ChromeFeatureList.java | 4 ++++ - net/android/java/src/org/chromium/net/X509Util.java | 5 +++++ - 8 files changed, 33 insertions(+) + .../chromium/chrome/browser/app/ChromeActivity.java | 3 +++ + chrome/browser/flags/android/chrome_feature_list.cc | 1 + + .../chrome/browser/flags/ChromeFeatureList.java | 4 ++++ + .../Add-AllowUserCertificates-flag.inc | 13 +++++++++++++ + .../Add-AllowUserCertificates-flag.inc | 3 +++ + .../Add-AllowUserCertificates-flag.inc | 1 + + net/android/java/src/org/chromium/net/X509Util.java | 5 +++++ + 7 files changed, 30 insertions(+) + create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Add-AllowUserCertificates-flag.inc + create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Add-AllowUserCertificates-flag.inc + create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/Add-AllowUserCertificates-flag.inc diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java @@ -35,51 +37,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv // postDeferredStartupIfNeeded() is called in TabModelSelectorTabObsever#onLoadStopped(), // #onPageLoadFinished() and #onCrash(). If we are not actively loading a tab (e.g. -diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc ---- a/chrome/browser/about_flags.cc -+++ b/chrome/browser/about_flags.cc -@@ -9668,6 +9668,13 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kEnableDrDcDescription, kOsAll, - FEATURE_VALUE_TYPE(features::kEnableDrDc)}, - -+#if BUILDFLAG(IS_ANDROID) -+ {"allow-user-certificates", -+ flag_descriptions::kAllowUserCertificatesName, -+ flag_descriptions::kAllowUserCertificatesDescription, kOsAndroid, -+ FEATURE_VALUE_TYPE(chrome::android::kAllowUserCertificates)}, -+#endif // BUILDFLAG(IS_ANDROID) -+ - {"force-gpu-main-thread-to-normal-priority-drdc", - flag_descriptions::kForceGpuMainThreadToNormalPriorityDrDcName, - flag_descriptions::kForceGpuMainThreadToNormalPriorityDrDcDescription, -diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc ---- a/chrome/browser/flag_descriptions.cc -+++ b/chrome/browser/flag_descriptions.cc -@@ -14,6 +14,11 @@ - - namespace flag_descriptions { - -+const char kAllowUserCertificatesName[] = "Allow user certificates"; -+const char kAllowUserCertificatesDescription[] = -+ "Allow user CA certificates during " -+ "validation of the certificate chain"; -+ - const char kAccelerated2dCanvasName[] = "Accelerated 2D canvas"; - const char kAccelerated2dCanvasDescription[] = - "Enables the use of the GPU to perform 2d canvas rendering instead of " -diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h ---- a/chrome/browser/flag_descriptions.h -+++ b/chrome/browser/flag_descriptions.h -@@ -43,6 +43,9 @@ namespace flag_descriptions { - - // Cross-platform ------------------------------------------------------------- - -+extern const char kAllowUserCertificatesName[]; -+extern const char kAllowUserCertificatesDescription[]; -+ - extern const char kAccelerated2dCanvasName[]; - extern const char kAccelerated2dCanvasDescription[]; - diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc @@ -91,28 +48,6 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &feed::kInterestFeedV2, &feed::kInterestFeedV2Autoplay, &feed::kInterestFeedV2Hearts, -@@ -477,6 +478,10 @@ BASE_FEATURE(kSearchReadyOmniboxFeature, - "SearchReadyOmnibox", - base::FEATURE_DISABLED_BY_DEFAULT); - -+BASE_FEATURE(kAllowUserCertificates, -+ "AllowUserCertificates", -+ base::FEATURE_DISABLED_BY_DEFAULT); -+ - BASE_FEATURE(kFocusOmniboxInIncognitoTabIntents, - "FocusOmniboxInIncognitoTabIntents", - base::FEATURE_ENABLED_BY_DEFAULT); -diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h ---- a/chrome/browser/flags/android/chrome_feature_list.h -+++ b/chrome/browser/flags/android/chrome_feature_list.h -@@ -23,6 +23,7 @@ BASE_DECLARE_FEATURE(kAdvancedPeripheralsSupport); - BASE_DECLARE_FEATURE(kAdvancedPeripheralsSupportTabStrip); - BASE_DECLARE_FEATURE(kAllowNewIncognitoTabIntents); - BASE_DECLARE_FEATURE(kAndroidAppIntegration); -+BASE_DECLARE_FEATURE(kAllowUserCertificates); - BASE_DECLARE_FEATURE(kAndroidAppIntegrationSafeSearch); - BASE_DECLARE_FEATURE(kAndroidHatsRefactor); - BASE_DECLARE_FEATURE(kAndroidSearchEngineChoiceNotification); diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java @@ -141,6 +76,38 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f sAppMenuMobileSiteOption, sBackGestureActivityTabProvider, sBackGestureRefactorActivityAndroid, +diff --git a/cromite_flags/chrome/browser/about_flags_cc/Add-AllowUserCertificates-flag.inc b/cromite_flags/chrome/browser/about_flags_cc/Add-AllowUserCertificates-flag.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/chrome/browser/about_flags_cc/Add-AllowUserCertificates-flag.inc +@@ -0,0 +1,13 @@ ++#ifdef FLAG_SECTION ++ ++#if BUILDFLAG(IS_ANDROID) ++ ++ {"allow-user-certificates", ++ "Allow user certificates", ++ "Allow user CA certificates during " ++ "validation of the certificate chain", kOsAndroid, ++ FEATURE_VALUE_TYPE(chrome::android::kAllowUserCertificates)}, ++ ++#endif ++ ++#endif +diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Add-AllowUserCertificates-flag.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Add-AllowUserCertificates-flag.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Add-AllowUserCertificates-flag.inc +@@ -0,0 +1,3 @@ ++CROMITE_FEATURE(kAllowUserCertificates, ++ "AllowUserCertificates", ++ base::FEATURE_DISABLED_BY_DEFAULT); +diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/Add-AllowUserCertificates-flag.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/Add-AllowUserCertificates-flag.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/Add-AllowUserCertificates-flag.inc +@@ -0,0 +1 @@ ++BASE_DECLARE_FEATURE(kAllowUserCertificates); diff --git a/net/android/java/src/org/chromium/net/X509Util.java b/net/android/java/src/org/chromium/net/X509Util.java --- a/net/android/java/src/org/chromium/net/X509Util.java +++ b/net/android/java/src/org/chromium/net/X509Util.java diff --git a/build/patches/Add-IsCleartextPermitted-flag.patch b/build/patches/Add-IsCleartextPermitted-flag.patch index d55b1b1a3..084b195cd 100644 --- a/build/patches/Add-IsCleartextPermitted-flag.patch +++ b/build/patches/Add-IsCleartextPermitted-flag.patch @@ -5,94 +5,56 @@ Subject: Add IsCleartextPermitted flag Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - chrome/browser/about_flags.cc | 4 ++++ - chrome/browser/flag_descriptions.cc | 4 ++++ - chrome/browser/flag_descriptions.h | 3 +++ - net/base/features.cc | 4 ++++ - net/base/features.h | 2 ++ - net/url_request/url_request_http_job.cc | 4 ++++ - 6 files changed, 21 insertions(+) + .../about_flags_cc/Add-IsCleartextPermitted-flag.inc | 8 ++++++++ + .../base/features_cc/Add-IsCleartextPermitted-flag.inc | 3 +++ + .../net/base/features_h/Add-IsCleartextPermitted-flag.inc | 1 + + net/url_request/url_request_http_job.cc | 5 +++++ + 4 files changed, 17 insertions(+) + create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Add-IsCleartextPermitted-flag.inc + create mode 100644 cromite_flags/net/base/features_cc/Add-IsCleartextPermitted-flag.inc + create mode 100644 cromite_flags/net/base/features_h/Add-IsCleartextPermitted-flag.inc -diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc ---- a/chrome/browser/about_flags.cc -+++ b/chrome/browser/about_flags.cc -@@ -9869,6 +9869,10 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kForceOffTextAutosizingName, - flag_descriptions::kForceOffTextAutosizingDescription, kOsAndroid, - FEATURE_VALUE_TYPE(features::kForceOffTextAutosizing)}, +diff --git a/cromite_flags/chrome/browser/about_flags_cc/Add-IsCleartextPermitted-flag.inc b/cromite_flags/chrome/browser/about_flags_cc/Add-IsCleartextPermitted-flag.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/chrome/browser/about_flags_cc/Add-IsCleartextPermitted-flag.inc +@@ -0,0 +1,8 @@ ++#ifdef FLAG_SECTION ++ + {"cleartext-permitted", -+ flag_descriptions::kIsCleartextPermittedName, -+ flag_descriptions::kIsCleartextPermittedDescription, kOsAndroid, ++ "Allow cleartext traffic", ++ "Allow insecure connections over HTTP", kOsAll, + FEATURE_VALUE_TYPE(net::features::kIsCleartextPermitted)}, - #endif - - #if BUILDFLAG(IS_ANDROID) -diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc ---- a/chrome/browser/flag_descriptions.cc -+++ b/chrome/browser/flag_descriptions.cc -@@ -2001,6 +2001,10 @@ const char kHttpsUpgradesDescription[] = - "Enable automatically upgrading all top-level navigations to HTTPS with " - "fast fallback to HTTP."; - -+const char kIsCleartextPermittedName[] = "Allow cleartext traffic"; -+const char kIsCleartextPermittedDescription[] = -+ "Allow insecure connections over HTTP"; -+ - const char kIgnoreGpuBlocklistName[] = "Override software rendering list"; - const char kIgnoreGpuBlocklistDescription[] = - "Overrides the built-in software rendering list and enables " -diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h ---- a/chrome/browser/flag_descriptions.h -+++ b/chrome/browser/flag_descriptions.h -@@ -1123,6 +1123,9 @@ extern const char kStorageBucketsDescription[]; - extern const char kHideIncognitoMediaMetadataName[]; - extern const char kHideIncognitoMediaMetadataDescription[]; - -+extern const char kIsCleartextPermittedName[]; -+extern const char kIsCleartextPermittedDescription[]; -+ - extern const char kHttpsFirstModeV2Name[]; - extern const char kHttpsFirstModeV2Description[]; - -diff --git a/net/base/features.cc b/net/base/features.cc ---- a/net/base/features.cc -+++ b/net/base/features.cc -@@ -146,6 +146,10 @@ BASE_FEATURE(kHttpCacheKeyingExperimentControlGroup, - "HttpCacheKeyingExperimentControlGroup", - base::FEATURE_DISABLED_BY_DEFAULT); - -+BASE_FEATURE(kIsCleartextPermitted, -+ "IsCleartextPermitted", -+ base::FEATURE_ENABLED_BY_DEFAULT); + - BASE_FEATURE(kTLS13KeyUpdate, - "TLS13KeyUpdate", - base::FEATURE_DISABLED_BY_DEFAULT); -diff --git a/net/base/features.h b/net/base/features.h ---- a/net/base/features.h -+++ b/net/base/features.h -@@ -30,6 +30,8 @@ NET_EXPORT BASE_DECLARE_FEATURE(kAvoidH2Reprioritization); - // origin requests are restricted to contain at most the source origin. - NET_EXPORT BASE_DECLARE_FEATURE(kCapReferrerToOriginOnCrossOrigin); - ++#endif +diff --git a/cromite_flags/net/base/features_cc/Add-IsCleartextPermitted-flag.inc b/cromite_flags/net/base/features_cc/Add-IsCleartextPermitted-flag.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/net/base/features_cc/Add-IsCleartextPermitted-flag.inc +@@ -0,0 +1,3 @@ ++CROMITE_FEATURE(kIsCleartextPermitted, ++ "IsCleartextPermitted", ++ base::FEATURE_ENABLED_BY_DEFAULT); +diff --git a/cromite_flags/net/base/features_h/Add-IsCleartextPermitted-flag.inc b/cromite_flags/net/base/features_h/Add-IsCleartextPermitted-flag.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/net/base/features_h/Add-IsCleartextPermitted-flag.inc +@@ -0,0 +1 @@ +NET_EXPORT BASE_DECLARE_FEATURE(kIsCleartextPermitted); -+ - // Support for altering the parameters used for DNS transaction timeout. See - // ResolveContext::SecureTransactionTimeout(). - NET_EXPORT BASE_DECLARE_FEATURE(kDnsTransactionDynamicTimeouts); diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc --- a/net/url_request/url_request_http_job.cc +++ b/net/url_request/url_request_http_job.cc -@@ -233,6 +233,10 @@ std::unique_ptr URLRequestHttpJob::Create(URLRequest* request) { +@@ -232,6 +232,11 @@ std::unique_ptr URLRequestHttpJob::Create(URLRequest* request) { + RedirectUtil::ResponseCode::REDIRECT_307_TEMPORARY_REDIRECT, "HSTS"); } - #if BUILDFLAG(IS_ANDROID) + if (base::FeatureList::IsEnabled(net::features::kIsCleartextPermitted) == false) { + return std::make_unique(request, + ERR_CLEARTEXT_NOT_PERMITTED); + } ++ + #if BUILDFLAG(IS_ANDROID) // Check whether the app allows cleartext traffic to this host, and return // ERR_CLEARTEXT_NOT_PERMITTED if not. - if (request->context()->check_cleartext_permitted() && -- 2.25.1 diff --git a/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch b/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch index 8b7c47252..1355753c9 100644 --- a/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch +++ b/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch @@ -7,52 +7,14 @@ and internal chrome:// pages will be used for the autocomplete results. License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - chrome/browser/about_flags.cc | 22 ++++++++++++++++++- - .../browser/autocomplete_controller.cc | 10 +++++++++ - .../omnibox/browser/history_url_provider.cc | 3 +++ - components/omnibox/browser/search_provider.cc | 4 ++++ - components/url_formatter/url_fixer.cc | 4 ++++ - 5 files changed, 42 insertions(+), 1 deletion(-) + .../browser/autocomplete_controller.cc | 10 ++++++ + .../omnibox/browser/history_url_provider.cc | 3 ++ + components/omnibox/browser/search_provider.cc | 4 +++ + components/url_formatter/url_fixer.cc | 4 +++ + ...lag-for-omnibox-autocomplete-filtering.inc | 32 +++++++++++++++++++ + 5 files changed, 53 insertions(+) + create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Add-flag-for-omnibox-autocomplete-filtering.inc -diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc ---- a/chrome/browser/about_flags.cc -+++ b/chrome/browser/about_flags.cc -@@ -653,6 +653,22 @@ const FeatureEntry::FeatureVariation kReaderModeDiscoverabilityVariations[] = { - #endif // BUILDFLAG(IS_ANDROID) - - #if BUILDFLAG(IS_ANDROID) -+const FeatureEntry::Choice kOmniboxAutocompleteFiltering[] = { -+ {flags_ui::kGenericExperimentChoiceDefault, "", ""}, -+ {"Search suggestions only", -+ "omnibox-autocomplete-filtering", -+ "search"}, -+ {"Search suggestions and bookmarks", -+ "omnibox-autocomplete-filtering", -+ "search-bookmarks"}, -+ {"Search suggestions and internal chrome pages", -+ "omnibox-autocomplete-filtering", -+ "search-chrome"}, -+ {"Search suggestions, bookmarks, and internal chrome pages", -+ "omnibox-autocomplete-filtering", -+ "search-bookmarks-chrome"}, -+}; -+ - const FeatureEntry::FeatureParam kAdaptiveButton_AlwaysNone[] = { - {"mode", "always-none"}}; - const FeatureEntry::FeatureParam kAdaptiveButton_AlwaysNewTab[] = { -@@ -4972,7 +4988,11 @@ const FeatureEntry kFeatureEntries[] = { - kOsMac | kOsLinux | kOsWin, - FEATURE_VALUE_TYPE(features::kSystemNotifications)}, - #endif // BUILDFLAG(ENABLE_SYSTEM_NOTIFICATIONS) && !BUILDFLAG(IS_CHROMEOS_ASH) --#if BUILDFLAG(IS_ANDROID) -+#if BUILDFLAG(IS_ANDROID) // Bromite autocomplete filtering -+ {"omnibox-autocomplete-filtering", -+ "Omnibox Autocomplete Filtering", -+ "Restrict omnibox autocomplete results to a combination of search suggestions (if enabled), bookmarks, and internal chrome pages.", -+ kOsAll, MULTI_VALUE_TYPE(kOmniboxAutocompleteFiltering)}, - {"adaptive-button-in-top-toolbar", - flag_descriptions::kAdaptiveButtonInTopToolbarName, - flag_descriptions::kAdaptiveButtonInTopToolbarDescription, kOsAndroid, diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/omnibox/browser/autocomplete_controller.cc --- a/components/omnibox/browser/autocomplete_controller.cc +++ b/components/omnibox/browser/autocomplete_controller.cc @@ -135,5 +97,42 @@ diff --git a/components/url_formatter/url_fixer.cc b/components/url_formatter/ur url.append(kChromeUIDefaultHost); FixupPort(trimmed, parts.port, &url); FixupPath(trimmed, parts.path, &url); +diff --git a/cromite_flags/chrome/browser/about_flags_cc/Add-flag-for-omnibox-autocomplete-filtering.inc b/cromite_flags/chrome/browser/about_flags_cc/Add-flag-for-omnibox-autocomplete-filtering.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/chrome/browser/about_flags_cc/Add-flag-for-omnibox-autocomplete-filtering.inc +@@ -0,0 +1,32 @@ ++#if BUILDFLAG(IS_ANDROID) ++ ++#ifdef FEATURE_PARAM_SECTION ++ ++const FeatureEntry::Choice kOmniboxAutocompleteFiltering[] = { ++ {flags_ui::kGenericExperimentChoiceDefault, "", ""}, ++ {"Search suggestions only", ++ "omnibox-autocomplete-filtering", ++ "search"}, ++ {"Search suggestions and bookmarks", ++ "omnibox-autocomplete-filtering", ++ "search-bookmarks"}, ++ {"Search suggestions and internal chrome pages", ++ "omnibox-autocomplete-filtering", ++ "search-chrome"}, ++ {"Search suggestions, bookmarks, and internal chrome pages", ++ "omnibox-autocomplete-filtering", ++ "search-bookmarks-chrome"}, ++}; ++ ++#endif ++ ++#ifdef FLAG_SECTION ++ ++ {"omnibox-autocomplete-filtering", ++ "Omnibox Autocomplete Filtering", ++ "Restrict omnibox autocomplete results to a combination of search suggestions (if enabled), bookmarks, and internal chrome pages.", ++ kOsAll, MULTI_VALUE_TYPE(kOmniboxAutocompleteFiltering)}, ++ ++#endif ++ ++#endif -- 2.25.1 diff --git a/build/patches/Add-flag-for-save-data-header.patch b/build/patches/Add-flag-for-save-data-header.patch index 70b862ee6..3bdc1e9fa 100644 --- a/build/patches/Add-flag-for-save-data-header.patch +++ b/build/patches/Add-flag-for-save-data-header.patch @@ -4,56 +4,15 @@ Subject: Add flag for save-data-header License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - chrome/browser/about_flags.cc | 5 ++++- - chrome/browser/flag_descriptions.cc | 4 ++++ - chrome/browser/flag_descriptions.h | 3 +++ - .../browser/loader/browser_initiated_resource_request.cc | 8 ++++++++ - services/network/public/cpp/features.cc | 5 +++++ - services/network/public/cpp/features.h | 2 ++ - 6 files changed, 26 insertions(+), 1 deletion(-) + .../loader/browser_initiated_resource_request.cc | 8 ++++++++ + .../about_flags_cc/Add-flag-for-save-data-header.inc | 10 ++++++++++ + .../cpp/features_cc/Add-flag-for-save-data-header.inc | 4 ++++ + .../cpp/features_h/Add-flag-for-save-data-header.inc | 1 + + 4 files changed, 23 insertions(+) + create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Add-flag-for-save-data-header.inc + create mode 100644 cromite_flags/services/network/public/cpp/features_cc/Add-flag-for-save-data-header.inc + create mode 100644 cromite_flags/services/network/public/cpp/features_h/Add-flag-for-save-data-header.inc -diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc ---- a/chrome/browser/about_flags.cc -+++ b/chrome/browser/about_flags.cc -@@ -5600,7 +5600,10 @@ const FeatureEntry kFeatureEntries[] = { - {"force-text-direction", flag_descriptions::kForceTextDirectionName, - flag_descriptions::kForceTextDirectionDescription, kOsAll, - MULTI_VALUE_TYPE(kForceTextDirectionChoices)}, --#if BUILDFLAG(IS_ANDROID) -+#if BUILDFLAG(IS_ANDROID) // Bromite save data header -+ {"enable-save-data-header", flag_descriptions::kEnableSaveDataHeaderName, -+ flag_descriptions::kEnableSaveDataHeaderDescription, kOsAndroid, -+ FEATURE_VALUE_TYPE(network::features::kEnableSaveDataHeader)}, - {"force-update-menu-type", flag_descriptions::kUpdateMenuTypeName, - flag_descriptions::kUpdateMenuTypeDescription, kOsAndroid, - MULTI_VALUE_TYPE(kForceUpdateMenuTypeChoices)}, -diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc ---- a/chrome/browser/flag_descriptions.cc -+++ b/chrome/browser/flag_descriptions.cc -@@ -1401,6 +1401,10 @@ const char kDeprecateAltBasedSixPackDescription[] = - "Show deprecation notifications and disable functionality for Alt based " - "six pack deprecations. The Search based versions continue to work."; - -+const char kEnableSaveDataHeaderName[] = "Enable save-data header"; -+const char kEnableSaveDataHeaderDescription[] = -+ "Enable save-data header without enabling Data Saver."; -+ - const char kDeprecateOldKeyboardShortcutsAcceleratorName[] = - "Enable deprecation notifications for Ctrl+Alt+/ to open Keyboard " - "shortcuts app"; -diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h ---- a/chrome/browser/flag_descriptions.h -+++ b/chrome/browser/flag_descriptions.h -@@ -726,6 +726,9 @@ extern const char kDeprecateAltBasedSixPackDescription[]; - extern const char kDeprecateOldKeyboardShortcutsAcceleratorName[]; - extern const char kDeprecateOldKeyboardShortcutsAcceleratorDescription[]; - -+extern const char kEnableSaveDataHeaderName[]; -+extern const char kEnableSaveDataHeaderDescription[]; -+ - extern const char kMemlogName[]; - extern const char kMemlogDescription[]; - extern const char kMemlogModeMinimal[]; diff --git a/content/browser/loader/browser_initiated_resource_request.cc b/content/browser/loader/browser_initiated_resource_request.cc --- a/content/browser/loader/browser_initiated_resource_request.cc +++ b/content/browser/loader/browser_initiated_resource_request.cc @@ -81,32 +40,35 @@ diff --git a/content/browser/loader/browser_initiated_resource_request.cc b/cont if (should_update_existing_headers) { headers->RemoveHeader("Save-Data"); } -diff --git a/services/network/public/cpp/features.cc b/services/network/public/cpp/features.cc ---- a/services/network/public/cpp/features.cc -+++ b/services/network/public/cpp/features.cc -@@ -14,6 +14,11 @@ - - namespace network::features { - -+// Enable save-data header separately (without enabled data reduction service). -+BASE_FEATURE(kEnableSaveDataHeader, -+ "EnableSaveDataHeader", -+ base::FEATURE_DISABLED_BY_DEFAULT); +diff --git a/cromite_flags/chrome/browser/about_flags_cc/Add-flag-for-save-data-header.inc b/cromite_flags/chrome/browser/about_flags_cc/Add-flag-for-save-data-header.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/chrome/browser/about_flags_cc/Add-flag-for-save-data-header.inc +@@ -0,0 +1,10 @@ + - BASE_FEATURE(kNetworkErrorLogging, - "NetworkErrorLogging", // disabled by default - base::FEATURE_DISABLED_BY_DEFAULT); // in bromite -diff --git a/services/network/public/cpp/features.h b/services/network/public/cpp/features.h ---- a/services/network/public/cpp/features.h -+++ b/services/network/public/cpp/features.h -@@ -91,6 +91,8 @@ extern uint32_t GetLoaderChunkSize(); - COMPONENT_EXPORT(NETWORK_CPP) - BASE_DECLARE_FEATURE(kCorsNonWildcardRequestHeadersSupport); - -+COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kEnableSaveDataHeader); ++#ifdef FLAG_SECTION + - COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kNetworkServiceMemoryCache); - - COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kOmitCorsClientCert); ++ // Bromite save data header ++ {"enable-save-data-header", ++ "Enable save-data header", ++ "Enable save-data header without enabling Data Saver.", kOsAll, ++ FEATURE_VALUE_TYPE(network::features::kEnableSaveDataHeader)}, ++ ++#endif +diff --git a/cromite_flags/services/network/public/cpp/features_cc/Add-flag-for-save-data-header.inc b/cromite_flags/services/network/public/cpp/features_cc/Add-flag-for-save-data-header.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/services/network/public/cpp/features_cc/Add-flag-for-save-data-header.inc +@@ -0,0 +1,4 @@ ++// Enable save-data header separately (without enabled data reduction service). ++CROMITE_FEATURE(kEnableSaveDataHeader, ++ "EnableSaveDataHeader", ++ base::FEATURE_DISABLED_BY_DEFAULT); +diff --git a/cromite_flags/services/network/public/cpp/features_h/Add-flag-for-save-data-header.inc b/cromite_flags/services/network/public/cpp/features_h/Add-flag-for-save-data-header.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/services/network/public/cpp/features_h/Add-flag-for-save-data-header.inc +@@ -0,0 +1 @@ ++COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kEnableSaveDataHeader); -- 2.25.1 diff --git a/build/patches/Add-flag-to-disable-external-intent-requests.patch b/build/patches/Add-flag-to-disable-external-intent-requests.patch index 298f4daac..8e37f8c7b 100644 --- a/build/patches/Add-flag-to-disable-external-intent-requests.patch +++ b/build/patches/Add-flag-to-disable-external-intent-requests.patch @@ -7,54 +7,27 @@ when flag is disabled no external intent will ever be allowed, for any URL. License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - chrome/browser/about_flags.cc | 5 +++++ - chrome/browser/flag_descriptions.cc | 6 ++++++ - chrome/browser/flag_descriptions.h | 3 +++ - 3 files changed, 14 insertions(+) + ...Add-flag-to-disable-external-intent-requests.inc | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Add-flag-to-disable-external-intent-requests.inc -diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc ---- a/chrome/browser/about_flags.cc -+++ b/chrome/browser/about_flags.cc -@@ -4150,6 +4150,11 @@ const FeatureEntry kFeatureEntries[] = { - {"ui-disable-partial-swap", flag_descriptions::kUiPartialSwapName, - flag_descriptions::kUiPartialSwapDescription, kOsAll, - SINGLE_DISABLE_VALUE_TYPE(switches::kUIDisablePartialSwap)}, +diff --git a/cromite_flags/chrome/browser/about_flags_cc/Add-flag-to-disable-external-intent-requests.inc b/cromite_flags/chrome/browser/about_flags_cc/Add-flag-to-disable-external-intent-requests.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/chrome/browser/about_flags_cc/Add-flag-to-disable-external-intent-requests.inc +@@ -0,0 +1,13 @@ +#if BUILDFLAG(IS_ANDROID) -+ {"allow-external-intent-requests", flag_descriptions::kDisableExternalIntentRequestsName, -+ flag_descriptions::kDisableExternalIntentRequestsDescription, kOsAll, ++ ++#ifdef FLAG_SECTION ++ ++ {"allow-external-intent-requests", ++ "Allow forward URL requests to external intents", ++ "If disabled, URL requests will never" ++ "allow for redirecting to an external intent.", kOsAndroid, + SINGLE_DISABLE_VALUE_TYPE("disable-external-intent-requests")}, -+#endif - {"disable-webrtc-hw-decoding", flag_descriptions::kWebrtcHwDecodingName, - flag_descriptions::kWebrtcHwDecodingDescription, kOsAndroid | kOsCrOS, - SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWDecoding)}, -diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc ---- a/chrome/browser/flag_descriptions.cc -+++ b/chrome/browser/flag_descriptions.cc -@@ -4271,6 +4271,12 @@ const char kPolicyLogsPageAndroidDescription[] = - "Enable the new chrome://policy-logs page containing logs for debugging " - "policy related issues on Android."; - -+const char kDisableExternalIntentRequestsName[] = -+ "Allow forward URL requests to external intents"; -+const char kDisableExternalIntentRequestsDescription[] = -+ "If disabled, URL requests will never" -+ "allow for redirecting to an external intent."; + - const char kQueryTilesName[] = "Show query tiles"; - const char kQueryTilesDescription[] = "Shows query tiles in Chrome"; - const char kQueryTilesNTPName[] = "Show query tiles in NTP"; -diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h ---- a/chrome/browser/flag_descriptions.h -+++ b/chrome/browser/flag_descriptions.h -@@ -2534,6 +2534,9 @@ extern const char kQueryTilesNTPDescription[]; - extern const char kQueryTilesOnStartName[]; - extern const char kQueryTilesOnStartDescription[]; - extern const char kQueryTilesSingleTierName[]; -+extern const char kDisableExternalIntentRequestsName[]; -+extern const char kDisableExternalIntentRequestsDescription[]; ++#endif + - extern const char kQueryTilesSingleTierDescription[]; - extern const char kQueryTilesEnableQueryEditingName[]; - extern const char kQueryTilesEnableQueryEditingDescription[]; ++#endif -- 2.25.1 diff --git a/build/patches/Add-site-engagement-flag.patch b/build/patches/Add-site-engagement-flag.patch index b7d52b8df..7a8ce5145 100644 --- a/build/patches/Add-site-engagement-flag.patch +++ b/build/patches/Add-site-engagement-flag.patch @@ -7,16 +7,16 @@ Disabled by default. Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - chrome/browser/about_flags.cc | 6 ++++ - chrome/browser/flag_descriptions.cc | 5 +++ - chrome/browser/flag_descriptions.h | 3 ++ + chrome/browser/about_flags.cc | 1 + .../content/site_engagement_score.cc | 5 +++ components/site_engagement/core/BUILD.gn | 6 ++++ - components/site_engagement/core/features.cc | 29 ++++++++++++++++ + components/site_engagement/core/features.cc | 30 ++++++++++++++++ components/site_engagement/core/features.h | 34 +++++++++++++++++++ - 7 files changed, 88 insertions(+) + .../Add-site-engagement-flag.inc | 11 ++++++ + 6 files changed, 87 insertions(+) create mode 100644 components/site_engagement/core/features.cc create mode 100644 components/site_engagement/core/features.h + create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Add-site-engagement-flag.inc diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc @@ -29,46 +29,6 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc #include "components/shared_highlighting/core/common/shared_highlighting_features.h" #include "components/signin/core/browser/dice_account_reconcilor_delegate.h" #include "components/signin/public/base/signin_buildflags.h" -@@ -9917,6 +9918,11 @@ const FeatureEntry kFeatureEntries[] = { - kLargeFaviconFromGoogleVariations, - "LargeFaviconFromGoogle")}, - -+ {"site-engagement", -+ flag_descriptions::kSiteEngagementName, -+ flag_descriptions::kSiteEngagementDescription, kOsAll, -+ FEATURE_VALUE_TYPE(site_engagement::features::kSiteEngagement)}, -+ - #if BUILDFLAG(IS_ANDROID) - {"force-off-text-autosizing", - flag_descriptions::kForceOffTextAutosizingName, -diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc ---- a/chrome/browser/flag_descriptions.cc -+++ b/chrome/browser/flag_descriptions.cc -@@ -3815,6 +3815,11 @@ const char kSkipServiceWorkerFetchHandlerDescription[] = - "Skips starting the service worker and run the fetch handler if the fetch " - "handler is recognized as skippable."; - -+const char kSiteEngagementName[] = -+ "Enable site engagement feature"; -+const char kSiteEngagementDescription[] = -+ "Site Engagement Service provides information about how engaged a user is with a origin; this affects which NTP tiles are automatically created."; -+ - const char kWebSQLAccessName[] = "Allows access to WebSQL APIs"; - const char kWebSQLAccessDescription[] = - "The WebSQL API is disabled by default, but can be enabled here."; -diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h ---- a/chrome/browser/flag_descriptions.h -+++ b/chrome/browser/flag_descriptions.h -@@ -2231,6 +2231,9 @@ extern const char kReduceAcceptLanguageDescription[]; - extern const char kSkipServiceWorkerFetchHandlerName[]; - extern const char kSkipServiceWorkerFetchHandlerDescription[]; - -+extern const char kSiteEngagementName[]; -+extern const char kSiteEngagementDescription[]; -+ - extern const char kWebSQLAccessName[]; - extern const char kWebSQLAccessDescription[]; - diff --git a/components/site_engagement/content/site_engagement_score.cc b/components/site_engagement/content/site_engagement_score.cc --- a/components/site_engagement/content/site_engagement_score.cc +++ b/components/site_engagement/content/site_engagement_score.cc @@ -113,7 +73,7 @@ diff --git a/components/site_engagement/core/features.cc b/components/site_engag new file mode 100644 --- /dev/null +++ b/components/site_engagement/core/features.cc -@@ -0,0 +1,29 @@ +@@ -0,0 +1,30 @@ +/* + This file is part of Bromite. + @@ -138,8 +98,9 @@ new file mode 100644 +namespace site_engagement { +namespace features { + -+const base::Feature kSiteEngagement{"SiteEngagement", -+ base::FEATURE_DISABLED_BY_DEFAULT}; ++CROMITE_FEATURE(kSiteEngagement, ++ "SiteEngagement", ++ base::FEATURE_DISABLED_BY_DEFAULT); + +} // namespace features +} // namespace site_engagement @@ -176,11 +137,27 @@ new file mode 100644 +namespace features { + +// Enable site engagement -+extern const base::Feature kSiteEngagement; ++BASE_DECLARE_FEATURE(kSiteEngagement); + +} // namespace features +} // namespace site_engagement + +#endif // SITE_ENGAGEMENT_CORE_FEATURES_H_ +diff --git a/cromite_flags/chrome/browser/about_flags_cc/Add-site-engagement-flag.inc b/cromite_flags/chrome/browser/about_flags_cc/Add-site-engagement-flag.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/chrome/browser/about_flags_cc/Add-site-engagement-flag.inc +@@ -0,0 +1,11 @@ ++#ifdef FLAG_SECTION ++ ++ {"site-engagement", ++ "Enable site engagement feature", ++ "Site Engagement Service provides information about how " ++ "engaged a user is with a origin; this affects which NTP " ++ "tiles are automatically created.", kOsAll, ++ FEATURE_VALUE_TYPE(site_engagement::features::kSiteEngagement)}, ++ ++#endif ++ -- 2.25.1 diff --git a/build/patches/Allow-building-without-enable_reporting.patch b/build/patches/Allow-building-without-enable_reporting.patch index 4ddc862d0..c0f6ae5c2 100644 --- a/build/patches/Allow-building-without-enable_reporting.patch +++ b/build/patches/Allow-building-without-enable_reporting.patch @@ -12,10 +12,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../renderer_host/render_frame_host_impl.cc | 6 ------ .../web_package/signed_exchange_reporter.cc | 2 ++ ...content_switch_dependent_feature_overrides.cc | 1 + - net/base/features.cc | 2 +- + .../Allow-building-without-enable_reporting.inc | 2 ++ + net/base/features.cc | 1 + net/reporting/reporting_service.cc | 6 ++++++ services/network/network_context.h | 4 ++-- - services/network/public/cpp/features.cc | 6 +++--- services/network/public/mojom/BUILD.gn | 1 - .../network/public/mojom/network_context.mojom | 2 ++ .../core/frame/csp/content_security_policy.cc | 3 +++ @@ -24,7 +24,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../renderer/core/frame/reporting_context.cc | 9 +++++++++ .../renderer/core/frame/reporting_context.h | 7 +++++-- .../renderer/core/frame/reporting_observer.cc | 3 +-- - 20 files changed, 59 insertions(+), 31 deletions(-) + 20 files changed, 58 insertions(+), 27 deletions(-) + create mode 100644 cromite_flags/services/network/public/cpp/features_cc/Allow-building-without-enable_reporting.inc diff --git a/chrome/browser/net/chrome_report_sender.cc b/chrome/browser/net/chrome_report_sender.cc --- a/chrome/browser/net/chrome_report_sender.cc @@ -243,18 +244,24 @@ diff --git a/content/public/common/content_switch_dependent_feature_overrides.cc #include "services/network/public/cpp/features.h" #include "services/network/public/cpp/network_switches.h" #include "third_party/blink/public/common/features.h" +diff --git a/cromite_flags/services/network/public/cpp/features_cc/Allow-building-without-enable_reporting.inc b/cromite_flags/services/network/public/cpp/features_cc/Allow-building-without-enable_reporting.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/services/network/public/cpp/features_cc/Allow-building-without-enable_reporting.inc +@@ -0,0 +1,2 @@ ++SET_CROMITE_FEATURE_DISABLED(kNetworkErrorLogging); ++SET_CROMITE_FEATURE_DISABLED(kReporting); diff --git a/net/base/features.cc b/net/base/features.cc --- a/net/base/features.cc +++ b/net/base/features.cc -@@ -234,7 +234,7 @@ extern const base::FeatureParam kTimeoutTcpConnectAttemptMax( +@@ -224,6 +224,7 @@ extern const base::FeatureParam kTimeoutTcpConnectAttemptMax( + base::Seconds(30)); + #if BUILDFLAG(ENABLE_REPORTING) ++#error Attempting to build with enable_reporting BASE_FEATURE(kDocumentReporting, "DocumentReporting", -- base::FEATURE_ENABLED_BY_DEFAULT); -+ base::FEATURE_DISABLED_BY_DEFAULT); - #endif // BUILDFLAG(ENABLE_REPORTING) - - #if BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) + base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/net/reporting/reporting_service.cc b/net/reporting/reporting_service.cc --- a/net/reporting/reporting_service.cc +++ b/net/reporting/reporting_service.cc @@ -287,23 +294,6 @@ diff --git a/services/network/network_context.h b/services/network/network_conte void AddDomainReliabilityContextForTesting( const url::Origin& origin, const GURL& upload_url, -diff --git a/services/network/public/cpp/features.cc b/services/network/public/cpp/features.cc ---- a/services/network/public/cpp/features.cc -+++ b/services/network/public/cpp/features.cc -@@ -15,10 +15,10 @@ - namespace network::features { - - BASE_FEATURE(kNetworkErrorLogging, -- "NetworkErrorLogging", -- base::FEATURE_ENABLED_BY_DEFAULT); -+ "NetworkErrorLogging", // disabled by default -+ base::FEATURE_DISABLED_BY_DEFAULT); // in bromite - --BASE_FEATURE(kReporting, "Reporting", base::FEATURE_ENABLED_BY_DEFAULT); -+BASE_FEATURE(kReporting, "Reporting", base::FEATURE_DISABLED_BY_DEFAULT); // disabled by default - - // Based on the field trial parameters, this feature will override the value of - // the maximum number of delayable requests allowed in flight. The number of diff --git a/services/network/public/mojom/BUILD.gn b/services/network/public/mojom/BUILD.gn --- a/services/network/public/mojom/BUILD.gn +++ b/services/network/public/mojom/BUILD.gn diff --git a/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch b/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch index 52d255ff4..c8677db76 100644 --- a/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch +++ b/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch @@ -6,11 +6,9 @@ Truncate base latency precision to two digits License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - chrome/browser/about_flags.cc | 4 ++++ - chrome/browser/flag_descriptions.cc | 5 +++++ - chrome/browser/flag_descriptions.h | 3 +++ - third_party/blink/common/features.cc | 4 ++++ - third_party/blink/public/common/features.h | 2 ++ + .../AudioBuffer-AnalyserNode-fp-mitigations.inc | 8 ++++++++ + .../AudioBuffer-AnalyserNode-fp-mitigations.inc | 3 +++ + .../AudioBuffer-AnalyserNode-fp-mitigations.inc | 1 + .../renderer/modules/webaudio/audio_buffer.cc | 14 ++++++++++++++ .../blink/renderer/modules/webaudio/audio_buffer.h | 2 ++ .../renderer/modules/webaudio/audio_context.cc | 5 ++++- @@ -18,76 +16,38 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../renderer/modules/webaudio/base_audio_context.h | 2 ++ .../modules/webaudio/offline_audio_context.cc | 1 + .../renderer/modules/webaudio/realtime_analyser.cc | 7 +++++++ - 12 files changed, 60 insertions(+), 1 deletion(-) + 10 files changed, 54 insertions(+), 1 deletion(-) + create mode 100644 cromite_flags/chrome/browser/about_flags_cc/AudioBuffer-AnalyserNode-fp-mitigations.inc + create mode 100644 cromite_flags/third_party/blink/common/features_cc/AudioBuffer-AnalyserNode-fp-mitigations.inc + create mode 100644 cromite_flags/third_party/blink/common/features_h/AudioBuffer-AnalyserNode-fp-mitigations.inc -diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc ---- a/chrome/browser/about_flags.cc -+++ b/chrome/browser/about_flags.cc -@@ -4185,6 +4185,10 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kKioskEnableAppServiceDescription, kOsCrOS, - FEATURE_VALUE_TYPE(features::kKioskEnableAppService)}, - #endif // BUILDFLAG(IS_CHROMEOS) +diff --git a/cromite_flags/chrome/browser/about_flags_cc/AudioBuffer-AnalyserNode-fp-mitigations.inc b/cromite_flags/chrome/browser/about_flags_cc/AudioBuffer-AnalyserNode-fp-mitigations.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/chrome/browser/about_flags_cc/AudioBuffer-AnalyserNode-fp-mitigations.inc +@@ -0,0 +1,8 @@ ++#ifdef FLAG_SECTION ++ + {"fingerprinting-audio-context-data-noise", -+ flag_descriptions::kAudioContextShuffleEnabledName, -+ flag_descriptions::kAudioContextShuffleEnabledDescription, kOsAll, ++ "Enable Audio Context fingerprint deception", ++ "Scale the output values of rendered data with a randomly selected factor.", kOsAll, + FEATURE_VALUE_TYPE(blink::features::kAudioContextShuffleEnabled)}, - #if !BUILDFLAG(IS_ANDROID) - {"enable-webrtc-remote-event-log", - flag_descriptions::kWebRtcRemoteEventLogName, -diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc ---- a/chrome/browser/flag_descriptions.cc -+++ b/chrome/browser/flag_descriptions.cc -@@ -3735,6 +3735,11 @@ const char kWebTransportDeveloperModeDescription[] = - "When enabled, removes the requirement that all certificates used for " - "WebTransport over HTTP/3 are issued by a known certificate root."; - -+const char kAudioContextShuffleEnabledName[] = -+ "Enable Audio Context fingerprint deception"; -+const char kAudioContextShuffleEnabledDescription[] = -+ "Scale the output values of rendered data with a randomly selected factor."; -+ - const char kWebUsbDeviceDetectionName[] = - "Automatic detection of WebUSB-compatible devices"; - const char kWebUsbDeviceDetectionDescription[] = -diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h ---- a/chrome/browser/flag_descriptions.h -+++ b/chrome/browser/flag_descriptions.h -@@ -2171,6 +2171,9 @@ extern const char kWebRtcRemoteEventLogDescription[]; - extern const char kWebrtcUseMinMaxVEADimensionsName[]; - extern const char kWebrtcUseMinMaxVEADimensionsDescription[]; - -+extern const char kAudioContextShuffleEnabledName[]; -+extern const char kAudioContextShuffleEnabledDescription[]; -+ - extern const char kWebTransportDeveloperModeName[]; - extern const char kWebTransportDeveloperModeDescription[]; - -diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc ---- a/third_party/blink/common/features.cc -+++ b/third_party/blink/common/features.cc -@@ -258,6 +258,10 @@ BASE_FEATURE(kBiddingAndScoringDebugReportingAPI, - "BiddingAndScoringDebugReportingAPI", - base::FEATURE_DISABLED_BY_DEFAULT); - -+BASE_FEATURE(kAudioContextShuffleEnabled, -+ "AudioContextShuffleEnabled", -+ base::FEATURE_ENABLED_BY_DEFAULT); + - // Blink garbage collection. - // Enables compaction of backing stores on Blink's heap. - BASE_FEATURE(kBlinkHeapCompaction, -diff --git a/third_party/blink/public/common/features.h b/third_party/blink/public/common/features.h ---- a/third_party/blink/public/common/features.h -+++ b/third_party/blink/public/common/features.h -@@ -158,6 +158,8 @@ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kBlinkHeapConcurrentSweeping); - BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kBlinkHeapIncrementalMarking); - BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kBlinkHeapIncrementalMarkingStress); - ++#endif +diff --git a/cromite_flags/third_party/blink/common/features_cc/AudioBuffer-AnalyserNode-fp-mitigations.inc b/cromite_flags/third_party/blink/common/features_cc/AudioBuffer-AnalyserNode-fp-mitigations.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/third_party/blink/common/features_cc/AudioBuffer-AnalyserNode-fp-mitigations.inc +@@ -0,0 +1,3 @@ ++CROMITE_FEATURE(kAudioContextShuffleEnabled, ++ "AudioContextShuffleEnabled", ++ base::FEATURE_ENABLED_BY_DEFAULT); +diff --git a/cromite_flags/third_party/blink/common/features_h/AudioBuffer-AnalyserNode-fp-mitigations.inc b/cromite_flags/third_party/blink/common/features_h/AudioBuffer-AnalyserNode-fp-mitigations.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/third_party/blink/common/features_h/AudioBuffer-AnalyserNode-fp-mitigations.inc +@@ -0,0 +1 @@ +BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kAudioContextShuffleEnabled); -+ - BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE( - kBlockingDownloadsInAdFrameWithoutUserActivation); - diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.cc b/third_party/blink/renderer/modules/webaudio/audio_buffer.cc --- a/third_party/blink/renderer/modules/webaudio/audio_buffer.cc +++ b/third_party/blink/renderer/modules/webaudio/audio_buffer.cc diff --git a/build/patches/Client-hints-overrides.patch b/build/patches/Client-hints-overrides.patch index bebbcf1f9..b67f5af69 100644 --- a/build/patches/Client-hints-overrides.patch +++ b/build/patches/Client-hints-overrides.patch @@ -10,14 +10,16 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html components/embedder_support/user_agent_utils.cc | 4 +--- content/browser/client_hints/client_hints.cc | 3 ++- content/browser/loader/navigation_url_loader_impl.cc | 5 +++++ - content/common/features.cc | 4 ++-- + .../content/common/features_cc/Client-hints-overrides.inc | 1 + + .../public/cpp/features_cc/Client-hints-overrides.inc | 1 + net/http/http_network_transaction.cc | 1 + services/network/public/cpp/client_hints.cc | 1 + - services/network/public/cpp/features.cc | 2 +- third_party/blink/common/client_hints/client_hints.cc | 1 + .../blink/common/client_hints/enabled_client_hints.cc | 4 +++- .../blink/renderer/platform/runtime_enabled_features.json5 | 4 ++-- - 10 files changed, 19 insertions(+), 10 deletions(-) + 10 files changed, 18 insertions(+), 7 deletions(-) + create mode 100644 cromite_flags/content/common/features_cc/Client-hints-overrides.inc + create mode 100644 cromite_flags/services/network/public/cpp/features_cc/Client-hints-overrides.inc diff --git a/components/embedder_support/user_agent_utils.cc b/components/embedder_support/user_agent_utils.cc --- a/components/embedder_support/user_agent_utils.cc @@ -61,20 +63,18 @@ diff --git a/content/browser/loader/navigation_url_loader_impl.cc b/content/brow LogAcceptCHFrameStatus(AcceptCHFrameRestart::kFramePresent); // Given that this is happening in the middle of navigation, there should -diff --git a/content/common/features.cc b/content/common/features.cc ---- a/content/common/features.cc -+++ b/content/common/features.cc -@@ -114,8 +114,8 @@ BASE_FEATURE(kConsolidatedMovementXY, - // Enables support for the `Critical-CH` response header. - // https://github.com/WICG/client-hints-infrastructure/blob/master/reliability.md#critical-ch - BASE_FEATURE(kCriticalClientHint, -- "CriticalClientHint", -- base::FEATURE_ENABLED_BY_DEFAULT); -+ "CriticalClientHint", // disabled -+ base::FEATURE_DISABLED_BY_DEFAULT); // by default - - // Enable changing source dynamically for desktop capture. - BASE_FEATURE(kDesktopCaptureChangeSource, +diff --git a/cromite_flags/content/common/features_cc/Client-hints-overrides.inc b/cromite_flags/content/common/features_cc/Client-hints-overrides.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/content/common/features_cc/Client-hints-overrides.inc +@@ -0,0 +1 @@ ++SET_CROMITE_FEATURE_DISABLED(kCriticalClientHint); +diff --git a/cromite_flags/services/network/public/cpp/features_cc/Client-hints-overrides.inc b/cromite_flags/services/network/public/cpp/features_cc/Client-hints-overrides.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/services/network/public/cpp/features_cc/Client-hints-overrides.inc +@@ -0,0 +1 @@ ++SET_CROMITE_FEATURE_DISABLED(kAcceptCHFrame); diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc --- a/net/http/http_network_transaction.cc +++ b/net/http/http_network_transaction.cc @@ -97,18 +97,6 @@ diff --git a/services/network/public/cpp/client_hints.cc b/services/network/publ // Accept-CH is an sh-list of tokens; see: // https://datatracker.ietf.org/doc/html/draft-ietf-httpbis-header-structure-19#section-3.1 absl::optional maybe_list = -diff --git a/services/network/public/cpp/features.cc b/services/network/public/cpp/features.cc ---- a/services/network/public/cpp/features.cc -+++ b/services/network/public/cpp/features.cc -@@ -207,7 +207,7 @@ BASE_FEATURE(kWebSocketReassembleShortMessages, - // Enable support for ACCEPT_CH H2/3 frame as part of Client Hint Reliability. - // See: - // https://tools.ietf.org/html/draft-davidben-http-client-hint-reliability-02#section-4.3 --BASE_FEATURE(kAcceptCHFrame, "AcceptCHFrame", base::FEATURE_ENABLED_BY_DEFAULT); -+BASE_FEATURE(kAcceptCHFrame, "AcceptCHFrame", base::FEATURE_DISABLED_BY_DEFAULT); // disabled by default in Bromite - - // Enable - BASE_FEATURE(kGetCookiesStringUma, diff --git a/third_party/blink/common/client_hints/client_hints.cc b/third_party/blink/common/client_hints/client_hints.cc --- a/third_party/blink/common/client_hints/client_hints.cc +++ b/third_party/blink/common/client_hints/client_hints.cc diff --git a/build/patches/Disable-AsyncDNS-by-default.patch b/build/patches/Disable-AsyncDNS-by-default.patch index 4a240166d..8a4455e7b 100644 --- a/build/patches/Disable-AsyncDNS-by-default.patch +++ b/build/patches/Disable-AsyncDNS-by-default.patch @@ -7,27 +7,15 @@ This feature is detrimental to privacy, see also: License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - chrome/common/chrome_features.cc | 9 ++------- - 1 file changed, 2 insertions(+), 7 deletions(-) + .../common/chrome_features_cc/Disable-AsyncDNS-by-default.inc | 1 + + 1 file changed, 1 insertion(+) + create mode 100644 cromite_flags/chrome/common/chrome_features_cc/Disable-AsyncDNS-by-default.inc -diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc ---- a/chrome/common/chrome_features.cc -+++ b/chrome/common/chrome_features.cc -@@ -74,13 +74,8 @@ BASE_FEATURE(kAppShimNotificationAttribution, - - // Enables the built-in DNS resolver. - BASE_FEATURE(kAsyncDns, -- "AsyncDns", --#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID) || \ -- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -- base::FEATURE_ENABLED_BY_DEFAULT --#else -- base::FEATURE_DISABLED_BY_DEFAULT --#endif -+ "AsyncDns", // disabled by default -+ base::FEATURE_DISABLED_BY_DEFAULT // in Bromite - ); - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +diff --git a/cromite_flags/chrome/common/chrome_features_cc/Disable-AsyncDNS-by-default.inc b/cromite_flags/chrome/common/chrome_features_cc/Disable-AsyncDNS-by-default.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/chrome/common/chrome_features_cc/Disable-AsyncDNS-by-default.inc +@@ -0,0 +1 @@ ++SET_CROMITE_FEATURE_DISABLED(kAsyncDns); -- 2.25.1 diff --git a/build/patches/Disable-PrivacyGuide.patch b/build/patches/Disable-PrivacyGuide.patch index a038df872..75bc13396 100644 --- a/build/patches/Disable-PrivacyGuide.patch +++ b/build/patches/Disable-PrivacyGuide.patch @@ -4,9 +4,10 @@ Subject: Disable PrivacyGuide License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - .../browser/ui/webui/settings/settings_ui.cc | 2 +- - chrome/common/chrome_features.cc | 20 +++++++++---------- - 2 files changed, 11 insertions(+), 11 deletions(-) + chrome/browser/ui/webui/settings/settings_ui.cc | 2 +- + .../common/chrome_features_cc/Disable-PrivacyGuide.inc | 10 ++++++++++ + 2 files changed, 11 insertions(+), 1 deletion(-) + create mode 100644 cromite_flags/chrome/common/chrome_features_cc/Disable-PrivacyGuide.inc diff --git a/chrome/browser/ui/webui/settings/settings_ui.cc b/chrome/browser/ui/webui/settings/settings_ui.cc --- a/chrome/browser/ui/webui/settings/settings_ui.cc @@ -20,54 +21,20 @@ diff --git a/chrome/browser/ui/webui/settings/settings_ui.cc b/chrome/browser/ui html_source->AddBoolean("showPrivacyGuide", show_privacy_guide); html_source->AddBoolean("enablePrivacyGuide3", base::FeatureList::IsEnabled( -diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc ---- a/chrome/common/chrome_features.cc -+++ b/chrome/common/chrome_features.cc -@@ -475,26 +475,26 @@ BASE_FEATURE(kGeoLanguage, "GeoLanguage", base::FEATURE_DISABLED_BY_DEFAULT); - // Enables or disables the Privacy Guide v3 update of the Privacy Guide feature - // in Chrome Settings. - BASE_FEATURE(kPrivacyGuide3, -- "PrivacyGuide3", -- base::FEATURE_DISABLED_BY_DEFAULT); -+ "PrivacyGuide3", // always disabled -+ base::FEATURE_DISABLED_BY_DEFAULT); // in Bromite - - // Enables or disables the Privacy Guide preload card update of the Privacy - // Guide feature in Chrome Settings. Also, this requires the PrivacyGuide3 - // feature to be enabled as well. - BASE_FEATURE(kPrivacyGuidePreload, -- "PrivacyGuidePreload", -- base::FEATURE_DISABLED_BY_DEFAULT); -+ "PrivacyGuidePreload", // always disabled -+ base::FEATURE_DISABLED_BY_DEFAULT); // in Bromite - - #if BUILDFLAG(IS_ANDROID) - BASE_FEATURE(kPrivacyGuideAndroid3, -- "PrivacyGuideAndroid3", -- base::FEATURE_DISABLED_BY_DEFAULT); -+ "PrivacyGuideAndroid3", // always disabled -+ base::FEATURE_DISABLED_BY_DEFAULT); // in Bromite - #endif - - #if BUILDFLAG(IS_ANDROID) - BASE_FEATURE(kPrivacyGuidePreloadAndroid, -- "PrivacyGuidePreloadAndroid", -- base::FEATURE_DISABLED_BY_DEFAULT); -+ "PrivacyGuidePreloadAndroid", // disabled -+ base::FEATURE_DISABLED_BY_DEFAULT); // by default - #endif - - #if !BUILDFLAG(IS_ANDROID) -@@ -1050,8 +1050,8 @@ BASE_FEATURE(kPrintPreviewSetupAssistance, - - #if BUILDFLAG(IS_ANDROID) - BASE_FEATURE(kPrivacyGuideAndroid, -- "PrivacyGuideAndroid", -- base::FEATURE_ENABLED_BY_DEFAULT); -+ "PrivacyGuideAndroid", // disabled -+ base::FEATURE_DISABLED_BY_DEFAULT); // by default - - BASE_FEATURE(kPrivacyGuideAndroidPostMVP, - "PrivacyGuideAndroidPostMVP", +diff --git a/cromite_flags/chrome/common/chrome_features_cc/Disable-PrivacyGuide.inc b/cromite_flags/chrome/common/chrome_features_cc/Disable-PrivacyGuide.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/chrome/common/chrome_features_cc/Disable-PrivacyGuide.inc +@@ -0,0 +1,10 @@ ++SET_CROMITE_FEATURE_DISABLED(kPrivacyGuide3); ++SET_CROMITE_FEATURE_DISABLED(kPrivacyGuidePreload); ++ ++#if BUILDFLAG(IS_ANDROID) ++ ++SET_CROMITE_FEATURE_DISABLED(kPrivacyGuideAndroid3); ++SET_CROMITE_FEATURE_DISABLED(kPrivacyGuidePreloadAndroid); ++SET_CROMITE_FEATURE_DISABLED(kPrivacyGuideAndroid); ++ ++#endif -- 2.25.1 diff --git a/build/patches/Disable-StartSurface-feature.patch b/build/patches/Disable-StartSurface-feature.patch index 98f6037e8..42b096cff 100644 --- a/build/patches/Disable-StartSurface-feature.patch +++ b/build/patches/Disable-StartSurface-feature.patch @@ -6,24 +6,11 @@ This feature would normally show a search box but leads to crashes. License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - chrome/browser/flags/android/chrome_feature_list.cc | 4 ++-- - .../org/chromium/chrome/browser/flags/ChromeFeatureList.java | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) + .../org/chromium/chrome/browser/flags/ChromeFeatureList.java | 2 +- + .../chrome_feature_list_cc/Disable-StartSurface-feature.inc | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-StartSurface-feature.inc -diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc ---- a/chrome/browser/flags/android/chrome_feature_list.cc -+++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -1145,8 +1145,8 @@ BASE_FEATURE(kSearchEnginesPromoV3, - BASE_FEATURE(kSpareTab, "SpareTab", base::FEATURE_ENABLED_BY_DEFAULT); - - BASE_FEATURE(kStartSurfaceAndroid, -- "StartSurfaceAndroid", -- base::FEATURE_ENABLED_BY_DEFAULT); -+ "StartSurfaceAndroid", // must be disabled -+ base::FEATURE_DISABLED_BY_DEFAULT); // in Bromite - - BASE_FEATURE(kFeedPositionAndroid, - "FeedPositionAndroid", diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java @@ -36,5 +23,11 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f public static final CachedFlag sStartSurfaceDisabledFeedImprovement = new CachedFlag(START_SURFACE_DISABLED_FEED_IMPROVEMENT, false); public static final CachedFlag sStartSurfaceOnTablet = +diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-StartSurface-feature.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-StartSurface-feature.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-StartSurface-feature.inc +@@ -0,0 +1 @@ ++SET_CROMITE_FEATURE_DISABLED(kStartSurfaceAndroid); -- 2.25.1 diff --git a/build/patches/Disable-TLS-resumption.patch b/build/patches/Disable-TLS-resumption.patch index 67370db7b..2f2aee25d 100644 --- a/build/patches/Disable-TLS-resumption.patch +++ b/build/patches/Disable-TLS-resumption.patch @@ -25,101 +25,57 @@ See also: Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - chrome/browser/about_flags.cc | 6 +++ - chrome/browser/flag_descriptions.cc | 8 ++++ - chrome/browser/flag_descriptions.h | 6 +++ - net/base/features.cc | 8 ++++ - net/base/features.h | 6 +++ - net/http/http_network_session.cc | 1 + - net/quic/quic_stream_factory.cc | 35 ++++++++++++++++- - net/socket/ssl_client_socket_impl.cc | 59 ++++++++++++++++++++++++++++ - net/socket/ssl_client_socket_impl.h | 2 + - 9 files changed, 130 insertions(+), 1 deletion(-) + .../about_flags_cc/Disable-TLS-resumption.inc | 12 ++++ + .../features_cc/Disable-TLS-resumption.inc | 7 +++ + .../features_h/Disable-TLS-resumption.inc | 5 ++ + net/http/http_network_session.cc | 1 + + net/quic/quic_stream_factory.cc | 35 ++++++++++- + net/socket/ssl_client_socket_impl.cc | 59 +++++++++++++++++++ + net/socket/ssl_client_socket_impl.h | 2 + + 7 files changed, 120 insertions(+), 1 deletion(-) + create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Disable-TLS-resumption.inc + create mode 100644 cromite_flags/net/base/features_cc/Disable-TLS-resumption.inc + create mode 100644 cromite_flags/net/base/features_h/Disable-TLS-resumption.inc -diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc ---- a/chrome/browser/about_flags.cc -+++ b/chrome/browser/about_flags.cc -@@ -5638,6 +5638,12 @@ const FeatureEntry kFeatureEntries[] = { - {"enable-tls13-kyber", flag_descriptions::kEnableTLS13KyberName, - flag_descriptions::kEnableTLS13KyberDescription, kOsAll, - FEATURE_VALUE_TYPE(net::features::kPostQuantumKyber)}, -+ {"disable-tls-resumption", flag_descriptions::kDisableTLSResumptionName, -+ flag_descriptions::kDisableTLSResumptionDescription, kOsAll, +diff --git a/cromite_flags/chrome/browser/about_flags_cc/Disable-TLS-resumption.inc b/cromite_flags/chrome/browser/about_flags_cc/Disable-TLS-resumption.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/chrome/browser/about_flags_cc/Disable-TLS-resumption.inc +@@ -0,0 +1,12 @@ ++#ifdef FLAG_SECTION ++ ++ {"disable-tls-resumption", ++ "Disable TLS Session Resumption", ++ "Disable TLS session resumption.", kOsAll, + FEATURE_VALUE_TYPE(net::features::kDisableTLSResumption)}, -+ {"log-tls-resumption", flag_descriptions::kLogTLSResumptionName, -+ flag_descriptions::kLogTLSResumptionDescription, kOsAll, ++ {"log-tls-resumption", ++ "Log TLS Session Resumption", ++ "Log TLS Session Resumption", kOsAll, + FEATURE_VALUE_TYPE(net::features::kLogTLSResumption)}, - #if BUILDFLAG(IS_ANDROID) - {"feed-back-to-top", flag_descriptions::kFeedBackToTopName, - flag_descriptions::kFeedBackToTopDescription, kOsAndroid, -diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc ---- a/chrome/browser/flag_descriptions.cc -+++ b/chrome/browser/flag_descriptions.cc -@@ -1116,6 +1116,14 @@ const char kAccessibilityAcceleratorNotificationsTimeoutDescription[] = - "shortcut (docked magnifier, screen magnifier and high contrast) to time " - "out instead of remaining pinned."; - -+const char kDisableTLSResumptionName[] = "Disable TLS Session Resumption"; -+const char kDisableTLSResumptionDescription[] = -+ "Disable TLS session resumption."; -+ -+const char kLogTLSResumptionName[] = "Log TLS Session Resumption"; -+const char kLogTLSResumptionDescription[] = -+ "Log TLS session resumption"; -+ - const char kAccessibilityServiceName[] = "Experimental Accessibility Service"; - const char kAccessibilityServiceDescription[] = - "This option enables the experimental Accessibility Service and runs some " -diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h ---- a/chrome/browser/flag_descriptions.h -+++ b/chrome/browser/flag_descriptions.h -@@ -644,6 +644,12 @@ extern const char kDevicePostureDescription[]; - extern const char kEnableTLS13EarlyDataName[]; - extern const char kEnableTLS13EarlyDataDescription[]; - -+extern const char kDisableTLSResumptionName[]; -+extern const char kDisableTLSResumptionDescription[]; -+ -+extern const char kLogTLSResumptionName[]; -+extern const char kLogTLSResumptionDescription[]; + - extern const char kEnableTLS13KyberName[]; - extern const char kEnableTLS13KyberDescription[]; - -diff --git a/net/base/features.cc b/net/base/features.cc ---- a/net/base/features.cc -+++ b/net/base/features.cc -@@ -67,6 +67,14 @@ const base::FeatureParam kUseDnsHttpsSvcbSecureExtraTimeMin{ - &kUseDnsHttpsSvcb, "UseDnsHttpsSvcbSecureExtraTimeMin", - base::Milliseconds(5)}; - -+BASE_FEATURE(kDisableTLSResumption, -+ "DisableTLSResumption", -+ base::FEATURE_ENABLED_BY_DEFAULT); -+ -+BASE_FEATURE(kLogTLSResumption, -+ "LogTLSResumption", -+ base::FEATURE_DISABLED_BY_DEFAULT); -+ - BASE_FEATURE(kUseDnsHttpsSvcbAlpn, - "UseDnsHttpsSvcbAlpn", - base::FEATURE_ENABLED_BY_DEFAULT); -diff --git a/net/base/features.h b/net/base/features.h ---- a/net/base/features.h -+++ b/net/base/features.h -@@ -107,6 +107,12 @@ NET_EXPORT BASE_DECLARE_FEATURE(kSHA1ServerSignature); - // Enables TLS 1.3 early data. - NET_EXPORT BASE_DECLARE_FEATURE(kEnableTLS13EarlyData); - ++#endif +diff --git a/cromite_flags/net/base/features_cc/Disable-TLS-resumption.inc b/cromite_flags/net/base/features_cc/Disable-TLS-resumption.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/net/base/features_cc/Disable-TLS-resumption.inc +@@ -0,0 +1,7 @@ ++CROMITE_FEATURE(kDisableTLSResumption, ++ "DisableTLSResumption", ++ base::FEATURE_ENABLED_BY_DEFAULT); ++ ++CROMITE_FEATURE(kLogTLSResumption, ++ "LogTLSResumption", ++ base::FEATURE_DISABLED_BY_DEFAULT); +diff --git a/cromite_flags/net/base/features_h/Disable-TLS-resumption.inc b/cromite_flags/net/base/features_h/Disable-TLS-resumption.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/net/base/features_h/Disable-TLS-resumption.inc +@@ -0,0 +1,5 @@ +// Disables TLS resumption. +NET_EXPORT BASE_DECLARE_FEATURE(kDisableTLSResumption); + +// Log TLS resumption. +NET_EXPORT BASE_DECLARE_FEATURE(kLogTLSResumption); -+ - // Enables the TLS Encrypted ClientHello feature. - // https://datatracker.ietf.org/doc/html/draft-ietf-tls-esni-13 - NET_EXPORT BASE_DECLARE_FEATURE(kEncryptedClientHello); diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc --- a/net/http/http_network_session.cc +++ b/net/http/http_network_session.cc diff --git a/build/patches/Disable-all-predictors-code.patch b/build/patches/Disable-all-predictors-code.patch index bf073aa86..436dcb285 100644 --- a/build/patches/Disable-all-predictors-code.patch +++ b/build/patches/Disable-all-predictors-code.patch @@ -15,7 +15,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../browser/predictors/loading_predictor.cc | 4 +- .../predictors/loading_predictor_config.cc | 4 +- .../browser/predictors/predictors_features.cc | 14 +--- - chrome/common/chrome_features.cc | 6 +- .../browser/autofill_optimization_guide.cc | 5 +- .../optimization_guide/core/hints_fetcher.cc | 1 + .../optimization_guide/core/hints_manager.cc | 5 ++ @@ -23,10 +22,14 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../core/prediction_model_download_manager.cc | 6 +- .../core/prediction_model_fetcher_impl.cc | 1 + components/optimization_guide/features.gni | 3 +- - components/permissions/features.cc | 16 ++-- - third_party/blink/common/features.cc | 12 +-- + .../Disable-all-predictors-code.inc | 7 ++ + .../Disable-all-predictors-code.inc | 4 + + .../Disable-all-predictors-code.inc | 2 + .../platform/runtime_enabled_features.json5 | 2 +- - 21 files changed, 82 insertions(+), 112 deletions(-) + 21 files changed, 80 insertions(+), 93 deletions(-) + create mode 100644 cromite_flags/chrome/common/chrome_features_cc/Disable-all-predictors-code.inc + create mode 100644 cromite_flags/components/permissions/features_cc/Disable-all-predictors-code.inc + create mode 100644 cromite_flags/third_party/blink/common/features_cc/Disable-all-predictors-code.inc diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn @@ -221,29 +224,6 @@ diff --git a/chrome/browser/predictors/predictors_features.cc b/chrome/browser/p // Modifies loading predictor so that it does prefetches of subresources instead // of preconnects. -diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc ---- a/chrome/common/chrome_features.cc -+++ b/chrome/common/chrome_features.cc -@@ -1044,7 +1044,7 @@ BASE_FEATURE(kPluginVm, "PluginVm", base::FEATURE_DISABLED_BY_DEFAULT); - // Allows Chrome to do preconnect when prerender fails. - BASE_FEATURE(kPrerenderFallbackToPreconnect, - "PrerenderFallbackToPreconnect", -- base::FEATURE_ENABLED_BY_DEFAULT); -+ base::FEATURE_DISABLED_BY_DEFAULT); - - #if BUILDFLAG(IS_CHROMEOS) - // Enable improved printer state and error state messaging for Print Preview. -@@ -1105,8 +1105,8 @@ BASE_FEATURE(kSafetyCheckExtensions, - - // Enables notification permission module in Safety Check. - BASE_FEATURE(kSafetyCheckNotificationPermissions, -- "SafetyCheckNotificationPermissions", -- base::FEATURE_ENABLED_BY_DEFAULT); -+ "SafetyCheckNotificationPermissions", // disabled by default -+ base::FEATURE_DISABLED_BY_DEFAULT); // in Bromite - - const base::FeatureParam - kSafetyCheckNotificationPermissionsMinEnagementLimit{ diff --git a/components/autofill/core/browser/autofill_optimization_guide.cc b/components/autofill/core/browser/autofill_optimization_guide.cc --- a/components/autofill/core/browser/autofill_optimization_guide.cc +++ b/components/autofill/core/browser/autofill_optimization_guide.cc @@ -538,75 +518,38 @@ diff --git a/components/optimization_guide/features.gni b/components/optimizatio } declare_args() { -diff --git a/components/permissions/features.cc b/components/permissions/features.cc ---- a/components/permissions/features.cc -+++ b/components/permissions/features.cc -@@ -93,24 +93,24 @@ BASE_FEATURE(kFailFastQuietChip, - // When enabled, use the value of the `service_url` FeatureParam as the url - // for the Web Permission Predictions Service. - BASE_FEATURE(kPermissionPredictionServiceUseUrlOverride, -- "kPermissionPredictionServiceUseUrlOverride", -- base::FEATURE_DISABLED_BY_DEFAULT); -+ "kPermissionPredictionServiceUseUrlOverride", // disabled by default -+ base::FEATURE_DISABLED_BY_DEFAULT); // in Bromite - - BASE_FEATURE(kPermissionOnDeviceNotificationPredictions, -- "PermissionOnDeviceNotificationPredictions", -- base::FEATURE_ENABLED_BY_DEFAULT); -+ "PermissionOnDeviceNotificationPredictions", // disabled by default -+ base::FEATURE_DISABLED_BY_DEFAULT); // in Bromite - - BASE_FEATURE(kPermissionOnDeviceGeolocationPredictions, -- "PermissionOnDeviceGeolocationPredictions", -- base::FEATURE_ENABLED_BY_DEFAULT); -+ "PermissionOnDeviceGeolocationPredictions", // disabled by default -+ base::FEATURE_DISABLED_BY_DEFAULT); // in Bromite - - BASE_FEATURE(kPermissionDedicatedCpssSetting, - "PermissionDedicatedCpssSettings", - base::FEATURE_DISABLED_BY_DEFAULT); - - BASE_FEATURE(kPermissionPredictionsV2, -- "PermissionPredictionsV2", -- base::FEATURE_DISABLED_BY_DEFAULT); -+ "PermissionPredictionsV2", // disabled by default -+ base::FEATURE_DISABLED_BY_DEFAULT); // in Bromite - - #if BUILDFLAG(IS_ANDROID) - -diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc ---- a/third_party/blink/common/features.cc -+++ b/third_party/blink/common/features.cc -@@ -1217,12 +1217,8 @@ BASE_FEATURE(kMemoryCacheStrongReferenceSingleUnload, - // in the first viewport after the page load and the metrics of the clicked - // anchor element will be extracted and recorded. - BASE_FEATURE(kNavigationPredictor, -- "NavigationPredictor", --#if BUILDFLAG(IS_ANDROID) -- base::FEATURE_ENABLED_BY_DEFAULT --#else -- base::FEATURE_DISABLED_BY_DEFAULT --#endif -+ "NavigationPredictor", // disabled by default -+ base::FEATURE_DISABLED_BY_DEFAULT // in Bromite - ); - - BASE_FEATURE(kNewBaseUrlInheritanceBehavior, -@@ -1359,8 +1355,8 @@ BASE_FEATURE(kPrefetchPrivacyChanges, - base::FEATURE_ENABLED_BY_DEFAULT); // in Bromite - - BASE_FEATURE(kPreloadingHeuristicsMLModel, -- "PreloadingHeuristicsMLModel", -- base::FEATURE_DISABLED_BY_DEFAULT); -+ "PreloadingHeuristicsMLModel", // must be disabled -+ base::FEATURE_DISABLED_BY_DEFAULT); // in cromite - - BASE_FEATURE(kPrerender2InNewTab, - "Prerender2InNewTab", +diff --git a/cromite_flags/chrome/common/chrome_features_cc/Disable-all-predictors-code.inc b/cromite_flags/chrome/common/chrome_features_cc/Disable-all-predictors-code.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/chrome/common/chrome_features_cc/Disable-all-predictors-code.inc +@@ -0,0 +1,7 @@ ++SET_CROMITE_FEATURE_DISABLED(kPrerenderFallbackToPreconnect); ++ ++#if !BUILDFLAG(IS_ANDROID) ++ ++SET_CROMITE_FEATURE_DISABLED(kSafetyCheckNotificationPermissions); ++ ++#endif +diff --git a/cromite_flags/components/permissions/features_cc/Disable-all-predictors-code.inc b/cromite_flags/components/permissions/features_cc/Disable-all-predictors-code.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/components/permissions/features_cc/Disable-all-predictors-code.inc +@@ -0,0 +1,4 @@ ++SET_CROMITE_FEATURE_DISABLED(kPermissionPredictionServiceUseUrlOverride); ++SET_CROMITE_FEATURE_DISABLED(kPermissionOnDeviceNotificationPredictions); ++SET_CROMITE_FEATURE_DISABLED(kPermissionOnDeviceGeolocationPredictions); ++SET_CROMITE_FEATURE_DISABLED(kPermissionPredictionsV2); +diff --git a/cromite_flags/third_party/blink/common/features_cc/Disable-all-predictors-code.inc b/cromite_flags/third_party/blink/common/features_cc/Disable-all-predictors-code.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/third_party/blink/common/features_cc/Disable-all-predictors-code.inc +@@ -0,0 +1,2 @@ ++SET_CROMITE_FEATURE_DISABLED(kNavigationPredictor); ++SET_CROMITE_FEATURE_DISABLED(kPreloadingHeuristicsMLModel); diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -3014,7 +3014,7 @@ +@@ -3007,7 +3007,7 @@ { // https://crbug.com/1126305 name: "Prerender2", diff --git a/build/patches/Enable-Certificate-Transparency.patch b/build/patches/Enable-Certificate-Transparency.patch index 8ab3bda44..a73682255 100644 --- a/build/patches/Enable-Certificate-Transparency.patch +++ b/build/patches/Enable-Certificate-Transparency.patch @@ -8,65 +8,21 @@ by default. License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - chrome/browser/about_flags.cc | 5 +++++ - chrome/browser/browser_features.cc | 13 +++++++------ - chrome/browser/browser_features.h | 1 + - chrome/browser/flag_descriptions.cc | 6 +++++- - chrome/browser/flag_descriptions.h | 5 ++++- - .../browser/net/system_network_context_manager.cc | 6 +----- - chrome/browser/ssl/sct_reporting_service.cc | 5 +++++ - chrome/common/chrome_features.cc | 10 ++-------- - net/http/transport_security_state.cc | 5 +++-- - net/url_request/report_sender.cc | 3 ++- - services/network/network_context.cc | 2 +- - .../network/sct_auditing/sct_auditing_handler.cc | 2 ++ - 12 files changed, 38 insertions(+), 25 deletions(-) + chrome/browser/browser_features.h | 1 + + chrome/browser/net/system_network_context_manager.cc | 6 +----- + chrome/browser/ssl/sct_reporting_service.cc | 5 +++++ + .../about_flags_cc/Enable-Certificate-Transparency.inc | 9 +++++++++ + .../Enable-Certificate-Transparency.inc | 6 ++++++ + .../Enable-Certificate-Transparency.inc | 2 ++ + net/http/transport_security_state.cc | 5 +++-- + net/url_request/report_sender.cc | 3 ++- + services/network/network_context.cc | 2 +- + services/network/sct_auditing/sct_auditing_handler.cc | 2 ++ + 10 files changed, 32 insertions(+), 9 deletions(-) + create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Enable-Certificate-Transparency.inc + create mode 100644 cromite_flags/chrome/browser/browser_features_cc/Enable-Certificate-Transparency.inc + create mode 100644 cromite_flags/chrome/common/chrome_features_cc/Enable-Certificate-Transparency.inc -diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc ---- a/chrome/browser/about_flags.cc -+++ b/chrome/browser/about_flags.cc -@@ -9880,6 +9880,11 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kWebMidiDescription, kOsAll, - FEATURE_VALUE_TYPE(features::kWebMidi)}, - -+ {"certificate-transparency-enabled", -+ flag_descriptions::kCTEnabledName, -+ flag_descriptions::kCTEnabledDescription, kOsAll, -+ FEATURE_VALUE_TYPE(features::kCertificateTransparency)}, -+ - #if BUILDFLAG(IS_CHROMEOS_ASH) - {"dns-over-https-with-identifiers-reuse-old-policy", - flag_descriptions::kDnsOverHttpsWithIdentifiersReuseOldPolicyName, -diff --git a/chrome/browser/browser_features.cc b/chrome/browser/browser_features.cc ---- a/chrome/browser/browser_features.cc -+++ b/chrome/browser/browser_features.cc -@@ -77,6 +77,11 @@ BASE_FEATURE(kEnableUniveralLinks, - base::FEATURE_ENABLED_BY_DEFAULT); - #endif - -+// Enables Certificate Transparency -+BASE_FEATURE(kCertificateTransparency, -+ "CertificateTransparency", // must be enabled -+ base::FEATURE_ENABLED_BY_DEFAULT); // in Bromite -+ - #if BUILDFLAG(IS_CHROMEOS_ASH) - // Enables reading and writing PWA notification permissions from quick settings - // menu. -@@ -177,12 +182,8 @@ BASE_FEATURE(kWebUsbDeviceDetection, - // update the list of accepted logs. Embedders who are planning to enable this - // should first reach out to chrome-certificate-transparency@google.com. - BASE_FEATURE(kCertificateTransparencyAskBeforeEnabling, -- "CertificateTransparencyAskBeforeEnabling", --#if BUILDFLAG(GOOGLE_CHROME_BRANDING) -- base::FEATURE_ENABLED_BY_DEFAULT); --#else -- base::FEATURE_DISABLED_BY_DEFAULT); --#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) -+ "CertificateTransparencyAskBeforeEnabling", // enabled -+ base::FEATURE_ENABLED_BY_DEFAULT); // by default - - BASE_FEATURE(kLargeFaviconFromGoogle, - "LargeFaviconFromGoogle", diff --git a/chrome/browser/browser_features.h b/chrome/browser/browser_features.h --- a/chrome/browser/browser_features.h +++ b/chrome/browser/browser_features.h @@ -78,37 +34,6 @@ diff --git a/chrome/browser/browser_features.h b/chrome/browser/browser_features BASE_DECLARE_FEATURE(kCertificateTransparencyAskBeforeEnabling); BASE_DECLARE_FEATURE(kLargeFaviconFromGoogle); -diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc ---- a/chrome/browser/flag_descriptions.cc -+++ b/chrome/browser/flag_descriptions.cc -@@ -7761,7 +7761,11 @@ const char kAutofillCreditCardUploadDescription[] = - - #endif // defined(TOOLKIT_VIEWS) || BUILDFLAG(IS_ANDROID) - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) -+const char kCTEnabledName[] = "Enable Certificate Transparency"; -+const char kCTEnabledDescription[] = -+ "Enables compliance against the Certificate Transparency Policy, with reporting disabled."; -+ - const char kElasticOverscrollName[] = "Elastic Overscroll"; - const char kElasticOverscrollDescription[] = - "Enables Elastic Overscrolling on touchscreens and precision touchpads."; -diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h ---- a/chrome/browser/flag_descriptions.h -+++ b/chrome/browser/flag_descriptions.h -@@ -4496,7 +4496,10 @@ extern const char kAutofillCreditCardUploadDescription[]; - - #endif // defined(TOOLKIT_VIEWS) || BUILDFLAG(IS_ANDROID) - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) -+extern const char kCTEnabledName[]; -+extern const char kCTEnabledDescription[]; -+ - extern const char kElasticOverscrollName[]; - extern const char kElasticOverscrollDescription[]; - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc --- a/chrome/browser/net/system_network_context_manager.cc +++ b/chrome/browser/net/system_network_context_manager.cc @@ -147,36 +72,38 @@ diff --git a/chrome/browser/ssl/sct_reporting_service.cc b/chrome/browser/ssl/sc if (profile_->IsOffTheRecord() || !base::FeatureList::IsEnabled(features::kSCTAuditing)) { return network::mojom::SCTAuditingMode::kDisabled; -diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc ---- a/chrome/common/chrome_features.cc -+++ b/chrome/common/chrome_features.cc -@@ -1127,15 +1127,9 @@ BASE_FEATURE(kSchedulerConfiguration, - base::FEATURE_DISABLED_BY_DEFAULT); - #endif // BUILDFLAG(IS_CHROMEOS_ASH) - --// Controls whether SCT audit reports are queued and the rate at which they --// should be sampled. Default sampling rate is 1/10,000 certificates. --#if BUILDFLAG(GOOGLE_CHROME_BRANDING) && !BUILDFLAG(IS_ANDROID) --BASE_FEATURE(kSCTAuditing, "SCTAuditing", base::FEATURE_ENABLED_BY_DEFAULT); --#else - // This requires backend infrastructure and a data collection policy. - // Non-Chrome builds should not use Chrome's infrastructure. - BASE_FEATURE(kSCTAuditing, "SCTAuditing", base::FEATURE_DISABLED_BY_DEFAULT); --#endif - constexpr base::FeatureParam kSCTAuditingSamplingRate{ - &kSCTAuditing, "sampling_rate", 0.0001}; - -@@ -1144,8 +1138,8 @@ constexpr base::FeatureParam kSCTAuditingSamplingRate{ - // about an SCT seen in the wild. If it hasn't been seen, then it is considered - // a security incident and uploaded to Google. - BASE_FEATURE(kSCTAuditingHashdance, -- "SCTAuditingHashdance", -- base::FEATURE_ENABLED_BY_DEFAULT); -+ "SCTAuditingHashdance", // disabled -+ base::FEATURE_DISABLED_BY_DEFAULT); // by default - - // An estimated high bound for the time it takes Google to ingest updates to an - // SCT log. Chrome will wait for at least this time plus the Log's Maximum Merge +diff --git a/cromite_flags/chrome/browser/about_flags_cc/Enable-Certificate-Transparency.inc b/cromite_flags/chrome/browser/about_flags_cc/Enable-Certificate-Transparency.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/chrome/browser/about_flags_cc/Enable-Certificate-Transparency.inc +@@ -0,0 +1,9 @@ ++#ifdef FLAG_SECTION ++ ++ {"certificate-transparency-enabled", ++ "Enable Certificate Transparency", ++ "Enables compliance against the Certificate Transparency " ++ "Policy, with reporting disabled.", kOsAll, ++ FEATURE_VALUE_TYPE(features::kCertificateTransparency)}, ++ ++#endif +diff --git a/cromite_flags/chrome/browser/browser_features_cc/Enable-Certificate-Transparency.inc b/cromite_flags/chrome/browser/browser_features_cc/Enable-Certificate-Transparency.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/chrome/browser/browser_features_cc/Enable-Certificate-Transparency.inc +@@ -0,0 +1,6 @@ ++SET_CROMITE_FEATURE_ENABLED(kCertificateTransparencyAskBeforeEnabling); ++ ++// Enables Certificate Transparency ++CROMITE_FEATURE(kCertificateTransparency, ++ "CertificateTransparency", ++ base::FEATURE_ENABLED_BY_DEFAULT); +diff --git a/cromite_flags/chrome/common/chrome_features_cc/Enable-Certificate-Transparency.inc b/cromite_flags/chrome/common/chrome_features_cc/Enable-Certificate-Transparency.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/chrome/common/chrome_features_cc/Enable-Certificate-Transparency.inc +@@ -0,0 +1,2 @@ ++SET_CROMITE_FEATURE_DISABLED(kSCTAuditing); ++SET_CROMITE_FEATURE_DISABLED(kSCTAuditingHashdance); diff --git a/net/http/transport_security_state.cc b/net/http/transport_security_state.cc --- a/net/http/transport_security_state.cc +++ b/net/http/transport_security_state.cc diff --git a/build/patches/Enable-ECH-by-default.patch b/build/patches/Enable-ECH-by-default.patch index ceda433b2..be75b2683 100644 --- a/build/patches/Enable-ECH-by-default.patch +++ b/build/patches/Enable-ECH-by-default.patch @@ -4,28 +4,16 @@ Subject: Enable ECH by default License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - net/base/features.cc | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) + cromite_flags/net/base/features_cc/Enable-ECH-by-default.inc | 2 ++ + 1 file changed, 2 insertions(+) + create mode 100644 cromite_flags/net/base/features_cc/Enable-ECH-by-default.inc -diff --git a/net/base/features.cc b/net/base/features.cc ---- a/net/base/features.cc -+++ b/net/base/features.cc -@@ -96,12 +96,12 @@ BASE_FEATURE(kEnableTLS13EarlyData, - base::FEATURE_DISABLED_BY_DEFAULT); - - BASE_FEATURE(kEncryptedClientHello, -- "EncryptedClientHello", -- base::FEATURE_ENABLED_BY_DEFAULT); -+ "EncryptedClientHello", // enabled -+ base::FEATURE_ENABLED_BY_DEFAULT); // in Bromite - - BASE_FEATURE(kEncryptedClientHelloQuic, -- "EncryptedClientHelloQuic", -- base::FEATURE_ENABLED_BY_DEFAULT); -+ "EncryptedClientHelloQuic", // enabled -+ base::FEATURE_ENABLED_BY_DEFAULT); // in Bromite - - // TODO(crbug.com/795089): Enable this feature. - BASE_FEATURE(kRSAKeyUsageForLocalAnchors, +diff --git a/cromite_flags/net/base/features_cc/Enable-ECH-by-default.inc b/cromite_flags/net/base/features_cc/Enable-ECH-by-default.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/net/base/features_cc/Enable-ECH-by-default.inc +@@ -0,0 +1,2 @@ ++SET_CROMITE_FEATURE_ENABLED(kEncryptedClientHello); ++SET_CROMITE_FEATURE_ENABLED(kEncryptedClientHelloQuic); -- 2.25.1 diff --git a/build/patches/Enable-PermuteTLSExtensions-by-default.patch b/build/patches/Enable-PermuteTLSExtensions-by-default.patch index 303ec0c47..d26df4c12 100644 --- a/build/patches/Enable-PermuteTLSExtensions-by-default.patch +++ b/build/patches/Enable-PermuteTLSExtensions-by-default.patch @@ -4,22 +4,15 @@ Subject: Enable PermuteTLSExtensions by default License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - net/base/features.cc | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + .../base/features_cc/Enable-PermuteTLSExtensions-by-default.inc | 1 + + 1 file changed, 1 insertion(+) + create mode 100644 cromite_flags/net/base/features_cc/Enable-PermuteTLSExtensions-by-default.inc -diff --git a/net/base/features.cc b/net/base/features.cc ---- a/net/base/features.cc -+++ b/net/base/features.cc -@@ -163,8 +163,8 @@ BASE_FEATURE(kTLS13KeyUpdate, - base::FEATURE_DISABLED_BY_DEFAULT); - - BASE_FEATURE(kPermuteTLSExtensions, -- "PermuteTLSExtensions", -- base::FEATURE_ENABLED_BY_DEFAULT); -+ "PermuteTLSExtensions", // enabled by default -+ base::FEATURE_ENABLED_BY_DEFAULT); // in Bromite - - BASE_FEATURE(kPostQuantumKyber, - "PostQuantumKyber", +diff --git a/cromite_flags/net/base/features_cc/Enable-PermuteTLSExtensions-by-default.inc b/cromite_flags/net/base/features_cc/Enable-PermuteTLSExtensions-by-default.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/net/base/features_cc/Enable-PermuteTLSExtensions-by-default.inc +@@ -0,0 +1 @@ ++SET_CROMITE_FEATURE_ENABLED(kPermuteTLSExtensions); -- 2.25.1 diff --git a/build/patches/Enable-network-isolation-features.patch b/build/patches/Enable-network-isolation-features.patch index 3c1ff0862..a600388f2 100644 --- a/build/patches/Enable-network-isolation-features.patch +++ b/build/patches/Enable-network-isolation-features.patch @@ -9,99 +9,32 @@ PartitionNelAndReportingByNetworkIsolationKey License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - net/base/features.cc | 68 ++++++++++++------------- - services/network/public/cpp/features.cc | 2 +- - 2 files changed, 35 insertions(+), 35 deletions(-) + .../features_cc/Enable-network-isolation-features.inc | 10 ++++++++++ + .../features_cc/Enable-network-isolation-features.inc | 1 + + 2 files changed, 11 insertions(+) + create mode 100644 cromite_flags/net/base/features_cc/Enable-network-isolation-features.inc + create mode 100644 cromite_flags/services/network/public/cpp/features_cc/Enable-network-isolation-features.inc -diff --git a/net/base/features.cc b/net/base/features.cc ---- a/net/base/features.cc -+++ b/net/base/features.cc -@@ -108,40 +108,40 @@ BASE_FEATURE(kSplitCacheByIncludeCredentials, - "SplitCacheByIncludeCredentials", - base::FEATURE_DISABLED_BY_DEFAULT); - --BASE_FEATURE(kSplitCacheByNetworkIsolationKey, -- "SplitCacheByNetworkIsolationKey", -- base::FEATURE_DISABLED_BY_DEFAULT); -- --BASE_FEATURE(kSplitCodeCacheByNetworkIsolationKey, -- "SplitCodeCacheByNetworkIsolationKey", -- base::FEATURE_DISABLED_BY_DEFAULT); -- --BASE_FEATURE(kSplitHostCacheByNetworkIsolationKey, -- "SplitHostCacheByNetworkIsolationKey", -- base::FEATURE_DISABLED_BY_DEFAULT); -- --BASE_FEATURE(kPartitionConnectionsByNetworkIsolationKey, -- "PartitionConnectionsByNetworkIsolationKey", -- base::FEATURE_DISABLED_BY_DEFAULT); -- --BASE_FEATURE(kPartitionHttpServerPropertiesByNetworkIsolationKey, -- "PartitionHttpServerPropertiesByNetworkIsolationKey", -- base::FEATURE_DISABLED_BY_DEFAULT); -- --BASE_FEATURE(kPartitionSSLSessionsByNetworkIsolationKey, -- "PartitionSSLSessionsByNetworkIsolationKey", -- base::FEATURE_DISABLED_BY_DEFAULT); -- --BASE_FEATURE(kPartitionNelAndReportingByNetworkIsolationKey, -- "PartitionNelAndReportingByNetworkIsolationKey", -- base::FEATURE_DISABLED_BY_DEFAULT); -- --BASE_FEATURE(kEnableCrossSiteFlagNetworkIsolationKey, -- "EnableCrossSiteFlagNetworkIsolationKey", -- base::FEATURE_DISABLED_BY_DEFAULT); --BASE_FEATURE(kEnableFrameSiteSharedOpaqueNetworkIsolationKey, -- "EnableFrameSiteSharedOpaqueNetworkIsolationKey", -- base::FEATURE_DISABLED_BY_DEFAULT); -+BASE_FEATURE(kSplitCacheByNetworkIsolationKey, // must be enabled -+ "SplitCacheByNetworkIsolationKey", // enabled -+ base::FEATURE_ENABLED_BY_DEFAULT); // in Bromite +diff --git a/cromite_flags/net/base/features_cc/Enable-network-isolation-features.inc b/cromite_flags/net/base/features_cc/Enable-network-isolation-features.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/net/base/features_cc/Enable-network-isolation-features.inc +@@ -0,0 +1,10 @@ ++SET_CROMITE_FEATURE_ENABLED(kSplitCacheByNetworkIsolationKey); ++SET_CROMITE_FEATURE_ENABLED(kSplitCodeCacheByNetworkIsolationKey); ++SET_CROMITE_FEATURE_ENABLED(kSplitHostCacheByNetworkIsolationKey); ++SET_CROMITE_FEATURE_ENABLED(kPartitionConnectionsByNetworkIsolationKey); ++SET_CROMITE_FEATURE_ENABLED(kPartitionHttpServerPropertiesByNetworkIsolationKey); ++SET_CROMITE_FEATURE_ENABLED(kPartitionSSLSessionsByNetworkIsolationKey); ++SET_CROMITE_FEATURE_ENABLED(kPartitionNelAndReportingByNetworkIsolationKey); + -+BASE_FEATURE(kSplitCodeCacheByNetworkIsolationKey, // must be enabled -+ "SplitCodeCacheByNetworkIsolationKey", // enabled -+ base::FEATURE_ENABLED_BY_DEFAULT); // in Bromite -+ -+BASE_FEATURE(kSplitHostCacheByNetworkIsolationKey, // must be -+ "SplitHostCacheByNetworkIsolationKey", // enabled -+ base::FEATURE_ENABLED_BY_DEFAULT); // in Bromite -+ -+BASE_FEATURE(kPartitionConnectionsByNetworkIsolationKey, // must be -+ "PartitionConnectionsByNetworkIsolationKey", // enabled -+ base::FEATURE_ENABLED_BY_DEFAULT); // in Bromite -+ -+BASE_FEATURE(kPartitionHttpServerPropertiesByNetworkIsolationKey, // must be -+ "PartitionHttpServerPropertiesByNetworkIsolationKey", // enabled -+ base::FEATURE_ENABLED_BY_DEFAULT); // in Bromite -+ -+BASE_FEATURE(kPartitionSSLSessionsByNetworkIsolationKey, // must be -+ "PartitionSSLSessionsByNetworkIsolationKey", // enabled -+ base::FEATURE_ENABLED_BY_DEFAULT); // in Bromite -+ -+BASE_FEATURE(kPartitionNelAndReportingByNetworkIsolationKey, // must be -+ "PartitionNelAndReportingByNetworkIsolationKey", // enabled -+ base::FEATURE_ENABLED_BY_DEFAULT); // in Bromite -+ -+BASE_FEATURE(kEnableCrossSiteFlagNetworkIsolationKey, // must be -+ "EnableCrossSiteFlagNetworkIsolationKey", // disabled -+ base::FEATURE_DISABLED_BY_DEFAULT); // in Bromite -+BASE_FEATURE(kEnableFrameSiteSharedOpaqueNetworkIsolationKey, // must be -+ "EnableFrameSiteSharedOpaqueNetworkIsolationKey", // disabled -+ base::FEATURE_DISABLED_BY_DEFAULT); // in Bromite - BASE_FEATURE(kHttpCacheKeyingExperimentControlGroup, - "HttpCacheKeyingExperimentControlGroup", - base::FEATURE_DISABLED_BY_DEFAULT); -diff --git a/services/network/public/cpp/features.cc b/services/network/public/cpp/features.cc ---- a/services/network/public/cpp/features.cc -+++ b/services/network/public/cpp/features.cc -@@ -96,7 +96,7 @@ BASE_FEATURE(kCoopRestrictPropertiesOriginTrial, - // HttpAuthCache. - BASE_FEATURE(kSplitAuthCacheByNetworkIsolationKey, - "SplitAuthCacheByNetworkIsolationKey", -- base::FEATURE_DISABLED_BY_DEFAULT); -+ base::FEATURE_ENABLED_BY_DEFAULT); - - // Enable usage of hardcoded DoH upgrade mapping for use in automatic mode. - BASE_FEATURE(kDnsOverHttpsUpgrade, ++SET_CROMITE_FEATURE_DISABLED(kEnableCrossSiteFlagNetworkIsolationKey); ++SET_CROMITE_FEATURE_DISABLED(kEnableFrameSiteSharedOpaqueNetworkIsolationKey); +diff --git a/cromite_flags/services/network/public/cpp/features_cc/Enable-network-isolation-features.inc b/cromite_flags/services/network/public/cpp/features_cc/Enable-network-isolation-features.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/services/network/public/cpp/features_cc/Enable-network-isolation-features.inc +@@ -0,0 +1 @@ ++SET_CROMITE_FEATURE_ENABLED(kSplitAuthCacheByNetworkIsolationKey); -- 2.25.1 diff --git a/build/patches/Enable-share-intent.patch b/build/patches/Enable-share-intent.patch index c912b89ba..a33fa8890 100644 --- a/build/patches/Enable-share-intent.patch +++ b/build/patches/Enable-share-intent.patch @@ -18,16 +18,18 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../browser/LaunchIntentDispatcher.java | 2 +- .../init/ProcessInitializationHandler.java | 3 + .../SharedIntentShareActivity.java | 119 ++++++++++++++++++ - chrome/browser/about_flags.cc | 4 + - chrome/browser/flag_descriptions.cc | 5 + - chrome/browser/flag_descriptions.h | 3 + - .../flags/android/chrome_feature_list.cc | 5 + - .../flags/android/chrome_feature_list.h | 1 + + .../flags/android/chrome_feature_list.cc | 1 + .../browser/flags/ChromeFeatureList.java | 1 + .../strings/android_chrome_strings.grd | 13 ++ - 15 files changed, 277 insertions(+), 8 deletions(-) + .../about_flags_cc/Enable-share-intent.inc | 12 ++ + .../Enable-share-intent.inc | 3 + + .../Enable-share-intent.inc | 1 + + 14 files changed, 276 insertions(+), 8 deletions(-) create mode 100644 chrome/android/java/res/layout/sharing_intent_content.xml create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/sharing/shared_intent/SharedIntentShareActivity.java + create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Enable-share-intent.inc + create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Enable-share-intent.inc + create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/Enable-share-intent.inc diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni --- a/chrome/android/chrome_java_resources.gni @@ -381,48 +383,6 @@ new file mode 100644 + return false; + } +} -diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc ---- a/chrome/browser/about_flags.cc -+++ b/chrome/browser/about_flags.cc -@@ -10236,6 +10236,10 @@ const FeatureEntry kFeatureEntries[] = { - features::kBrokerFileOperationsOnDiskCacheInNetworkService)}, - - #if BUILDFLAG(IS_ANDROID) -+ {"shared-intent-ui", flag_descriptions::kSharedIntentUIName, -+ flag_descriptions::kSharedIntentUIDescription, kOsAll, -+ FEATURE_VALUE_TYPE(chrome::android::kSharedIntentUI)}, -+ - {"enable-commerce-hint-android", - flag_descriptions::kCommerceHintAndroidName, - flag_descriptions::kCommerceHintAndroidDescription, kOsAndroid, -diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc ---- a/chrome/browser/flag_descriptions.cc -+++ b/chrome/browser/flag_descriptions.cc -@@ -3220,6 +3220,11 @@ const char kIsolateOriginsDescription[] = - "Requires dedicated processes for an additional set of origins, " - "specified as a comma-separated list."; - -+const char kSharedIntentUIName[] = -+ "Enable shared feature"; -+const char kSharedIntentUIDescription[] = -+ "Enables shared feature"; -+ - const char kIsolationByDefaultName[] = - "Change web-facing behaviors that prevent origin-level isolation"; - const char kIsolationByDefaultDescription[] = -diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h ---- a/chrome/browser/flag_descriptions.h -+++ b/chrome/browser/flag_descriptions.h -@@ -1866,6 +1866,9 @@ extern const char kIsolateOriginsDescription[]; - - extern const char kIsolationByDefaultName[]; - extern const char kIsolationByDefaultDescription[]; -+extern const char kSharedIntentUIName[]; -+extern const char kSharedIntentUIDescription[]; -+ - - extern const char kSiteIsolationOptOutName[]; - extern const char kSiteIsolationOptOutDescription[]; diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc @@ -434,28 +394,6 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &kReportParentalControlSitesChild, &kRequestDesktopSiteDefaults, &kRequestDesktopSiteDefaultsControl, -@@ -1035,6 +1036,10 @@ BASE_FEATURE(kScrollToTLDOptimization, - "ScrollToTLDOptimization", - base::FEATURE_DISABLED_BY_DEFAULT); - -+BASE_FEATURE(kSharedIntentUI, -+ "SharedIntentUI", -+ base::FEATURE_ENABLED_BY_DEFAULT); -+ - BASE_FEATURE(kShowScrollableMVTOnNTPAndroid, - "ShowScrollableMVTOnNTPAndroid", - base::FEATURE_DISABLED_BY_DEFAULT); -diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h ---- a/chrome/browser/flags/android/chrome_feature_list.h -+++ b/chrome/browser/flags/android/chrome_feature_list.h -@@ -176,6 +176,7 @@ BASE_DECLARE_FEATURE(kRequestDesktopSiteDefaultsLogging); - BASE_DECLARE_FEATURE(kRestoreTabsOnFRE); - BASE_DECLARE_FEATURE(kSearchEnginesPromoV3); - BASE_DECLARE_FEATURE(kSearchReadyOmniboxFeature); -+BASE_DECLARE_FEATURE(kSharedIntentUI); - BASE_DECLARE_FEATURE(kSharingHubLinkToggle); - BASE_DECLARE_FEATURE(kShowScrollableMVTOnNTPAndroid); - BASE_DECLARE_FEATURE(kFeedPositionAndroid); diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java @@ -490,5 +428,36 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Submit %1$s123 on %2$sZoe's Macbook? +diff --git a/cromite_flags/chrome/browser/about_flags_cc/Enable-share-intent.inc b/cromite_flags/chrome/browser/about_flags_cc/Enable-share-intent.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/chrome/browser/about_flags_cc/Enable-share-intent.inc +@@ -0,0 +1,12 @@ ++#if BUILDFLAG(IS_ANDROID) ++ ++#ifdef FLAG_SECTION ++ ++ {"share-intent-ui", ++ "Enable share feature", ++ "Enables share feature", kOsAndroid, ++ FEATURE_VALUE_TYPE(chrome::android::kSharedIntentUI)}, ++ ++#endif ++ ++#endif +diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Enable-share-intent.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Enable-share-intent.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Enable-share-intent.inc +@@ -0,0 +1,3 @@ ++CROMITE_FEATURE(kSharedIntentUI, ++ "SharedIntentUI", ++ base::FEATURE_ENABLED_BY_DEFAULT); +diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/Enable-share-intent.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/Enable-share-intent.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/Enable-share-intent.inc +@@ -0,0 +1 @@ ++BASE_DECLARE_FEATURE(kSharedIntentUI); -- 2.25.1 diff --git a/build/patches/Enable-third-party-storage-partitioning.patch b/build/patches/Enable-third-party-storage-partitioning.patch index bcf0f8056..6f0230ed7 100644 --- a/build/patches/Enable-third-party-storage-partitioning.patch +++ b/build/patches/Enable-third-party-storage-partitioning.patch @@ -4,22 +4,15 @@ Subject: Enable third-party storage partitioning License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - net/base/features.cc | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + .../base/features_cc/Enable-third-party-storage-partitioning.inc | 1 + + 1 file changed, 1 insertion(+) + create mode 100644 cromite_flags/net/base/features_cc/Enable-third-party-storage-partitioning.inc -diff --git a/net/base/features.cc b/net/base/features.cc ---- a/net/base/features.cc -+++ b/net/base/features.cc -@@ -278,8 +278,8 @@ BASE_FEATURE(kCookieDomainRejectNonASCII, - // Enables partitioning of third party storage (IndexedDB, CacheStorage, etc.) - // by the top level site to reduce fingerprinting. - BASE_FEATURE(kThirdPartyStoragePartitioning, -- "ThirdPartyStoragePartitioning", -- base::FEATURE_ENABLED_BY_DEFAULT); -+ "ThirdPartyStoragePartitioning", // must be enabled -+ base::FEATURE_ENABLED_BY_DEFAULT); // in Bromite - - // Whether to use the new code paths needed to support partitioning Blob URLs. - // This exists as a kill-switch in case an issue is identified with the Blob +diff --git a/cromite_flags/net/base/features_cc/Enable-third-party-storage-partitioning.inc b/cromite_flags/net/base/features_cc/Enable-third-party-storage-partitioning.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/net/base/features_cc/Enable-third-party-storage-partitioning.inc +@@ -0,0 +1 @@ ++SET_CROMITE_FEATURE_ENABLED(kThirdPartyStoragePartitioning); -- 2.25.1 diff --git a/build/patches/Experimental-user-scripts-support.patch b/build/patches/Experimental-user-scripts-support.patch index 3544c8ef1..fb6e984d7 100644 --- a/build/patches/Experimental-user-scripts-support.patch +++ b/build/patches/Experimental-user-scripts-support.patch @@ -33,9 +33,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../init/ProcessInitializationHandler.java | 3 + chrome/android/java_sources.gni | 3 + chrome/browser/BUILD.gn | 7 + - chrome/browser/about_flags.cc | 7 + - chrome/browser/flag_descriptions.cc | 5 + - chrome/browser/flag_descriptions.h | 3 + + chrome/browser/about_flags.cc | 1 + chrome/browser/prefs/browser_prefs.cc | 4 + chrome/browser/profiles/BUILD.gn | 3 + ...hrome_browser_main_extra_parts_profiles.cc | 7 + @@ -134,8 +132,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../renderer/web_ui_injection_host.cc | 40 + .../renderer/web_ui_injection_host.h | 27 + .../strings/userscripts_strings.grdp | 54 ++ + .../Experimental-user-scripts-support.inc | 13 + tools/gritsettings/resource_ids.spec | 6 + - 108 files changed, 9491 insertions(+), 2 deletions(-) + 107 files changed, 9490 insertions(+), 2 deletions(-) create mode 100644 components/user_scripts/README.md create mode 100755 components/user_scripts/android/BUILD.gn create mode 100644 components/user_scripts/android/java/res/layout/accept_script_item.xml @@ -221,6 +220,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html create mode 100755 components/user_scripts/renderer/web_ui_injection_host.cc create mode 100755 components/user_scripts/renderer/web_ui_injection_host.h create mode 100755 components/user_scripts/strings/userscripts_strings.grdp + create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Experimental-user-scripts-support.inc diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn @@ -349,47 +349,6 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc #include "components/version_info/version_info.h" #include "components/viz/common/features.h" #include "components/viz/common/switches.h" -@@ -8624,6 +8625,12 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(ash::features::kClipboardHistoryWebContentsPaste)}, - #endif // BUILDFLAG(IS_CHROMEOS_ASH) - -+#if BUILDFLAG(IS_ANDROID) -+ {"enable-userscripts-log", flag_descriptions::kEnableLoggingUserScriptsName, -+ flag_descriptions::kEnableLoggingUserScriptsDescription, kOsDesktop | kOsAndroid, -+ FEATURE_VALUE_TYPE(user_scripts::features::kEnableLoggingUserScripts)}, -+#endif -+ - #if BUILDFLAG(IS_WIN) - {"enable-media-foundation-video-capture", - flag_descriptions::kEnableMediaFoundationVideoCaptureName, -diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc ---- a/chrome/browser/flag_descriptions.cc -+++ b/chrome/browser/flag_descriptions.cc -@@ -7599,6 +7599,11 @@ const char kUseOutOfProcessVideoDecodingDescription[] = - "enabled in ash-chrome)."; - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) - -+const char kEnableLoggingUserScriptsName[] = "Enable logging user scripts component"; -+const char kEnableLoggingUserScriptsDescription[] = -+ "Enables logging for troubleshooting feature. " -+ "Enabling logs may make browsing slower."; -+ - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) - const char kWebShareName[] = "Web Share"; - const char kWebShareDescription[] = -diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h ---- a/chrome/browser/flag_descriptions.h -+++ b/chrome/browser/flag_descriptions.h -@@ -4358,6 +4358,9 @@ extern const char kQuickCommandsDescription[]; - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || - // defined (OS_FUCHSIA) - -+extern const char kEnableLoggingUserScriptsName[]; -+extern const char kEnableLoggingUserScriptsDescription[]; -+ - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) - extern const char kWebShareName[]; - extern const char kWebShareDescription[]; diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc @@ -10490,6 +10449,24 @@ new file mode 100755 + + + +diff --git a/cromite_flags/chrome/browser/about_flags_cc/Experimental-user-scripts-support.inc b/cromite_flags/chrome/browser/about_flags_cc/Experimental-user-scripts-support.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/chrome/browser/about_flags_cc/Experimental-user-scripts-support.inc +@@ -0,0 +1,13 @@ ++#if BUILDFLAG(IS_ANDROID) ++ ++#ifdef FLAG_SECTION ++ ++ {"enable-userscripts-log", ++ "Enable logging user scripts component", ++ "Enables logging for troubleshooting feature. " ++ "Enabling logs may make browsing slower.", kOsAndroid, ++ FEATURE_VALUE_TYPE(user_scripts::features::kEnableLoggingUserScripts)}, ++ ++#endif ++ ++#endif diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec --- a/tools/gritsettings/resource_ids.spec +++ b/tools/gritsettings/resource_ids.spec diff --git a/build/patches/Move-navigation-bar-to-bottom.patch b/build/patches/Move-navigation-bar-to-bottom.patch index e0a304c66..2cf1f404b 100644 --- a/build/patches/Move-navigation-bar-to-bottom.patch +++ b/build/patches/Move-navigation-bar-to-bottom.patch @@ -50,12 +50,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../browser/toolbar/ToolbarManager.java | 36 +++++++-- .../chrome/browser/ui/BottomContainer.java | 18 +++++ .../ui/system/StatusBarColorController.java | 9 +++ - chrome/browser/about_flags.cc | 5 ++ .../scene_layer/tab_strip_scene_layer.cc | 16 +++- .../BrowserControlsMarginSupplier.java | 5 ++ .../BrowserControlsStateProvider.java | 6 ++ - chrome/browser/flag_descriptions.cc | 4 + - chrome/browser/flag_descriptions.h | 3 + .../flags/android/chrome_feature_list.cc | 2 + .../chrome/browser/flags/CachedFlag.java | 6 ++ .../browser/flags/ChromeFeatureList.java | 5 ++ @@ -87,7 +84,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../accessibility/AccessibilitySettings.java | 16 ++++ .../AccessibilitySettingsDelegate.java | 6 ++ .../render_widget_host_view_android.cc | 3 + - 74 files changed, 835 insertions(+), 66 deletions(-) + .../Move-navigation-bar-to-bottom.inc | 12 +++ + 72 files changed, 835 insertions(+), 66 deletions(-) + create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Move-navigation-bar-to-bottom.inc diff --git a/cc/base/features.cc b/cc/base/features.cc --- a/cc/base/features.cc @@ -1578,21 +1577,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/system/Statu } /** -diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc ---- a/chrome/browser/about_flags.cc -+++ b/chrome/browser/about_flags.cc -@@ -8393,6 +8393,11 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kWindowsScrollingPersonalityDescription, kOsAll, - FEATURE_VALUE_TYPE(features::kWindowsScrollingPersonality)}, - -+ {"move-top-toolbar-to-bottom", -+ flag_descriptions::kMoveTopToolbarToBottomName, -+ flag_descriptions::kMoveTopToolbarToBottomDescription, kOsAndroid, -+ FEATURE_VALUE_TYPE(features::kMoveTopToolbarToBottom)}, -+ - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) - {"elastic-overscroll", flag_descriptions::kElasticOverscrollName, - flag_descriptions::kElasticOverscrollDescription, kOsWin | kOsAndroid, diff --git a/chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer.cc b/chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer.cc --- a/chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer.cc +++ b/chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer.cc @@ -1676,33 +1660,6 @@ diff --git a/chrome/browser/browser_controls/android/java/src/org/chromium/chrom /** * @return The minimum visible height top controls can have in pixels. */ -diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc ---- a/chrome/browser/flag_descriptions.cc -+++ b/chrome/browser/flag_descriptions.cc -@@ -2043,6 +2043,10 @@ const char kImprovedKeyboardShortcutsDescription[] = - "Ensure keyboard shortcuts work consistently with international keyboard " - "layouts and deprecate legacy shortcuts."; - -+const char kMoveTopToolbarToBottomName[] = "Move top toolbar to bottom"; -+const char kMoveTopToolbarToBottomDescription[] = -+ "Move the top toolbar to the bottom."; -+ - const char kIncognitoDownloadsWarningName[] = - "Enable Incognito downloads warning"; - const char kIncognitoDownloadsWarningDescription[] = -diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h ---- a/chrome/browser/flag_descriptions.h -+++ b/chrome/browser/flag_descriptions.h -@@ -1156,6 +1156,9 @@ extern const char kImprovedIncognitoScreenshotDescription[]; - extern const char kImprovedKeyboardShortcutsName[]; - extern const char kImprovedKeyboardShortcutsDescription[]; - -+extern const char kMoveTopToolbarToBottomName[]; -+extern const char kMoveTopToolbarToBottomDescription[]; -+ - extern const char kIncognitoReauthenticationForAndroidName[]; - extern const char kIncognitoReauthenticationForAndroidDescription[]; - diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc @@ -2676,5 +2633,22 @@ diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/ float top_shown_pix = top_content_offset; if (ime_adapter_android_) { +diff --git a/cromite_flags/chrome/browser/about_flags_cc/Move-navigation-bar-to-bottom.inc b/cromite_flags/chrome/browser/about_flags_cc/Move-navigation-bar-to-bottom.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/chrome/browser/about_flags_cc/Move-navigation-bar-to-bottom.inc +@@ -0,0 +1,12 @@ ++#if BUILDFLAG(IS_ANDROID) ++ ++#ifdef FLAG_SECTION ++ ++ {"move-top-toolbar-to-bottom", ++ "Move top toolbar to bottom", ++ "Move the top toolbar to the bottom.", kOsAndroid, ++ FEATURE_VALUE_TYPE(features::kMoveTopToolbarToBottom)}, ++ ++#endif ++ ++#endif -- 2.25.1 diff --git a/build/patches/Re-introduce-modal-dialog-flag-to-close-all-tabs.patch b/build/patches/Re-introduce-modal-dialog-flag-to-close-all-tabs.patch index b4b58350d..70c340f1b 100644 --- a/build/patches/Re-introduce-modal-dialog-flag-to-close-all-tabs.patch +++ b/build/patches/Re-introduce-modal-dialog-flag-to-close-all-tabs.patch @@ -8,14 +8,16 @@ This reverts commit 614a998c5af5dcd36baffa6d65090c0b8decb03f. License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - .../browser/tasks/tab_management/CloseAllTabsDialog.java | 6 ++++++ - chrome/browser/about_flags.cc | 7 +++++++ - chrome/browser/flag_descriptions.cc | 5 +++++ - chrome/browser/flag_descriptions.h | 3 +++ - chrome/browser/flags/android/chrome_feature_list.cc | 9 +++++++-- - chrome/browser/flags/android/chrome_feature_list.h | 1 + - .../chromium/chrome/browser/flags/ChromeFeatureList.java | 1 + - 7 files changed, 30 insertions(+), 2 deletions(-) + .../tasks/tab_management/CloseAllTabsDialog.java | 6 ++++++ + chrome/browser/flags/android/chrome_feature_list.cc | 1 + + .../chrome/browser/flags/ChromeFeatureList.java | 1 + + ...ntroduce-modal-dialog-flag-to-close-all-tabs.inc | 13 +++++++++++++ + ...ntroduce-modal-dialog-flag-to-close-all-tabs.inc | 9 +++++++++ + ...ntroduce-modal-dialog-flag-to-close-all-tabs.inc | 5 +++++ + 6 files changed, 35 insertions(+) + create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Re-introduce-modal-dialog-flag-to-close-all-tabs.inc + create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Re-introduce-modal-dialog-flag-to-close-all-tabs.inc + create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/Re-introduce-modal-dialog-flag-to-close-all-tabs.inc diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/CloseAllTabsDialog.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/CloseAllTabsDialog.java --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/CloseAllTabsDialog.java @@ -40,51 +42,6 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser assert modalDialogManagerSupplier.hasValue(); final ModalDialogManager manager = modalDialogManagerSupplier.get(); final boolean isIncognito = tabModelSelector.getCurrentModel().isIncognito(); -diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc ---- a/chrome/browser/about_flags.cc -+++ b/chrome/browser/about_flags.cc -@@ -9941,6 +9941,13 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(base::i18n::kLacrosMergeIcuDataFile)}, - #endif - -+#if BUILDFLAG(IS_ANDROID) -+ {"close-all-tabs-modal-dialog", -+ flag_descriptions::kCloseAllTabsModalDialogName, -+ flag_descriptions::kCloseAllTabsModalDialogDescription, kOsAndroid, -+ FEATURE_VALUE_TYPE(chrome::android::kCloseAllTabsModalDialog)}, -+#endif // BUILDFLAG(IS_ANDROID) -+ - #if !BUILDFLAG(IS_ANDROID) - // TODO(https://crbug.com/1443349): Add Windows once library supports it. - {"layout-extraction", flag_descriptions::kLayoutExtractionName, -diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc ---- a/chrome/browser/flag_descriptions.cc -+++ b/chrome/browser/flag_descriptions.cc -@@ -3976,6 +3976,11 @@ const char kChimeAndroidSdkDescription[] = - "Enable Chime SDK to receive push notification."; - const char kChimeAndroidSdkName[] = "Use Chime SDK"; - -+const char kCloseAllTabsModalDialogName[] = "Close all tabs modal dialog"; -+const char kCloseAllTabsModalDialogDescription[] = -+ "Shows a confirmation modal dialog when clicking 'Close all tabs' in the" -+ "app menu."; -+ - const char kCloseTabSuggestionsName[] = "Suggest to close Tabs"; - const char kCloseTabSuggestionsDescription[] = - "Suggests to the user to close Tabs that haven't been used beyond a " -diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h ---- a/chrome/browser/flag_descriptions.h -+++ b/chrome/browser/flag_descriptions.h -@@ -46,6 +46,9 @@ namespace flag_descriptions { - extern const char kAccelerated2dCanvasName[]; - extern const char kAccelerated2dCanvasDescription[]; - -+extern const char kCloseAllTabsModalDialogName[]; -+extern const char kCloseAllTabsModalDialogDescription[]; -+ - extern const char kAcceleratedVideoDecodeName[]; - extern const char kAcceleratedVideoDecodeDescription[]; - diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc @@ -96,39 +53,6 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &kBackgroundThreadPool, &kBaselineGM3SurfaceColors, &kBlockIntentsWhileLocked, -@@ -536,6 +537,10 @@ BASE_FEATURE(kCacheActivityTaskID, - "CacheActivityTaskID", - base::FEATURE_ENABLED_BY_DEFAULT); - -+BASE_FEATURE(kCloseAllTabsModalDialog, -+ "CloseAllTabsModalDialog", -+ base::FEATURE_ENABLED_BY_DEFAULT); -+ - // Used in downstream code. - BASE_FEATURE(kCastDeviceFilter, - "CastDeviceFilter", -@@ -546,8 +551,8 @@ BASE_FEATURE(kClearOmniboxFocusAfterNavigation, - base::FEATURE_ENABLED_BY_DEFAULT); - - BASE_FEATURE(kCloseTabSuggestions, -- "CloseTabSuggestions", -- base::FEATURE_DISABLED_BY_DEFAULT); -+ "CloseTabSuggestions", // must be enabled -+ base::FEATURE_ENABLED_BY_DEFAULT); // in Bromite - - BASE_FEATURE(kCloseTabSaveTabList, - "CloseTabSaveTabList", -diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h ---- a/chrome/browser/flags/android/chrome_feature_list.h -+++ b/chrome/browser/flags/android/chrome_feature_list.h -@@ -41,6 +41,7 @@ BASE_DECLARE_FEATURE(kBaselineGM3SurfaceColors); - BASE_DECLARE_FEATURE(kBlockIntentsWhileLocked); - BASE_DECLARE_FEATURE(kCacheActivityTaskID); - BASE_DECLARE_FEATURE(kClearOmniboxFocusAfterNavigation); -+BASE_DECLARE_FEATURE(kCloseAllTabsModalDialog); - BASE_DECLARE_FEATURE(kCloseTabSuggestions); - BASE_DECLARE_FEATURE(kCloseTabSaveTabList); - BASE_DECLARE_FEATURE(kCreateNewTabInitializeRenderer); diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java @@ -140,5 +64,47 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f public static final String CCT_RESIZABLE_FOR_THIRD_PARTIES = "CCTResizableForThirdParties"; public static final String CCT_RESIZABLE_SIDE_SHEET = "CCTResizableSideSheet"; public static final String CCT_RESIZABLE_SIDE_SHEET_FOR_THIRD_PARTIES = +diff --git a/cromite_flags/chrome/browser/about_flags_cc/Re-introduce-modal-dialog-flag-to-close-all-tabs.inc b/cromite_flags/chrome/browser/about_flags_cc/Re-introduce-modal-dialog-flag-to-close-all-tabs.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/chrome/browser/about_flags_cc/Re-introduce-modal-dialog-flag-to-close-all-tabs.inc +@@ -0,0 +1,13 @@ ++#if BUILDFLAG(IS_ANDROID) ++ ++#ifdef FLAG_SECTION ++ ++ {"close-all-tabs-modal-dialog", ++ "Close all tabs modal dialog", ++ "Shows a confirmation modal dialog when clicking 'Close all tabs' in the" ++ "app menu.", kOsAndroid, ++ FEATURE_VALUE_TYPE(chrome::android::kCloseAllTabsModalDialog)}, ++ ++#endif ++ ++#endif +diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Re-introduce-modal-dialog-flag-to-close-all-tabs.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Re-introduce-modal-dialog-flag-to-close-all-tabs.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Re-introduce-modal-dialog-flag-to-close-all-tabs.inc +@@ -0,0 +1,9 @@ ++#if BUILDFLAG(IS_ANDROID) ++ ++CROMITE_FEATURE(kCloseAllTabsModalDialog, ++ "CloseAllTabsModalDialog", ++ base::FEATURE_ENABLED_BY_DEFAULT); ++ ++SET_CROMITE_FEATURE_ENABLED(kCloseTabSuggestions); ++ ++#endif +diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/Re-introduce-modal-dialog-flag-to-close-all-tabs.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/Re-introduce-modal-dialog-flag-to-close-all-tabs.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/Re-introduce-modal-dialog-flag-to-close-all-tabs.inc +@@ -0,0 +1,5 @@ ++#if BUILDFLAG(IS_ANDROID) ++ ++BASE_DECLARE_FEATURE(kCloseAllTabsModalDialog); ++ ++#endif -- 2.25.1 diff --git a/build/patches/Restore-adaptive-button-in-top-toolbar-customization.patch b/build/patches/Restore-adaptive-button-in-top-toolbar-customization.patch index a5040d365..289c758eb 100644 --- a/build/patches/Restore-adaptive-button-in-top-toolbar-customization.patch +++ b/build/patches/Restore-adaptive-button-in-top-toolbar-customization.patch @@ -89,7 +89,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/ShareButt diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -702,18 +702,12 @@ const FeatureEntry::FeatureParam kAdaptiveButtonCustomization_Share[] = { +@@ -675,18 +675,12 @@ const FeatureEntry::FeatureParam kAdaptiveButtonCustomization_Share[] = { {"default_segment", "share"}, {"show_ui_only_after_ready", "false"}, {"ignore_segmentation_results", "true"}}; diff --git a/build/patches/Restore-offline-indicator-v2-flag.patch b/build/patches/Restore-offline-indicator-v2-flag.patch index cf870ad30..f5e9710fb 100644 --- a/build/patches/Restore-offline-indicator-v2-flag.patch +++ b/build/patches/Restore-offline-indicator-v2-flag.patch @@ -8,14 +8,15 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- .../indicator/OfflineDetector.java | 38 ++++++++++++++++++- .../tabbed_mode/TabbedRootUiCoordinator.java | 8 +++- - chrome/browser/about_flags.cc | 3 ++ - chrome/browser/flag-metadata.json | 5 +++ - chrome/browser/flag_descriptions.cc | 4 ++ - chrome/browser/flag_descriptions.h | 3 ++ - .../flags/android/chrome_feature_list.cc | 5 +++ - .../flags/android/chrome_feature_list.h | 1 + + .../flags/android/chrome_feature_list.cc | 1 + .../browser/flags/ChromeFeatureList.java | 1 + - 9 files changed, 65 insertions(+), 3 deletions(-) + .../Restore-offline-indicator-v2-flag.inc | 12 ++++++ + .../Restore-offline-indicator-v2-flag.inc | 3 ++ + .../Restore-offline-indicator-v2-flag.inc | 1 + + 7 files changed, 61 insertions(+), 3 deletions(-) + create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Restore-offline-indicator-v2-flag.inc + create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Restore-offline-indicator-v2-flag.inc + create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/Restore-offline-indicator-v2-flag.inc diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineDetector.java b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineDetector.java --- a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineDetector.java @@ -111,61 +112,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab ObservableSupplierImpl isUrlBarFocusedSupplier = new ObservableSupplierImpl<>(); isUrlBarFocusedSupplier.set(mToolbarManager.isUrlBarFocused()); mUrlFocusChangeListener = new UrlFocusChangeListener() { -diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc ---- a/chrome/browser/about_flags.cc -+++ b/chrome/browser/about_flags.cc -@@ -5453,6 +5453,9 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kOfflinePagesLivePageSharingName, - flag_descriptions::kOfflinePagesLivePageSharingDescription, kOsAndroid, - FEATURE_VALUE_TYPE(offline_pages::kOfflinePagesLivePageSharingFeature)}, -+ {"offline-indicator-v2", flag_descriptions::kOfflineIndicatorV2Name, -+ flag_descriptions::kOfflineIndicatorV2Description, kOsAndroid, -+ FEATURE_VALUE_TYPE(chrome::android::kOfflineIndicatorV2)}, - {"offline-pages-auto-save", - flag_descriptions::kOfflinePagesAutoSaveFeatureName, - flag_descriptions::kOfflinePagesAutoSaveFeatureDescription, kOsAndroid, -diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json ---- a/chrome/browser/flag-metadata.json -+++ b/chrome/browser/flag-metadata.json -@@ -6052,6 +6052,11 @@ - "owners": [ "dom" ], - "expiry_milestone": 125 - }, -+ { -+ "name": "offline-indicator-v2", -+ "owners": [ "sinansahin@google.com", "twellington", "offline-dev" ], -+ "expiry_milestone": -1 -+ }, - { - "name": "offline-pages-live-page-sharing", - "owners": [ "sclittle", "srsudar", "offline-dev" ], -diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc ---- a/chrome/browser/flag_descriptions.cc -+++ b/chrome/browser/flag_descriptions.cc -@@ -4244,6 +4244,10 @@ const char kNotificationPermissionRationaleBottomSheetDescription[] = - "flow. " - "Only works with builds targeting Android T+."; - -+const char kOfflineIndicatorV2Name[] = "Offline indicator V2"; -+const char kOfflineIndicatorV2Description[] = -+ "Show a persistent offline indicator when offline."; -+ - const char kOfflinePagesLivePageSharingName[] = - "Enables live page sharing of offline pages"; - const char kOfflinePagesLivePageSharingDescription[] = -diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h ---- a/chrome/browser/flag_descriptions.h -+++ b/chrome/browser/flag_descriptions.h -@@ -2501,6 +2501,9 @@ extern const char kNewTabSearchEngineUrlAndroidDescription[]; - extern const char kNotificationPermissionRationaleName[]; - extern const char kNotificationPermissionRationaleDescription[]; - -+extern const char kOfflineIndicatorV2Name[]; -+extern const char kOfflineIndicatorV2Description[]; -+ - extern const char kNotificationPermissionRationaleBottomSheetName[]; - extern const char kNotificationPermissionRationaleBottomSheetDescription[]; - diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc @@ -177,28 +123,6 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &kPageAnnotationsService, &kPreconnectOnTabCreation, &kInlineUpdateFlow, -@@ -818,6 +819,10 @@ BASE_FEATURE(kEarlyInitializeStartupMetrics, - - BASE_FEATURE(kEmptyStates, "EmptyStates", base::FEATURE_ENABLED_BY_DEFAULT); - -+BASE_FEATURE(kOfflineIndicatorV2, -+ "OfflineIndicatorV2", -+ base::FEATURE_ENABLED_BY_DEFAULT); -+ - BASE_FEATURE(kExperimentsForAgsa, - "ExperimentsForAgsa", - base::FEATURE_ENABLED_BY_DEFAULT); -diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h ---- a/chrome/browser/flags/android/chrome_feature_list.h -+++ b/chrome/browser/flags/android/chrome_feature_list.h -@@ -132,6 +132,7 @@ BASE_DECLARE_FEATURE(kLensCameraAssistedSearch); - BASE_DECLARE_FEATURE(kLensOnQuickActionSearchWidget); - BASE_DECLARE_FEATURE(kLocationBarModelOptimizations); - BASE_DECLARE_FEATURE(kNewTabSearchEngineUrlAndroid); -+BASE_DECLARE_FEATURE(kOfflineIndicatorV2); - BASE_DECLARE_FEATURE(kNotificationPermissionVariant); - BASE_DECLARE_FEATURE(kNotificationPermissionBottomSheet); - BASE_DECLARE_FEATURE(kOmahaMinSdkVersionAndroid); diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java @@ -210,5 +134,36 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f public static final String OFFLINE_PAGES_DESCRIPTIVE_FAIL_STATUS = "OfflinePagesDescriptiveFailStatus"; public static final String OFFLINE_PAGES_DESCRIPTIVE_PENDING_STATUS = +diff --git a/cromite_flags/chrome/browser/about_flags_cc/Restore-offline-indicator-v2-flag.inc b/cromite_flags/chrome/browser/about_flags_cc/Restore-offline-indicator-v2-flag.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/chrome/browser/about_flags_cc/Restore-offline-indicator-v2-flag.inc +@@ -0,0 +1,12 @@ ++#if BUILDFLAG(IS_ANDROID) ++ ++#ifdef FLAG_SECTION ++ ++ {"offline-indicator-v2", ++ "Offline indicator V2", ++ "Show a persistent offline indicator when offline.", kOsAndroid, ++ FEATURE_VALUE_TYPE(chrome::android::kOfflineIndicatorV2)}, ++ ++#endif ++ ++#endif +diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Restore-offline-indicator-v2-flag.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Restore-offline-indicator-v2-flag.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Restore-offline-indicator-v2-flag.inc +@@ -0,0 +1,3 @@ ++CROMITE_FEATURE(kOfflineIndicatorV2, ++ "OfflineIndicatorV2", ++ base::FEATURE_ENABLED_BY_DEFAULT); +diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/Restore-offline-indicator-v2-flag.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/Restore-offline-indicator-v2-flag.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/Restore-offline-indicator-v2-flag.inc +@@ -0,0 +1 @@ ++BASE_DECLARE_FEATURE(kOfflineIndicatorV2); -- 2.25.1 diff --git a/build/patches/Revert-Delete-block-external-form-redirects.patch b/build/patches/Revert-Delete-block-external-form-redirects.patch index 43366ce37..7ed50bed3 100644 --- a/build/patches/Revert-Delete-block-external-form-redirects.patch +++ b/build/patches/Revert-Delete-block-external-form-redirects.patch @@ -7,76 +7,14 @@ enables IntentBlockExternalFormRedirectsNoGesture. License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - chrome/browser/about_flags.cc | 6 ++++++ - chrome/browser/flag-metadata.json | 5 +++++ - chrome/browser/flag_descriptions.cc | 6 ++++++ - chrome/browser/flag_descriptions.h | 3 +++ .../android/external_intents_features.cc | 7 ++++++- .../android/external_intents_features.h | 1 + .../ExternalIntentsFeatures.java | 6 ++++++ .../ExternalNavigationHandler.java | 21 +++++++++++++++++++ - 8 files changed, 54 insertions(+), 1 deletion(-) + ...t-Delete-block-external-form-redirects.inc | 15 +++++++++++++ + 5 files changed, 49 insertions(+), 1 deletion(-) + create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Revert-Delete-block-external-form-redirects.inc -diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc ---- a/chrome/browser/about_flags.cc -+++ b/chrome/browser/about_flags.cc -@@ -10392,6 +10392,12 @@ const FeatureEntry kFeatureEntries[] = { - "ServiceWorkerSkipIgnorableFetchHandler")}, - - #if BUILDFLAG(IS_ANDROID) -+ {"block-external-form-redirects-no-gesture", -+ flag_descriptions::kIntentBlockExternalFormRedirectsNoGestureName, -+ flag_descriptions::kIntentBlockExternalFormRedirectsNoGestureDescription, -+ kOsAndroid, -+ FEATURE_VALUE_TYPE( -+ external_intents::kIntentBlockExternalFormRedirectsNoGesture)}, - {"external-navigation-debug-logs", - flag_descriptions::kExternalNavigationDebugLogsName, - flag_descriptions::kExternalNavigationDebugLogsDescription, kOsAndroid, -diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json ---- a/chrome/browser/flag-metadata.json -+++ b/chrome/browser/flag-metadata.json -@@ -841,6 +841,11 @@ - "owners": ["ortuno", "cros-apps-platform-core@google.com" ], - "expiry_milestone": 132 - }, -+ { -+ "name": "block-external-form-redirects-no-gesture", -+ "owners": [ "jochen", "tedchoc" ], -+ "expiry_milestone": -1 -+ }, - { - "name": "block-insecure-private-network-requests", - "owners": [ "lyf", "phao", "chrome-security-owp-team@google.com" ], -diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc ---- a/chrome/browser/flag_descriptions.cc -+++ b/chrome/browser/flag_descriptions.cc -@@ -4145,6 +4145,12 @@ const char kInstantStartName[] = "Instant start"; - const char kInstantStartDescription[] = - "Show start surface before native library is loaded."; - -+const char kIntentBlockExternalFormRedirectsNoGestureName[] = -+ "Block intents from form submissions without user gesture"; -+const char kIntentBlockExternalFormRedirectsNoGestureDescription[] = -+ "Require a user gesture that triggered a form submission in order to " -+ "allow for redirecting to an external intent."; -+ - const char kInterestFeedV2Name[] = "Interest Feed v2"; - const char kInterestFeedV2Description[] = - "Show content suggestions on the New Tab Page and Start Surface using the " -diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h ---- a/chrome/browser/flag_descriptions.h -+++ b/chrome/browser/flag_descriptions.h -@@ -2444,6 +2444,9 @@ extern const char kInstanceSwitcherDescription[]; - extern const char kInstantStartName[]; - extern const char kInstantStartDescription[]; - -+extern const char kIntentBlockExternalFormRedirectsNoGestureName[]; -+extern const char kIntentBlockExternalFormRedirectsNoGestureDescription[]; -+ - extern const char kInterestFeedV2Name[]; - extern const char kInterestFeedV2Description[]; - diff --git a/components/external_intents/android/external_intents_features.cc b/components/external_intents/android/external_intents_features.cc --- a/components/external_intents/android/external_intents_features.cc +++ b/components/external_intents/android/external_intents_features.cc @@ -92,9 +30,9 @@ diff --git a/components/external_intents/android/external_intents_features.cc b/ "TrustedClientGestureBypass", base::FEATURE_ENABLED_BY_DEFAULT); -+BASE_FEATURE(kIntentBlockExternalFormRedirectsNoGesture, -+ "IntentBlockExternalFormRedirectsNoGesture", -+ base::FEATURE_ENABLED_BY_DEFAULT); ++CROMITE_FEATURE(kIntentBlockExternalFormRedirectsNoGesture, ++ "IntentBlockExternalFormRedirectsNoGesture", ++ base::FEATURE_ENABLED_BY_DEFAULT); + static jlong JNI_ExternalIntentsFeatures_GetFeature(JNIEnv* env, jint ordinal) { + if (ordinal == -1) @@ -167,5 +105,25 @@ diff --git a/components/external_intents/android/java/src/org/chromium/component if (hasInternalScheme(params.getUrl(), targetIntent) || hasContentScheme(params.getUrl(), targetIntent) || hasFileSchemeInIntentURI(params.getUrl(), targetIntent)) { +diff --git a/cromite_flags/chrome/browser/about_flags_cc/Revert-Delete-block-external-form-redirects.inc b/cromite_flags/chrome/browser/about_flags_cc/Revert-Delete-block-external-form-redirects.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/chrome/browser/about_flags_cc/Revert-Delete-block-external-form-redirects.inc +@@ -0,0 +1,15 @@ ++#if BUILDFLAG(IS_ANDROID) ++ ++#ifdef FLAG_SECTION ++ ++ {"block-external-form-redirects-no-gesture", ++ "Block intents from form submissions without user gesture", ++ "Require a user gesture that triggered a form submission in order to " ++ "allow for redirecting to an external intent.", ++ kOsAndroid, ++ FEATURE_VALUE_TYPE( ++ external_intents::kIntentBlockExternalFormRedirectsNoGesture)}, ++ ++#endif ++ ++#endif -- 2.25.1 diff --git a/build/patches/Revert-flags-remove-num-raster-threads.patch b/build/patches/Revert-flags-remove-num-raster-threads.patch index 1dd0406a2..4c13d85df 100644 --- a/build/patches/Revert-flags-remove-num-raster-threads.patch +++ b/build/patches/Revert-flags-remove-num-raster-threads.patch @@ -6,91 +6,37 @@ This reverts commit 2a51528a1737e9038f7f96f29403032a6a845a25. License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - chrome/browser/about_flags.cc | 14 ++++++++++++++ - chrome/browser/flag-metadata.json | 4 ++++ - chrome/browser/flag_descriptions.cc | 8 ++++++++ - chrome/browser/flag_descriptions.h | 7 +++++++ - 4 files changed, 33 insertions(+) + ...Revert-flags-remove-num-raster-threads.inc | 23 +++++++++++++++++++ + 1 file changed, 23 insertions(+) + create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Revert-flags-remove-num-raster-threads.inc -diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc ---- a/chrome/browser/about_flags.cc -+++ b/chrome/browser/about_flags.cc -@@ -398,6 +398,17 @@ const FeatureEntry::Choice kOverlayStrategiesChoices[] = { - "single-fullscreen,single-on-top,underlay"}, - }; - +diff --git a/cromite_flags/chrome/browser/about_flags_cc/Revert-flags-remove-num-raster-threads.inc b/cromite_flags/chrome/browser/about_flags_cc/Revert-flags-remove-num-raster-threads.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/chrome/browser/about_flags_cc/Revert-flags-remove-num-raster-threads.inc +@@ -0,0 +1,23 @@ +#if BUILDFLAG(IS_ANDROID) ++ ++#ifdef FEATURE_PARAM_SECTION ++ +const FeatureEntry::Choice kNumRasterThreadsChoices[] = { + {flags_ui::kGenericExperimentChoiceDefault, "", ""}, -+ {flag_descriptions::kNumRasterThreadsOne, cc::switches::kNumRasterThreads, "1"}, -+ {flag_descriptions::kNumRasterThreadsTwo, cc::switches::kNumRasterThreads, "2"}, -+ {flag_descriptions::kNumRasterThreadsThree, cc::switches::kNumRasterThreads, -+ "3"}, -+ {flag_descriptions::kNumRasterThreadsFour, cc::switches::kNumRasterThreads, -+ "4"}}; ++ {"1", cc::switches::kNumRasterThreads, "1"}, ++ {"2", cc::switches::kNumRasterThreads, "2"}, ++ {"3", cc::switches::kNumRasterThreads, "3"}, ++ {"4", cc::switches::kNumRasterThreads, "4"}}; ++ +#endif + - const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = { - {flags_ui::kGenericExperimentChoiceDefault, "", ""}, - {flag_descriptions::kTouchSelectionStrategyCharacter, -@@ -5101,6 +5112,9 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(mojo::core::kMojoLinuxChannelSharedMem)}, - #endif - #if BUILDFLAG(IS_ANDROID) -+ {"num-raster-threads", flag_descriptions::kNumRasterThreadsName, -+ flag_descriptions::kNumRasterThreadsDescription, kOsAll, ++#ifdef FLAG_SECTION ++ ++ {"num-raster-threads", ++ "Number of raster threads", ++ "Specify the number of raster threads.", kOsAll, + MULTI_VALUE_TYPE(kNumRasterThreadsChoices)}, - {"enable-site-isolation-for-password-sites", - flag_descriptions::kSiteIsolationForPasswordSitesName, - flag_descriptions::kSiteIsolationForPasswordSitesDescription, kOsAndroid, -diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json ---- a/chrome/browser/flag-metadata.json -+++ b/chrome/browser/flag-metadata.json -@@ -5658,6 +5658,10 @@ - "owners": [ "lazzzis", "aishwaryarj" ], - "expiry_milestone": 120 - }, -+ { -+ "name": "num-raster-threads", -+ "expiry_milestone": -1 -+ }, - { - "name": "messages-for-android-offer-notification", - "owners": [ "vishwasuppoor", "siashah" ], -diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc ---- a/chrome/browser/flag_descriptions.cc -+++ b/chrome/browser/flag_descriptions.cc -@@ -2312,6 +2312,14 @@ const char kOmniboxActionsInSuggestDescription[] = - "Actions in Suggest permits optional Action Chips to be attached to " - "Entity suggestions."; - -+const char kNumRasterThreadsName[] = "Number of raster threads"; -+const char kNumRasterThreadsDescription[] = -+ "Specify the number of raster threads."; -+const char kNumRasterThreadsOne[] = "1"; -+const char kNumRasterThreadsTwo[] = "2"; -+const char kNumRasterThreadsThree[] = "3"; -+const char kNumRasterThreadsFour[] = "4"; + - const char kOmniboxAdaptiveSuggestionsCountName[] = - "Adaptive Omnibox Suggestions count"; - const char kOmniboxAdaptiveSuggestionsCountDescription[] = -diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h ---- a/chrome/browser/flag_descriptions.h -+++ b/chrome/browser/flag_descriptions.h -@@ -1325,6 +1325,13 @@ extern const char kOmitCorsClientCertDescription[]; - extern const char kOmniboxActionsInSuggestName[]; - extern const char kOmniboxActionsInSuggestDescription[]; - -+extern const char kNumRasterThreadsName[]; -+extern const char kNumRasterThreadsDescription[]; -+extern const char kNumRasterThreadsOne[]; -+extern const char kNumRasterThreadsTwo[]; -+extern const char kNumRasterThreadsThree[]; -+extern const char kNumRasterThreadsFour[]; ++#endif + - extern const char kOmniboxAdaptiveSuggestionsCountName[]; - extern const char kOmniboxAdaptiveSuggestionsCountDescription[]; - ++#endif -- 2.25.1 diff --git a/build/patches/Viewport-Protection-Site-Setting.patch b/build/patches/Viewport-Protection-Site-Setting.patch index d01ec71f6..612552403 100644 --- a/build/patches/Viewport-Protection-Site-Setting.patch +++ b/build/patches/Viewport-Protection-Site-Setting.patch @@ -8,10 +8,9 @@ Require: Content-settings-infrastructure.patch .../bromite_content_settings/viewport.grdp | 27 ++++++ .../bromite_content_settings/viewport.inc | 22 +++++ .../bromite_content_settings/VIEWPORT.inc | 1 + - third_party/blink/common/features.cc | 2 +- .../renderer/core/frame/local_dom_window.cc | 2 + third_party/blink/renderer/core/page/page.cc | 3 + - 7 files changed, 149 insertions(+), 1 deletion(-) + 6 files changed, 148 insertions(+) create mode 100644 components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/impl/BromiteViewportContentSetting.java create mode 100644 components/browser_ui/strings/bromite_content_settings/viewport.grdp create mode 100644 components/content_settings/core/browser/bromite_content_settings/viewport.inc @@ -180,18 +179,6 @@ new file mode 100644 +++ b/components/content_settings/core/common/bromite_content_settings/VIEWPORT.inc @@ -0,0 +1 @@ + VIEWPORT, -diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc ---- a/third_party/blink/common/features.cc -+++ b/third_party/blink/common/features.cc -@@ -1445,7 +1445,7 @@ constexpr base::FeatureParam kPrivateAggregationApiDebugModeEnabledAtAll{ - - BASE_FEATURE(kViewportProtection, - "ViewportProtection", -- base::FEATURE_ENABLED_BY_DEFAULT); -+ base::FEATURE_DISABLED_BY_DEFAULT); - - BASE_FEATURE(kProcessHtmlDataImmediately, - "ProcessHtmlDataImmediately", diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc --- a/third_party/blink/renderer/core/frame/local_dom_window.cc +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc diff --git a/build/patches/Viewport-Protection-flag.patch b/build/patches/Viewport-Protection-flag.patch index f4665d5c8..c2fcecfc5 100644 --- a/build/patches/Viewport-Protection-flag.patch +++ b/build/patches/Viewport-Protection-flag.patch @@ -7,11 +7,9 @@ prevent coordinate-based fingerprinting scripts. The factor is changed at each change of origin. The feature is controlled by a feature flag (default enabled) --- - chrome/browser/about_flags.cc | 5 ++ - chrome/browser/flag_descriptions.cc | 6 ++ - chrome/browser/flag_descriptions.h | 3 + - third_party/blink/common/features.cc | 4 + - third_party/blink/public/common/features.h | 3 + + .../Viewport-Protection-flag.inc | 10 +++ + .../features_cc/Viewport-Protection-flag.inc | 3 + + .../features_h/Viewport-Protection-flag.inc | 2 + .../common/widget/device_emulation_params.h | 6 +- .../blink/renderer/core/css/media_values.cc | 2 +- .../core/css/resolver/style_resolver.cc | 7 +- @@ -28,79 +26,41 @@ The feature is controlled by a feature flag (default enabled) .../blink/renderer/core/input/touch.cc | 17 ++++- third_party/blink/renderer/core/page/page.cc | 76 +++++++++++++++++++ third_party/blink/renderer/core/page/page.h | 7 ++ - 21 files changed, 251 insertions(+), 19 deletions(-) + 19 files changed, 245 insertions(+), 19 deletions(-) + create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Viewport-Protection-flag.inc + create mode 100644 cromite_flags/third_party/blink/common/features_cc/Viewport-Protection-flag.inc + create mode 100644 cromite_flags/third_party/blink/common/features_h/Viewport-Protection-flag.inc -diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc ---- a/chrome/browser/about_flags.cc -+++ b/chrome/browser/about_flags.cc -@@ -10460,6 +10460,11 @@ const FeatureEntry kFeatureEntries[] = { - kServiceWorkerSkipIgnorableFetchHandlerVariations, - "ServiceWorkerSkipIgnorableFetchHandler")}, - +diff --git a/cromite_flags/chrome/browser/about_flags_cc/Viewport-Protection-flag.inc b/cromite_flags/chrome/browser/about_flags_cc/Viewport-Protection-flag.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/chrome/browser/about_flags_cc/Viewport-Protection-flag.inc +@@ -0,0 +1,10 @@ ++#ifdef FLAG_SECTION ++ + {"viewport-protection", -+ flag_descriptions::kViewportProtectionName, -+ flag_descriptions::kViewportProtectionDescription, kOsAll, ++ "Viewport Protection", ++ "Scale the viewport and the screen by a random factor to prevent " ++ "coordinate-based fingerprinting scripts. The factor is changed at each " ++ "change of origin.", kOsAll, + FEATURE_VALUE_TYPE(blink::features::kViewportProtection)}, + - #if BUILDFLAG(IS_ANDROID) - {"block-external-form-redirects-no-gesture", - flag_descriptions::kIntentBlockExternalFormRedirectsNoGestureName, -diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc ---- a/chrome/browser/flag_descriptions.cc -+++ b/chrome/browser/flag_descriptions.cc -@@ -7762,6 +7762,12 @@ const char kWebXrInternalsDescription[] = - "debug issues with the WebXR Device API."; - #endif // #if defined(ENABLE_VR) - -+const char kViewportProtectionName[] = "Viewport Protection"; -+const char kViewportProtectionDescription[] = -+ "Scale the viewport and the screen by a random factor to prevent " -+ "coordinate-based fingerprinting scripts. The factor is changed at each " -+ "change of origin."; -+ - #if BUILDFLAG(ENABLE_WEBUI_TAB_STRIP) - const char kWebUITabStripFlagId[] = "webui-tab-strip"; - const char kWebUITabStripName[] = "WebUI tab strip"; -diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h ---- a/chrome/browser/flag_descriptions.h -+++ b/chrome/browser/flag_descriptions.h -@@ -4488,6 +4488,9 @@ extern const char kPaintPreviewDemoName[]; - extern const char kPaintPreviewDemoDescription[]; - #endif // ENABLE_PAINT_PREVIEW && BUILDFLAG(IS_ANDROID) - -+extern const char kViewportProtectionName[]; -+extern const char kViewportProtectionDescription[]; -+ - #if BUILDFLAG(ENABLE_VR) - extern const char kWebXrInternalsName[]; - extern const char kWebXrInternalsDescription[]; -diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc ---- a/third_party/blink/common/features.cc -+++ b/third_party/blink/common/features.cc -@@ -1443,6 +1443,10 @@ constexpr base::FeatureParam kPrivateAggregationApiDebugModeEnabledAtAll{ - &kPrivateAggregationApi, "debug_mode_enabled_at_all", - /*default_value=*/true}; - -+BASE_FEATURE(kViewportProtection, -+ "ViewportProtection", -+ base::FEATURE_ENABLED_BY_DEFAULT); -+ - BASE_FEATURE(kProcessHtmlDataImmediately, - "ProcessHtmlDataImmediately", - base::FEATURE_DISABLED_BY_DEFAULT); -diff --git a/third_party/blink/public/common/features.h b/third_party/blink/public/common/features.h ---- a/third_party/blink/public/common/features.h -+++ b/third_party/blink/public/common/features.h -@@ -1363,6 +1363,9 @@ BLINK_COMMON_EXPORT bool IsFencedFramesEnabled(); - - BLINK_COMMON_EXPORT bool IsMaxUnthrottledTimeoutNestingLevelEnabled(); - ++#endif +diff --git a/cromite_flags/third_party/blink/common/features_cc/Viewport-Protection-flag.inc b/cromite_flags/third_party/blink/common/features_cc/Viewport-Protection-flag.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/third_party/blink/common/features_cc/Viewport-Protection-flag.inc +@@ -0,0 +1,3 @@ ++CROMITE_FEATURE(kViewportProtection, ++ "ViewportProtection", ++ base::FEATURE_DISABLED_BY_DEFAULT); +diff --git a/cromite_flags/third_party/blink/common/features_h/Viewport-Protection-flag.inc b/cromite_flags/third_party/blink/common/features_h/Viewport-Protection-flag.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/third_party/blink/common/features_h/Viewport-Protection-flag.inc +@@ -0,0 +1,2 @@ +// Enable blink viewport protection +BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kViewportProtection); -+ - // This function checks both kNewBaseUrlInheritanceBehavior and - // kIsolateSandboxedIframes and returns true if either is enabled. - BLINK_COMMON_EXPORT bool IsNewBaseUrlInheritanceBehaviorEnabled(); diff --git a/third_party/blink/public/common/widget/device_emulation_params.h b/third_party/blink/public/common/widget/device_emulation_params.h --- a/third_party/blink/public/common/widget/device_emulation_params.h +++ b/third_party/blink/public/common/widget/device_emulation_params.h diff --git a/build/patches/ungoogled-chromium-no-special-hosts-domains.patch b/build/patches/ungoogled-chromium-no-special-hosts-domains.patch index ab5e14a28..0d85c7a8a 100644 --- a/build/patches/ungoogled-chromium-no-special-hosts-domains.patch +++ b/build/patches/ungoogled-chromium-no-special-hosts-domains.patch @@ -55,11 +55,12 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html components/search_provider_logos/BUILD.gn | 2 - .../logo_service_impl.cc | 16 +- components/url_matcher/url_util.cc | 83 ----- - content/common/features.cc | 4 +- + ...gled-chromium-no-special-hosts-domains.inc | 1 + ...gled-chromium-no-special-hosts-domains.inc | 1 + net/base/url_util.cc | 21 -- services/network/network_context.cc | 2 +- - 52 files changed, 58 insertions(+), 802 deletions(-) + 52 files changed, 57 insertions(+), 800 deletions(-) + create mode 100644 cromite_flags/content/common/features_cc/ungoogled-chromium-no-special-hosts-domains.inc create mode 100644 cromite_flags/content/public/common/content_features_cc/ungoogled-chromium-no-special-hosts-domains.inc diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn @@ -1630,20 +1631,12 @@ diff --git a/components/url_matcher/url_util.cc b/components/url_matcher/url_uti return GURL(); } -diff --git a/content/common/features.cc b/content/common/features.cc ---- a/content/common/features.cc -+++ b/content/common/features.cc -@@ -178,8 +178,8 @@ BASE_FEATURE(kExperimentalContentSecurityPolicyFeatures, - // parsing the signin status HTTP headers. - // kFedCmIdpSigninStatusEnabled takes precedence over this feature flag. - BASE_FEATURE(kFedCmIdpSigninStatusMetrics, -- "FedCmIdpSigninStatusMetrics", -- base::FEATURE_ENABLED_BY_DEFAULT); -+ "FedCmIdpSigninStatusMetrics", // disabled -+ base::FEATURE_DISABLED_BY_DEFAULT); // by default - - // If enabled, limits the number of FLEDGE auctions that can be run between page - // load and unload -- any attempt to run more than this number of auctions will +diff --git a/cromite_flags/content/common/features_cc/ungoogled-chromium-no-special-hosts-domains.inc b/cromite_flags/content/common/features_cc/ungoogled-chromium-no-special-hosts-domains.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/content/common/features_cc/ungoogled-chromium-no-special-hosts-domains.inc +@@ -0,0 +1 @@ ++SET_CROMITE_FEATURE_DISABLED(kFedCmIdpSigninStatusMetrics); diff --git a/cromite_flags/content/public/common/content_features_cc/ungoogled-chromium-no-special-hosts-domains.inc b/cromite_flags/content/public/common/content_features_cc/ungoogled-chromium-no-special-hosts-domains.inc new file mode 100644 --- /dev/null