From 9f00f57f9b31bca6fd75b36784c7233579e3b785 Mon Sep 17 00:00:00 2001 From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Mon, 31 Oct 2022 18:41:03 +0100 Subject: [PATCH] Release 106.0.5249.163 --- CHANGELOG.md | 3 + build/LASTCHANGE | 2 +- build/RELEASE | 2 +- build/RELEASE_COMMIT | 2 +- build/bromite_patches_list.txt | 1 + .../AImageReader-CFI-crash-mitigations.patch | 2 +- .../Add-AllowUserCertificates-flag.patch | 4 +- .../Add-an-always-incognito-mode.patch | 2 +- .../Add-bookmark-import-export-actions.patch | 6 +- .../Ask-user-before-closing-all-tabs.patch | 2 +- .../Automated-domain-substitution.patch | 63 ++----------------- build/patches/Bromite-auto-updater.patch | 8 +-- build/patches/Disable-AGSA-by-default.patch | 2 +- .../Disable-conversion-measurement-api.patch | 2 +- .../Disable-smart-selection-by-default.patch | 4 +- .../Disable-text-fragments-by-default.patch | 2 +- build/patches/Enable-ECH-by-default.patch | 25 ++++++++ build/patches/Enable-share-intent.patch | 8 +-- ...-allow-screenshots-in-Incognito-mode.patch | 2 +- .../Move-navigation-bar-to-bottom.patch | 6 +- .../Multiple-fingerprinting-mitigations.patch | 8 +-- ...-modal-dialog-flag-to-close-all-tabs.patch | 2 +- .../Remove-contextual-search-manager.patch | 6 +- .../Restore-Search-Ready-Omnibox-flag.patch | 10 +-- .../Restore-Simplified-NTP-launch.patch | 8 +-- .../Restore-offline-indicator-v2-flag.patch | 10 +-- ...emove-disable-pull-to-refresh-effect.patch | 2 +- ...vert-flags-remove-num-raster-threads.patch | 2 +- build/patches/Unexpire-tab-groups-flags.patch | 8 +-- ...build-remove-calling-untrusted-hooks.patch | 6 +- 30 files changed, 93 insertions(+), 117 deletions(-) create mode 100644 build/patches/Enable-ECH-by-default.patch diff --git a/CHANGELOG.md b/CHANGELOG.md index 900b608e..1337e34a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# 106.0.5249.163 +* enable ECH (Encrypted ClientHello) by default + # 106.0.5249.72 * dropped patches already merged upstream diff --git a/build/LASTCHANGE b/build/LASTCHANGE index 4a8eacc3..0a58a322 100644 --- a/build/LASTCHANGE +++ b/build/LASTCHANGE @@ -1 +1 @@ -25d529f97d15fcc222fcc6ebf047045fdc3c844c- \ No newline at end of file +b9c06a0f04c03ea3997e667dff0eb39165741528- \ No newline at end of file diff --git a/build/RELEASE b/build/RELEASE index f7482ba4..f8e4194d 100644 --- a/build/RELEASE +++ b/build/RELEASE @@ -1 +1 @@ -106.0.5249.72 \ No newline at end of file +106.0.5249.163 \ No newline at end of file diff --git a/build/RELEASE_COMMIT b/build/RELEASE_COMMIT index cf91097f..ea442b6a 100644 --- a/build/RELEASE_COMMIT +++ b/build/RELEASE_COMMIT @@ -1 +1 @@ -49e8f8fad2cf71c2fde1d1a9ecf68d04e4a6263b \ No newline at end of file +8afcb6d66c09af9ccf2f306c5e0d1f997bfea024 \ No newline at end of file diff --git a/build/bromite_patches_list.txt b/build/bromite_patches_list.txt index 7e126764..be1f0d76 100644 --- a/build/bromite_patches_list.txt +++ b/build/bromite_patches_list.txt @@ -205,3 +205,4 @@ Override-Navigator-Language.patch Disable-add-to-home-screen-prompt.patch Remove-HTTP-referrals-in-cross-origin-navigation.patch Automated-domain-substitution.patch +Enable-ECH-by-default.patch diff --git a/build/patches/AImageReader-CFI-crash-mitigations.patch b/build/patches/AImageReader-CFI-crash-mitigations.patch index 46140bc9..27993350 100644 --- a/build/patches/AImageReader-CFI-crash-mitigations.patch +++ b/build/patches/AImageReader-CFI-crash-mitigations.patch @@ -84,7 +84,7 @@ diff --git a/base/android/android_image_reader_compat.h b/base/android/android_i 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 -@@ -2367,9 +2367,9 @@ +@@ -2372,9 +2372,9 @@ "expiry_milestone": 106 }, { diff --git a/build/patches/Add-AllowUserCertificates-flag.patch b/build/patches/Add-AllowUserCertificates-flag.patch index 8c6b6d23..18ad74c5 100644 --- a/build/patches/Add-AllowUserCertificates-flag.patch +++ b/build/patches/Add-AllowUserCertificates-flag.patch @@ -103,7 +103,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &feed::kInterestFeedV1ClicksAndViewsConditionalUpload, &feed::kInterestFeedV2, &feed::kInterestFeedV2Autoplay, -@@ -440,6 +441,9 @@ const base::Feature kAdaptiveButtonInTopToolbarCustomizationV2{ +@@ -441,6 +442,9 @@ const base::Feature kAdaptiveButtonInTopToolbarCustomizationV2{ "AdaptiveButtonInTopToolbarCustomizationV2", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -146,7 +146,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f public static final String ABOUT_THIS_SITE_BANNER = "AboutThisSiteBanner"; public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR = "AdaptiveButtonInTopToolbar"; public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_CUSTOMIZATION_V2 = -@@ -612,6 +613,8 @@ public abstract class ChromeFeatureList { +@@ -613,6 +614,8 @@ public abstract class ChromeFeatureList { public static final String FEED_REPLACE_ALL = "FeedReplaceAll"; /* Alphabetical: */ diff --git a/build/patches/Add-an-always-incognito-mode.patch b/build/patches/Add-an-always-incognito-mode.patch index 51ac74ba..3f0ba749 100644 --- a/build/patches/Add-an-always-incognito-mode.patch +++ b/build/patches/Add-an-always-incognito-mode.patch @@ -1216,7 +1216,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio 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 -@@ -532,8 +532,8 @@ const base::Feature kCCTNewDownloadTab{"CCTNewDownloadTab", +@@ -533,8 +533,8 @@ const base::Feature kCCTNewDownloadTab{"CCTNewDownloadTab", const base::Feature kCCTIncognito{"CCTIncognito", base::FEATURE_ENABLED_BY_DEFAULT}; diff --git a/build/patches/Add-bookmark-import-export-actions.patch b/build/patches/Add-bookmark-import-export-actions.patch index 997ce02f..ee29bd72 100644 --- a/build/patches/Add-bookmark-import-export-actions.patch +++ b/build/patches/Add-bookmark-import-export-actions.patch @@ -1287,7 +1287,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &kCriticalPersistedTabData, &kCommerceCoupons, &kCCTBackgroundTab, -@@ -948,6 +949,10 @@ const base::Feature kWebApkInstallService{"WebApkInstallService", +@@ -952,6 +953,10 @@ const base::Feature kWebApkInstallService{"WebApkInstallService", const base::Feature kWebApkTrampolineOnInitialIntent{ "WebApkTrampolineOnInitialIntent", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -1301,7 +1301,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 -@@ -161,6 +161,7 @@ extern const base::Feature kTabReparenting; +@@ -162,6 +162,7 @@ extern const base::Feature kTabReparenting; extern const base::Feature kTabSelectionEditorV2; extern const base::Feature kTabStripImprovements; extern const base::Feature kTabSwitcherOnReturn; @@ -1312,7 +1312,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser 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 -@@ -587,6 +587,7 @@ public abstract class ChromeFeatureList { +@@ -588,6 +588,7 @@ public abstract class ChromeFeatureList { public static final String USE_CHIME_ANDROID_SDK = "UseChimeAndroidSdk"; public static final String USE_CLIENT_CONFIG_IPH = "UseClientConfigIPH"; public static final String VOICE_SEARCH_AUDIO_CAPTURE_POLICY = "VoiceSearchAudioCapturePolicy"; diff --git a/build/patches/Ask-user-before-closing-all-tabs.patch b/build/patches/Ask-user-before-closing-all-tabs.patch index 0b3bf025..89c2fd0f 100644 --- a/build/patches/Ask-user-before-closing-all-tabs.patch +++ b/build/patches/Ask-user-before-closing-all-tabs.patch @@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 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 -@@ -501,8 +501,8 @@ const base::Feature kCastDeviceFilter{"CastDeviceFilter", +@@ -502,8 +502,8 @@ const base::Feature kCastDeviceFilter{"CastDeviceFilter", const base::Feature kClearOmniboxFocusAfterNavigation{ "ClearOmniboxFocusAfterNavigation", base::FEATURE_DISABLED_BY_DEFAULT}; diff --git a/build/patches/Automated-domain-substitution.patch b/build/patches/Automated-domain-substitution.patch index 5a5805f9..09b2951b 100644 --- a/build/patches/Automated-domain-substitution.patch +++ b/build/patches/Automated-domain-substitution.patch @@ -188,7 +188,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../resources/cart_domain_name_mapping.json | 2 +- .../browser/chrome_browser_application_mac.mm | 2 +- .../browser/chrome_content_browser_client.cc | 4 +- - .../browser/chrome_for_testing/buildflags.gni | 2 +- .../file_manager/private_api_misc.cc | 2 +- .../dlp/dlp_clipboard_bubble_constants.h | 2 +- chrome/browser/devtools/url_constants.cc | 4 +- @@ -249,7 +248,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../chromevox/options/options.css | 2 +- .../tools/webstore_extension_util.py | 10 +- .../chromevox_manifest.json.jinja2 | 8 +- - .../common/testing/e2e_test_base.js | 2 +- .../common/tutorial/chromevox_tutorial.js | 6 +- .../accessibility/select_to_speak/options.css | 2 +- .../select_to_speak/options.html | 2 +- @@ -1250,8 +1248,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../closure/goog/net/networktester.js | 2 +- .../closure/goog/net/tmpnetwork.js | 2 +- .../closure/goog/soy/soy_testhelper.js | 4 +- - .../closure/goog/testing/performancetable.css | 4 +- - .../closure/goog/testing/testcase.js | 2 +- .../closure/goog/transpile.js | 46 +- .../closure/goog/ui/editor/linkdialog.js | 2 +- .../closure/goog/ui/editor/messages.js | 2 +- @@ -1657,7 +1653,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html url/third_party/mozilla/LICENSE.txt | 4 +- ...weblayer_security_blocking_page_factory.cc | 2 +- weblayer/shell/app/shell_main_params.cc | 2 +- - 1653 files changed, 5236 insertions(+), 5236 deletions(-) + 1649 files changed, 5231 insertions(+), 5231 deletions(-) diff --git a/PRESUBMIT.py b/PRESUBMIT.py --- a/PRESUBMIT.py @@ -3541,9 +3537,9 @@ diff --git a/build/android/test_wrapper/logdog_wrapper.py b/build/android/test_w OUTPUT = 'logdog' -COORDINATOR_HOST = 'luci-logdog.appspot.com' +COORDINATOR_HOST = 'luci-logdog.8pp2p8t.qjz9zk' - SERVICE_ACCOUNT_JSON = ('/creds/service_accounts' - '/service-account-luci-logdog-publisher.json') LOGDOG_TERMINATION_TIMEOUT = 30 + + diff --git a/build/apple/tweak_info_plist.py b/build/apple/tweak_info_plist.py --- a/build/apple/tweak_info_plist.py +++ b/build/apple/tweak_info_plist.py @@ -6378,17 +6374,6 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch "https://chromeenterprise.google/policies/" "#SandboxExternalProtocolBlocked"); } -diff --git a/chrome/browser/chrome_for_testing/buildflags.gni b/chrome/browser/chrome_for_testing/buildflags.gni ---- a/chrome/browser/chrome_for_testing/buildflags.gni -+++ b/chrome/browser/chrome_for_testing/buildflags.gni -@@ -9,6 +9,6 @@ declare_args() { - # - # Note: CfT is not intended to be used to run tests in this repository. - # -- # Design doc: https://goo.gle/chrome-for-testing -+ # Design doc: https://goo.gl.qjz9zke/chrome-for-testing - is_chrome_for_testing_branded = false - } diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc --- a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc @@ -7471,18 +7456,6 @@ diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox_manifest. ], "all_frames": true, "js": [ -diff --git a/chrome/browser/resources/chromeos/accessibility/common/testing/e2e_test_base.js b/chrome/browser/resources/chromeos/accessibility/common/testing/e2e_test_base.js ---- a/chrome/browser/resources/chromeos/accessibility/common/testing/e2e_test_base.js -+++ b/chrome/browser/resources/chromeos/accessibility/common/testing/e2e_test_base.js -@@ -234,7 +234,7 @@ E2ETestBase = class extends AccessibilityTestBase { - const url = opt_params.url || DocUtils.createUrlForDoc(doc); - - const hasLacrosChromePath = await new Promise( -- r => chrome.commandLinePrivate.hasSwitch('lacros-chrome-path', r)); -+ r => ch40me.qjz9zkmandLinePrivate.hasSwitch('lacros-chrome-path', r)); - // The below block handles opening a url either in a Lacros tab or Ash - // tab. For Lacros, we re-use an already open Lacros tab. For Ash, we use - // the chrome.tabs api. diff --git a/chrome/browser/resources/chromeos/accessibility/common/tutorial/chromevox_tutorial.js b/chrome/browser/resources/chromeos/accessibility/common/tutorial/chromevox_tutorial.js --- a/chrome/browser/resources/chromeos/accessibility/common/tutorial/chromevox_tutorial.js +++ b/chrome/browser/resources/chromeos/accessibility/common/tutorial/chromevox_tutorial.js @@ -30905,7 +30878,7 @@ diff --git a/ios/chrome/browser/flags/about_flags.mm b/ios/chrome/browser/flags/ {"wallet-service-use-sandbox", flag_descriptions::kWalletServiceUseSandboxName, flag_descriptions::kWalletServiceUseSandboxDescription, flags_ui::kOsIos, -@@ -1236,7 +1236,7 @@ NSMutableDictionary* CreateExperimentalTestingPolicies() { +@@ -1239,7 +1239,7 @@ NSMutableDictionary* CreateExperimentalTestingPolicies() { base::SysUTF8ToNSString(policy::key::kDefaultSearchProviderEnabled) : @YES, base::SysUTF8ToNSString(policy::key::kDefaultSearchProviderSearchURL) : @@ -35396,7 +35369,7 @@ diff --git a/third_party/blink/renderer/core/css/remote_font_face_source.cc b/th diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/renderer/core/dom/element.cc --- a/third_party/blink/renderer/core/dom/element.cc +++ b/third_party/blink/renderer/core/dom/element.cc -@@ -2439,7 +2439,7 @@ void Element::UpdatePopupAttribute(String value) { +@@ -2440,7 +2440,7 @@ void Element::UpdatePopupAttribute(String value) { "https://html.spec.whatwg.org/multipage/" "dom.html#custom-data-attribute. This usage will *likely cause site " "breakage* when the popup API ships: " @@ -37419,32 +37392,6 @@ diff --git a/third_party/google-closure-library/closure/goog/soy/soy_testhelper. }; -diff --git a/third_party/google-closure-library/closure/goog/testing/performancetable.css b/third_party/google-closure-library/closure/goog/testing/performancetable.css ---- a/third_party/google-closure-library/closure/goog/testing/performancetable.css -+++ b/third_party/google-closure-library/closure/goog/testing/performancetable.css -@@ -5,8 +5,8 @@ - * See the COPYING file for details. - */ - --/* Author: attila@google.com (Attila Bodis) */ --/* Author: nicksantos@google.com (Nick Santos) */ -+/* Author: attila@9oo91e.qjz9zk (Attila Bodis) */ -+/* Author: nicksantos@9oo91e.qjz9zk (Nick Santos) */ - - table.test-results { - font: 12px "Courier New", Courier, monospace; -diff --git a/third_party/google-closure-library/closure/goog/testing/testcase.js b/third_party/google-closure-library/closure/goog/testing/testcase.js ---- a/third_party/google-closure-library/closure/goog/testing/testcase.js -+++ b/third_party/google-closure-library/closure/goog/testing/testcase.js -@@ -2298,7 +2298,7 @@ goog.testing.TestCase.parseRunTests_ = function(href) { - // Use a "fake" origin because tests may load using protocols that goog.url - // doesn't support - const searchParams = goog.url.getSearchParams( -- goog.url.resolveUrl('https://google.com' + nonOriginParts)); -+ goog.url.resolveUrl('https://9oo91e.qjz9zk' + nonOriginParts)); - - let runTestsString = null; - for (const [key, value] of searchParams) { diff --git a/third_party/google-closure-library/closure/goog/transpile.js b/third_party/google-closure-library/closure/goog/transpile.js --- a/third_party/google-closure-library/closure/goog/transpile.js +++ b/third_party/google-closure-library/closure/goog/transpile.js diff --git a/build/patches/Bromite-auto-updater.patch b/build/patches/Bromite-auto-updater.patch index 94c4fc7c..355a7ed0 100644 --- a/build/patches/Bromite-auto-updater.patch +++ b/build/patches/Bromite-auto-updater.patch @@ -1250,7 +1250,7 @@ new file mode 100644 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 -@@ -253,6 +253,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -254,6 +254,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kNewWindowAppMenu, &kNotificationPermissionVariant, &kPageAnnotationsService, @@ -1258,7 +1258,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &kBookmarksImprovedSaveFlow, &kBookmarksRefresh, &kBackGestureRefactorAndroid, -@@ -676,6 +677,9 @@ const base::Feature kIncognitoReauthenticationForAndroid{ +@@ -680,6 +681,9 @@ const base::Feature kIncognitoReauthenticationForAndroid{ const base::Feature kIncognitoScreenshot{"IncognitoScreenshot", base::FEATURE_DISABLED_BY_DEFAULT}; @@ -1271,7 +1271,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 -@@ -92,6 +92,7 @@ extern const base::Feature kGridTabSwitcherForTablets; +@@ -93,6 +93,7 @@ extern const base::Feature kGridTabSwitcherForTablets; extern const base::Feature kHandleMediaIntents; extern const base::Feature kImmersiveUiMode; extern const base::Feature kIncognitoReauthenticationForAndroid; @@ -1282,7 +1282,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser 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 -@@ -379,6 +379,7 @@ public abstract class ChromeFeatureList { +@@ -380,6 +380,7 @@ public abstract class ChromeFeatureList { "IncognitoReauthenticationForAndroid"; public static final String INCOGNITO_SCREENSHOT = "IncognitoScreenshot"; public static final String INFOBAR_SCROLL_OPTIMIZATION = "InfobarScrollOptimization"; diff --git a/build/patches/Disable-AGSA-by-default.patch b/build/patches/Disable-AGSA-by-default.patch index 6bcacee8..19e6ff74 100644 --- a/build/patches/Disable-AGSA-by-default.patch +++ b/build/patches/Disable-AGSA-by-default.patch @@ -262,7 +262,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils 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 -@@ -655,7 +655,7 @@ const base::Feature kDuetTabStripIntegrationAndroid{ +@@ -659,7 +659,7 @@ const base::Feature kDuetTabStripIntegrationAndroid{ "DuetTabStripIntegrationAndroid", base::FEATURE_DISABLED_BY_DEFAULT}; const base::Feature kExperimentsForAgsa{"ExperimentsForAgsa", diff --git a/build/patches/Disable-conversion-measurement-api.patch b/build/patches/Disable-conversion-measurement-api.patch index 1f2de715..3115b9fa 100644 --- a/build/patches/Disable-conversion-measurement-api.patch +++ b/build/patches/Disable-conversion-measurement-api.patch @@ -27,7 +27,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 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 -@@ -489,7 +489,7 @@ const base::Feature kAppMenuMobileSiteOption{"AppMenuMobileSiteOption", +@@ -490,7 +490,7 @@ const base::Feature kAppMenuMobileSiteOption{"AppMenuMobileSiteOption", base::FEATURE_DISABLED_BY_DEFAULT}; const base::Feature kAppToWebAttribution{"AppToWebAttribution", diff --git a/build/patches/Disable-smart-selection-by-default.patch b/build/patches/Disable-smart-selection-by-default.patch index 1a10e8c0..4f169016 100644 --- a/build/patches/Disable-smart-selection-by-default.patch +++ b/build/patches/Disable-smart-selection-by-default.patch @@ -50,7 +50,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &kCCTIncognitoAvailableToThirdParty, &kCCTNewDownloadTab, &kCCTPackageNameRecording, -@@ -586,6 +587,9 @@ const base::Feature kChromeSharingHubLaunchAdjacent{ +@@ -590,6 +591,9 @@ const base::Feature kChromeSharingHubLaunchAdjacent{ const base::Feature kChromeSurveyNextAndroid{"ChromeSurveyNextAndroid", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -63,7 +63,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 -@@ -60,6 +60,7 @@ extern const base::Feature kCacheDeprecatedSystemLocationSetting; +@@ -61,6 +61,7 @@ extern const base::Feature kCacheDeprecatedSystemLocationSetting; extern const base::Feature kChromeNewDownloadTab; extern const base::Feature kChromeShareLongScreenshot; extern const base::Feature kChromeShareScreenshot; diff --git a/build/patches/Disable-text-fragments-by-default.patch b/build/patches/Disable-text-fragments-by-default.patch index 8f94daa7..d9868f7d 100644 --- a/build/patches/Disable-text-fragments-by-default.patch +++ b/build/patches/Disable-text-fragments-by-default.patch @@ -36,7 +36,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc 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 -@@ -2641,6 +2641,11 @@ +@@ -2646,6 +2646,11 @@ "owners": [ "alionadangla", "bwwilliams", "bling-flags@google.com"], "expiry_milestone": 105 }, diff --git a/build/patches/Enable-ECH-by-default.patch b/build/patches/Enable-ECH-by-default.patch new file mode 100644 index 00000000..4d193584 --- /dev/null +++ b/build/patches/Enable-ECH-by-default.patch @@ -0,0 +1,25 @@ +From: csagan5 <32685696+csagan5@users.noreply.github.com> +Date: Sun, 30 Oct 2022 18:11:19 +0100 +Subject: Enable ECH 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(-) + +diff --git a/net/base/features.cc b/net/base/features.cc +--- a/net/base/features.cc ++++ b/net/base/features.cc +@@ -114,8 +114,8 @@ const base::Feature kDisableTLSResumption{"DisableTLSResumption", + const base::Feature kLogTLSResumption{"LogTLSResumption", + base::FEATURE_DISABLED_BY_DEFAULT}; + +-const base::Feature kEncryptedClientHello{"EncryptedClientHello", +- base::FEATURE_DISABLED_BY_DEFAULT}; ++const base::Feature kEncryptedClientHello{"EncryptedClientHello", // enabled by default ++ base::FEATURE_ENABLED_BY_DEFAULT}; // in Bromite + + const base::Feature kIsCleartextPermitted{"IsCleartextPermitted", + base::FEATURE_ENABLED_BY_DEFAULT}; +-- +2.25.1 diff --git a/build/patches/Enable-share-intent.patch b/build/patches/Enable-share-intent.patch index 21f547fa..2f2e3544 100644 --- a/build/patches/Enable-share-intent.patch +++ b/build/patches/Enable-share-intent.patch @@ -353,7 +353,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio 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 -@@ -271,6 +271,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -272,6 +272,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kRelatedSearchesAlternateUx, &kRelatedSearchesInBar, &kRelatedSearchesSimplifiedUx, @@ -361,7 +361,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &kRelatedSearchesUi, &kRequestDesktopSiteDefaults, &kSafeModeForCachedFlags, -@@ -708,6 +709,9 @@ const base::Feature kNewInstanceFromDraggedLink{ +@@ -712,6 +713,9 @@ const base::Feature kNewInstanceFromDraggedLink{ const base::Feature kNewTabPageTilesTitleWrapAround{ "NewTabPageTilesTitleWrapAround", base::FEATURE_DISABLED_BY_DEFAULT}; @@ -374,7 +374,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 -@@ -132,6 +132,7 @@ extern const base::Feature kRequestDesktopSiteDefaults; +@@ -133,6 +133,7 @@ extern const base::Feature kRequestDesktopSiteDefaults; extern const base::Feature kSearchEnginePromoExistingDevice; extern const base::Feature kSearchEnginePromoExistingDeviceV2; extern const base::Feature kSearchEnginePromoNewDevice; @@ -385,7 +385,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser 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 -@@ -501,6 +501,7 @@ public abstract class ChromeFeatureList { +@@ -502,6 +502,7 @@ public abstract class ChromeFeatureList { public static final String QUIET_NOTIFICATION_PROMPTS = "QuietNotificationPrompts"; public static final String REACHED_CODE_PROFILER = "ReachedCodeProfiler"; public static final String READ_LATER = "ReadLater"; diff --git a/build/patches/Keep-flag-to-allow-screenshots-in-Incognito-mode.patch b/build/patches/Keep-flag-to-allow-screenshots-in-Incognito-mode.patch index 952f652d..7c742728 100644 --- a/build/patches/Keep-flag-to-allow-screenshots-in-Incognito-mode.patch +++ b/build/patches/Keep-flag-to-allow-screenshots-in-Incognito-mode.patch @@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.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 -@@ -3872,9 +3872,9 @@ +@@ -3877,9 +3877,9 @@ "expiry_milestone": 110 }, { diff --git a/build/patches/Move-navigation-bar-to-bottom.patch b/build/patches/Move-navigation-bar-to-bottom.patch index 98165d83..ea7f3631 100644 --- a/build/patches/Move-navigation-bar-to-bottom.patch +++ b/build/patches/Move-navigation-bar-to-bottom.patch @@ -1599,7 +1599,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse #include "base/metrics/field_trial_params.h" #include "base/no_destructor.h" #include "base/strings/string_piece_forward.h" -@@ -247,6 +248,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -248,6 +249,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kKitKatSupported, &kLensCameraAssistedSearch, &kLensOnQuickActionSearchWidget, @@ -1653,7 +1653,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f 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 -@@ -420,6 +420,8 @@ public abstract class ChromeFeatureList { +@@ -421,6 +421,8 @@ public abstract class ChromeFeatureList { public static final String MESSAGES_FOR_ANDROID_SYNC_ERROR = "MessagesForAndroidSyncError"; public static final String SEARCH_READY_OMNIBOX = "SearchReadyOmnibox"; public static final String MODAL_PERMISSION_DIALOG_VIEW = "ModalPermissionDialogView"; @@ -1662,7 +1662,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f public static final String METRICS_SETTINGS_ANDROID = "MetricsSettingsAndroid"; public static final String MOST_RECENT_TAB_ON_BACKGROUND_CLOSE_TAB = "MostRecentTabOnBackgroundCloseTab"; -@@ -673,6 +675,8 @@ public abstract class ChromeFeatureList { +@@ -674,6 +676,8 @@ public abstract class ChromeFeatureList { public static final CachedFlag sInterestFeedV2 = new CachedFlag(INTEREST_FEED_V2, true); public static final CachedFlag sLensCameraAssistedSearch = new CachedFlag(LENS_CAMERA_ASSISTED_SEARCH, false); diff --git a/build/patches/Multiple-fingerprinting-mitigations.patch b/build/patches/Multiple-fingerprinting-mitigations.patch index 875e3a50..28372f55 100644 --- a/build/patches/Multiple-fingerprinting-mitigations.patch +++ b/build/patches/Multiple-fingerprinting-mitigations.patch @@ -253,7 +253,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/ diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/renderer/core/dom/element.cc --- a/third_party/blink/renderer/core/dom/element.cc +++ b/third_party/blink/renderer/core/dom/element.cc -@@ -2110,6 +2110,7 @@ void Element::ClientQuads(Vector& quads) const { +@@ -2111,6 +2111,7 @@ void Element::ClientQuads(Vector& quads) const { quads.push_back(element_layout_object->LocalToAbsoluteQuad( gfx::QuadF(element_layout_object->ObjectBoundingBox()))); } @@ -261,7 +261,7 @@ diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/ return; } -@@ -2117,6 +2118,11 @@ void Element::ClientQuads(Vector& quads) const { +@@ -2118,6 +2119,11 @@ void Element::ClientQuads(Vector& quads) const { if (element_layout_object->IsBoxModelObject() || element_layout_object->IsBR()) element_layout_object->AbsoluteQuads(quads); @@ -273,7 +273,7 @@ diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/ } DOMRectList* Element::getClientRects() { -@@ -2148,6 +2154,9 @@ gfx::RectF Element::GetBoundingClientRectNoLifecycleUpdate() const { +@@ -2149,6 +2155,9 @@ gfx::RectF Element::GetBoundingClientRectNoLifecycleUpdate() const { DCHECK(element_layout_object); GetDocument().AdjustRectForScrollAndAbsoluteZoom(result, *element_layout_object); @@ -472,7 +472,7 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_c #include "third_party/blink/renderer/platform/graphics/skia/skia_utils.h" #include "third_party/blink/renderer/platform/graphics/stroke_data.h" #include "third_party/blink/renderer/platform/graphics/video_frame_image_util.h" -@@ -2094,6 +2095,10 @@ ImageData* BaseRenderingContext2D::getImageDataInternal( +@@ -2072,6 +2073,10 @@ ImageData* BaseRenderingContext2D::getImageDataInternal( snapshot->PaintImageForCurrentFrame().GetSkImageInfo().bounds(); DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh))); } 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 d3c96829..5fe4e776 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 @@ -185,7 +185,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &kAppToWebAttribution, &kBackgroundThreadPool, &kBulkTabRestore, -@@ -503,6 +504,9 @@ const base::Feature kBulkTabRestore{"BulkTabRestore", +@@ -504,6 +505,9 @@ const base::Feature kBulkTabRestore{"BulkTabRestore", const base::Feature kConditionalTabStripAndroid{ "ConditionalTabStripAndroid", base::FEATURE_DISABLED_BY_DEFAULT}; diff --git a/build/patches/Remove-contextual-search-manager.patch b/build/patches/Remove-contextual-search-manager.patch index 66a06cdf..965f6510 100644 --- a/build/patches/Remove-contextual-search-manager.patch +++ b/build/patches/Remove-contextual-search-manager.patch @@ -1139,7 +1139,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse #include "components/download/public/common/download_features.h" #include "components/embedder_support/android/util/cdn_utils.h" #include "components/feature_engagement/public/feature_list.h" -@@ -221,15 +220,6 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -222,15 +221,6 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kContextMenuSearchAndShopWithGoogleLens, &kContextMenuTranslateWithGoogleLens, &kContextMenuPopupStyle, @@ -1155,7 +1155,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &kDelayToolbarUpdateOnLoadStarted, &kDirectActions, &kDisableCompositedProgressBar, -@@ -627,32 +617,6 @@ const base::Feature kLensCameraAssistedSearch{"LensCameraAssistedSearch", +@@ -631,32 +621,6 @@ const base::Feature kLensCameraAssistedSearch{"LensCameraAssistedSearch", const base::Feature kLensOnQuickActionSearchWidget{ "LensOnQuickActionSearchWidget", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -1191,7 +1191,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 -@@ -73,14 +73,6 @@ extern const base::Feature kContextMenuSearchWithGoogleLens; +@@ -74,14 +74,6 @@ extern const base::Feature kContextMenuSearchWithGoogleLens; extern const base::Feature kContextMenuShopWithGoogleLens; extern const base::Feature kContextMenuSearchAndShopWithGoogleLens; extern const base::Feature kContextMenuTranslateWithGoogleLens; diff --git a/build/patches/Restore-Search-Ready-Omnibox-flag.patch b/build/patches/Restore-Search-Ready-Omnibox-flag.patch index aaab6ce7..50be5a4a 100644 --- a/build/patches/Restore-Search-Ready-Omnibox-flag.patch +++ b/build/patches/Restore-Search-Ready-Omnibox-flag.patch @@ -35,7 +35,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc 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 -@@ -2619,6 +2619,11 @@ +@@ -2624,6 +2624,11 @@ // with neural net palm detection. "expiry_milestone": 90 }, @@ -78,7 +78,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio 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 -@@ -263,6 +263,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -264,6 +264,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kReachedCodeProfiler, &kReaderModeInCCT, &kReengagementNotification, @@ -86,7 +86,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &kRelatedSearches, &kRelatedSearchesAlternateUx, &kRelatedSearchesInBar, -@@ -770,6 +771,9 @@ const base::Feature kRequestDesktopSiteDefaults{ +@@ -774,6 +775,9 @@ const base::Feature kRequestDesktopSiteDefaults{ const base::Feature kSafeModeForCachedFlags{"SafeModeForCachedFlags", base::FEATURE_DISABLED_BY_DEFAULT}; @@ -99,7 +99,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 -@@ -129,6 +129,7 @@ extern const base::Feature kRequestDesktopSiteDefaults; +@@ -130,6 +130,7 @@ extern const base::Feature kRequestDesktopSiteDefaults; extern const base::Feature kSearchEnginePromoExistingDevice; extern const base::Feature kSearchEnginePromoExistingDeviceV2; extern const base::Feature kSearchEnginePromoNewDevice; @@ -110,7 +110,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser 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 -@@ -414,6 +414,7 @@ public abstract class ChromeFeatureList { +@@ -415,6 +415,7 @@ public abstract class ChromeFeatureList { public static final String MESSAGES_FOR_ANDROID_STACKING_ANIMATION = "MessagesForAndroidStackingAnimation"; public static final String MESSAGES_FOR_ANDROID_SYNC_ERROR = "MessagesForAndroidSyncError"; diff --git a/build/patches/Restore-Simplified-NTP-launch.patch b/build/patches/Restore-Simplified-NTP-launch.patch index ddfc5861..88e005c3 100644 --- a/build/patches/Restore-Simplified-NTP-launch.patch +++ b/build/patches/Restore-Simplified-NTP-launch.patch @@ -356,7 +356,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio 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 -@@ -236,6 +236,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -237,6 +237,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kGridTabSwitcherForTablets, &kHandleMediaIntents, &kImmersiveUiMode, @@ -364,7 +364,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &kIncognitoReauthenticationForAndroid, &kIncognitoScreenshot, &kInfobarScrollOptimization, -@@ -712,6 +713,9 @@ const base::Feature kNotificationPermissionVariant{ +@@ -716,6 +717,9 @@ const base::Feature kNotificationPermissionVariant{ const base::Feature kInstanceSwitcher{"InstanceSwitcher", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -377,7 +377,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 -@@ -112,6 +112,7 @@ extern const base::Feature kOmniboxModernizeVisualUpdate; +@@ -113,6 +113,7 @@ extern const base::Feature kOmniboxModernizeVisualUpdate; extern const base::Feature kOptimizeGeolocationHeaderGeneration; extern const base::Feature kOSKResizesVisualViewport; extern const base::Feature kPageAnnotationsService; @@ -388,7 +388,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser 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 -@@ -403,6 +403,7 @@ public abstract class ChromeFeatureList { +@@ -404,6 +404,7 @@ public abstract class ChromeFeatureList { public static final String MESSAGES_FOR_ANDROID_ADS_BLOCKED = "MessagesForAndroidAdsBlocked"; public static final String MESSAGES_FOR_ANDROID_CHROME_SURVEY = "MessagesForAndroidChromeSurvey"; diff --git a/build/patches/Restore-offline-indicator-v2-flag.patch b/build/patches/Restore-offline-indicator-v2-flag.patch index 88de65eb..845eb011 100644 --- a/build/patches/Restore-offline-indicator-v2-flag.patch +++ b/build/patches/Restore-offline-indicator-v2-flag.patch @@ -141,7 +141,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc 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 -@@ -4683,6 +4683,11 @@ +@@ -4688,6 +4688,11 @@ "owners": [ "adamta", "sczs" ], "expiry_milestone": 98 }, @@ -183,7 +183,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio 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 -@@ -252,6 +252,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -253,6 +253,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kNewTabPageTilesTitleWrapAround, &kNewWindowAppMenu, &kNotificationPermissionVariant, @@ -191,7 +191,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &kPageAnnotationsService, &kInlineUpdateFlow, &kBookmarksImprovedSaveFlow, -@@ -728,6 +729,9 @@ const base::Feature kInstanceSwitcher{"InstanceSwitcher", +@@ -732,6 +733,9 @@ const base::Feature kInstanceSwitcher{"InstanceSwitcher", const base::Feature kSimplifiedNTP{"SimplifiedNTP", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -204,7 +204,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 -@@ -105,6 +105,7 @@ extern const base::Feature kLensCameraAssistedSearch; +@@ -106,6 +106,7 @@ extern const base::Feature kLensCameraAssistedSearch; extern const base::Feature kLensOnQuickActionSearchWidget; extern const base::Feature kLocationBarModelOptimizations; extern const base::Feature kMostRecentTabOnBackgroundCloseTab; @@ -215,7 +215,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser 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 -@@ -429,6 +429,7 @@ public abstract class ChromeFeatureList { +@@ -430,6 +430,7 @@ public abstract class ChromeFeatureList { public static final String NEW_WINDOW_APP_MENU = "NewWindowAppMenu"; public static final String NOTIFICATION_PERMISSION_VARIANT = "NotificationPermissionVariant"; public static final String OFFLINE_INDICATOR = "OfflineIndicator"; diff --git a/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch b/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch index 05e2665c..0797a18d 100644 --- a/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch +++ b/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch @@ -30,7 +30,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc 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 -@@ -1370,6 +1370,11 @@ +@@ -1375,6 +1375,11 @@ "yangsharon@google.com", "alexmos@google.com", "creis@google.com" ], "expiry_milestone": 110 }, diff --git a/build/patches/Revert-flags-remove-num-raster-threads.patch b/build/patches/Revert-flags-remove-num-raster-threads.patch index 50819877..c056e53a 100644 --- a/build/patches/Revert-flags-remove-num-raster-threads.patch +++ b/build/patches/Revert-flags-remove-num-raster-threads.patch @@ -44,7 +44,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc 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 -@@ -4488,6 +4488,11 @@ +@@ -4493,6 +4493,11 @@ "owners": [ "aaronhk", "fserb", "juanmihd", "yiyix" ], "expiry_milestone": 100 }, diff --git a/build/patches/Unexpire-tab-groups-flags.patch b/build/patches/Unexpire-tab-groups-flags.patch index 433cf6ba..4210a29d 100644 --- a/build/patches/Unexpire-tab-groups-flags.patch +++ b/build/patches/Unexpire-tab-groups-flags.patch @@ -2,7 +2,7 @@ From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Mon, 17 May 2021 22:32:36 +0200 Subject: Unexpire tab groups flags -Disable by default +Disabled by default License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- @@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.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 -@@ -2913,7 +2913,7 @@ +@@ -2918,7 +2918,7 @@ { "name": "enable-tab-groups", "owners": [ "memex-team@google.com" ], @@ -23,7 +23,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js }, { "name": "enable-tab-groups-continuation", -@@ -2928,7 +2928,7 @@ +@@ -2933,7 +2933,7 @@ { "name": "enable-tab-groups-ui-improvements", "owners": [ "memex-team@google.com" ], @@ -35,7 +35,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js 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 -@@ -818,13 +818,13 @@ const base::Feature kTabEngagementReportingAndroid{ +@@ -822,13 +822,13 @@ const base::Feature kTabEngagementReportingAndroid{ "TabEngagementReportingAndroid", base::FEATURE_DISABLED_BY_DEFAULT}; const base::Feature kTabGroupsAndroid{"TabGroupsAndroid", diff --git a/build/patches/build-remove-calling-untrusted-hooks.patch b/build/patches/build-remove-calling-untrusted-hooks.patch index ad9ffdd0..cabac5f0 100644 --- a/build/patches/build-remove-calling-untrusted-hooks.patch +++ b/build/patches/build-remove-calling-untrusted-hooks.patch @@ -33,7 +33,7 @@ diff --git a/DEPS b/DEPS # By default bot checkouts the WPR archive files only when this # flag is set True. -@@ -3766,49 +3766,6 @@ hooks = [ +@@ -3763,49 +3763,6 @@ hooks = [ 'sync', '--extract', ], }, @@ -83,7 +83,7 @@ diff --git a/DEPS b/DEPS { # Case-insensitivity for the Win SDK. Must run before win_toolchain below. 'name': 'ciopfs_linux', -@@ -3970,57 +3927,6 @@ hooks = [ +@@ -3967,57 +3924,6 @@ hooks = [ ], }, @@ -141,7 +141,7 @@ diff --git a/DEPS b/DEPS # Pull rc binaries using checked-in hashes. { 'name': 'rc_win', -@@ -4046,30 +3952,6 @@ hooks = [ +@@ -4043,30 +3949,6 @@ hooks = [ '-s', 'src/build/toolchain/win/rc/mac/rc.sha1', ], },