From e2461db5fc7db23f2dfada7b591d07301a11232d Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Fri, 24 Jan 2025 13:46:53 +0530 Subject: [PATCH 01/10] Dockerfile: update chromium version to 132.0.6834.83 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7a43e0a5..3ba18e0b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:20.04 ENV CHROMIUM_DIR "/srv/chromium" -ENV CHROMIUM_VER "131.0.6778.140" +ENV CHROMIUM_VER "132.0.6834.83" RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive \ -- GitLab From 30d544775559874aaccc474cfce6da324840bd5c Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Fri, 24 Jan 2025 13:48:30 +0530 Subject: [PATCH 02/10] Update cromite patches --- .../AImageReader-CFI-crash-mitigations.patch | 16 +- .../Add-AllowUserCertificates-flag.patch | 18 +- ...dd-Alt-D-hotkey-to-focus-address-bar.patch | 2 +- .../Add-IsCleartextPermitted-flag.patch | 2 +- .../Add-a-proxy-configuration-page.patch | 75 ++-- .../Add-an-always-incognito-mode.patch | 151 ++++----- .../Add-autoplay-site-setting.patch | 4 +- .../Add-bookmark-import-export-actions.patch | 92 +++-- .../Add-cromite-flags-support.patch | 160 +++++---- ...dd-custom-tab-intents-privacy-option.patch | 26 +- .../cromite_patches/Add-exit-menu-item.patch | 14 +- ...g-for-omnibox-autocomplete-filtering.patch | 4 +- .../Add-flag-to-disable-IPv6-probes.patch | 4 +- ...-to-disable-external-intent-requests.patch | 2 +- .../Add-flag-to-disable-vibration.patch | 6 +- ...Add-lifetime-options-for-permissions.patch | 26 +- .../Add-menu-item-to-bookmark-all-tabs.patch | 31 +- .../Add-menu-item-to-view-source.patch | 12 +- .../Add-option-to-force-tablet-UI.patch | 100 +++--- ...-to-not-persist-tabs-across-sessions.patch | 6 +- .../Add-option-to-use-home-page-as-NTP.patch | 18 +- build/cromite_patches/Add-search-engine.patch | 2 +- .../Add-site-engagement-flag.patch | 6 +- ...-support-for-ISupportHelpAndFeedback.patch | 2 +- .../Add-support-for-writing-URIs.patch | 12 +- .../Add-webRTC-site-settings.patch | 4 +- ...ow-building-without-enable_reporting.patch | 30 +- ...ow-building-without-supervised-users.patch | 20 +- .../Allow-playing-audio-in-background.patch | 6 +- ...ioBuffer-AnalyserNode-fp-mitigations.patch | 6 +- .../Block-qjz9zk-or-trk-requests.patch | 8 +- .../Bromite-subresource-adblocker.patch | 26 +- .../Client-hints-overrides.patch | 12 +- .../Content-settings-infrastructure.patch | 241 +++++++------ ...ctionary-suggestions-for-the-Omnibox.patch | 19 +- ...ble-Accessibility-service-by-default.patch | 8 +- .../Disable-PrivacyGuide.patch | 23 +- .../Disable-TLS-resumption.patch | 12 +- .../Disable-all-predictors-code.patch | 158 ++++++--- .../Disable-all-promo-dialogs.patch | 92 +++-- .../Disable-conversion-measurement-api.patch | 59 ++-- .../Disable-crash-reporting.patch | 2 +- .../Disable-feeds-support-by-default.patch | 2 +- ...Disable-fetching-of-all-field-trials.patch | 28 +- .../Disable-idle-detection.patch | 4 +- ...media-router-and-remoting-by-default.patch | 16 +- .../Disable-minidump-upload-scheduling.patch | 2 +- .../Disable-omission-of-URL-elements.patch | 17 +- .../Disable-plugins-enumeration.patch | 2 +- ...e-privacy-issues-in-password-manager.patch | 4 +- .../Disable-privacy-sandbox.patch | 46 +-- ...e-references-to-fonts.googleapis.com.patch | 2 +- .../Disable-safety-check.patch | 23 +- .../Disable-smart-selection-by-default.patch | 6 +- ...isable-some-signed-exchange-features.patch | 2 +- .../Disable-text-fragments-by-default.patch | 12 +- .../Disable-third-party-origin-trials.patch | 22 +- .../Disable-update-scheduler.patch | 2 +- .../Disable-various-metrics.patch | 10 +- .../Do-not-build-API-keys-infobar.patch | 2 +- .../Do-not-compile-QR-code-sharing.patch | 18 +- .../Do-not-link-with-libatomic.patch | 2 +- .../Do-not-store-passwords-by-default.patch | 6 +- build/cromite_patches/DoH-improvements.patch | 2 +- .../Enable-Certificate-Transparency.patch | 6 +- .../Enable-HEVC-by-default.patch | 2 +- ...ctOriginIsolation-and-SitePerProcess.patch | 4 +- ...e-darken-websites-checkbox-in-themes.patch | 2 +- ...fwrapv-in-Clang-for-non-UBSan-builds.patch | 2 +- .../Enable-native-Android-autofill.patch | 82 ++--- .../Enable-network-isolation-features.patch | 2 +- .../cromite_patches/Enable-share-intent.patch | 34 +- .../Experimental-user-scripts-support.patch | 118 ++++--- .../Eyeo-Adblock-for-Cromite.patch | 53 ++- .../Fix-chromium-build-bugs.patch | 20 +- .../Fix-chromium-vanilla.patch | 2 +- .../Follow-only-system-dark-mode.patch | 2 +- ...story-number-of-days-privacy-setting.patch | 16 +- ...number-of-autocomplete-matches-to-10.patch | 2 +- .../Invalidate-components-public-key.patch | 2 +- build/cromite_patches/JIT-site-settings.patch | 2 +- .../Keep-empty-tabs-between-sessions.patch | 2 +- ...-allow-screenshots-in-Incognito-mode.patch | 4 +- .../Logcat-crash-reports-UI.patch | 8 +- .../Modify-default-preferences.patch | 12 +- .../Move-navigation-bar-to-bottom.patch | 316 ++++++++--------- ...nt-settings-back-to-privacy-settings.patch | 8 +- .../OpenSearch-miscellaneous.patch | 2 +- .../Override-Navigator-Language.patch | 2 +- .../Partition-Blink-memory-cache.patch | 18 +- .../Partition-blobs-by-top-frame-URL.patch | 86 ++++- ...-modal-dialog-flag-to-close-all-tabs.patch | 22 +- ...e-introduce-override_build_timestamp.patch | 2 +- ...ders-in-DoH-requests-to-bare-minimum.patch | 8 +- ...referrals-in-cross-origin-navigation.patch | 34 +- .../Remove-SMS-integration.patch | 10 +- .../Remove-binary-blob-integrations.patch | 319 ++++++++++-------- .../Remove-help-menu-item.patch | 18 +- ...load-of-com.google.android.gms.fonts.patch | 2 +- .../Remove-segmentation-platform.patch | 6 +- ...Remove-voice-recognition-integration.patch | 70 ++-- ...ndow-name-on-cross-origin-navigation.patch | 4 +- ...ore-BookmarkToolbar-setCurrentFolder.patch | 2 +- .../Restore-LastTabStandingTracker.patch | 12 +- .../Restore-Search-Ready-Omnibox-flag.patch | 12 +- .../Restore-Simplified-NTP-launch.patch | 52 ++- ...-button-in-top-toolbar-customization.patch | 4 +- .../Restore-chrome-password-store.patch | 41 ++- .../Restore-offline-indicator-v2-flag.patch | 8 +- ...evert-Permit-blocking-of-view-source.patch | 2 +- ...emove-disable-pull-to-refresh-effect.patch | 2 +- ...l-of-execution-context-address-space.patch | 24 +- ...script-content-setting-secondary-url.patch | 16 +- ...tings-for-cookies-javascript-and-ads.patch | 12 +- .../Site-setting-for-images.patch | 18 +- .../Switch-to-fstack-protector-strong.patch | 4 +- .../Timezone-customization.patch | 152 ++++++++- .../Use-browser-navigation-handler.patch | 20 +- .../User-agent-customization.patch | 52 +-- build/cromite_patches/Welcome-screen.patch | 32 +- .../autofill-miscellaneous.patch | 6 +- .../cromite_patches/bromite-build-utils.patch | 14 +- .../disable-AdsBlockedInfoBar.patch | 68 +--- ...IPv6-connectivity-probes-to-RIPE-DNS.patch | 2 +- .../enable-ftrivial-auto-var-init-zero.patch | 2 +- .../eyeo-beta-118.0.5993.48-android_api.patch | 14 +- ...-beta-118.0.5993.48-android_settings.patch | 4 +- .../eyeo-beta-118.0.5993.48-base.patch | 38 +-- ...eta-118.0.5993.48-chrome_integration.patch | 98 +++--- ...yeo-beta-118.0.5993.48-extension_api.patch | 32 +- .../kill-Location-fall-back-to-system.patch | 2 +- build/cromite_patches/kill-Vision.patch | 2 +- ...rce-text-x-suse-ymp-to-be-downloaded.patch | 2 +- ...always-prompt-for-download-directory.patch | 2 +- ...gled-chromium-Disable-profile-avatar.patch | 4 +- ...romium-Disable-translate-integration.patch | 2 +- ...ed-chromium-no-special-hosts-domains.patch | 172 ++++------ ...RTC-do-not-expose-local-IP-addresses.patch | 2 +- ...iew-Hard-no-to-persistent-histograms.patch | 2 +- update_cromite_patches.sh | 2 +- 140 files changed, 2171 insertions(+), 1815 deletions(-) diff --git a/build/cromite_patches/AImageReader-CFI-crash-mitigations.patch b/build/cromite_patches/AImageReader-CFI-crash-mitigations.patch index 40a0ef0a..d4801656 100644 --- a/build/cromite_patches/AImageReader-CFI-crash-mitigations.patch +++ b/build/cromite_patches/AImageReader-CFI-crash-mitigations.patch @@ -90,7 +90,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 -@@ -3408,6 +3408,10 @@ +@@ -3290,6 +3290,10 @@ "name": "enable-identity-in-auth-error", "owners": [ "jlebel@chromium.org", "chrome-signin-team@google.com" ], "expiry_milestone": 135 @@ -145,7 +145,7 @@ diff --git a/gpu/config/gpu_driver_bug_list.json b/gpu/config/gpu_driver_bug_lis diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc --- a/gpu/config/gpu_finch_features.cc +++ b/gpu/config/gpu_finch_features.cc -@@ -53,6 +53,11 @@ BASE_FEATURE(kUseGles2ForOopR, +@@ -59,6 +59,11 @@ BASE_FEATURE(kAggressiveShaderCacheLimits, base::FEATURE_DISABLED_BY_DEFAULT); #if BUILDFLAG(IS_ANDROID) @@ -160,9 +160,9 @@ diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc diff --git a/gpu/config/gpu_finch_features.h b/gpu/config/gpu_finch_features.h --- a/gpu/config/gpu_finch_features.h +++ b/gpu/config/gpu_finch_features.h -@@ -24,6 +24,7 @@ GPU_EXPORT BASE_DECLARE_FEATURE(kUseGles2ForOopR); - // All features in alphabetical order. The features should be documented - // alongside the definition of their values in the .cc file. +@@ -26,6 +26,7 @@ GPU_EXPORT BASE_DECLARE_FEATURE(kUseGles2ForOopR); + GPU_EXPORT BASE_DECLARE_FEATURE(kAggressiveShaderCacheLimits); + #if BUILDFLAG(IS_ANDROID) +GPU_EXPORT BASE_DECLARE_FEATURE(kAImageReaderMediaPlayer); GPU_EXPORT BASE_DECLARE_FEATURE(kAndroidSurfaceControl); @@ -171,7 +171,7 @@ diff --git a/gpu/config/gpu_finch_features.h b/gpu/config/gpu_finch_features.h diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc --- a/gpu/config/gpu_util.cc +++ b/gpu/config/gpu_util.cc -@@ -126,6 +126,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus( +@@ -125,6 +125,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus( #if !BUILDFLAG(IS_ANDROID) return kGpuFeatureStatusDisabled; #else @@ -181,7 +181,7 @@ diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc if (!gpu_preferences.enable_android_surface_control) return kGpuFeatureStatusDisabled; -@@ -379,6 +382,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info, +@@ -378,6 +381,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info, kGpuFeatureStatusSoftware; } } @@ -215,7 +215,7 @@ diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc #endif #if BUILDFLAG(ENABLE_VULKAN) -@@ -702,6 +703,13 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line, +@@ -701,6 +702,13 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line, } #endif // BUILDFLAG(IS_WIN) diff --git a/build/cromite_patches/Add-AllowUserCertificates-flag.patch b/build/cromite_patches/Add-AllowUserCertificates-flag.patch index 79834013..7edc0571 100644 --- a/build/cromite_patches/Add-AllowUserCertificates-flag.patch +++ b/build/cromite_patches/Add-AllowUserCertificates-flag.patch @@ -20,7 +20,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 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 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java -@@ -227,6 +227,7 @@ import org.chromium.content_public.browser.ScreenOrientationProvider; +@@ -223,6 +223,7 @@ import org.chromium.content_public.browser.ScreenOrientationProvider; import org.chromium.content_public.browser.SelectionPopupController; import org.chromium.content_public.browser.WebContents; import org.chromium.content_public.common.ContentSwitches; @@ -28,10 +28,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv import org.chromium.printing.PrintManagerDelegateImpl; import org.chromium.printing.PrintingController; import org.chromium.printing.PrintingControllerImpl; -@@ -1044,6 +1045,8 @@ public abstract class ChromeActivity +@@ -1056,6 +1057,8 @@ public abstract class ChromeActivity + super.onStartWithNative(); ChromeActivitySessionTracker.getInstance().onStartWithNative(getProfileProviderSupplier()); - ChromeCachedFlags.getInstance().cacheNativeFlags(); + X509Util.AllowUserCertificates = ChromeFeatureList.isEnabled( + ChromeFeatureList.ALLOW_USER_CERTIFICATES); @@ -40,7 +40,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv 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 -@@ -161,6 +161,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -165,6 +165,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &feed::kFeedPerformanceStudy, &feed::kFeedShowSignInCommand, &feed::kFeedSignedOutViewDemotion, @@ -51,7 +51,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse 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 -@@ -161,6 +161,7 @@ public abstract class ChromeFeatureList { +@@ -155,6 +155,7 @@ public abstract class ChromeFeatureList { /* Alphabetical: */ public static final String ACCOUNT_REAUTHENTICATION_RECENT_TIME_WINDOW = "AccountReauthenticationRecentTimeWindow"; @@ -59,7 +59,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_PAGE_SUMMARY = "AdaptiveButtonInTopToolbarPageSummary"; public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_CUSTOMIZATION_V2 = -@@ -609,6 +610,8 @@ public abstract class ChromeFeatureList { +@@ -586,6 +587,8 @@ public abstract class ChromeFeatureList { public static final CachedFlag sAndroidTabDeclutterDedupeTabIdsKillSwitch = newCachedFlag(ANDROID_TAB_DECLUTTER_DEDUPE_TAB_IDS_KILL_SWITCH, true); public static final CachedFlag sAppSpecificHistory = newCachedFlag(APP_SPECIFIC_HISTORY, true); @@ -67,15 +67,15 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f + newCachedFlag(ALLOW_USER_CERTIFICATES, false); public static final CachedFlag sAsyncNotificationManager = newCachedFlag(ASYNC_NOTIFICATION_MANAGER, false); - public static final CachedFlag sBackGestureActivityTabProvider = -@@ -780,6 +783,7 @@ public abstract class ChromeFeatureList { + public static final CachedFlag sBlockIntentsWhileLocked = +@@ -744,6 +747,7 @@ public abstract class ChromeFeatureList { public static final List sFlagsCachedFullBrowserChromium = List.of( sAccountReauthenticationRecentTimeWindow, + sAllowUserCertificates, sAndroidAppIntegration, + sAndroidAppIntegrationV2, sAndroidAppIntegrationWithFavicon, - sAndroidBottomToolbar, 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 diff --git a/build/cromite_patches/Add-Alt-D-hotkey-to-focus-address-bar.patch b/build/cromite_patches/Add-Alt-D-hotkey-to-focus-address-bar.patch index ec406d8a..d35e0a21 100644 --- a/build/cromite_patches/Add-Alt-D-hotkey-to-focus-address-bar.patch +++ b/build/cromite_patches/Add-Alt-D-hotkey-to-focus-address-bar.patch @@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java --- a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java -@@ -392,6 +392,8 @@ public class KeyboardShortcuts { +@@ -403,6 +403,8 @@ public class KeyboardShortcuts { R.string.keyboard_shortcut_address_bar, KeyEvent.KEYCODE_L, KeyEvent.META_CTRL_ON); diff --git a/build/cromite_patches/Add-IsCleartextPermitted-flag.patch b/build/cromite_patches/Add-IsCleartextPermitted-flag.patch index f93fcb5d..1eb7da68 100644 --- a/build/cromite_patches/Add-IsCleartextPermitted-flag.patch +++ b/build/cromite_patches/Add-IsCleartextPermitted-flag.patch @@ -44,7 +44,7 @@ new file mode 100644 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 -@@ -383,6 +383,11 @@ std::unique_ptr URLRequestHttpJob::Create(URLRequest* request) { +@@ -371,6 +371,11 @@ std::unique_ptr URLRequestHttpJob::Create(URLRequest* request) { } } diff --git a/build/cromite_patches/Add-a-proxy-configuration-page.patch b/build/cromite_patches/Add-a-proxy-configuration-page.patch index 0675e3bc..451073f5 100644 --- a/build/cromite_patches/Add-a-proxy-configuration-page.patch +++ b/build/cromite_patches/Add-a-proxy-configuration-page.patch @@ -29,9 +29,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html chrome/browser/resources/proxy_config.html | 77 ++++ chrome/browser/resources/proxy_config.js | 278 +++++++++++++ chrome/browser/ui/BUILD.gn | 2 + - .../webui/chrome_web_ui_controller_factory.cc | 5 +- + .../browser/ui/webui/chrome_web_ui_configs.cc | 4 + chrome/browser/ui/webui/proxy_config_ui.cc | 389 ++++++++++++++++++ - chrome/browser/ui/webui/proxy_config_ui.h | 31 ++ + chrome/browser/ui/webui/proxy_config_ui.h | 41 ++ chrome/common/webui_url_constants.cc | 2 + chrome/common/webui_url_constants.h | 2 + .../pref_proxy_config_tracker_impl.cc | 5 +- @@ -40,7 +40,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../proxy_config/proxy_policy_handler.cc | 2 +- net/proxy_resolution/proxy_config.cc | 51 ++- net/proxy_resolution/proxy_config.h | 3 + - 25 files changed, 974 insertions(+), 18 deletions(-) + 25 files changed, 984 insertions(+), 17 deletions(-) create mode 100644 chrome/browser/resources/proxy_config.css create mode 100644 chrome/browser/resources/proxy_config.html create mode 100644 chrome/browser/resources/proxy_config.js @@ -77,7 +77,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java -@@ -75,6 +75,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment +@@ -76,6 +76,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment private static final String PREF_SAFE_BROWSING = "safe_browsing"; private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link"; private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox"; @@ -112,7 +112,7 @@ diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resou diff --git a/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc b/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc --- a/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc +++ b/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc -@@ -392,7 +392,7 @@ std::optional CreateProxyConfigDict( +@@ -372,7 +372,7 @@ std::optional CreateProxyConfigDict( return std::nullopt; } return ProxyConfigDictionary::CreateFixedServers(proxy_rules_string, @@ -196,7 +196,7 @@ diff --git a/chrome/browser/net/proxy_service_factory.h b/chrome/browser/net/pro 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 -@@ -202,6 +202,8 @@ +@@ -198,6 +198,8 @@ #include "printing/buildflags/buildflags.h" #include "rlz/buildflags/buildflags.h" @@ -205,7 +205,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse #if BUILDFLAG(ENABLE_BACKGROUND_MODE) #include "chrome/browser/background/background_mode_manager.h" #endif -@@ -1652,6 +1654,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -1615,6 +1617,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { component_updater::RegisterPrefs(registry); domain_reliability::RegisterPrefs(registry); embedder_support::OriginTrialPrefs::RegisterPrefs(registry); @@ -660,7 +660,7 @@ new file mode 100644 diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -238,6 +238,8 @@ static_library("ui") { +@@ -224,6 +224,8 @@ static_library("ui") { "webui/metrics_internals/metrics_internals_ui.h", "webui/net_export_ui.cc", "webui/net_export_ui.h", @@ -669,28 +669,25 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn "webui/net_internals/net_internals_ui.cc", "webui/net_internals/net_internals_ui.h", "webui/ntp_tiles_internals_ui.cc", -diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc ---- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -32,6 +32,7 @@ - #include "chrome/browser/ui/webui/about/about_ui.h" - #include "chrome/browser/ui/webui/components/components_ui.h" - #include "chrome/browser/ui/webui/crashes_ui.h" +diff --git a/chrome/browser/ui/webui/chrome_web_ui_configs.cc b/chrome/browser/ui/webui/chrome_web_ui_configs.cc +--- a/chrome/browser/ui/webui/chrome_web_ui_configs.cc ++++ b/chrome/browser/ui/webui/chrome_web_ui_configs.cc +@@ -56,6 +56,9 @@ + #include "extensions/buildflags/buildflags.h" + #include "printing/buildflags/buildflags.h" + +#include "chrome/browser/ui/webui/proxy_config_ui.h" - #include "chrome/browser/ui/webui/download_internals/download_internals_ui.h" - #include "chrome/browser/ui/webui/flags/flags_ui.h" - #include "chrome/browser/ui/webui/webui_util.h" -@@ -261,7 +262,9 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, - history_clusters_internals::kChromeUIHistoryClustersInternalsHost) { - return &NewWebUI; - } -- -+ if (url.host_piece() == chrome::kChromeUIProxyConfigHost) { -+ return &NewWebUI; -+ } - #if !BUILDFLAG(IS_ANDROID) - if (url.host_piece() == chrome::kChromeUINewTabHost) { - // The URL chrome://newtab/ can be either a virtual or a real URL, ++ ++ + #if BUILDFLAG(ENABLE_NACL) + #include "chrome/browser/ui/webui/nacl_ui.h" + #endif +@@ -410,4 +413,5 @@ void RegisterChromeWebUIConfigs() { + map.AddWebUIConfig(std::make_unique()); + map.AddWebUIConfig(std::make_unique()); + #endif // !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_ANDROID) ++ map.AddWebUIConfig(std::make_unique()); + } diff --git a/chrome/browser/ui/webui/proxy_config_ui.cc b/chrome/browser/ui/webui/proxy_config_ui.cc new file mode 100644 --- /dev/null @@ -893,7 +890,7 @@ new file mode 100644 + state.SetByDottedPath("config.rules.fallback_proxies", base::Value(omitDirect(rules.fallback_proxies.ToPacString()))); + break; + default: -+ NOTREACHED_NORETURN(); ++ NOTREACHED(); + } + state.SetByDottedPath("config.rules.type", base::Value(type)); + state.SetByDottedPath("config.rules.bypass_rules", base::Value(rules.bypass_rules.ToString())); @@ -1089,7 +1086,7 @@ diff --git a/chrome/browser/ui/webui/proxy_config_ui.h b/chrome/browser/ui/webui new file mode 100644 --- /dev/null +++ b/chrome/browser/ui/webui/proxy_config_ui.h -@@ -0,0 +1,31 @@ +@@ -0,0 +1,41 @@ +/* + This file is part of Bromite. + @@ -1110,7 +1107,9 @@ new file mode 100644 +#ifndef CHROME_BROWSER_UI_WEBUI_PROXY_CONFIG_UI_H_ +#define CHROME_BROWSER_UI_WEBUI_PROXY_CONFIG_UI_H_ + ++#include "chrome/common/webui_url_constants.h" +#include "content/public/browser/web_ui_controller.h" ++#include "content/public/browser/webui_config.h" + +// The WebUI for chrome://proxy/. +class ProxyConfigUI : public content::WebUIController { @@ -1120,6 +1119,14 @@ new file mode 100644 + explicit ProxyConfigUI(content::WebUI* web_ui); +}; + ++class ProxyConfigUIConfig ++ : public content::DefaultWebUIConfig { ++ public: ++ ProxyConfigUIConfig() ++ : DefaultWebUIConfig(content::kChromeUIScheme, ++ chrome::kChromeUIProxyConfigHost) {} ++}; ++ +#endif // CHROME_BROWSER_UI_WEBUI_PROXY_CONFIG_UI_H_ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_constants.cc --- a/chrome/common/webui_url_constants.cc @@ -1321,8 +1328,8 @@ diff --git a/components/proxy_config/proxy_policy_handler.cc b/components/proxy_ diff --git a/net/proxy_resolution/proxy_config.cc b/net/proxy_resolution/proxy_config.cc --- a/net/proxy_resolution/proxy_config.cc +++ b/net/proxy_resolution/proxy_config.cc -@@ -131,7 +131,7 @@ void ProxyConfig::ProxyRules::ParseFromString(const std::string& proxy_rules, - url_scheme, &single_proxies, ProxyServer::SCHEME_HTTP, +@@ -129,7 +129,7 @@ void ProxyConfig::ProxyRules::ParseFromString(const std::string& proxy_rules, + std::move(url_scheme), &single_proxies, ProxyServer::SCHEME_HTTP, allow_bracketed_proxy_chains, is_quic_allowed); type = Type::PROXY_LIST; - return; @@ -1330,7 +1337,7 @@ diff --git a/net/proxy_resolution/proxy_config.cc b/net/proxy_resolution/proxy_c } // Trim whitespace off the url scheme. -@@ -162,6 +162,55 @@ void ProxyConfig::ProxyRules::ParseFromString(const std::string& proxy_rules, +@@ -160,6 +160,55 @@ void ProxyConfig::ProxyRules::ParseFromString(const std::string& proxy_rules, } } diff --git a/build/cromite_patches/Add-an-always-incognito-mode.patch b/build/cromite_patches/Add-an-always-incognito-mode.patch index 0c82dcfd..a986644b 100644 --- a/build/cromite_patches/Add-an-always-incognito-mode.patch +++ b/build/cromite_patches/Add-an-always-incognito-mode.patch @@ -79,12 +79,12 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../browser/autocomplete_provider_client.cc | 4 + .../browser/autocomplete_provider_client.h | 1 + .../omnibox/browser/base_search_provider.cc | 2 +- - components/omnibox/browser/search_provider.cc | 7 +- + components/omnibox/browser/search_provider.cc | 3 +- .../add-an-always-incognito-mode.inc | 13 ++ .../add-an-always-incognito-mode.inc | 1 + .../add-an-always-incognito-mode.inc | 3 + .../add-an-always-incognito-mode.inc | 1 + - 65 files changed, 787 insertions(+), 113 deletions(-) + 65 files changed, 784 insertions(+), 112 deletions(-) create mode 100644 chrome/android/java/res/xml/incognito_preferences.xml create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.java create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/IncognitoSettings.java @@ -97,7 +97,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni --- a/chrome/android/chrome_java_resources.gni +++ b/chrome/android/chrome_java_resources.gni -@@ -626,6 +626,7 @@ chrome_java_resources = [ +@@ -627,6 +627,7 @@ chrome_java_resources = [ "java/res/xml/main_preferences_legacy.xml", "java/res/xml/manage_sync_preferences.xml", "java/res/xml/personalize_google_services_preferences.xml", @@ -108,15 +108,15 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -3,6 +3,7 @@ - # found in the LICENSE file. +@@ -5,6 +5,7 @@ + import("//content/public/common/features.gni") chrome_java_sources = [ + "java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.java", "java/src/com/google/android/apps/chrome/appwidget/bookmarks/BookmarkThumbnailWidgetProvider.java", "java/src/org/chromium/chrome/browser/ActivityTabProvider.java", "java/src/org/chromium/chrome/browser/ActivityUtils.java", -@@ -952,6 +953,7 @@ chrome_java_sources = [ +@@ -947,6 +948,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/privacy/settings/IncognitoLockSettings.java", "java/src/org/chromium/chrome/browser/privacy/settings/PrivacyPreferencesManagerImpl.java", "java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java", @@ -243,7 +243,7 @@ new file mode 100644 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -72,6 +72,10 @@ import org.chromium.base.task.TaskTraits; +@@ -70,6 +70,10 @@ import org.chromium.base.task.TaskTraits; import org.chromium.build.annotations.UsedByReflection; import org.chromium.cc.input.BrowserControlsState; import org.chromium.chrome.R; @@ -254,7 +254,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct import org.chromium.chrome.browser.IntentHandler.TabOpenType; import org.chromium.chrome.browser.app.ChromeActivity; import org.chromium.chrome.browser.app.metrics.LaunchCauseMetrics; -@@ -686,14 +690,19 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -2005,6 +2006,9 @@ public abstract class ChromeActivity throw new IllegalStateException( "Attempting to access TabCreator before initialization"); } @@ -326,7 +326,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App import org.chromium.chrome.browser.bookmarks.BookmarkModel; import org.chromium.chrome.browser.bookmarks.PowerBookmarkUtils; import org.chromium.chrome.browser.commerce.ShoppingServiceFactory; -@@ -100,6 +102,10 @@ import java.util.ArrayList; +@@ -102,6 +104,10 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -337,7 +337,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App /** * Base implementation of {@link AppMenuPropertiesDelegate} that handles hiding and showing menu * items based on activity state. -@@ -584,6 +590,13 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -593,6 +599,13 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate } private void prepareCommonMenuItems(Menu menu, @MenuGroup int menuGroup, boolean isIncognito) { @@ -351,7 +351,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App // We have to iterate all menu items since same menu item ID may be associated with more // than one menu items. boolean isOverviewModeMenu = menuGroup == MenuGroup.OVERVIEW_MODE_MENU; -@@ -647,7 +660,15 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -656,7 +669,15 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate } if (item.getItemId() == R.id.recent_tabs_menu_id) { @@ -368,7 +368,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App } if (item.getItemId() == R.id.menu_select_tabs) { item.setVisible(isMenuSelectTabsVisible); -@@ -861,8 +882,9 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -870,8 +891,9 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate && !isNativePage && !isFileScheme && !isContentScheme @@ -391,7 +391,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr import org.chromium.chrome.browser.contextmenu.ChromeContextMenuItem.Item; import org.chromium.chrome.browser.contextmenu.ContextMenuCoordinator.ListItemType; import org.chromium.chrome.browser.download.DownloadUtils; -@@ -271,6 +272,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { +@@ -267,6 +268,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { public List> buildContextMenu() { mShowEphemeralTabNewLabel = null; @@ -401,7 +401,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr List> groupedItems = new ArrayList<>(); if (mParams.isAnchor()) { -@@ -281,6 +285,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { +@@ -277,6 +281,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { if (mMode == ContextMenuMode.NORMAL) { linkGroup.add(createListItem(Item.OPEN_IN_NEW_TAB_IN_GROUP)); linkGroup.add(createListItem(Item.OPEN_IN_NEW_TAB)); @@ -409,7 +409,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr if (!mItemDelegate.isIncognito() && mItemDelegate.isIncognitoSupported()) { linkGroup.add(createListItem(Item.OPEN_IN_INCOGNITO_TAB)); } -@@ -305,7 +310,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { +@@ -301,7 +306,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { } } if (FirstRunStatus.getFirstRunFlowComplete()) { @@ -421,29 +421,29 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityLifecycleUmaTracker.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityLifecycleUmaTracker.java --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityLifecycleUmaTracker.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityLifecycleUmaTracker.java -@@ -71,45 +71,6 @@ public class CustomTabActivityLifecycleUmaTracker +@@ -70,45 +70,6 @@ public class CustomTabActivityLifecycleUmaTracker private boolean mIsInitialResume = true; private void recordIncognitoLaunchReason() { - // TODO(crbug.com/352525607): Separate Ephemeral and Incognito CCT metrics. -- @IntentHandler.IncognitoCCTCallerId int incognitoCCTCallerId; +- @IntentHandler.IncognitoCctCallerId int incognitoCctCallerId; - if (mIntentDataProvider.getCustomTabMode() == CustomTabProfileType.INCOGNITO) { -- incognitoCCTCallerId = +- incognitoCctCallerId = - ((IncognitoCustomTabIntentDataProvider) mIntentDataProvider) - .getFeatureIdForMetricsCollection(); - } else { -- incognitoCCTCallerId = +- incognitoCctCallerId = - ((EphemeralCustomTabIntentDataProvider) mIntentDataProvider) - .getFeatureIdForMetricsCollection(); - } - - RecordHistogram.recordEnumeratedHistogram( -- "CustomTabs.IncognitoCCTCallerId", -- incognitoCCTCallerId, -- IntentHandler.IncognitoCCTCallerId.NUM_ENTRIES); +- "CustomTabs.IncognitoCctCallerId", +- incognitoCctCallerId, +- IntentHandler.IncognitoCctCallerId.NUM_ENTRIES); - - // Record which 1P app launched Incognito CCT. -- if (incognitoCCTCallerId == IntentHandler.IncognitoCCTCallerId.GOOGLE_APPS) { +- if (incognitoCctCallerId == IntentHandler.IncognitoCctCallerId.GOOGLE_APPS) { - String sendersPackageName = mIntentDataProvider.getClientPackageName(); - @IntentHandler.ExternalAppId - int externalId = IntentHandler.mapPackageToExternalAppId(sendersPackageName); @@ -478,7 +478,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust import org.chromium.chrome.browser.DefaultBrowserInfo; import org.chromium.chrome.browser.app.appmenu.AppMenuPropertiesDelegateImpl; import org.chromium.chrome.browser.app.appmenu.DividerLineMenuItemViewBinder; -@@ -213,6 +214,9 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat +@@ -218,6 +219,9 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat openInChromeItemVisible = false; tryAddingReadAloud = false; } @@ -501,7 +501,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; -@@ -1222,6 +1225,13 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid +@@ -1231,6 +1234,13 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid return getInitialActivityWidth() > 0; } @@ -537,7 +537,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/Downlo /** A class containing some utility static methods. */ public class DownloadUtils { private static final String TAG = "download"; -@@ -297,7 +302,16 @@ public class DownloadUtils { +@@ -298,7 +303,16 @@ public class DownloadUtils { // Offline pages isn't supported in Incognito. This should be checked before calling // OfflinePageBridge.getForProfile because OfflinePageBridge instance will not be found // for incognito profile. @@ -683,7 +683,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat import org.chromium.chrome.browser.app.ChromeActivity; import org.chromium.chrome.browser.app.download.home.DownloadPage; import org.chromium.chrome.browser.bookmarks.BookmarkPage; -@@ -316,7 +317,8 @@ public class NativePageFactory { +@@ -320,7 +321,8 @@ public class NativePageFactory { String url, NativePage candidatePage, Tab tab, boolean isIncognito, PdfInfo pdfInfo) { NativePage page; @@ -722,7 +722,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsM mActiveTab = tab; mTabModelSelector = tabModelSelector; mShowHistoryManager = showHistoryManager; -@@ -273,6 +283,22 @@ public class RecentTabsManager +@@ -269,6 +279,22 @@ public class RecentTabsManager */ public void openRecentlyClosedTab(RecentlyClosedTab tab, int windowDisposition) { if (mIsDestroyed) return; @@ -923,7 +923,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Fragme import org.chromium.components.browser_ui.bottomsheet.BottomSheetController; import org.chromium.components.browser_ui.settings.FragmentSettingsNavigation; import org.chromium.components.browser_ui.site_settings.BaseSiteSettingsFragment; -@@ -271,6 +272,9 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl +@@ -270,6 +271,9 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl safetyHubFragment.setCustomTabIntentHelper( LaunchIntentDispatcher::createCustomTabActivityIntent); } @@ -936,7 +936,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Fragme diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabModelObserver.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabModelObserver.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabModelObserver.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabModelObserver.java -@@ -23,6 +23,8 @@ import java.util.HashMap; +@@ -22,6 +22,8 @@ import java.util.HashMap; import java.util.List; import java.util.Set; @@ -945,7 +945,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore /** A tab model observer for managing bulk closures. */ public class HistoricalTabModelObserver implements TabModelObserver { private final TabGroupModelFilter mTabGroupModelFilter; -@@ -71,9 +73,10 @@ public class HistoricalTabModelObserver implements TabModelObserver { +@@ -70,9 +72,10 @@ public class HistoricalTabModelObserver implements TabModelObserver { if (tabs.isEmpty() || !canRestore) return; if (tabs.size() == 1) { @@ -1042,7 +1042,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java -@@ -158,6 +158,8 @@ import org.chromium.ui.InsetObserver; +@@ -159,6 +159,8 @@ import org.chromium.ui.InsetObserver; import org.chromium.ui.UiUtils; import org.chromium.ui.base.ActivityWindowAndroid; import org.chromium.ui.base.DeviceFormFactor; @@ -1051,7 +1051,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab import org.chromium.ui.base.IntentRequestTracker; import org.chromium.ui.base.LocalizationUtils; import org.chromium.ui.dragdrop.DragDropGlobalState; -@@ -1017,7 +1019,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -1029,7 +1031,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { () -> { mTabCreatorManagerSupplier .get() @@ -1085,15 +1085,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorImpl.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorImpl.java -@@ -10,6 +10,7 @@ import androidx.annotation.Nullable; - import androidx.annotation.VisibleForTesting; +@@ -12,6 +12,7 @@ import androidx.annotation.VisibleForTesting; import org.chromium.base.supplier.OneshotSupplier; + import org.chromium.base.supplier.Supplier; +import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor; import org.chromium.chrome.browser.flags.ActivityType; import org.chromium.chrome.browser.ntp.RecentlyClosedBridge; import org.chromium.chrome.browser.profiles.ProfileProvider; -@@ -106,6 +107,8 @@ public class TabModelSelectorImpl extends TabModelSelectorBase implements TabMod +@@ -117,6 +118,8 @@ public class TabModelSelectorImpl extends TabModelSelectorBase implements TabMod ProfileProvider profileProvider = mProfileProviderSupplier.get(); assert profileProvider != null; @@ -1139,7 +1139,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar import org.chromium.chrome.browser.IntentHandler; import org.chromium.chrome.browser.app.tabmodel.TabWindowManagerSingleton; import org.chromium.chrome.browser.back_press.BackPressManager; -@@ -669,7 +670,7 @@ public class ToolbarManager +@@ -699,7 +700,7 @@ public class ToolbarManager TraceEvent.end("isOfflinePage"); return ret; } @@ -1245,7 +1245,7 @@ diff --git a/chrome/browser/android/historical_tab_saver.cc b/chrome/browser/and DCHECK_EQ(root_ids.size(), group_titles.size()); DCHECK_EQ(root_ids.size(), group_colors.size()); DCHECK_EQ(root_ids.size(), optional_tab_group_ids.size()); -@@ -319,11 +330,12 @@ static void JNI_HistoricalTabSaverImpl_CreateHistoricalTab( +@@ -318,11 +329,12 @@ static void JNI_HistoricalTabSaverImpl_CreateHistoricalTab( JNIEnv* env, const JavaParamRef& jtab_android, const JavaParamRef& state, @@ -1318,7 +1318,7 @@ diff --git a/chrome/browser/autocomplete/remote_suggestions_service_factory.cc b diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.cc b/chrome/browser/content_settings/host_content_settings_map_factory.cc --- a/chrome/browser/content_settings/host_content_settings_map_factory.cc +++ b/chrome/browser/content_settings/host_content_settings_map_factory.cc -@@ -18,6 +18,7 @@ +@@ -17,6 +17,7 @@ #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/supervised_user/supervised_user_settings_service_factory.h" #include "chrome/common/buildflags.h" @@ -1326,7 +1326,7 @@ diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.c #include "components/content_settings/core/browser/content_settings_pref_provider.h" #include "components/content_settings/core/browser/host_content_settings_map.h" #include "components/permissions/features.h" -@@ -104,9 +105,25 @@ scoped_refptr +@@ -103,9 +104,25 @@ scoped_refptr if (profile->IsOffTheRecord() && !profile->IsGuestSession()) GetForProfile(original_profile); @@ -1353,7 +1353,7 @@ diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.c /*store_last_modified=*/true, profile->ShouldRestoreOldSessionCookies(), profiles::IsRegularUserProfile(profile))); -@@ -115,6 +132,9 @@ scoped_refptr +@@ -114,6 +131,9 @@ scoped_refptr settings_map->RegisterProvider(ProviderType::kWebuiAllowlistProvider, std::move(allowlist_provider)); @@ -1376,7 +1376,7 @@ diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/histo #else #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" -@@ -488,6 +491,13 @@ void HistoryTabHelper::TitleWasSet(NavigationEntry* entry) { +@@ -489,6 +492,13 @@ void HistoryTabHelper::TitleWasSet(NavigationEntry* entry) { history::HistoryService* HistoryTabHelper::GetHistoryService() { Profile* profile = Profile::FromBrowserContext(web_contents()->GetBrowserContext()); @@ -1390,7 +1390,7 @@ diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/histo if (profile->IsOffTheRecord()) return nullptr; -@@ -495,6 +505,16 @@ history::HistoryService* HistoryTabHelper::GetHistoryService() { +@@ -496,6 +506,16 @@ history::HistoryService* HistoryTabHelper::GetHistoryService() { profile, ServiceAccessType::IMPLICIT_ACCESS); } @@ -1454,7 +1454,7 @@ diff --git a/chrome/browser/offline_pages/android/offline_page_bridge.cc b/chrom // Must come after all headers that specialize FromJniType() / ToJniType(). #include "chrome/android/chrome_jni_headers/OfflinePageBridge_jni.h" -@@ -758,9 +761,15 @@ void OfflinePageBridge::GetPageByOfflineIdDone( +@@ -757,9 +760,15 @@ void OfflinePageBridge::GetPageByOfflineIdDone( } if (offline_page_model_->IsArchiveInInternalDir(offline_page->file_path)) { @@ -1739,7 +1739,7 @@ diff --git a/chrome/browser/offline_pages/request_coordinator_factory.h b/chrome 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 -@@ -251,6 +251,7 @@ +@@ -247,6 +247,7 @@ #if BUILDFLAG(IS_ANDROID) #include "chrome/browser/accessibility/accessibility_prefs/android/accessibility_prefs_controller.h" @@ -1747,7 +1747,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" #include "chrome/browser/android/ntp/recent_tabs_page_prefs.h" #include "chrome/browser/android/oom_intervention/oom_intervention_decider.h" -@@ -2105,6 +2106,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -2068,6 +2069,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, usage_stats::UsageStatsBridge::RegisterProfilePrefs(registry); variations::VariationsService::RegisterProfilePrefs(registry); webapps::InstallPromptPrefs::RegisterProfilePrefs(registry); @@ -1908,7 +1908,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -1419,6 +1419,31 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1411,6 +1411,31 @@ Your Google account may have other forms of browsing history like searches and a Deletes history from all synced devices @@ -1943,15 +1943,15 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/LocationBarModel.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/LocationBarModel.java --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/LocationBarModel.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/LocationBarModel.java -@@ -162,6 +162,7 @@ public class LocationBarModel implements ToolbarDataProvider, LocationBarDataPro +@@ -160,6 +160,7 @@ public class LocationBarModel implements ToolbarDataProvider, LocationBarDataPro + protected GURL mVisibleGurl = GURL.emptyGURL(); protected String mFormattedFullUrl; protected String mUrlForDisplay; - private boolean mOmniboxUpdatedConnectionSecurityIndicatorsEnabled; + private boolean mIsAlwaysIncognito; // notifyUrlChanged and notifySecurityStateChanged are usually called 3 times across a same // document navigation. The first call is usually necessary, which updates the UrlBar to reflect -@@ -185,7 +186,9 @@ public class LocationBarModel implements ToolbarDataProvider, LocationBarDataPro +@@ -183,7 +184,9 @@ public class LocationBarModel implements ToolbarDataProvider, LocationBarDataPro Context context, NewTabPageDelegate newTabPageDelegate, @NonNull UrlFormatter urlFormatter, @@ -2009,7 +2009,7 @@ new file mode 100644 diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h --- a/chrome/common/pref_names.h +++ b/chrome/common/pref_names.h -@@ -4211,6 +4211,12 @@ inline constexpr char kOutOfProcessSystemDnsResolutionEnabled[] = +@@ -4193,6 +4193,12 @@ inline constexpr char kOutOfProcessSystemDnsResolutionEnabled[] = "net.out_of_process_system_dns_resolution_enabled"; #endif // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) @@ -2075,7 +2075,7 @@ diff --git a/components/content_settings/core/browser/content_settings_pref_prov diff --git a/components/content_settings/core/browser/host_content_settings_map.cc b/components/content_settings/core/browser/host_content_settings_map.cc --- a/components/content_settings/core/browser/host_content_settings_map.cc +++ b/components/content_settings/core/browser/host_content_settings_map.cc -@@ -263,6 +263,7 @@ struct ContentSettingEntry { +@@ -266,6 +266,7 @@ struct ContentSettingEntry { HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs, bool is_off_the_record, @@ -2083,7 +2083,7 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map. bool store_last_modified, bool restore_session, bool should_record_metrics) -@@ -272,6 +273,7 @@ HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs, +@@ -275,6 +276,7 @@ HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs, #endif prefs_(prefs), is_off_the_record_(is_off_the_record), @@ -2091,7 +2091,7 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map. store_last_modified_(store_last_modified), allow_invalid_secondary_pattern_for_testing_(false), clock_(base::DefaultClock::GetInstance()) { -@@ -285,7 +287,7 @@ HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs, +@@ -288,7 +290,7 @@ HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs, policy_provider->AddObserver(this); auto pref_provider_ptr = std::make_unique( @@ -2111,7 +2111,7 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map. bool store_last_modified, bool restore_session, bool should_record_metrics); -@@ -510,6 +511,8 @@ class HostContentSettingsMap : public content_settings::Observer, +@@ -502,6 +503,8 @@ class HostContentSettingsMap : public content_settings::Observer, // Whether this settings map is for an incognito or guest session. bool is_off_the_record_; @@ -2145,39 +2145,28 @@ diff --git a/components/omnibox/browser/autocomplete_provider_client.h b/compone diff --git a/components/omnibox/browser/base_search_provider.cc b/components/omnibox/browser/base_search_provider.cc --- a/components/omnibox/browser/base_search_provider.cc +++ b/components/omnibox/browser/base_search_provider.cc -@@ -386,7 +386,7 @@ bool BaseSearchProvider::CanSendSuggestRequestWithoutPageURL( - } +@@ -395,7 +395,7 @@ bool BaseSearchProvider::CanSendSuggestRequest( - // Don't make a suggest request if in incognito mode. -- if (client->IsOffTheRecord()) { -+ if (client->IsOffTheRecord() && client->IsAlwaysIncognitoEnabled() == false) { + // Don't make a suggest request if in incognito mode; unless for the Lens + // searchboxes. +- if (client->IsOffTheRecord() && ++ if (client->IsOffTheRecord() && !client->IsAlwaysIncognitoEnabled() && + !omnibox::IsLensSearchbox(page_classification)) { return false; } - diff --git a/components/omnibox/browser/search_provider.cc b/components/omnibox/browser/search_provider.cc --- a/components/omnibox/browser/search_provider.cc +++ b/components/omnibox/browser/search_provider.cc -@@ -778,7 +778,9 @@ bool SearchProvider::IsQuerySuitableForSuggest(bool* query_is_private) const { - // keyword input to a keyword suggest server, if any.) - const TemplateURL* default_url = providers_.GetDefaultProviderURL(); - const TemplateURL* keyword_url = providers_.GetKeywordProviderURL(); -- return !client()->IsOffTheRecord() && client()->SearchSuggestEnabled() && -+ return (client()->IsOffTheRecord() == false || -+ client()->IsAlwaysIncognitoEnabled() == true) && -+ client()->SearchSuggestEnabled() && - ((default_url && !default_url->suggestions_url().empty() && - !*query_is_private) || - (keyword_url && !keyword_url->suggestions_url().empty())); -@@ -937,7 +939,8 @@ std::unique_ptr SearchProvider::CreateSuggestLoader( - // purpose of such a request is to signal the server to warm up; no info +@@ -915,7 +915,8 @@ std::unique_ptr SearchProvider::CreateSuggestLoader( // is required. - // Request for suggestions in OTR contexts is not allowed. -- DCHECK(!client()->IsOffTheRecord()); + // Request for suggestions in OTR contexts is not allowed; except for the Lens + // searchboxes. +- DCHECK(!client()->IsOffTheRecord() || + if (!client()->IsAlwaysIncognitoEnabled()) -+ DCHECK(!client()->IsOffTheRecord()); ++ DCHECK(!client()->IsOffTheRecord() || + omnibox::IsLensSearchbox(input.current_page_classification())); return client() ->GetRemoteSuggestionsService(/*create_if_necessary=*/true) - ->StartSuggestionsRequest( diff --git a/cromite_flags/chrome/browser/about_flags_cc/add-an-always-incognito-mode.inc b/cromite_flags/chrome/browser/about_flags_cc/add-an-always-incognito-mode.inc new file mode 100644 --- /dev/null diff --git a/build/cromite_patches/Add-autoplay-site-setting.patch b/build/cromite_patches/Add-autoplay-site-setting.patch index 90f82c57..5893c42f 100644 --- a/build/cromite_patches/Add-autoplay-site-setting.patch +++ b/build/cromite_patches/Add-autoplay-site-setting.patch @@ -299,7 +299,7 @@ diff --git a/third_party/blink/renderer/core/html/media/autoplay_policy.cc b/thi #include "third_party/blink/public/platform/web_media_player.h" #include "third_party/blink/public/web/web_local_frame.h" #include "third_party/blink/public/web/web_local_frame_client.h" -@@ -338,6 +339,8 @@ void AutoplayPolicy::TryUnlockingUserGesture() { +@@ -337,6 +338,8 @@ void AutoplayPolicy::TryUnlockingUserGesture() { } bool AutoplayPolicy::IsGestureNeededForPlayback() const { @@ -308,7 +308,7 @@ diff --git a/third_party/blink/renderer/core/html/media/autoplay_policy.cc b/thi if (!IsLockedPendingUserGesture()) return false; -@@ -450,6 +453,17 @@ void AutoplayPolicy::MaybeSetAutoplayInitiated() { +@@ -449,6 +452,17 @@ void AutoplayPolicy::MaybeSetAutoplayInitiated() { } } diff --git a/build/cromite_patches/Add-bookmark-import-export-actions.patch b/build/cromite_patches/Add-bookmark-import-export-actions.patch index a2d4df33..944bf6d1 100644 --- a/build/cromite_patches/Add-bookmark-import-export-actions.patch +++ b/build/cromite_patches/Add-bookmark-import-export-actions.patch @@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html chrome/android/java/AndroidManifest.xml | 1 - .../menu/bookmark_toolbar_menu_improved.xml | 14 + .../browser/TabbedModeTabDelegateFactory.java | 5 +- - .../app/bookmarks/BookmarkActivity.java | 32 ++ + .../app/bookmarks/BookmarkActivity.java | 30 ++ .../browser/bookmarks/BookmarkBridge.java | 285 ++++++++++++++++++ .../browser/bookmarks/BookmarkDelegate.java | 10 + .../bookmarks/BookmarkManagerCoordinator.java | 9 + @@ -53,7 +53,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html ui/shell_dialogs/select_file_dialog_linux.cc | 4 + ui/shell_dialogs/select_file_dialog_linux.h | 2 + ui/shell_dialogs/select_file_dialog_win.cc | 5 + - 42 files changed, 900 insertions(+), 30 deletions(-) + 42 files changed, 898 insertions(+), 30 deletions(-) create mode 100644 cromite_flags/chrome/browser/about_flags_cc/add-bookmark-import-export-actions.inc create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/add-bookmark-import-export-actions.inc create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/add-bookmark-import-export-actions.inc @@ -104,7 +104,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDe import org.chromium.chrome.browser.app.tab_activity_glue.ActivityTabWebContentsDelegateAndroid; import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider; import org.chromium.chrome.browser.compositor.CompositorViewHolder; -@@ -55,7 +56,7 @@ import org.chromium.ui.modaldialog.ModalDialogManager; +@@ -54,7 +55,7 @@ import org.chromium.ui.modaldialog.ModalDialogManager; * {@link ChromeTabbedActivity}. */ public class TabbedModeTabDelegateFactory implements TabDelegateFactory { @@ -113,7 +113,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDe private final BrowserControlsVisibilityDelegate mAppBrowserControlsVisibilityDelegate; private final Supplier mShareDelegateSupplier; private final Supplier mEphemeralTabCoordinatorSupplier; -@@ -84,7 +85,7 @@ public class TabbedModeTabDelegateFactory implements TabDelegateFactory { +@@ -83,7 +84,7 @@ public class TabbedModeTabDelegateFactory implements TabDelegateFactory { private NativePageFactory mNativePageFactory; public TabbedModeTabDelegateFactory( @@ -125,19 +125,17 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDe diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/BookmarkActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/BookmarkActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/BookmarkActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/BookmarkActivity.java -@@ -21,6 +21,11 @@ import org.chromium.chrome.browser.profiles.Profile; - import org.chromium.chrome.browser.profiles.ProfileProvider; - import org.chromium.components.bookmarks.BookmarkId; - import org.chromium.components.embedder_support.util.UrlConstants; +@@ -25,6 +25,9 @@ import org.chromium.components.embedder_support.util.UrlConstants; + import org.chromium.ui.modaldialog.ModalDialogManager; + import org.chromium.ui.modaldialog.ModalDialogManager.ModalDialogType; + +import org.chromium.ui.base.ActivityWindowAndroid; +import org.chromium.ui.base.IntentRequestTracker; + -+import org.chromium.ui.modaldialog.ModalDialogManager; -+import org.chromium.components.browser_ui.modaldialog.AppModalPresenter; - /** * The activity that displays the bookmark UI on the phone. It keeps a {@link -@@ -33,6 +38,9 @@ public class BookmarkActivity extends SnackbarActivity { + * BookmarkManagerCoordinator} inside of it and creates a snackbar manager. This activity should +@@ -36,6 +39,9 @@ public class BookmarkActivity extends SnackbarActivity { public static final int EDIT_BOOKMARK_REQUEST_CODE = 14; public static final String INTENT_VISIT_BOOKMARK_ID = "BookmarkEditActivity.VisitBookmarkId"; @@ -147,14 +145,14 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/B @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); -@@ -58,8 +66,23 @@ public class BookmarkActivity extends SnackbarActivity { +@@ -61,8 +67,23 @@ public class BookmarkActivity extends SnackbarActivity { getOnBackPressedDispatcher(), mBookmarkManagerCoordinator, SecondaryActivity.BOOKMARK); + + final boolean listenToActivityState = true; + mIntentRequestTracker = IntentRequestTracker.createFromActivity(this); -+ mWindowAndroid = new ActivityWindowAndroid(this, listenToActivityState, mIntentRequestTracker); ++ mWindowAndroid = new ActivityWindowAndroid(this, listenToActivityState, mIntentRequestTracker, /*InsetObserver*/ null); + mWindowAndroid.getIntentRequestTracker().restoreInstanceState(savedInstanceState); + mBookmarkManagerCoordinator.setWindow(mWindowAndroid, + new ModalDialogManager( @@ -171,7 +169,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/B @Override protected void onDestroy() { super.onDestroy(); -@@ -69,6 +92,7 @@ public class BookmarkActivity extends SnackbarActivity { +@@ -72,6 +93,7 @@ public class BookmarkActivity extends SnackbarActivity { @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); @@ -179,8 +177,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/B if (requestCode == EDIT_BOOKMARK_REQUEST_CODE && resultCode == RESULT_OK) { BookmarkId bookmarkId = BookmarkId.getBookmarkIdFromString( -@@ -77,6 +101,14 @@ public class BookmarkActivity extends SnackbarActivity { - } +@@ -85,6 +107,14 @@ public class BookmarkActivity extends SnackbarActivity { + return new ModalDialogManager(new AppModalPresenter(this), ModalDialogType.APP); } + @Override @@ -542,7 +540,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm import org.chromium.ui.modaldialog.ModalDialogManager; import org.chromium.ui.modaldialog.ModalDialogManager.ModalDialogType; import org.chromium.ui.modelutil.MVCListAdapter.ModelList; -@@ -296,6 +298,13 @@ public class BookmarkManagerCoordinator +@@ -302,6 +304,13 @@ public class BookmarkManagerCoordinator // Public API implementation. @@ -559,7 +557,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java -@@ -55,6 +55,8 @@ import org.chromium.components.commerce.core.SubscriptionsObserver; +@@ -57,6 +57,8 @@ import org.chromium.components.commerce.core.SubscriptionsObserver; import org.chromium.components.embedder_support.util.UrlConstants; import org.chromium.components.power_bookmarks.PowerBookmarkMeta; import org.chromium.components.power_bookmarks.PowerBookmarkType; @@ -568,7 +566,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm import org.chromium.ui.accessibility.AccessibilityState; import org.chromium.ui.listmenu.ListMenu; import org.chromium.ui.listmenu.ListMenuItemProperties; -@@ -79,6 +81,9 @@ class BookmarkManagerMediator +@@ -81,6 +83,9 @@ class BookmarkManagerMediator private static boolean sPreventLoadingForTesting; @@ -578,7 +576,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm /** Keeps track of whether drag is enabled / active for bookmark lists. */ private class BookmarkDragStateDelegate implements DragStateDelegate { private BookmarkDelegate mBookmarkDelegate; -@@ -534,6 +539,14 @@ class BookmarkManagerMediator +@@ -552,6 +557,14 @@ class BookmarkManagerMediator mNativePage = nativePage; } @@ -593,7 +591,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm /** See BookmarkManager(Coordinator)#updateForUrl */ void updateForUrl(String url) { // Bookmark model is null if the manager has been destroyed. -@@ -714,6 +727,16 @@ class BookmarkManagerMediator +@@ -732,6 +745,16 @@ class BookmarkManagerMediator } } @@ -639,7 +637,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm + mBookmarkManagerCoordinator.setWindow(activity.getWindowAndroid(), + new ModalDialogManager( + new AppModalPresenter(activity), ModalDialogManager.ModalDialogType.APP)); - mTitle = host.getContext().getResources().getString(R.string.bookmarks); + mTitle = host.getContext().getString(R.string.bookmarks); initWithView(mBookmarkManagerCoordinator.getView()); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java @@ -814,7 +812,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -207,6 +207,8 @@ static_library("browser") { +@@ -205,6 +205,8 @@ static_library("browser") { "bluetooth/chrome_bluetooth_delegate_impl_client.h", "bookmarks/bookmark_model_factory.cc", "bookmarks/bookmark_model_factory.h", @@ -823,7 +821,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "bookmarks/chrome_bookmark_client.cc", "bookmarks/chrome_bookmark_client.h", "bookmarks/managed_bookmark_service_factory.cc", -@@ -1707,6 +1709,13 @@ static_library("browser") { +@@ -1679,6 +1681,13 @@ static_library("browser") { "webid/identity_provider_permission_request.h", ] @@ -837,7 +835,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn configs += [ "//build/config/compiler:wexit_time_destructors", "//build/config:precompiled_headers", -@@ -3508,8 +3517,6 @@ static_library("browser") { +@@ -3486,8 +3495,6 @@ static_library("browser") { "bookmarks/bookmark_expanded_state_tracker.h", "bookmarks/bookmark_expanded_state_tracker_factory.cc", "bookmarks/bookmark_expanded_state_tracker_factory.h", @@ -1339,28 +1337,28 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc @@ -206,6 +206,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { - &kCastDeviceFilter, &kCCTAuthTab, &kCCTAuthTabDisableAllExternalIntents, + &kCCTAuthTabEnableHttpsRedirects, + &kBookmarksExportUseSaf, &kCCTBeforeUnload, &kCCTClientDataHeader, - &kCCTExtendTrustedCdnPublisher, + &kCCTEarlyNav, 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 -@@ -560,6 +560,7 @@ public abstract class ChromeFeatureList { +@@ -546,6 +546,7 @@ public abstract class ChromeFeatureList { public static final String USE_LIBUNWINDSTACK_NATIVE_UNWINDER_ANDROID = "UseLibunwindstackNativeUnwinderAndroid"; public static final String VISITED_URL_RANKING_SERVICE = "VisitedURLRankingService"; + public static final String BOOKMARKS_EXPORT_USESAF = "BookmarksExportUseSaf"; public static final String VOICE_SEARCH_AUDIO_CAPTURE_POLICY = "VoiceSearchAudioCapturePolicy"; - public static final String WEB_APK_ALLOW_ICON_UPDATE = "WebApkAllowIconUpdate"; public static final String WEB_APK_BACKUP_AND_RESTORE_BACKEND = "WebApkBackupAndRestoreBackend"; + public static final String WEB_APK_INSTALL_FAILURE_NOTIFICATION = diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer/profile_writer.cc --- a/chrome/browser/importer/profile_writer.cc +++ b/chrome/browser/importer/profile_writer.cc -@@ -125,6 +125,16 @@ void ProfileWriter::AddBookmarks( +@@ -124,6 +124,16 @@ void ProfileWriter::AddBookmarks( return; BookmarkModel* model = BookmarkModelFactory::GetForBrowserContext(profile_); @@ -1403,7 +1401,7 @@ diff --git a/chrome/browser/importer/profile_writer.h b/chrome/browser/importer/ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java -@@ -104,6 +104,8 @@ public final class ChromePreferenceKeys { +@@ -103,6 +103,8 @@ public final class ChromePreferenceKeys { "enhanced_bookmark_last_used_parent_folder"; public static final String BOOKMARKS_SORT_ORDER = "Chrome.Bookmarks.BookmarkRowSortOrder"; public static final String BOOKMARKS_VISUALS_PREF = "Chrome.Bookmarks.BookmarkRowDisplay"; @@ -1412,7 +1410,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro /** Whether Chrome is set as the default browser. Default value is false. */ public static final String CHROME_DEFAULT_BROWSER = "applink.chrome_default_browser"; -@@ -922,6 +924,7 @@ public final class ChromePreferenceKeys { +@@ -919,6 +921,7 @@ public final class ChromePreferenceKeys { AUTOFILL_ASSISTANT_PROACTIVE_HELP_ENABLED, APP_LAUNCH_LAST_KNOWN_ACTIVE_TAB_STATE, APP_LAUNCH_SEARCH_ENGINE_HAD_LOGO, @@ -1473,7 +1471,7 @@ diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn "importer/bookmarks_file_importer.cc", "importer/bookmarks_file_importer.h", "importer/external_process_importer_bridge.cc", -@@ -225,6 +223,11 @@ static_library("utility") { +@@ -227,6 +225,11 @@ static_library("utility") { ] } @@ -1506,7 +1504,7 @@ diff --git a/chrome/utility/importer/bookmark_html_reader.cc b/chrome/utility/im // Given the URL of a page and a favicon data URL, adds an appropriate record // to the given favicon usage vector. void DataURLToFaviconUsage(const GURL& link_url, -@@ -85,6 +88,7 @@ void DataURLToFaviconUsage(const GURL& link_url, +@@ -88,6 +91,7 @@ void DataURLToFaviconUsage(const GURL& link_url, favicons->push_back(usage); } @@ -1514,7 +1512,7 @@ diff --git a/chrome/utility/importer/bookmark_html_reader.cc b/chrome/utility/im } // namespace -@@ -105,14 +109,29 @@ static std::string stripDt(const std::string& lineDt) { +@@ -108,14 +112,29 @@ static std::string stripDt(const std::string& lineDt) { } void ImportBookmarksFile( @@ -1547,7 +1545,7 @@ diff --git a/chrome/utility/importer/bookmark_html_reader.cc b/chrome/utility/im std::vector lines = base::SplitString( content, "\n", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); -@@ -125,6 +144,7 @@ void ImportBookmarksFile( +@@ -128,6 +147,7 @@ void ImportBookmarksFile( std::vector path; size_t toolbar_folder_index = 0; std::string charset = "UTF-8"; // If no charset is specified, assume utf-8. @@ -1555,7 +1553,7 @@ diff --git a/chrome/utility/importer/bookmark_html_reader.cc b/chrome/utility/im for (size_t i = 0; i < lines.size() && (cancellation_callback.is_null() || !cancellation_callback.Run()); -@@ -217,10 +237,12 @@ void ImportBookmarksFile( +@@ -219,10 +239,12 @@ void ImportBookmarksFile( } bookmarks->push_back(entry); @@ -1635,7 +1633,7 @@ new file mode 100644 diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java --- a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java +++ b/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java -@@ -46,6 +46,7 @@ import org.chromium.base.task.AsyncTask; +@@ -45,6 +45,7 @@ import org.chromium.base.task.AsyncTask; import org.chromium.base.task.PostTask; import org.chromium.base.task.TaskTraits; import org.chromium.ui.R; @@ -1643,7 +1641,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui import org.chromium.ui.UiUtils; import java.io.File; -@@ -68,6 +69,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick +@@ -67,6 +68,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick private static final String TAG = "SelectFileDialog"; private static final String IMAGE_TYPE = "image"; private static final String VIDEO_TYPE = "video"; @@ -1651,7 +1649,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui private static final String AUDIO_TYPE = "audio"; private static final String ALL_TYPES = "*/*"; private static final String GENERIC_TYPE = "application/octet-stream"; -@@ -313,6 +315,11 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick +@@ -312,6 +314,11 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick mMimeTypes = convertToSupportedMimeTypes(mFileTypes); } @@ -1663,7 +1661,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui /** * Creates and starts an intent based on the passed fileTypes and capture value. * -@@ -359,7 +366,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick +@@ -374,7 +381,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick List missingPermissions = new ArrayList<>(); String storagePermission = Manifest.permission.READ_EXTERNAL_STORAGE; boolean shouldUsePhotoPicker = shouldUsePhotoPicker(); @@ -1672,7 +1670,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui // The permission scenario for accessing media has evolved a bit over the years: // Early on, READ_EXTERNAL_STORAGE was required to access media, but that permission was // later deprecated. In its place (starting with Android T) READ_MEDIA_IMAGES and -@@ -412,7 +419,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick +@@ -427,7 +434,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick // TODO(finnur): Remove once we figure out the cause of // crbug.com/950024. @@ -1681,7 +1679,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui if (permissions.length != requestPermissions.length) { throw new RuntimeException( String.format( -@@ -429,7 +436,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick +@@ -444,7 +451,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick } } @@ -1690,7 +1688,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui if (permissions[i].equals(storagePermission) || permissions[i].equals( Manifest.permission.READ_MEDIA_IMAGES) -@@ -740,6 +747,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick +@@ -751,6 +758,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick mimeTypes.add(mimeType); } } @@ -1698,7 +1696,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui return mimeTypes; } -@@ -1120,6 +1128,10 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick +@@ -1121,6 +1129,10 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick return countAcceptTypesFor(superType) == mMimeTypes.size(); } @@ -1737,7 +1735,7 @@ diff --git a/ui/shell_dialogs/select_file_dialog.h b/ui/shell_dialogs/select_fil diff --git a/ui/shell_dialogs/select_file_dialog_android.cc b/ui/shell_dialogs/select_file_dialog_android.cc --- a/ui/shell_dialogs/select_file_dialog_android.cc +++ b/ui/shell_dialogs/select_file_dialog_android.cc -@@ -160,6 +160,12 @@ void SelectFileDialogImpl::SelectFileImpl( +@@ -161,6 +161,12 @@ void SelectFileDialogImpl::SelectFileImpl( accept_multiple_files, owning_window->GetJavaObject()); } diff --git a/build/cromite_patches/Add-cromite-flags-support.patch b/build/cromite_patches/Add-cromite-flags-support.patch index 231e8191..6c0577b9 100644 --- a/build/cromite_patches/Add-cromite-flags-support.patch +++ b/build/cromite_patches/Add-cromite-flags-support.patch @@ -28,6 +28,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html .../browser/settings/SettingsActivity.java | 42 ++++- chrome/browser/about_flags.cc | 11 ++ chrome/browser/browser_features.cc | 1 + + chrome/browser/browser_features.h | 1 + chrome/browser/flags/BUILD.gn | 13 ++ .../flags/android/chrome_feature_list.cc | 1 + .../flags/android/chrome_feature_list.h | 1 + @@ -35,7 +36,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html .../flags/cromite/include_all_directory.java | 1 + .../java_template/CromiteCachedFlag.java.tmpl | 47 +++++ chrome/browser/settings/BUILD.gn | 1 + - .../settings/ChromeBaseSettingsFragment.java | 50 ++++++ + .../settings/ChromeBaseSettingsFragment.java | 50 +++++ .../strings/android_chrome_strings.grd | 1 + .../Add-cromite-flags-support.grdp | 9 + .../placeholder.txt | 1 + @@ -43,8 +44,8 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html chrome/common/chrome_features.cc | 1 + .../res/xml/accessibility_preferences.xml | 3 +- .../android/java/res/values/attrs.xml | 4 + - .../settings/ChromeSwitchPreference.java | 20 +++ - .../components/cached_flags/CachedFlag.java | 8 +- + .../settings/ChromeSwitchPreference.java | 20 ++ + .../components/cached_flags/CachedFlag.java | 9 +- components/components_strings.grd | 1 + .../content_settings/core/common/features.cc | 1 + .../placeholder.txt | 1 + @@ -66,9 +67,10 @@ 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 | 168 ++++++++++++++++++ + cromite_flags/BUILD.gn | 174 ++++++++++++++++++ .../browser/about_flags_cc/placeholder.txt | 1 + .../browser_features_cc/placeholder.txt | 1 + + .../browser_features_h/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 + @@ -102,7 +104,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html third_party/blink/public/common/features.h | 1 + ui/base/ui_base_features.cc | 1 + ui/base/ui_base_features.h | 1 + - 89 files changed, 792 insertions(+), 28 deletions(-) + 91 files changed, 801 insertions(+), 28 deletions(-) create mode 100644 chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/include_all_directory.java create mode 100644 chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/java_template/CromiteCachedFlag.java.tmpl create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-cromite-flags-support.grdp @@ -111,6 +113,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html 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/browser_features_h/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 @@ -138,7 +141,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/base/BUILD.gn b/base/BUILD.gn --- a/base/BUILD.gn +++ b/base/BUILD.gn -@@ -185,6 +185,8 @@ use_epoll = is_linux || is_chromeos || is_android +@@ -163,6 +163,8 @@ use_epoll = is_linux || is_chromeos || is_android # This does not include test code (test support and anything in the test # directory) which should use source_set as is recommended for GN targets). component("base") { @@ -147,7 +150,7 @@ diff --git a/base/BUILD.gn b/base/BUILD.gn sources = [ "allocator/allocator_check.cc", "allocator/allocator_check.h", -@@ -1025,7 +1027,7 @@ component("base") { +@@ -1005,7 +1007,7 @@ component("base") { "//build/config/compiler:wglobal_constructors", ] @@ -239,7 +242,7 @@ diff --git a/base/feature_list.cc b/base/feature_list.cc + return key; + } + } -+ NOTREACHED_NORETURN(); ++ NOTREACHED(); +} + +// static @@ -259,13 +262,13 @@ diff --git a/base/feature_list.cc b/base/feature_list.cc + return value == base::FEATURE_ENABLED_BY_DEFAULT; + } + } -+ NOTREACHED_NORETURN(); ++ NOTREACHED(); +} + // static bool FeatureList::IsValidFeatureOrFieldTrialName(std::string_view name) { return IsStringASCII(name) && name.find_first_of(",<*") == std::string::npos; -@@ -739,6 +804,17 @@ void FeatureList::VisitFeaturesAndParams(FeatureVisitor& visitor, +@@ -735,6 +800,17 @@ void FeatureList::VisitFeaturesAndParams(FeatureVisitor& visitor, void FeatureList::FinalizeInitialization() { DCHECK(!initialized_); @@ -445,14 +448,14 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java -@@ -18,6 +18,7 @@ import org.chromium.chrome.R; +@@ -19,6 +19,7 @@ import org.chromium.chrome.R; import org.chromium.chrome.browser.image_descriptions.ImageDescriptionsController; import org.chromium.chrome.browser.preferences.Pref; import org.chromium.chrome.browser.settings.SettingsNavigationFactory; +import org.chromium.chrome.browser.settings.ChromeBaseSettingsFragment; import org.chromium.components.browser_ui.accessibility.AccessibilitySettingsDelegate; import org.chromium.components.browser_ui.accessibility.FontSizePrefs; - import org.chromium.components.browser_ui.accessibility.FontSizePrefs.FontSizePrefsObserver; + import org.chromium.components.browser_ui.accessibility.PageZoomPreference; @@ -37,7 +38,7 @@ import org.chromium.content_public.browser.ContentFeatureList; import org.chromium.content_public.browser.ContentFeatureMap; @@ -460,9 +463,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s -public class AccessibilitySettings extends PreferenceFragmentCompat +public class AccessibilitySettings extends ChromeBaseSettingsFragment implements EmbeddableSettingsPage, Preference.OnPreferenceChangeListener { - public static final String PREF_TEXT_SCALE = "text_scale"; public static final String PREF_PAGE_ZOOM_DEFAULT_ZOOM = "page_zoom_default_zoom"; -@@ -101,7 +102,7 @@ public class AccessibilitySettings extends PreferenceFragmentCompat + public static final String PREF_PAGE_ZOOM_INCLUDE_OS_ADJUSTMENT = +@@ -85,7 +86,7 @@ public class AccessibilitySettings extends PreferenceFragmentCompat } @Override @@ -470,7 +473,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s + public void onCreatePreferencesCromite(Bundle savedInstanceState, String rootKey) { SettingsUtils.addPreferencesFromResource(this, R.xml.accessibility_preferences); - mTextScalePref = (TextScalePreference) findPreference(PREF_TEXT_SCALE); + mPageZoomDefaultZoomPref = (PageZoomPreference) findPreference(PREF_PAGE_ZOOM_DEFAULT_ZOOM); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java @@ -486,7 +489,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settin diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java -@@ -80,7 +80,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment +@@ -81,7 +81,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment private final ObservableSupplierImpl mPageTitle = new ObservableSupplierImpl<>(); @Override @@ -576,7 +579,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin import org.chromium.components.browser_ui.bottomsheet.BottomSheetController; import org.chromium.components.browser_ui.bottomsheet.BottomSheetControllerFactory; import org.chromium.components.browser_ui.bottomsheet.ManagedBottomSheetController; -@@ -83,6 +88,40 @@ import java.util.Locale; +@@ -85,6 +90,40 @@ import java.util.Locale; */ public class SettingsActivity extends ChromeBaseAppCompatActivity implements PreferenceFragmentCompat.OnPreferenceStartFragmentCallback, SnackbarManageable { @@ -617,7 +620,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE) public static final String EXTRA_SHOW_FRAGMENT = "show_fragment"; -@@ -141,7 +180,8 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity +@@ -151,7 +190,8 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity mProfile, mSnackbarManagerSupplier, mBottomSheetControllerSupplier, @@ -630,7 +633,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin 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 -@@ -388,6 +388,10 @@ using flags_ui::kOsLinux; +@@ -392,6 +392,10 @@ using flags_ui::kOsLinux; using flags_ui::kOsMac; using flags_ui::kOsWin; @@ -641,8 +644,8 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc namespace about_flags { namespace { -@@ -4210,6 +4214,10 @@ const FeatureEntry::FeatureVariation - 1, nullptr}, +@@ -4315,6 +4319,10 @@ const FeatureEntry::FeatureVariation kServiceWorkerAutoPreloadVariations[] = { + std::size(kServiceWorkerAutoPreload_SWNotRunningOnly), nullptr}, }; +#define FEATURE_PARAM_SECTION @@ -652,7 +655,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. -@@ -4236,6 +4244,9 @@ const FeatureEntry::FeatureVariation +@@ -4341,6 +4349,9 @@ const FeatureEntry::FeatureVariation kServiceWorkerAutoPreloadVariations[] = { const FeatureEntry kFeatureEntries[] = { // Include generated flags for flag unexpiry; see //docs/flag_expiry.md and // //tools/flags/generate_unexpire_flags.py. @@ -665,12 +668,23 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc 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 -@@ -392,4 +392,5 @@ BASE_FEATURE(kRemovalOfIWAsFromTabCapture, +@@ -372,4 +372,5 @@ BASE_FEATURE(kRemovalOfIWAsFromTabCapture, "RemovalOfIWAsFromTabCapture", base::FEATURE_ENABLED_BY_DEFAULT); +#include "cromite_flags/chrome_browser_browser_features_cc.inc" } // namespace features +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 +@@ -145,6 +145,7 @@ BASE_DECLARE_FEATURE(kRemovalOfIWAsFromTabCapture); + // module, e.g. + // //chrome/browser//features.h + // ++#include "cromite_flags/chrome_browser_browser_features_h.inc" + } // namespace features + + #endif // CHROME_BROWSER_BROWSER_FEATURES_H_ diff --git a/chrome/browser/flags/BUILD.gn b/chrome/browser/flags/BUILD.gn --- a/chrome/browser/flags/BUILD.gn +++ b/chrome/browser/flags/BUILD.gn @@ -713,8 +727,8 @@ diff --git a/chrome/browser/flags/BUILD.gn b/chrome/browser/flags/BUILD.gn 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 -@@ -1096,5 +1096,6 @@ BASE_FEATURE(kWebApkAllowIconUpdate, - "WebApkAllowIconUpdate", +@@ -1063,5 +1063,6 @@ BASE_FEATURE(kWebOtpCrossDeviceSimpleString, + "WebOtpCrossDeviceSimpleString", base::FEATURE_DISABLED_BY_DEFAULT); +#include "cromite_flags/chrome_browser_flags_android_chrome_feature_list_cc.inc" @@ -723,7 +737,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 -@@ -222,6 +222,7 @@ constexpr base::FeatureParam kQuickDeleteAndroidSurveyTriggerId( +@@ -215,6 +215,7 @@ constexpr base::FeatureParam kQuickDeleteAndroidSurveyTriggerId( "trigger_id", /*default_value=*/""); @@ -734,7 +748,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 -@@ -18,6 +18,10 @@ import org.chromium.components.cached_flags.DoubleCachedFieldTrialParameter; +@@ -17,6 +17,10 @@ import org.chromium.components.cached_flags.DoubleCachedFieldTrialParameter; import org.chromium.components.cached_flags.IntCachedFieldTrialParameter; import org.chromium.components.cached_flags.StringCachedFieldTrialParameter; @@ -745,7 +759,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f import java.util.List; import java.util.Map; -@@ -766,7 +770,7 @@ public abstract class ChromeFeatureList { +@@ -730,7 +734,7 @@ public abstract class ChromeFeatureList { public static final CachedFlag sWebApkMinShellApkVersion = newCachedFlag(WEB_APK_MIN_SHELL_APK_VERSION, true); @@ -754,7 +768,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f List.of( sAccountReauthenticationRecentTimeWindow, sAndroidAppIntegration, -@@ -867,6 +871,13 @@ public abstract class ChromeFeatureList { +@@ -823,6 +827,13 @@ public abstract class ChromeFeatureList { sUseLibunwindstackNativeUnwinderAndroid, sWebApkMinShellApkVersion); @@ -765,9 +779,9 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f + public static final List sFlagsCachedFullBrowser = + concatenateLists(CromiteCachedFlagImplBase.getList(), sFlagsCachedFullBrowserChromium); + - public static final List sFlagsCachedInMinimalBrowser = - List.of(sExperimentsForAgsa); + public static final List sFlagsCachedInMinimalBrowser = List.of(); + public static final List sTestCachedFlags = diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/include_all_directory.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/include_all_directory.java new file mode 100644 --- /dev/null @@ -943,16 +957,16 @@ new file mode 100644 diff --git a/chrome/browser/ui/ui_features.cc b/chrome/browser/ui/ui_features.cc --- a/chrome/browser/ui/ui_features.cc +++ b/chrome/browser/ui/ui_features.cc -@@ -458,4 +458,5 @@ BASE_FEATURE(kPageSpecificDataDialogRelatedInstalledAppsSection, - "PageSpecificDataDialogRelatedInstalledAppsSection", - base::FEATURE_DISABLED_BY_DEFAULT); +@@ -487,4 +487,5 @@ BASE_FEATURE(kInlineFullscreenPerfExperiment, + "InlineFullscreenPerfExperiment", + base::FEATURE_ENABLED_BY_DEFAULT); +#include "cromite_flags/chrome_browser_ui_ui_features_cc.inc" } // namespace features 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 -@@ -1737,4 +1737,5 @@ BASE_FEATURE(kPeriodicLogUploadMigration, +@@ -1629,4 +1629,5 @@ BASE_FEATURE(kPeriodicLogUploadMigration, base::FEATURE_DISABLED_BY_DEFAULT); #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -969,8 +983,8 @@ diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibil + - +@@ -352,6 +352,7 @@ CONTENT_EXPORT extern const base::FeatureParam CONTENT_EXPORT bool IsVideoCaptureServiceEnabledForOutOfProcess(); CONTENT_EXPORT bool IsVideoCaptureServiceEnabledForBrowserProcess(); @@ -1549,7 +1571,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,168 @@ +@@ -0,0 +1,174 @@ +# This file is part of Bromite. + +# Bromite is free software: you can redistribute it and/or modify @@ -1620,6 +1642,11 @@ new file mode 100755 + output_file = "chrome_browser_browser_features_cc.inc" +} + ++cpp_bromite_include("chrome_browser_browser_features_h") { ++ inputs = [ "//cromite_flags/chrome/browser/browser_features_h/placeholder.txt" ] ++ output_file = "chrome_browser_browser_features_h.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" @@ -1710,6 +1737,7 @@ new file mode 100755 + ":chrome_browser_flags_android_chrome_feature_list_h", + ":chrome_browser_ui_ui_features_cc", + ":chrome_browser_browser_features_cc", ++ ":chrome_browser_browser_features_h", + ":services_network_public_cpp_features_cc", + ":services_network_public_cpp_features_h", + ":third_party_blink_common_features_cc", @@ -1730,6 +1758,12 @@ new file mode 100755 +++ 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/browser_features_h/placeholder.txt b/cromite_flags/chrome/browser/browser_features_h/placeholder.txt +new file mode 100755 +--- /dev/null ++++ b/cromite_flags/chrome/browser/browser_features_h/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 @@ -1871,7 +1905,7 @@ new file mode 100755 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 -@@ -1906,5 +1906,5 @@ uint32_t GetPassthroughAudioFormats() { +@@ -1837,5 +1837,5 @@ uint32_t GetPassthroughAudioFormats() { return 0; #endif // BUILDFLAG(ENABLE_PASSTHROUGH_AUDIO_CODECS) } @@ -1881,7 +1915,7 @@ diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc diff --git a/media/base/media_switches.h b/media/base/media_switches.h --- a/media/base/media_switches.h +++ b/media/base/media_switches.h -@@ -585,5 +585,5 @@ MEDIA_EXPORT OOPVDMode GetOutOfProcessVideoDecodingMode(); +@@ -572,5 +572,5 @@ MEDIA_EXPORT OOPVDMode GetOutOfProcessVideoDecodingMode(); MEDIA_EXPORT uint32_t GetPassthroughAudioFormats(); } // namespace media @@ -1891,18 +1925,18 @@ 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 -@@ -616,4 +616,5 @@ const base::FeatureParam kDiskCacheBackendParam{ - &kDiskCacheBackendExperiment, "backend", DiskCacheBackend::kBlockfile, - &kDiskCacheBackendOptions}; +@@ -629,4 +629,5 @@ BASE_FEATURE(kIgnoreHSTSForLocalhost, + "IgnoreHSTSForLocalhost", + base::FEATURE_ENABLED_BY_DEFAULT); +#include "cromite_flags/net_base_features_cc.inc" } // namespace net::features diff --git a/net/base/features.h b/net/base/features.h --- a/net/base/features.h +++ b/net/base/features.h -@@ -628,6 +628,7 @@ NET_EXPORT BASE_DECLARE_FEATURE(kDiskCacheBackendExperiment); - NET_EXPORT extern const base::FeatureParam - kDiskCacheBackendParam; +@@ -650,6 +650,7 @@ NET_EXPORT extern const base::FeatureParam + // If enabled, ignore Strict-Transport-Security for [*.]localhost hosts. + NET_EXPORT BASE_DECLARE_FEATURE(kIgnoreHSTSForLocalhost); +#include "cromite_flags/net_base_features_h.inc" } // namespace net::features @@ -1911,18 +1945,18 @@ diff --git a/net/base/features.h b/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 -@@ -515,4 +515,5 @@ BASE_FEATURE(kStorageAccessHeadersTrial, - "StorageAccessHeadersTrial", +@@ -475,4 +475,5 @@ BASE_FEATURE(kEnableLockCookieDatabaseByDefault, base::FEATURE_ENABLED_BY_DEFAULT); + #endif // BUILDFLAG(IS_WIN) +#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 -@@ -204,6 +204,7 @@ COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kStorageAccessHeaders); - // Enables the Storage Access Headers Origin Trial. - COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kStorageAccessHeadersTrial); +@@ -211,6 +211,7 @@ COMPONENT_EXPORT(NETWORK_CPP) + BASE_DECLARE_FEATURE(kEnableLockCookieDatabaseByDefault); + #endif // BUILDFLAG(IS_WIN) +#include "cromite_flags/services_network_public_cpp_features_h.inc" } // namespace network::features @@ -1931,7 +1965,7 @@ diff --git a/services/network/public/cpp/features.h b/services/network/public/cp 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 -@@ -2801,4 +2801,5 @@ bool IsCanvasSharedBitmapConversionEnabled() { +@@ -2932,4 +2932,5 @@ bool IsCanvasSharedBitmapConversionEnabled() { // // DO NOT ADD NEW FEATURES HERE. @@ -1940,7 +1974,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 -@@ -1879,6 +1879,7 @@ BLINK_COMMON_EXPORT bool IsCanvasSharedBitmapConversionEnabled(); +@@ -1886,6 +1886,7 @@ BLINK_COMMON_EXPORT bool IsCanvasSharedBitmapConversionEnabled(); // // DO NOT ADD NEW FEATURES HERE. @@ -1951,7 +1985,7 @@ diff --git a/third_party/blink/public/common/features.h b/third_party/blink/publ diff --git a/ui/base/ui_base_features.cc b/ui/base/ui_base_features.cc --- a/ui/base/ui_base_features.cc +++ b/ui/base/ui_base_features.cc -@@ -554,4 +554,5 @@ BASE_FEATURE(kAsyncFullscreenWindowState, +@@ -503,4 +503,5 @@ BASE_FEATURE(kAsyncFullscreenWindowState, "AsyncFullscreenWindowState", base::FEATURE_DISABLED_BY_DEFAULT); @@ -1960,7 +1994,7 @@ diff --git a/ui/base/ui_base_features.cc b/ui/base/ui_base_features.cc diff --git a/ui/base/ui_base_features.h b/ui/base/ui_base_features.h --- a/ui/base/ui_base_features.h +++ b/ui/base/ui_base_features.h -@@ -273,6 +273,7 @@ BASE_DECLARE_FEATURE(kWriteBookmarkWithoutTitle); +@@ -259,6 +259,7 @@ BASE_DECLARE_FEATURE(kWriteBookmarkWithoutTitle); COMPONENT_EXPORT(UI_BASE_FEATURES) BASE_DECLARE_FEATURE(kAsyncFullscreenWindowState); diff --git a/build/cromite_patches/Add-custom-tab-intents-privacy-option.patch b/build/cromite_patches/Add-custom-tab-intents-privacy-option.patch index 1d31cbfa..27ac9054 100644 --- a/build/cromite_patches/Add-custom-tab-intents-privacy-option.patch +++ b/build/cromite_patches/Add-custom-tab-intents-privacy-option.patch @@ -56,7 +56,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java --- a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java -@@ -58,6 +58,9 @@ import java.lang.annotation.Retention; +@@ -64,6 +64,9 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.Set; @@ -66,7 +66,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis /** * Dispatches incoming intents to the appropriate activity based on the current configuration and * Intent fired. -@@ -244,6 +247,9 @@ public class LaunchIntentDispatcher { +@@ -266,6 +269,9 @@ public class LaunchIntentDispatcher { @OptIn(markerClass = ExperimentalAuthTab.class) public static boolean isCustomTabIntent(Intent intent) { if (intent == null) return false; @@ -76,7 +76,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis Log.w( TAG, "CustomTabsIntent#shouldAlwaysUseBrowserUI() = " -@@ -272,6 +278,10 @@ public class LaunchIntentDispatcher { +@@ -294,6 +300,10 @@ public class LaunchIntentDispatcher { // Make sure the result of the CustomTabActivity is forwarded to the client. newIntent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT); @@ -87,7 +87,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis // Since configureIntentForResizableCustomTab() might change the componenet/class // associated with the passed intent, it needs to be called after #setClassName(context, // CustomTabActivity.class.getName()); -@@ -445,6 +455,17 @@ public class LaunchIntentDispatcher { +@@ -490,6 +500,17 @@ public class LaunchIntentDispatcher { if (Intent.ACTION_VIEW.equals(newIntent.getAction()) && !IntentHandler.wasIntentSenderChrome(newIntent)) { @@ -108,7 +108,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java -@@ -1229,7 +1229,9 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid +@@ -1238,7 +1238,9 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid public @CustomTabProfileType int getCustomTabMode() { return AlwaysIncognitoLinkInterceptor.isAlwaysIncognito() ? CustomTabProfileType.INCOGNITO @@ -122,7 +122,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java -@@ -958,6 +958,7 @@ public class CustomTabsConnection { +@@ -969,6 +969,7 @@ public class CustomTabsConnection { PostTask.postTask( TaskTraits.UI_DEFAULT, () -> { @@ -156,7 +156,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Inco @@ -216,6 +222,10 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD } - public static boolean isValidIncognitoIntent(Intent intent) { + public static boolean isValidIncognitoIntent(Intent intent, boolean recordMetrics) { + if (ContextUtils.getAppSharedPreferences() + .getBoolean(PrivacySettings.PREF_OPEN_EXTERNAL_LINKS_INCOGNITO, false)) { + return true; @@ -164,7 +164,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Inco if (!isIncognitoRequested(intent)) return false; var session = CustomTabsSessionToken.getSessionTokenFromIntent(intent); if (isIntentFromThirdPartyAllowed() -@@ -326,6 +336,10 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD +@@ -329,6 +339,10 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD @Override public @CustomTabProfileType int getCustomTabMode() { @@ -178,7 +178,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Inco diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java -@@ -56,6 +56,15 @@ import org.chromium.components.signin.identitymanager.ConsentLevel; +@@ -57,6 +57,15 @@ import org.chromium.components.signin.identitymanager.ConsentLevel; import org.chromium.components.user_prefs.UserPrefs; import org.chromium.ui.text.SpanApplier; @@ -194,7 +194,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting import androidx.annotation.Nullable; import androidx.preference.PreferenceCategory; import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager; -@@ -103,6 +112,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment +@@ -104,6 +113,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment private IncognitoLockSettings mIncognitoLockSettings; private final ObservableSupplierImpl mPageTitle = new ObservableSupplierImpl<>(); @@ -266,7 +266,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting 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 -@@ -692,6 +692,7 @@ public abstract class ChromeFeatureList { +@@ -662,6 +662,7 @@ public abstract class ChromeFeatureList { public static final CachedFlag sLogoPolishAnimationKillSwitch = newCachedFlag(LOGO_POLISH_ANIMATION_KILL_SWITCH, true); public static final CachedFlag sMagicStackAndroid = newCachedFlag(MAGIC_STACK_ANDROID, true); @@ -274,7 +274,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f public static final CachedFlag sMostVisitedTilesReselect = newCachedFlag(MOST_VISITED_TILES_RESELECT, false); public static final CachedFlag sMultiInstanceApplicationStatusCleanup = -@@ -833,6 +834,7 @@ public abstract class ChromeFeatureList { +@@ -792,6 +793,7 @@ public abstract class ChromeFeatureList { sLogoPolishAnimationKillSwitch, sNotificationTrampoline, sMagicStackAndroid, @@ -346,7 +346,7 @@ diff --git a/components/content_relationship_verification/android/java/src/org/c diff --git a/components/language/core/common/language_experiments.cc b/components/language/core/common/language_experiments.cc --- a/components/language/core/common/language_experiments.cc +++ b/components/language/core/common/language_experiments.cc -@@ -28,4 +28,5 @@ BASE_FEATURE(kTranslateOpenSettings, +@@ -32,4 +32,5 @@ BASE_FEATURE(kDisableGeoLanguageModel, // Params: const char kContentLanguagesDisableObserversParam[] = "disable_observers"; diff --git a/build/cromite_patches/Add-exit-menu-item.patch b/build/cromite_patches/Add-exit-menu-item.patch index 6fb3a743..59881404 100644 --- a/build/cromite_patches/Add-exit-menu-item.patch +++ b/build/cromite_patches/Add-exit-menu-item.patch @@ -16,7 +16,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml --- a/chrome/android/java/res/menu/main_menu.xml +++ b/chrome/android/java/res/menu/main_menu.xml -@@ -157,6 +157,9 @@ found in the LICENSE file. +@@ -160,6 +160,9 @@ found in the LICENSE file. @@ -26,7 +26,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re -@@ -186,6 +189,9 @@ found in the LICENSE file. +@@ -189,6 +192,9 @@ found in the LICENSE file. @@ -39,7 +39,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -277,6 +277,8 @@ import java.util.Set; +@@ -276,6 +276,8 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.DoubleConsumer; @@ -48,7 +48,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct /** * This is the main activity for ChromeMobile when not running in document mode. All the tabs are * accessible via a chrome specific tab switching UI. -@@ -2826,6 +2828,8 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -2432,6 +2433,11 @@ public abstract class ChromeActivity return true; } @@ -102,7 +102,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLife diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -4379,6 +4379,9 @@ To change this setting, BEGIN_LINKdelete the Chrome d +@@ -4385,6 +4385,9 @@ To change this setting, BEGIN_LINKdelete the Chrome d Dark theme diff --git a/build/cromite_patches/Add-flag-for-omnibox-autocomplete-filtering.patch b/build/cromite_patches/Add-flag-for-omnibox-autocomplete-filtering.patch index 8665a06b..4de1e5af 100644 --- a/build/cromite_patches/Add-flag-for-omnibox-autocomplete-filtering.patch +++ b/build/cromite_patches/Add-flag-for-omnibox-autocomplete-filtering.patch @@ -26,7 +26,7 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/ #include "base/feature_list.h" #include "base/format_macros.h" #include "base/functional/bind.h" -@@ -535,6 +536,15 @@ AutocompleteController::AutocompleteController( +@@ -536,6 +537,15 @@ AutocompleteController::AutocompleteController( provider_client_->GetOmniboxTriggeredFeatureService()), steady_state_omnibox_position_( metrics::OmniboxEventProto::UNKNOWN_POSITION) { @@ -66,7 +66,7 @@ diff --git a/components/omnibox/browser/search_provider.cc b/components/omnibox/ #include "base/functional/callback.h" #include "base/i18n/break_iterator.h" #include "base/i18n/case_conversion.h" -@@ -647,6 +648,9 @@ void SearchProvider::Run(bool query_is_private) { +@@ -631,6 +632,9 @@ void SearchProvider::Run(bool query_is_private) { } void SearchProvider::DoHistoryQuery(bool minimal_changes) { diff --git a/build/cromite_patches/Add-flag-to-disable-IPv6-probes.patch b/build/cromite_patches/Add-flag-to-disable-IPv6-probes.patch index 6ea30ba6..c1912cc3 100644 --- a/build/cromite_patches/Add-flag-to-disable-IPv6-probes.patch +++ b/build/cromite_patches/Add-flag-to-disable-IPv6-probes.patch @@ -45,7 +45,7 @@ new file mode 100644 diff --git a/net/BUILD.gn b/net/BUILD.gn --- a/net/BUILD.gn +++ b/net/BUILD.gn -@@ -1101,6 +1101,7 @@ component("net") { +@@ -1102,6 +1102,7 @@ component("net") { "//components/miracle_parameter/common", "//components/network_time/time_tracker", "//net/http:transport_security_state_generated_files", @@ -64,7 +64,7 @@ diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc #include "net/log/net_log_with_source.h" #include "net/socket/client_socket_factory.h" #include "net/url_request/url_request_context.h" -@@ -1430,6 +1431,13 @@ int HostResolverManager::StartIPv6ReachabilityCheck( +@@ -1426,6 +1427,13 @@ int HostResolverManager::StartIPv6ReachabilityCheck( return OK; } diff --git a/build/cromite_patches/Add-flag-to-disable-external-intent-requests.patch b/build/cromite_patches/Add-flag-to-disable-external-intent-requests.patch index defd6307..3376982d 100644 --- a/build/cromite_patches/Add-flag-to-disable-external-intent-requests.patch +++ b/build/cromite_patches/Add-flag-to-disable-external-intent-requests.patch @@ -186,7 +186,7 @@ diff --git a/components/external_intents/android/java/src/org/chromium/component private OverrideUrlLoadingResult shouldOverrideUrlLoadingInternal( ExternalNavigationParams params, Intent targetIntent, -@@ -1594,6 +1600,21 @@ public class ExternalNavigationHandler { +@@ -1588,6 +1594,21 @@ public class ExternalNavigationHandler { return OverrideUrlLoadingResult.forNoOverride(); } diff --git a/build/cromite_patches/Add-flag-to-disable-vibration.patch b/build/cromite_patches/Add-flag-to-disable-vibration.patch index ed36bcd3..24f732e0 100644 --- a/build/cromite_patches/Add-flag-to-disable-vibration.patch +++ b/build/cromite_patches/Add-flag-to-disable-vibration.patch @@ -20,7 +20,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc --- a/content/child/runtime_features.cc +++ b/content/child/runtime_features.cc -@@ -103,6 +103,7 @@ void SetRuntimeFeatureDefaultsForPlatform( +@@ -104,6 +104,7 @@ void SetRuntimeFeatureDefaultsForPlatform( if (command_line.HasSwitch(switches::kDisableMediaSessionAPI)) { WebRuntimeFeatures::EnableMediaSession(false); } @@ -78,7 +78,7 @@ diff --git a/third_party/blink/renderer/modules/vibration/vibration_controller.c // Maximum number of entries in a vibration pattern. const unsigned kVibrationPatternLengthMax = 99; -@@ -109,6 +110,8 @@ bool VibrationController::vibrate(Navigator& navigator, +@@ -108,6 +109,8 @@ bool VibrationController::vibrate(Navigator& navigator, // reference to |window| or |navigator| was retained in another window. if (!navigator.DomWindow()) return false; @@ -104,7 +104,7 @@ diff --git a/third_party/blink/renderer/platform/exported/web_runtime_features.c 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 -@@ -791,6 +791,10 @@ +@@ -793,6 +793,10 @@ status: {"Android": "stable"}, base_feature: "none", }, diff --git a/build/cromite_patches/Add-lifetime-options-for-permissions.patch b/build/cromite_patches/Add-lifetime-options-for-permissions.patch index 6dd29f9f..9ffcd0fc 100644 --- a/build/cromite_patches/Add-lifetime-options-for-permissions.patch +++ b/build/cromite_patches/Add-lifetime-options-for-permissions.patch @@ -176,7 +176,7 @@ diff --git a/chrome/browser/permissions/one_time_permissions_tracker.cc b/chrome OneTimePermissionsTracker::~OneTimePermissionsTracker() = default; OneTimePermissionsTracker::OriginTrackEntry::OriginTrackEntry() = default; -@@ -258,6 +284,11 @@ void OneTimePermissionsTracker::NotifyLastPageFromOriginClosed( +@@ -257,6 +283,11 @@ void OneTimePermissionsTracker::NotifyLastPageFromOriginClosed( for (auto& observer : observer_list_) { observer.OnLastPageFromOriginClosed(origin); } @@ -242,7 +242,7 @@ diff --git a/chrome/browser/ui/views/permissions/chip/chip_controller.cc b/chrom diff --git a/chrome/browser/ui/views/permissions/embedded_permission_prompt.cc b/chrome/browser/ui/views/permissions/embedded_permission_prompt.cc --- a/chrome/browser/ui/views/permissions/embedded_permission_prompt.cc +++ b/chrome/browser/ui/views/permissions/embedded_permission_prompt.cc -@@ -654,7 +654,7 @@ void EmbeddedPermissionPrompt::SendDelegateAction(Action action) { +@@ -660,7 +660,7 @@ void EmbeddedPermissionPrompt::SendDelegateAction(Action action) { delegate_->Accept(); break; case Action::kAllowThisTime: @@ -289,7 +289,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java -@@ -568,6 +568,11 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment +@@ -589,6 +589,11 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment } } @@ -301,7 +301,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c private void setUpClearDataPreference() { ClearWebsiteStorage preference = findPreference(PREF_CLEAR_DATA); long usage = mSite.getTotalUsage(); -@@ -1102,6 +1107,10 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment +@@ -1154,6 +1159,10 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment AppCompatResources.getColorStateList(getContext(), mHighlightColor) .getDefaultColor()); } @@ -327,7 +327,7 @@ diff --git a/components/browser_ui/site_settings/android/website_preference_brid diff --git a/components/browser_ui/strings/android/browser_ui_strings.grd b/components/browser_ui/strings/android/browser_ui_strings.grd --- a/components/browser_ui/strings/android/browser_ui_strings.grd +++ b/components/browser_ui/strings/android/browser_ui_strings.grd -@@ -654,6 +654,11 @@ +@@ -646,6 +646,11 @@ URL truncated @@ -342,7 +342,7 @@ diff --git a/components/browser_ui/strings/android/browser_ui_strings.grd b/comp diff --git a/components/content_settings/core/browser/content_settings_utils.cc b/components/content_settings/core/browser/content_settings_utils.cc --- a/components/content_settings/core/browser/content_settings_utils.cc +++ b/components/content_settings/core/browser/content_settings_utils.cc -@@ -160,6 +160,42 @@ bool IsConstraintPersistent(const ContentSettingConstraints& constraints) { +@@ -161,6 +161,42 @@ bool IsConstraintPersistent(const ContentSettingConstraints& constraints) { return constraints.session_model() == mojom::SessionModel::DURABLE; } @@ -461,7 +461,7 @@ diff --git a/components/page_info/android/java/src/org/chromium/components/page_ } } -@@ -126,13 +131,15 @@ public class PermissionParamsListBuilder { +@@ -127,13 +132,15 @@ public class PermissionParamsListBuilder { public final String nameMidSentence; public final int type; public final @ContentSettingValues int setting; @@ -481,7 +481,7 @@ diff --git a/components/page_info/android/java/src/org/chromium/components/page_ diff --git a/components/page_info/android/page_info_controller_android.cc b/components/page_info/android/page_info_controller_android.cc --- a/components/page_info/android/page_info_controller_android.cc +++ b/components/page_info/android/page_info_controller_android.cc -@@ -164,6 +164,8 @@ void PageInfoControllerAndroid::SetPermissionInfo( +@@ -166,6 +166,8 @@ void PageInfoControllerAndroid::SetPermissionInfo( std::map user_specified_settings_to_display; @@ -490,7 +490,7 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp for (const auto& permission : permission_info_list) { if (base::Contains(permissions_to_display, permission.type)) { -@@ -172,6 +174,8 @@ void PageInfoControllerAndroid::SetPermissionInfo( +@@ -174,6 +176,8 @@ void PageInfoControllerAndroid::SetPermissionInfo( if (setting_to_display) { user_specified_settings_to_display[permission.type] = *setting_to_display; @@ -499,7 +499,7 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp } } } -@@ -188,7 +192,8 @@ void PageInfoControllerAndroid::SetPermissionInfo( +@@ -190,7 +194,8 @@ void PageInfoControllerAndroid::SetPermissionInfo( ConvertUTF16ToJavaString(env, setting_title), ConvertUTF16ToJavaString(env, setting_title_mid_sentence), static_cast(permission), @@ -509,7 +509,7 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp } } -@@ -201,7 +206,8 @@ void PageInfoControllerAndroid::SetPermissionInfo( +@@ -203,7 +208,8 @@ void PageInfoControllerAndroid::SetPermissionInfo( env, controller_jobject_, ConvertUTF16ToJavaString(env, object_title), ConvertUTF16ToJavaString(env, object_title), static_cast(chosen_object->ui_info->content_settings_type), @@ -522,7 +522,7 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.cc --- a/components/page_info/page_info.cc +++ b/components/page_info/page_info.cc -@@ -1188,6 +1188,8 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info, +@@ -1201,6 +1201,8 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info, permission_info.is_one_time = (info.metadata.session_model() == content_settings::mojom::SessionModel::ONE_TIME); @@ -1120,7 +1120,7 @@ diff --git a/components/permissions/permission_request.cc b/components/permissio PermissionRequest::~PermissionRequest() { DCHECK(delete_callback_.is_null()); } -@@ -406,19 +414,37 @@ bool PermissionRequest::ShouldUseTwoOriginPrompt() const { +@@ -404,19 +412,37 @@ bool PermissionRequest::ShouldUseTwoOriginPrompt() const { return request_type() == RequestType::kStorageAccess; } diff --git a/build/cromite_patches/Add-menu-item-to-bookmark-all-tabs.patch b/build/cromite_patches/Add-menu-item-to-bookmark-all-tabs.patch index 427ab057..36c1cc1a 100644 --- a/build/cromite_patches/Add-menu-item-to-bookmark-all-tabs.patch +++ b/build/cromite_patches/Add-menu-item-to-bookmark-all-tabs.patch @@ -13,6 +13,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../bookmark_merged_surface_service.cc | 2 + .../dialogs/DownloadLocationCustomView.java | 4 +- .../strings/android_chrome_strings.grd | 3 + + .../bookmark_ui_operations_helper.cc | 2 + .../views/bookmarks/bookmark_menu_delegate.cc | 2 + components/bookmark_bar_strings.grdp | 6 ++ .../bookmarks/browser/bookmark_codec.cc | 20 +++++- @@ -28,7 +29,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html components/bookmarks/browser/bookmark_uuids.h | 1 + components/bookmarks/browser/model_loader.cc | 8 ++- .../bookmark_specifics_conversions.cc | 1 + - 24 files changed, 245 insertions(+), 15 deletions(-) + 25 files changed, 247 insertions(+), 15 deletions(-) diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml --- a/chrome/android/java/res/menu/main_menu.xml @@ -44,7 +45,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re -@@ -180,6 +184,9 @@ found in the LICENSE file. +@@ -183,6 +187,9 @@ found in the LICENSE file. @@ -57,7 +58,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -97,6 +97,7 @@ import org.chromium.chrome.browser.base.ColdStartTracker; +@@ -95,6 +95,7 @@ import org.chromium.chrome.browser.base.ColdStartTracker; import org.chromium.chrome.browser.bookmarks.BookmarkUtils; import org.chromium.chrome.browser.browserservices.intents.WebappConstants; import org.chromium.chrome.browser.compositor.CompositorViewHolder; @@ -65,7 +66,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct import org.chromium.chrome.browser.compositor.layouts.Layout; import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChrome; import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChromePhone; -@@ -2858,6 +2859,8 @@ public class ChromeTabbedActivity extends ChromeActivityother_node()); ExtractUrls( BookmarkModelFactory::GetForBrowserContext(profile_)->mobile_node()); @@ -372,7 +373,7 @@ diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/b diff --git a/chrome/browser/bookmarks/bookmark_merged_surface_service.cc b/chrome/browser/bookmarks/bookmark_merged_surface_service.cc --- a/chrome/browser/bookmarks/bookmark_merged_surface_service.cc +++ b/chrome/browser/bookmarks/bookmark_merged_surface_service.cc -@@ -42,6 +42,8 @@ std::optional GetIfPermanentFolderType( +@@ -43,6 +43,8 @@ std::optional GetIfPermanentFolderType( case BookmarkNode::Type::URL: NOTREACHED(); @@ -405,7 +406,7 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -4506,6 +4506,9 @@ To change this setting, BEGIN_LINKdelete the Chrome d +@@ -4512,6 +4512,9 @@ To change this setting, BEGIN_LINKdelete the Chrome d Select tabs @@ -415,10 +416,22 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Get image descriptions +diff --git a/chrome/browser/ui/bookmarks/bookmark_ui_operations_helper.cc b/chrome/browser/ui/bookmarks/bookmark_ui_operations_helper.cc +--- a/chrome/browser/ui/bookmarks/bookmark_ui_operations_helper.cc ++++ b/chrome/browser/ui/bookmarks/bookmark_ui_operations_helper.cc +@@ -54,6 +54,8 @@ ui::mojom::DragOperation BookmarkUIOperationsHelper::DropBookmarks( + if (is_reorder) { + base::UmaHistogramEnumeration("Bookmarks.ReorderDropTarget", target); + switch (GetParentType()) { ++ case bookmarks::BookmarkNode::TABS_COLLECTION: ++ break; + case bookmarks::BookmarkNode::URL: + NOTREACHED(); + case bookmarks::BookmarkNode::FOLDER: diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc -@@ -157,6 +157,8 @@ BookmarkParentFolder GetBookmarkParentFolderForNode( +@@ -103,6 +103,8 @@ BookmarkParentFolder GetBookmarkParentFolderForNode( return BookmarkParentFolder::OtherFolder(); case bookmarks::BookmarkNode::MOBILE: return BookmarkParentFolder::MobileFolder(); diff --git a/build/cromite_patches/Add-menu-item-to-view-source.patch b/build/cromite_patches/Add-menu-item-to-view-source.patch index 22fb94e5..e7055d65 100644 --- a/build/cromite_patches/Add-menu-item-to-view-source.patch +++ b/build/cromite_patches/Add-menu-item-to-view-source.patch @@ -29,7 +29,7 @@ diff --git a/chrome/android/java/res/menu/custom_tabs_menu.xml b/chrome/android/ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml --- a/chrome/android/java/res/menu/main_menu.xml +++ b/chrome/android/java/res/menu/main_menu.xml -@@ -110,6 +110,9 @@ found in the LICENSE file. +@@ -113,6 +113,9 @@ found in the LICENSE file. @@ -42,7 +42,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -2891,6 +2891,8 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -2576,6 +2576,11 @@ public abstract class ChromeActivity return doOpenWebApk(currentTab); } @@ -69,7 +69,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java --- a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java -@@ -566,6 +566,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -575,6 +575,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate isNativePage, isFileScheme, isContentScheme, isIncognito, url)); updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */, isNativePage); @@ -77,7 +77,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App updateAutoDarkMenuItem(menu, currentTab, isNativePage); -@@ -1277,6 +1278,23 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -1286,6 +1287,23 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate findInPageMenuRow.setVisible(itemVisible); } @@ -104,7 +104,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java -@@ -293,6 +293,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat +@@ -300,6 +300,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat updateRequestDesktopSiteMenuItem( menu, currentTab, requestDesktopSiteVisible, isNativePage); diff --git a/build/cromite_patches/Add-option-to-force-tablet-UI.patch b/build/cromite_patches/Add-option-to-force-tablet-UI.patch index c15844f2..cd8bbd2f 100644 --- a/build/cromite_patches/Add-option-to-force-tablet-UI.patch +++ b/build/cromite_patches/Add-option-to-force-tablet-UI.patch @@ -14,7 +14,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html .../ChromeAccessibilitySettingsDelegate.java | 19 +++++++++++++++ .../chrome/browser/app/ChromeActivity.java | 4 +++- .../overlays/strip/StripLayoutHelper.java | 10 ++++++-- - .../strip/StripLayoutHelperManager.java | 5 +++- + .../strip/StripLayoutHelperManager.java | 6 ++++- .../init/ChromeBrowserInitializer.java | 2 ++ .../tabbed_mode/TabbedRootUiCoordinator.java | 4 +++- .../chrome/browser/ui/RootUiCoordinator.java | 6 ++++- @@ -37,7 +37,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html .../res/xml/accessibility_preferences.xml | 5 ++++ .../AccessibilitySettingsDelegate.java | 11 +++++++++ .../chromium/ui/base/DeviceFormFactor.java | 14 +++++++++++ - 33 files changed, 176 insertions(+), 27 deletions(-) + 33 files changed, 177 insertions(+), 27 deletions(-) diff --git a/chrome/android/java/res/layout/custom_tabs_control_container.xml b/chrome/android/java/res/layout/custom_tabs_control_container.xml --- a/chrome/android/java/res/layout/custom_tabs_control_container.xml @@ -98,14 +98,14 @@ diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java -@@ -50,6 +50,7 @@ import org.chromium.chrome.browser.metrics.UmaSessionStats; +@@ -51,6 +51,7 @@ import org.chromium.chrome.browser.metrics.UmaSessionStats; import org.chromium.chrome.browser.night_mode.GlobalNightModeStateProviderHolder; import org.chromium.chrome.browser.night_mode.NightModeStateProvider; import org.chromium.chrome.browser.night_mode.NightModeUtils; +import org.chromium.chrome.browser.preferences.ChromeSharedPreferences; + import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeUtils; + import org.chromium.components.browser_ui.edge_to_edge.EdgeToEdgeManager; import org.chromium.components.browser_ui.edge_to_edge.EdgeToEdgeStateProvider; - import org.chromium.components.browser_ui.util.AutomotiveUtils; - import org.chromium.components.cached_flags.BooleanCachedFieldTrialParameter; @@ -115,6 +116,8 @@ public class ChromeBaseAppCompatActivity extends AppCompatActivity protected void attachBaseContext(Context newBase) { super.attachBaseContext(newBase); @@ -118,7 +118,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCo diff --git a/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java b/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java --- a/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java -@@ -62,6 +62,7 @@ import org.chromium.content_public.browser.WebContents; +@@ -63,6 +63,7 @@ import org.chromium.content_public.browser.WebContents; import org.chromium.content_public.browser.WebContentsObserver; import org.chromium.net.NetId; import org.chromium.ui.LayoutInflaterUtils; @@ -126,7 +126,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.j import org.chromium.ui.base.WindowAndroid; import org.chromium.ui.display.DisplayUtil; import org.chromium.url.GURL; -@@ -463,7 +464,9 @@ public class WarmupManager { +@@ -469,7 +470,9 @@ public class WarmupManager { ControlContainer controlContainer = mainView.findViewById(R.id.control_container); if (toolbarId != ActivityUtils.NO_RESOURCE_ID && controlContainer != null) { @@ -140,25 +140,25 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.j diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java -@@ -20,6 +20,7 @@ import org.chromium.chrome.browser.preferences.Pref; +@@ -21,6 +21,7 @@ import org.chromium.chrome.browser.preferences.Pref; import org.chromium.chrome.browser.settings.SettingsNavigationFactory; import org.chromium.chrome.browser.settings.ChromeBaseSettingsFragment; import org.chromium.components.browser_ui.accessibility.AccessibilitySettingsDelegate; +import org.chromium.components.browser_ui.accessibility.AccessibilitySettingsDelegate.BooleanPreferenceDelegate; import org.chromium.components.browser_ui.accessibility.FontSizePrefs; - import org.chromium.components.browser_ui.accessibility.FontSizePrefs.FontSizePrefsObserver; import org.chromium.components.browser_ui.accessibility.PageZoomPreference; -@@ -51,6 +52,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment + import org.chromium.components.browser_ui.accessibility.PageZoomUma; +@@ -50,6 +51,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment public static final String PREF_ZOOM_INFO = "zoom_info"; public static final String PREF_IMAGE_DESCRIPTIONS = "image_descriptions"; + private BooleanPreferenceDelegate mForceTabletUIDelegate; + static final String PREF_FORCE_TABLET_UI = "force_tablet_ui"; + - private TextScalePreference mTextScalePref; private PageZoomPreference mPageZoomDefaultZoomPref; private ChromeSwitchPreference mPageZoomIncludeOSAdjustment; -@@ -153,6 +157,12 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment + private ChromeSwitchPreference mPageZoomAlwaysShowPref; +@@ -124,6 +128,12 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment mPrefService.getBoolean(Pref.READER_FOR_ACCESSIBILITY)); readerForAccessibilityPref.setOnPreferenceChangeListener(this); @@ -171,10 +171,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s Preference captions = findPreference(PREF_CAPTIONS); captions.setOnPreferenceClickListener( preference -> { -@@ -231,6 +241,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment - mFontSizePrefs.setUserFontScaleFactor((Float) newValue); - } else if (PREF_FORCE_ENABLE_ZOOM.equals(preference.getKey())) { - mFontSizePrefs.setForceEnableZoomFromUser((Boolean) newValue); +@@ -185,6 +195,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment + public boolean onPreferenceChange(Preference preference, Object newValue) { + if (PREF_FORCE_ENABLE_ZOOM.equals(preference.getKey())) { + mFontSizePrefs.setForceEnableZoom((Boolean) newValue); + } else if (PREF_FORCE_TABLET_UI.equals(preference.getKey())) { + mForceTabletUIDelegate.setEnabled((Boolean) newValue); + mDelegate.requestRestart(getActivity()); @@ -213,7 +213,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s 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 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java -@@ -860,7 +860,9 @@ public abstract class ChromeActivity +@@ -850,7 +850,9 @@ public abstract class ChromeActivity // Inflate the correct toolbar layout for the device. int toolbarLayoutId = getToolbarLayoutId(); if (toolbarLayoutId != ActivityUtils.NO_RESOURCE_ID && controlContainer != null) { @@ -227,15 +227,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java -@@ -93,6 +93,7 @@ import org.chromium.components.feature_engagement.Tracker; +@@ -99,6 +99,7 @@ import org.chromium.components.feature_engagement.Tracker; import org.chromium.components.prefs.PrefService; import org.chromium.components.tab_groups.TabGroupColorId; import org.chromium.ui.MotionEventUtils; +import org.chromium.ui.base.DeviceFormFactor; import org.chromium.ui.base.LocalizationUtils; import org.chromium.ui.base.WindowAndroid; - import org.chromium.ui.interpolators.Interpolators; -@@ -4655,8 +4656,13 @@ public class StripLayoutHelper + import org.chromium.ui.modaldialog.ModalDialogManager; +@@ -4277,8 +4278,13 @@ public class StripLayoutHelper mTabMenu.setAnchorView(tabView); // 3. Set the vertical offset to align the tab menu with bottom of the tab strip int tabHeight = mManagerHost.getHeight(); @@ -254,7 +254,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java -@@ -457,7 +457,10 @@ public class StripLayoutHelperManager +@@ -91,6 +91,7 @@ import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateMa + import org.chromium.components.browser_ui.styles.SemanticColorUtils; + import org.chromium.components.browser_ui.widget.scrim.ScrimProperties; + import org.chromium.content_public.browser.LoadUrlParams; ++import org.chromium.ui.base.DeviceFormFactor; + import org.chromium.ui.base.LocalizationUtils; + import org.chromium.ui.base.PageTransition; + import org.chromium.ui.base.WindowAndroid; +@@ -439,7 +440,10 @@ public class StripLayoutHelperManager mIsLayoutOptimizationsEnabled = ToolbarFeatures.isTabStripWindowLayoutOptimizationEnabled(true); @@ -288,7 +296,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrow diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java -@@ -570,7 +570,9 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -576,7 +576,9 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { @Override public int getControlContainerHeightResource() { @@ -302,7 +310,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java -@@ -102,6 +102,8 @@ import org.chromium.chrome.browser.paint_preview.DemoPaintPreview; +@@ -104,6 +104,8 @@ import org.chromium.chrome.browser.paint_preview.DemoPaintPreview; import org.chromium.chrome.browser.password_manager.ManagePasswordsReferrer; import org.chromium.chrome.browser.password_manager.PasswordManagerLauncher; import org.chromium.chrome.browser.pdf.PdfPage; @@ -311,7 +319,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi import org.chromium.chrome.browser.price_insights.PriceInsightsButtonController; import org.chromium.chrome.browser.price_tracking.CurrentTabPriceTrackingStateSupplier; import org.chromium.chrome.browser.price_tracking.PriceTrackingButtonController; -@@ -1758,7 +1760,9 @@ public class RootUiCoordinator +@@ -1773,7 +1775,9 @@ public class RootUiCoordinator if (!mSupportsFindInPageSupplier.getAsBoolean()) return; int stubId = R.id.find_toolbar_stub; @@ -326,7 +334,7 @@ diff --git a/chrome/browser/preferences/BUILD.gn b/chrome/browser/preferences/BU --- a/chrome/browser/preferences/BUILD.gn +++ b/chrome/browser/preferences/BUILD.gn @@ -26,6 +26,7 @@ android_library("java") { - "//components/browser_ui/site_settings/android:constants_java", + "//components/cached_flags:java", "//third_party/androidx:androidx_annotation_annotation_java", "//third_party/jni_zero:jni_zero_java", + "//ui/android:ui_java", @@ -336,7 +344,7 @@ diff --git a/chrome/browser/preferences/BUILD.gn b/chrome/browser/preferences/BU diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java -@@ -265,6 +265,7 @@ public final class ChromePreferenceKeys { +@@ -262,6 +262,7 @@ public final class ChromePreferenceKeys { /** Whether the app-specific history info text was already seen by users. */ public static final String HISTORY_APP_SPECIFIC_INFO_SEEN = "Chrome.History.AppSpecificInfoSeen"; @@ -376,12 +384,12 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java -@@ -57,6 +57,7 @@ public class LegacyChromePreferenceKeys { +@@ -55,6 +55,7 @@ public class LegacyChromePreferenceKeys { + ChromePreferenceKeys.FIRST_RUN_FLOW_COMPLETE, + ChromePreferenceKeys.FIRST_RUN_FLOW_SIGNIN_SETUP, ChromePreferenceKeys.FIRST_RUN_LIGHTWEIGHT_FLOW_COMPLETE, - ChromePreferenceKeys.FIRST_RUN_SKIP_WELCOME_PAGE, - ChromePreferenceKeys.FONT_USER_FONT_SCALE_FACTOR, + ChromePreferenceKeys.FLAGS_FORCE_TABLET_UI_ENABLED, - ChromePreferenceKeys.FONT_USER_SET_FORCE_ENABLE_ZOOM, + ChromePreferenceKeys.FIRST_RUN_SKIP_WELCOME_PAGE, ChromePreferenceKeys.HISTORY_SHOW_HISTORY_INFO, ChromePreferenceKeys.HOMEPAGE_ENABLED, diff --git a/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/chrome/browser/ui/desktop_windowing/AppHeaderCoordinator.java b/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/chrome/browser/ui/desktop_windowing/AppHeaderCoordinator.java @@ -389,7 +397,7 @@ diff --git a/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/c +++ b/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/chrome/browser/ui/desktop_windowing/AppHeaderCoordinator.java @@ -34,6 +34,7 @@ import org.chromium.chrome.browser.ui.desktop_windowing.AppHeaderUtils.DesktopWi import org.chromium.components.browser_ui.desktop_windowing.AppHeaderState; - import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateProvider; + import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateManager; import org.chromium.components.browser_ui.edge_to_edge.EdgeToEdgeStateProvider; +import org.chromium.ui.base.DeviceFormFactor; import org.chromium.ui.InsetObserver; @@ -406,7 +414,7 @@ diff --git a/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/c diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java -@@ -782,7 +782,7 @@ public class LocationBarCoordinator +@@ -786,7 +786,7 @@ public class LocationBarCoordinator } private boolean isTabletWindow() { @@ -418,7 +426,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -1742,6 +1742,13 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1710,6 +1710,13 @@ Your Google account may have other forms of browsing history like searches and a Hide your IP address @@ -524,7 +532,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/res/values/dimens.xml b/chro diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/ControlContainer.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/ControlContainer.java --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/ControlContainer.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/ControlContainer.java -@@ -22,7 +22,7 @@ public interface ControlContainer { +@@ -23,7 +23,7 @@ public interface ControlContainer { * Initialize the control container with the specified toolbar. * @param toolbarLayoutId The ID of the toolbar layout to use. */ @@ -544,7 +552,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow import android.graphics.Canvas; import android.graphics.PorterDuff; import android.graphics.Rect; -@@ -128,8 +129,29 @@ public class ToolbarControlContainer extends OptimizedFrameLayout +@@ -143,8 +144,29 @@ public class ToolbarControlContainer extends OptimizedFrameLayout } @Override @@ -578,15 +586,15 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java -@@ -65,6 +65,7 @@ import org.chromium.chrome.browser.util.BrowserUiUtils.ModuleTypeOnStartAndNtp; +@@ -63,6 +63,7 @@ import org.chromium.chrome.browser.util.BrowserUiUtils; + import org.chromium.chrome.browser.util.BrowserUiUtils.ModuleTypeOnStartAndNtp; import org.chromium.components.feature_engagement.Tracker; - import org.chromium.ui.UiUtils; import org.chromium.ui.base.ViewUtils; +import org.chromium.ui.base.DeviceFormFactor; import org.chromium.ui.util.TokenHolder; import org.chromium.url.GURL; -@@ -642,7 +643,9 @@ public abstract class ToolbarLayout extends FrameLayout +@@ -590,7 +591,9 @@ public abstract class ToolbarLayout extends FrameLayout * not have a tab strip. */ protected int getTabStripHeightFromResource() { @@ -600,33 +608,33 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/HeightTransitionHandler.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/HeightTransitionHandler.java --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/HeightTransitionHandler.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/HeightTransitionHandler.java -@@ -27,6 +27,7 @@ import org.chromium.chrome.browser.toolbar.top.ToolbarLayout; +@@ -28,6 +28,7 @@ import org.chromium.chrome.browser.toolbar.top.ToolbarLayout; import org.chromium.chrome.browser.toolbar.top.tab_strip.TabStripTransitionCoordinator.TabStripHeightObserver; import org.chromium.chrome.browser.toolbar.top.tab_strip.TabStripTransitionCoordinator.TabStripTransitionDelegate; import org.chromium.ui.base.ViewUtils; +import org.chromium.ui.base.DeviceFormFactor; import org.chromium.ui.resources.dynamics.DynamicResourceReadyOnceCallback; + import org.chromium.ui.util.TokenHolder; - /** -@@ -450,6 +451,7 @@ class HeightTransitionHandler { +@@ -542,6 +543,7 @@ class HeightTransitionHandler { if (TabStripTransitionCoordinator.sHeightTransitionThresholdForTesting != null) { return TabStripTransitionCoordinator.sHeightTransitionThresholdForTesting; } + if (DeviceFormFactor.isForceTabletUI()) return 0; return TRANSITION_THRESHOLD_DP; } - } + diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/TabStripTransitionCoordinator.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/TabStripTransitionCoordinator.java --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/TabStripTransitionCoordinator.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/TabStripTransitionCoordinator.java @@ -27,6 +27,7 @@ import org.chromium.chrome.browser.ui.desktop_windowing.AppHeaderUtils; import org.chromium.components.browser_ui.desktop_windowing.AppHeaderState; - import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateProvider; - import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateProvider.AppHeaderObserver; + import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateManager; + import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateManager.AppHeaderObserver; +import org.chromium.ui.base.DeviceFormFactor; - import org.chromium.ui.util.TokenHolder; /** Class used to manage tab strip visibility and height updates. */ + public class TabStripTransitionCoordinator implements ComponentCallbacks, AppHeaderObserver { @@ -151,7 +152,10 @@ public class TabStripTransitionCoordinator implements ComponentCallbacks, AppHea mTabStripReservedTopPadding = controlContainerView() @@ -642,7 +650,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml --- a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml +++ b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml -@@ -46,6 +46,11 @@ found in the LICENSE file. +@@ -41,6 +41,11 @@ found in the LICENSE file. android:summary="@string/jump_start_omnibox_summary" android:title="@string/jump_start_omnibox_title" /> diff --git a/build/cromite_patches/Add-option-to-not-persist-tabs-across-sessions.patch b/build/cromite_patches/Add-option-to-not-persist-tabs-across-sessions.patch index 9b20dedf..2da7eec4 100644 --- a/build/cromite_patches/Add-option-to-not-persist-tabs-across-sessions.patch +++ b/build/cromite_patches/Add-option-to-not-persist-tabs-across-sessions.patch @@ -36,7 +36,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct import org.chromium.base.IntentUtils; import org.chromium.base.Log; import org.chromium.base.MemoryPressureListener; -@@ -1551,8 +1552,10 @@ public class ChromeTabbedActivity extends ChromeActivityBEGIN_LINKdelete the Chrome d +@@ -5542,6 +5542,12 @@ To change this setting, BEGIN_LINKdelete the Chrome d IMAGE diff --git a/build/cromite_patches/Add-option-to-use-home-page-as-NTP.patch b/build/cromite_patches/Add-option-to-use-home-page-as-NTP.patch index 3b903626..1d46a529 100644 --- a/build/cromite_patches/Add-option-to-use-home-page-as-NTP.patch +++ b/build/cromite_patches/Add-option-to-use-home-page-as-NTP.patch @@ -23,7 +23,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediator.java --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediator.java +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediator.java -@@ -23,6 +23,7 @@ import org.chromium.chrome.R; +@@ -22,6 +22,7 @@ import org.chromium.base.supplier.OneshotSupplier; import org.chromium.chrome.browser.data_sharing.DataSharingServiceFactory; import org.chromium.chrome.browser.data_sharing.ui.shared_image_tiles.SharedImageTilesCoordinator; import org.chromium.chrome.browser.flags.ChromeFeatureList; @@ -31,7 +31,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser import org.chromium.chrome.browser.layouts.LayoutStateProvider; import org.chromium.chrome.browser.layouts.LayoutStateProvider.LayoutStateObserver; import org.chromium.chrome.browser.layouts.LayoutType; -@@ -408,10 +409,15 @@ public class TabGroupUiMediator implements BackPressHandler { +@@ -408,10 +409,15 @@ public class TabGroupUiMediator implements BackPressHandler, ThemeColorObserver, assert relatedTabs.size() > 0; Tab parentTabToAttach = relatedTabs.get(relatedTabs.size() - 1); @@ -51,7 +51,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabUiUtils.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabUiUtils.java --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabUiUtils.java +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabUiUtils.java -@@ -43,6 +43,8 @@ import org.chromium.components.tab_groups.TabGroupColorId; +@@ -48,6 +48,8 @@ import org.chromium.components.tab_groups.TabGroupColorId; import org.chromium.content_public.browser.LoadUrlParams; import org.chromium.ui.modaldialog.ModalDialogManager; import org.chromium.ui.modaldialog.ModalDialogUtils; @@ -59,8 +59,8 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser +import org.chromium.url.GURL; import java.util.List; - import java.util.Objects; -@@ -204,8 +206,13 @@ public class TabUiUtils { + +@@ -210,8 +212,13 @@ public class TabUiUtils { List relatedTabs = filter.getRelatedTabList(tabId); assert relatedTabs.size() > 0; @@ -191,7 +191,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java -@@ -278,6 +278,7 @@ public final class ChromePreferenceKeys { +@@ -275,6 +275,7 @@ public final class ChromePreferenceKeys { public static final String HOMEPAGE_USE_CHROME_NTP = "Chrome.Homepage.UseNTP"; public static final String HOMEPAGE_USE_DEFAULT_URI = "homepage_partner_enabled"; @@ -202,7 +202,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java -@@ -61,6 +61,7 @@ public class LegacyChromePreferenceKeys { +@@ -59,6 +59,7 @@ public class LegacyChromePreferenceKeys { ChromePreferenceKeys.HISTORY_SHOW_HISTORY_INFO, ChromePreferenceKeys.HOMEPAGE_ENABLED, ChromePreferenceKeys.HOMEPAGE_USE_DEFAULT_URI, @@ -213,7 +213,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -1528,6 +1528,9 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1520,6 +1520,9 @@ Your Google account may have other forms of browsing history like searches and a Last hour @@ -238,7 +238,7 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_u diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h --- a/chrome/common/pref_names.h +++ b/chrome/common/pref_names.h -@@ -1373,6 +1373,10 @@ inline constexpr char kShowHomeButton[] = "browser.show_home_button"; +@@ -1339,6 +1339,10 @@ inline constexpr char kShowHomeButton[] = "browser.show_home_button"; // toolbar. inline constexpr char kShowForwardButton[] = "browser.show_forward_button"; diff --git a/build/cromite_patches/Add-search-engine.patch b/build/cromite_patches/Add-search-engine.patch index c06d56cd..eaf3d962 100644 --- a/build/cromite_patches/Add-search-engine.patch +++ b/build/cromite_patches/Add-search-engine.patch @@ -108,7 +108,7 @@ diff --git a/components/search_engines/prepopulated_engines.json b/components/se diff --git a/components/search_engines/search_engine_choice/search_engine_choice_utils.cc b/components/search_engines/search_engine_choice/search_engine_choice_utils.cc --- a/components/search_engines/search_engine_choice/search_engine_choice_utils.cc +++ b/components/search_engines/search_engine_choice/search_engine_choice_utils.cc -@@ -178,10 +178,7 @@ void RecordChoiceScreenDefaultSearchProviderType(SearchEngineType engine_type) { +@@ -186,10 +186,7 @@ void RecordChoiceScreenDefaultSearchProviderType( } void RecordChoiceScreenSelectedIndex(int selected_engine_index) { diff --git a/build/cromite_patches/Add-site-engagement-flag.patch b/build/cromite_patches/Add-site-engagement-flag.patch index 3f9d9411..52b7ec7f 100644 --- a/build/cromite_patches/Add-site-engagement-flag.patch +++ b/build/cromite_patches/Add-site-engagement-flag.patch @@ -24,7 +24,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 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 -@@ -160,6 +160,7 @@ +@@ -162,6 +162,7 @@ #include "components/sensitive_content/features.h" #include "components/services/heap_profiling/public/cpp/switches.h" #include "components/services/storage/public/cpp/buckets/bucket_info.h" @@ -112,7 +112,7 @@ diff --git a/components/feature_engagement/public/feature_configurations.cc b/co 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 -@@ -23,6 +23,7 @@ +@@ -19,6 +19,7 @@ #include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_types.h" #include "components/content_settings/core/common/content_settings_utils.h" @@ -120,7 +120,7 @@ diff --git a/components/site_engagement/content/site_engagement_score.cc b/compo #include "components/site_engagement/content/engagement_type.h" #include "components/site_engagement/content/site_engagement_metrics.h" #include "third_party/blink/public/mojom/site_engagement/site_engagement.mojom.h" -@@ -280,6 +281,10 @@ void SiteEngagementScore::Commit() { +@@ -276,6 +277,10 @@ void SiteEngagementScore::Commit() { if (!UpdateScoreDict(*score_dict_)) return; diff --git a/build/cromite_patches/Add-support-for-ISupportHelpAndFeedback.patch b/build/cromite_patches/Add-support-for-ISupportHelpAndFeedback.patch index f9085359..279cf1eb 100644 --- a/build/cromite_patches/Add-support-for-ISupportHelpAndFeedback.patch +++ b/build/cromite_patches/Add-support-for-ISupportHelpAndFeedback.patch @@ -20,7 +20,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin import org.chromium.components.browser_ui.modaldialog.AppModalPresenter; import org.chromium.components.browser_ui.settings.EmbeddableSettingsPage; import org.chromium.components.browser_ui.util.TraceEventVectorDrawableCompat; -@@ -436,8 +437,12 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity +@@ -458,8 +459,12 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity finishCurrentSettings(mainFragment); return true; } else if (item.getItemId() == R.id.menu_id_general_help) { diff --git a/build/cromite_patches/Add-support-for-writing-URIs.patch b/build/cromite_patches/Add-support-for-writing-URIs.patch index ce39006a..6e776b78 100644 --- a/build/cromite_patches/Add-support-for-writing-URIs.patch +++ b/build/cromite_patches/Add-support-for-writing-URIs.patch @@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/base/android/content_uri_utils.cc b/base/android/content_uri_utils.cc --- a/base/android/content_uri_utils.cc +++ b/base/android/content_uri_utils.cc -@@ -125,6 +125,16 @@ void JNI_ContentUriUtils_AddFileInfoToVector( +@@ -130,6 +130,16 @@ void JNI_ContentUriUtils_AddFileInfoToVector( Time::FromMillisecondsSinceUnixEpoch(last_modified)); } @@ -44,8 +44,8 @@ diff --git a/base/android/content_uri_utils.h b/base/android/content_uri_utils.h +BASE_EXPORT File OpenContentUriForWrite(const FilePath& content_uri); + // Returns true if file exists and results are populated, else returns false. - // Java code requires a Content-URI to look up file info such as is-dir, size, - // and last-mod, so code that needs to support Content-URI should use + bool ContentUriGetFileInfo(const FilePath& content_uri, + FileEnumerator::FileInfo* results); diff --git a/base/android/java/src/org/chromium/base/ContentUriUtils.java b/base/android/java/src/org/chromium/base/ContentUriUtils.java --- a/base/android/java/src/org/chromium/base/ContentUriUtils.java +++ b/base/android/java/src/org/chromium/base/ContentUriUtils.java @@ -57,9 +57,9 @@ diff --git a/base/android/java/src/org/chromium/base/ContentUriUtils.java b/base import android.provider.DocumentsContract; import android.provider.MediaStore; import android.text.TextUtils; -@@ -25,6 +26,9 @@ import org.jni_zero.NativeMethods; - +@@ -26,6 +27,9 @@ import org.jni_zero.NativeMethods; import java.io.IOException; + import java.util.List; +import android.system.Os; +import android.content.ContentProviderClient; @@ -67,7 +67,7 @@ diff --git a/base/android/java/src/org/chromium/base/ContentUriUtils.java b/base /** This class provides methods to access content URI schemes. */ @JNINamespace("base") public abstract class ContentUriUtils { -@@ -53,6 +57,36 @@ public abstract class ContentUriUtils { +@@ -59,6 +63,36 @@ public abstract class ContentUriUtils { return -1; } diff --git a/build/cromite_patches/Add-webRTC-site-settings.patch b/build/cromite_patches/Add-webRTC-site-settings.patch index 977e1c2e..ec5144bd 100644 --- a/build/cromite_patches/Add-webRTC-site-settings.patch +++ b/build/cromite_patches/Add-webRTC-site-settings.patch @@ -195,7 +195,7 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/peer_connection_d #include "third_party/blink/public/platform/web_url.h" #include "third_party/blink/public/web/modules/mediastream/media_stream_video_source.h" #include "third_party/blink/public/web/web_document.h" -@@ -881,6 +882,11 @@ PeerConnectionDependencyFactory::CreatePortAllocator( +@@ -879,6 +880,11 @@ PeerConnectionDependencyFactory::CreatePortAllocator( // origin. WebRTCIPHandlingPolicy policy = GetWebRTCIPHandlingPolicy(webrtc_ip_handling_policy); @@ -246,7 +246,7 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h" #include "third_party/blink/renderer/bindings/modules/v8/v8_rtc_encoding_options.h" #include "third_party/blink/renderer/bindings/modules/v8/v8_rtc_insertable_streams.h" -@@ -1031,6 +1033,14 @@ RTCRtpCapabilities* RTCRtpSender::getCapabilities(ScriptState* state, +@@ -1030,6 +1032,14 @@ RTCRtpCapabilities* RTCRtpSender::getCapabilities(ScriptState* state, if (kind != "audio" && kind != "video") return nullptr; diff --git a/build/cromite_patches/Allow-building-without-enable_reporting.patch b/build/cromite_patches/Allow-building-without-enable_reporting.patch index 02ae6598..469a6951 100644 --- a/build/cromite_patches/Allow-building-without-enable_reporting.patch +++ b/build/cromite_patches/Allow-building-without-enable_reporting.patch @@ -41,7 +41,7 @@ diff --git a/chrome/browser/net/chrome_report_sender.cc b/chrome/browser/net/chr diff --git a/content/browser/devtools/protocol/network_handler.cc b/content/browser/devtools/protocol/network_handler.cc --- a/content/browser/devtools/protocol/network_handler.cc +++ b/content/browser/devtools/protocol/network_handler.cc -@@ -1462,6 +1462,7 @@ String BuildReportStatus(const net::ReportingReport::Status status) { +@@ -1464,6 +1464,7 @@ String BuildReportStatus(const net::ReportingReport::Status status) { } } @@ -49,7 +49,7 @@ diff --git a/content/browser/devtools/protocol/network_handler.cc b/content/brow std::vector ComputeReportingURLs(RenderFrameHostImpl* frame_host) { std::vector urls; frame_host->ForEachRenderFrameHostWithAction( -@@ -1475,6 +1476,7 @@ std::vector ComputeReportingURLs(RenderFrameHostImpl* frame_host) { +@@ -1477,6 +1478,7 @@ std::vector ComputeReportingURLs(RenderFrameHostImpl* frame_host) { }); return urls; } @@ -124,7 +124,7 @@ diff --git a/content/browser/network/reporting_service_proxy.cc b/content/browse diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc -@@ -15114,12 +15114,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport( +@@ -15172,12 +15172,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport( } } } @@ -217,7 +217,7 @@ diff --git a/content/browser/security/coop/cross_origin_opener_policy_reporter.c diff --git a/content/browser/web_package/signed_exchange_reporter.cc b/content/browser/web_package/signed_exchange_reporter.cc --- a/content/browser/web_package/signed_exchange_reporter.cc +++ b/content/browser/web_package/signed_exchange_reporter.cc -@@ -128,6 +128,7 @@ void ReportResult( +@@ -127,6 +127,7 @@ void ReportResult( FrameTreeNodeId frame_tree_node_id, network::mojom::SignedExchangeReportPtr report, const net::NetworkAnonymizationKey& network_anonymization_key) { @@ -225,7 +225,7 @@ diff --git a/content/browser/web_package/signed_exchange_reporter.cc b/content/b FrameTreeNode* frame_tree_node = FrameTreeNode::GloballyFindByID(frame_tree_node_id); if (!frame_tree_node) -@@ -142,6 +143,7 @@ void ReportResult( +@@ -141,6 +142,7 @@ void ReportResult( DCHECK(partition); partition->GetNetworkContext()->QueueSignedExchangeReport( std::move(report), network_anonymization_key); @@ -254,7 +254,7 @@ new file mode 100644 diff --git a/net/base/features.cc b/net/base/features.cc --- a/net/base/features.cc +++ b/net/base/features.cc -@@ -215,6 +215,7 @@ extern const base::FeatureParam kTimeoutTcpConnectAttemptMax( +@@ -207,6 +207,7 @@ extern const base::FeatureParam kTimeoutTcpConnectAttemptMax( base::Seconds(30)); #if BUILDFLAG(ENABLE_REPORTING) @@ -281,7 +281,7 @@ diff --git a/net/reporting/reporting_service.cc b/net/reporting/reporting_servic diff --git a/services/network/network_context.h b/services/network/network_context.h --- a/services/network/network_context.h +++ b/services/network/network_context.h -@@ -466,14 +466,14 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext +@@ -468,14 +468,14 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext const GURL& url, const std::optional& reporting_source, const net::NetworkAnonymizationKey& network_anonymization_key, @@ -302,7 +302,7 @@ diff --git a/services/network/network_context.h b/services/network/network_conte 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 -@@ -1489,7 +1489,6 @@ mojom("mojom") { +@@ -1560,7 +1560,6 @@ mojom("mojom") { export_define_blink = "BLINK_PLATFORM_IMPLEMENTATION=1" export_header_blink = "third_party/blink/public/platform/web_common.h" if (enable_reporting) { @@ -313,7 +313,7 @@ diff --git a/services/network/public/mojom/BUILD.gn b/services/network/public/mo diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom --- a/services/network/public/mojom/network_context.mojom +++ b/services/network/public/mojom/network_context.mojom -@@ -1240,6 +1240,7 @@ interface NetworkContext { +@@ -1181,6 +1181,7 @@ interface NetworkContext { // provided `network_anonymization_key`. // // Spec: https://w3c.github.io/reporting/#concept-reports @@ -321,7 +321,7 @@ diff --git a/services/network/public/mojom/network_context.mojom b/services/netw QueueReport(string type, string group, url.mojom.Url url, -@@ -1247,6 +1248,7 @@ interface NetworkContext { +@@ -1188,6 +1189,7 @@ interface NetworkContext { NetworkAnonymizationKey network_anonymization_key, mojo_base.mojom.DictionaryValue body); @@ -329,7 +329,7 @@ diff --git a/services/network/public/mojom/network_context.mojom b/services/netw QueueEnterpriseReport(string type, string group, url.mojom.Url url, -@@ -1257,6 +1259,7 @@ interface NetworkContext { +@@ -1198,6 +1200,7 @@ interface NetworkContext { // Note that this queued report will never be delivered if no reporting // endpoint matching is registered for with the provided // `network_anonymization_key`. @@ -348,7 +348,7 @@ diff --git a/third_party/blink/renderer/core/frame/csp/content_security_policy.c #include "base/containers/contains.h" #include "base/debug/dump_without_crashing.h" #include "base/ranges/algorithm.h" -@@ -1247,6 +1248,7 @@ void ContentSecurityPolicy::ReportViolation( +@@ -1243,6 +1244,7 @@ void ContentSecurityPolicy::ReportViolation( return; } @@ -356,7 +356,7 @@ diff --git a/third_party/blink/renderer/core/frame/csp/content_security_policy.c PostViolationReport(violation_data, context_frame, report_endpoints, use_reporting_api); -@@ -1254,6 +1256,7 @@ void ContentSecurityPolicy::ReportViolation( +@@ -1250,6 +1252,7 @@ void ContentSecurityPolicy::ReportViolation( // `context_frame` (i.e. we're not processing 'frame-ancestors'). if (delegate_ && !context_frame) delegate_->DispatchViolationEvent(*violation_data, element); @@ -375,7 +375,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/ #include "services/network/public/cpp/features.h" #include "services/network/public/mojom/content_security_policy.mojom-blink.h" #include "services/network/public/mojom/source_location.mojom-blink.h" -@@ -2784,9 +2785,11 @@ DocumentResourceCoordinator* LocalFrame::GetDocumentResourceCoordinator() { +@@ -2789,9 +2790,11 @@ DocumentResourceCoordinator* LocalFrame::GetDocumentResourceCoordinator() { return CHECK_DEREF(GetDocument()).GetResourceCoordinator(); } @@ -398,7 +398,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/b #include "mojo/public/cpp/bindings/pending_associated_receiver.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "services/metrics/public/cpp/ukm_source_id.h" -@@ -658,8 +659,9 @@ class CORE_EXPORT LocalFrame final +@@ -659,8 +660,9 @@ class CORE_EXPORT LocalFrame final void FinishedScrollSequence(); SmoothScrollSequencer* GetSmoothScrollSequencer() const; diff --git a/build/cromite_patches/Allow-building-without-supervised-users.patch b/build/cromite_patches/Allow-building-without-supervised-users.patch index 0cb2b7b4..640bd2ea 100644 --- a/build/cromite_patches/Allow-building-without-supervised-users.patch +++ b/build/cromite_patches/Allow-building-without-supervised-users.patch @@ -23,7 +23,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -757,7 +757,6 @@ if (current_toolchain == default_toolchain) { +@@ -771,7 +771,6 @@ if (current_toolchain == default_toolchain) { "//components/offline_pages/core:offline_page_model_enums_java", "//components/sharing_message:sharing_dialog_type_generated_enum", "//components/sharing_message:sharing_send_message_result_generated_enum", @@ -88,7 +88,7 @@ diff --git a/chrome/browser/profiles/profile_attributes_entry.cc b/chrome/browse diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc -@@ -667,10 +667,6 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) { +@@ -684,10 +684,6 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) { prefs->SetTime(prefs::kProfileCreationTime, path_creation_time_); pref_change_registrar_.Init(prefs); @@ -99,7 +99,7 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/p // Changes in the profile avatar. pref_change_registrar_.Add( -@@ -1627,6 +1623,7 @@ GURL ProfileImpl::GetHomePage() { +@@ -1649,6 +1645,7 @@ GURL ProfileImpl::GetHomePage() { } void ProfileImpl::UpdateSupervisedUserIdInStorage() { @@ -121,7 +121,7 @@ diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profile #if !BUILDFLAG(IS_ANDROID) if (profile->IsNewProfile()) { profile->GetPrefs()->SetBoolean(prefs::kHasSeenWelcomePage, false); -@@ -1968,9 +1964,6 @@ void ProfileManager::AddProfileToStorage(Profile* profile) { +@@ -1967,9 +1963,6 @@ void ProfileManager::AddProfileToStorage(Profile* profile) { init_params.icon_index = profile->GetPrefs()->GetInteger(prefs::kProfileAvatarIndex); @@ -148,7 +148,7 @@ diff --git a/chrome/browser/ui/webui/managed_ui_handler.cc b/chrome/browser/ui/w diff --git a/chrome/browser/ui/webui/management/management_ui_handler.cc b/chrome/browser/ui/webui/management/management_ui_handler.cc --- a/chrome/browser/ui/webui/management/management_ui_handler.cc +++ b/chrome/browser/ui/webui/management/management_ui_handler.cc -@@ -589,10 +589,6 @@ bool ManagementUIHandler::managed() const { +@@ -580,10 +580,6 @@ bool ManagementUIHandler::managed() const { void ManagementUIHandler::RegisterPrefChange( PrefChangeRegistrar& pref_registrar) { @@ -204,10 +204,10 @@ diff --git a/components/supervised_user/core/browser/supervised_user_service.cc - prefs::kSupervisedUserId, - base::BindRepeating(&SupervisedUserService::OnSupervisedUserIdChanged, - base::Unretained(this))); - FirstTimeInterstitialBannerState banner_state = - static_cast( - user_prefs_->GetInteger(prefs::kFirstTimeInterstitialBannerState)); -@@ -166,6 +162,7 @@ FirstTimeInterstitialBannerState SupervisedUserService::GetUpdatedBannerState( + SetActive(supervised_user::IsSubjectToParentalControls(user_prefs_.get())); + } + +@@ -139,6 +135,7 @@ SupervisedUserService::SupervisedUserService( } void SupervisedUserService::SetActive(bool active) { @@ -229,7 +229,7 @@ diff --git a/components/supervised_user/core/browser/supervised_user_utils.cc b/ diff --git a/components/supervised_user/core/common/features.cc b/components/supervised_user/core/common/features.cc --- a/components/supervised_user/core/common/features.cc +++ b/components/supervised_user/core/common/features.cc -@@ -191,4 +191,10 @@ bool IsKidFriendlyContentFeedAvailable() { +@@ -181,4 +181,10 @@ bool IsKidFriendlyContentFeedAvailable() { return base::FeatureList::IsEnabled(kKidFriendlyContentFeed); } diff --git a/build/cromite_patches/Allow-playing-audio-in-background.patch b/build/cromite_patches/Allow-playing-audio-in-background.patch index 3c1393c8..d1e1f772 100644 --- a/build/cromite_patches/Allow-playing-audio-in-background.patch +++ b/build/cromite_patches/Allow-playing-audio-in-background.patch @@ -11,7 +11,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc b/third_party/blink/renderer/platform/media/web_media_player_impl.cc --- a/third_party/blink/renderer/platform/media/web_media_player_impl.cc +++ b/third_party/blink/renderer/platform/media/web_media_player_impl.cc -@@ -1264,6 +1264,12 @@ void WebMediaPlayerImpl::OnSelectedVideoTrackChanged( +@@ -1305,6 +1305,12 @@ void WebMediaPlayerImpl::OnSelectedVideoTrackChanged( pipeline_controller_->OnSelectedVideoTrackChanged(selected); } @@ -24,7 +24,7 @@ diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc void WebMediaPlayerImpl::EnabledAudioTracksChanged( const WebVector& enabled_track_ids) { DCHECK(main_task_runner_->BelongsToCurrentThread()); -@@ -3667,7 +3673,10 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const { +@@ -3709,7 +3715,10 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const { : HasAudio(); // Audio only stream is allowed to play when in background. @@ -39,7 +39,7 @@ diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.h b/third_party/blink/renderer/platform/media/web_media_player_impl.h --- a/third_party/blink/renderer/platform/media/web_media_player_impl.h +++ b/third_party/blink/renderer/platform/media/web_media_player_impl.h -@@ -212,6 +212,9 @@ class PLATFORM_EXPORT WebMediaPlayerImpl +@@ -211,6 +211,9 @@ class PLATFORM_EXPORT WebMediaPlayerImpl bool HasVideo() const override; bool HasAudio() const override; diff --git a/build/cromite_patches/AudioBuffer-AnalyserNode-fp-mitigations.patch b/build/cromite_patches/AudioBuffer-AnalyserNode-fp-mitigations.patch index 37edd8eb..1d705612 100644 --- a/build/cromite_patches/AudioBuffer-AnalyserNode-fp-mitigations.patch +++ b/build/cromite_patches/AudioBuffer-AnalyserNode-fp-mitigations.patch @@ -96,7 +96,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/audio_context.cc b/thir #include "third_party/blink/public/platform/modules/webrtc/webrtc_logging.h" #include "third_party/blink/public/platform/web_audio_latency_hint.h" #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h" -@@ -594,7 +595,9 @@ double AudioContext::baseLatency() const { +@@ -612,7 +613,9 @@ double AudioContext::baseLatency() const { DCHECK_CALLED_ON_VALID_SEQUENCE(main_thread_sequence_checker_); DCHECK(destination()); @@ -118,7 +118,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/base_audio_context.cc b #include "third_party/blink/public/mojom/devtools/console_message.mojom-blink.h" #include "third_party/blink/public/mojom/frame/lifecycle.mojom-shared.h" #include "third_party/blink/public/platform/platform.h" -@@ -697,6 +698,17 @@ LocalDOMWindow* BaseAudioContext::GetWindow() const { +@@ -709,6 +710,17 @@ LocalDOMWindow* BaseAudioContext::GetWindow() const { return To(GetExecutionContext()); } @@ -207,7 +207,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc b/ 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 -@@ -440,9 +440,8 @@ +@@ -449,9 +449,8 @@ { // AudioContext.playoutStats interface. // https://chromestatus.com/feature/5172818344148992 diff --git a/build/cromite_patches/Block-qjz9zk-or-trk-requests.patch b/build/cromite_patches/Block-qjz9zk-or-trk-requests.patch index a0f84289..9cbc485c 100644 --- a/build/cromite_patches/Block-qjz9zk-or-trk-requests.patch +++ b/build/cromite_patches/Block-qjz9zk-or-trk-requests.patch @@ -107,7 +107,7 @@ diff --git a/components/url_formatter/url_fixer.cc b/components/url_formatter/ur diff --git a/content/browser/child_process_security_policy_impl.cc b/content/browser/child_process_security_policy_impl.cc --- a/content/browser/child_process_security_policy_impl.cc +++ b/content/browser/child_process_security_policy_impl.cc -@@ -872,6 +872,7 @@ ChildProcessSecurityPolicyImpl::ChildProcessSecurityPolicyImpl() +@@ -951,6 +951,7 @@ ChildProcessSecurityPolicyImpl::ChildProcessSecurityPolicyImpl() RegisterPseudoScheme(url::kJavaScriptScheme); RegisterPseudoScheme(kViewSourceScheme); RegisterPseudoScheme(kGoogleChromeScheme); @@ -118,7 +118,7 @@ diff --git a/content/browser/child_process_security_policy_impl.cc b/content/bro diff --git a/net/BUILD.gn b/net/BUILD.gn --- a/net/BUILD.gn +++ b/net/BUILD.gn -@@ -1067,6 +1067,8 @@ component("net") { +@@ -1068,6 +1068,8 @@ component("net") { "url_request/url_request_http_job.cc", "url_request/url_request_http_job.h", "url_request/url_request_interceptor.cc", @@ -211,7 +211,7 @@ diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc namespace net { -@@ -637,6 +639,12 @@ URLRequest::URLRequest(base::PassKey pass_key, +@@ -635,6 +637,12 @@ URLRequest::URLRequest(base::PassKey pass_key, // Sanity check out environment. DCHECK(base::SingleThreadTaskRunner::HasCurrentDefault()); @@ -235,7 +235,7 @@ diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/ur #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_job_factory.h" #include "url/url_constants.h" -@@ -596,6 +597,8 @@ std::unique_ptr URLRequestContextBuilder::Build() { +@@ -601,6 +602,8 @@ std::unique_ptr URLRequestContextBuilder::Build() { job_factory->SetProtocolHandler(scheme_handler.first, std::move(scheme_handler.second)); } diff --git a/build/cromite_patches/Bromite-subresource-adblocker.patch b/build/cromite_patches/Bromite-subresource-adblocker.patch index 67dfc4ba..91d12687 100644 --- a/build/cromite_patches/Bromite-subresource-adblocker.patch +++ b/build/cromite_patches/Bromite-subresource-adblocker.patch @@ -66,8 +66,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -319,6 +319,7 @@ if (current_toolchain == default_toolchain) { - "//chrome/android/modules/cablev2_authenticator/public:java", +@@ -324,6 +324,7 @@ if (current_toolchain == default_toolchain) { + "//chrome/android/features/tab_ui/public:ui_java_resources", "//chrome/android/modules/stack_unwinder/provider:java", "//chrome/android/webapk/libs/client:client_java", + "//chrome/browser/endpoint_fetcher:java", @@ -85,7 +85,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja "java/res/layout/auto_sign_in_first_run_dialog.xml", "java/res/layout/autofill_billing_address_dropdown.xml", "java/res/layout/autofill_card_name_and_number.xml", -@@ -614,6 +615,7 @@ chrome_java_resources = [ +@@ -615,6 +616,7 @@ chrome_java_resources = [ "java/res/xml/about_chrome_preferences.xml", "java/res/xml/account_management_preferences.xml", "java/res/xml/ad_services_config.xml", @@ -96,7 +96,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -947,6 +947,8 @@ chrome_java_sources = [ +@@ -942,6 +942,8 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/permissions/PermissionSettingsBridge.java", "java/src/org/chromium/chrome/browser/permissions/PermissionUpdateRequester.java", "java/src/org/chromium/chrome/browser/photo_picker/DecoderServiceImpl.java", @@ -426,7 +426,7 @@ new file mode 100644 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelImpl.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelImpl.java -@@ -863,9 +863,7 @@ public class TabModelImpl extends TabModelJniBridge { +@@ -905,9 +905,7 @@ public class TabModelImpl extends TabModelJniBridge { .createTabWithWebContents( parent, webContents, @@ -440,7 +440,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabMod diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd -@@ -15996,6 +15996,16 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -16478,6 +16478,16 @@ Please help our engineers fix this problem. Tell us what happened right before y Never show this again. @@ -511,7 +511,7 @@ diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc -@@ -1228,6 +1228,34 @@ BrowserProcessImpl::component_updater() { +@@ -1223,6 +1223,34 @@ BrowserProcessImpl::component_updater() { return component_updater_.get(); } @@ -568,7 +568,7 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_proc diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc -@@ -468,6 +468,9 @@ StartupProfileInfo CreateInitialProfile( +@@ -469,6 +469,9 @@ StartupProfileInfo CreateInitialProfile( // missing code in the above test. CHECK(profile_info.profile) << "Cannot get default profile."; @@ -679,7 +679,7 @@ new file mode 100755 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 -@@ -637,6 +637,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) { +@@ -638,6 +638,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) { StubResolverConfigReader::RegisterPrefs(registry); DefaultDnsOverHttpsConfigSource::RegisterPrefs(registry); @@ -693,7 +693,7 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows diff --git a/chrome/browser/sessions/session_restore_android.cc b/chrome/browser/sessions/session_restore_android.cc --- a/chrome/browser/sessions/session_restore_android.cc +++ b/chrome/browser/sessions/session_restore_android.cc -@@ -57,8 +57,11 @@ content::WebContents* SessionRestore::RestoreForeignSessionTab( +@@ -58,8 +58,11 @@ content::WebContents* SessionRestore::RestoreForeignSessionTab( DCHECK(current_tab); // If swapped, return the current tab's most up-to-date web contents. if (disposition == WindowOpenDisposition::CURRENT_TAB) { @@ -734,7 +734,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h --- a/chrome/common/pref_names.h +++ b/chrome/common/pref_names.h -@@ -2857,6 +2857,11 @@ inline constexpr char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled"; +@@ -2837,6 +2837,11 @@ inline constexpr char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled"; inline constexpr char kAudioCaptureAllowedUrls[] = "hardware.audio_capture_allowed_urls"; @@ -749,7 +749,7 @@ diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h diff --git a/components/browser_ui/strings/android/site_settings.grdp b/components/browser_ui/strings/android/site_settings.grdp --- a/components/browser_ui/strings/android/site_settings.grdp +++ b/components/browser_ui/strings/android/site_settings.grdp -@@ -373,6 +373,9 @@ +@@ -379,6 +379,9 @@ This site shows intrusive or misleading ads @@ -775,7 +775,7 @@ diff --git a/components/component_updater/BUILD.gn b/components/component_update "component_updater_service.cc", "component_updater_service.h", "component_updater_service_internal.h", -@@ -49,9 +55,11 @@ static_library("component_updater") { +@@ -47,9 +53,11 @@ static_library("component_updater") { "//components/update_client", "//components/version_info", "//net", diff --git a/build/cromite_patches/Client-hints-overrides.patch b/build/cromite_patches/Client-hints-overrides.patch index 8f4c5b43..3653f4b2 100644 --- a/build/cromite_patches/Client-hints-overrides.patch +++ b/build/cromite_patches/Client-hints-overrides.patch @@ -30,7 +30,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 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 +++ b/components/embedder_support/user_agent_utils.cc -@@ -187,9 +187,7 @@ const blink::UserAgentBrandList GetUserAgentBrandList( +@@ -191,9 +191,7 @@ const blink::UserAgentBrandList GetUserAgentBrandList( bool parse_result = base::StringToInt(major_version, &major_version_number); DCHECK(parse_result); std::optional brand; @@ -52,7 +52,7 @@ diff --git a/content/browser/client_hints/client_hints.cc b/content/browser/clie #include "ui/display/display.h" #include "ui/display/screen.h" #include "url/origin.h" -@@ -722,7 +723,8 @@ void UpdateNavigationRequestClientUaHeadersImpl( +@@ -706,7 +707,8 @@ void UpdateNavigationRequestClientUaHeadersImpl( // value, disable them. This overwrites previous decision from UI. disable_due_to_custom_ua = !ua_metadata.has_value(); } @@ -62,7 +62,7 @@ diff --git a/content/browser/client_hints/client_hints.cc b/content/browser/clie if (!disable_due_to_custom_ua) { if (!ua_metadata.has_value()) ua_metadata = delegate->GetUserAgentMetadata(); -@@ -904,10 +906,12 @@ void AddRequestClientHintsHeaders( +@@ -888,10 +890,12 @@ void AddRequestClientHintsHeaders( AddEctHeader(headers, network_quality_tracker, url); } @@ -79,7 +79,7 @@ diff --git a/content/browser/client_hints/client_hints.cc b/content/browser/clie if (ShouldAddClientHint(data, WebClientHintsType::kPrefersColorScheme)) { AddPrefersColorSchemeHeader(headers, frame_tree_node); -@@ -1001,6 +1005,7 @@ ParseAndPersistAcceptCHForNavigation( +@@ -985,6 +989,7 @@ ParseAndPersistAcceptCHForNavigation( BrowserContext* context, ClientHintsControllerDelegate* delegate, FrameTreeNode* frame_tree_node) { @@ -90,7 +90,7 @@ diff --git a/content/browser/client_hints/client_hints.cc b/content/browser/clie diff --git a/content/browser/loader/navigation_url_loader_impl.cc b/content/browser/loader/navigation_url_loader_impl.cc --- a/content/browser/loader/navigation_url_loader_impl.cc +++ b/content/browser/loader/navigation_url_loader_impl.cc -@@ -1225,6 +1225,11 @@ void NavigationURLLoaderImpl::OnAcceptCHFrameReceived( +@@ -1224,6 +1224,11 @@ void NavigationURLLoaderImpl::OnAcceptCHFrameReceived( return; } @@ -255,7 +255,7 @@ diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/thi 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 -@@ -395,6 +395,11 @@ +@@ -400,6 +400,11 @@ name: "AriaNotify", status: "test", }, diff --git a/build/cromite_patches/Content-settings-infrastructure.patch b/build/cromite_patches/Content-settings-infrastructure.patch index 807f3f6e..3ecd2d83 100644 --- a/build/cromite_patches/Content-settings-infrastructure.patch +++ b/build/cromite_patches/Content-settings-infrastructure.patch @@ -30,7 +30,7 @@ Require: bromite-build-utils.patch .../ui/views/page_info/page_info_main_view.cc | 28 +- .../views/page_info/page_info_view_factory.cc | 20 + .../views/page_info/page_info_view_factory.h | 5 + - .../page_info/permission_toggle_row_view.cc | 173 +++++++- + .../page_info/permission_toggle_row_view.cc | 179 +++++++- .../page_info/permission_toggle_row_view.h | 18 +- .../settings_localized_strings_provider.cc | 54 +++ .../ui/webui/settings/site_settings_helper.cc | 46 +- @@ -43,8 +43,8 @@ Require: bromite-build-utils.patch .../BromiteCustomContentSettingImpl.java | 412 ++++++++++++++++++ ...tomTriStateSiteSettingsPreferenceImpl.java | 24 + .../ContentSettingsResources.java | 16 +- - .../site_settings/SingleCategorySettings.java | 50 ++- - .../site_settings/SingleWebsiteSettings.java | 54 ++- + .../site_settings/SingleCategorySettings.java | 55 ++- + .../site_settings/SingleWebsiteSettings.java | 58 ++- .../site_settings/SiteSettings.java | 31 +- .../site_settings/SiteSettingsCategory.java | 18 +- .../site_settings/SiteSettingsDelegate.java | 2 + @@ -75,7 +75,7 @@ Require: bromite-build-utils.patch .../renderer/content_settings_agent_impl.cc | 71 +++ .../renderer/content_settings_agent_impl.h | 9 + .../PageInfoPermissionsController.java | 9 + - .../PermissionParamsListBuilder.java | 1 + + .../PermissionParamsListBuilder.java | 8 +- .../android/page_info_controller_android.cc | 18 + components/page_info/page_info.cc | 23 +- components/page_info/page_info_ui.cc | 25 ++ @@ -83,7 +83,7 @@ Require: bromite-build-utils.patch .../platform/web_content_settings_client.h | 13 + .../execution_context/execution_context.cc | 16 + .../execution_context/execution_context.h | 5 + - 72 files changed, 1919 insertions(+), 93 deletions(-) + 72 files changed, 1931 insertions(+), 103 deletions(-) create mode 100644 components/browser_ui/settings/android/java/res/layout/preference_spinner_single_widget.xml create mode 100644 components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BromiteCustomContentSetting.java create mode 100644 components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BromiteCustomContentSettingImpl.java @@ -97,8 +97,8 @@ Require: bromite-build-utils.patch diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java --- a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java -@@ -64,6 +64,10 @@ import org.chromium.url.GURL; - +@@ -69,6 +69,10 @@ import org.chromium.url.GURL; + import java.util.List; import java.util.Set; +import android.content.Intent; @@ -108,7 +108,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/C /** A SiteSettingsDelegate instance that contains Chrome-specific Site Settings logic. */ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate { public static final String EMBEDDED_CONTENT_HELP_CENTER_URL = -@@ -229,7 +233,7 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate { +@@ -240,7 +244,7 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate { @Override public boolean isHelpAndFeedbackEnabled() { @@ -117,8 +117,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/C } @Override -@@ -366,6 +370,17 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate { - return mPrivacySandboxBridge.getFirstPartySetOwner(memberOrigin); +@@ -402,6 +406,17 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate { + return mPrivacySandboxBridge.getRelatedWebsiteSetOwner(memberOrigin); } + @Override @@ -138,7 +138,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/C diff --git a/chrome/browser/content_settings/page_specific_content_settings_delegate.cc b/chrome/browser/content_settings/page_specific_content_settings_delegate.cc --- a/chrome/browser/content_settings/page_specific_content_settings_delegate.cc +++ b/chrome/browser/content_settings/page_specific_content_settings_delegate.cc -@@ -162,7 +162,7 @@ namespace { +@@ -199,7 +199,7 @@ namespace { void GetGuestViewDefaultContentSettingRules( bool incognito, RendererContentSettingRules* rules) { @@ -150,7 +150,7 @@ diff --git a/chrome/browser/content_settings/page_specific_content_settings_dele diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html -@@ -1491,4 +1491,5 @@ +@@ -1493,4 +1493,5 @@ @@ -262,7 +262,7 @@ diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resourc /** * Add all of the child routes that originate from the privacy route, -@@ -163,6 +164,7 @@ function addPrivacyChildRoutes(r: Partial) { +@@ -167,6 +168,7 @@ function addPrivacyChildRoutes(r: Partial) { r.SITE_SETTINGS_WEB_APP_INSTALLATION = r.SITE_SETTINGS.createChild('webApplications'); } @@ -692,7 +692,7 @@ diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_ /** * Determine localization string for i18n for a given content settings type. * Sorted alphabetically by |ContentSettingsType|. -@@ -107,6 +155,13 @@ export function getLocalizationStringForContentType( +@@ -108,6 +156,13 @@ export function getLocalizationStringForContentType( case ContentSettingsTypes.SMART_CARD_READERS: return null; default: @@ -709,15 +709,15 @@ diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -1808,6 +1808,7 @@ static_library("ui") { - "//components/commerce/core:shopping_service", +@@ -1759,6 +1759,7 @@ static_library("ui") { + "//components/commerce/core/mojom:mojo_bindings", "//components/commerce/core/webui", "//components/endpoint_fetcher:endpoint_fetcher", + "//components/content_settings/core/browser:browser", "//components/enterprise/common:files_scan_data", "//components/feedback/proto", "//components/headless/policy", -@@ -5047,6 +5048,7 @@ static_library("ui") { +@@ -5007,6 +5008,7 @@ static_library("ui") { "//components/power_bookmarks/storage", "//components/reading_list/features:flags", "//components/segmentation_platform/embedder/default_model:default_model", @@ -876,11 +876,12 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_view_factory.h b/chrome diff --git a/chrome/browser/ui/views/page_info/permission_toggle_row_view.cc b/chrome/browser/ui/views/page_info/permission_toggle_row_view.cc --- a/chrome/browser/ui/views/page_info/permission_toggle_row_view.cc +++ b/chrome/browser/ui/views/page_info/permission_toggle_row_view.cc -@@ -39,6 +39,30 @@ +@@ -39,6 +39,31 @@ #include "ui/views/controls/styled_label.h" #include "ui/views/style/typography.h" #include "ui/views/view_class_properties.h" +#include "components/content_settings/core/browser/content_settings_registry.h" ++#include "ui/base/mojom/menu_source_type.mojom.h" + +namespace { + bool IsAllowed(const PageInfo::PermissionInfo& permission) { @@ -907,7 +908,7 @@ diff --git a/chrome/browser/ui/views/page_info/permission_toggle_row_view.cc b/c DEFINE_CLASS_ELEMENT_IDENTIFIER_VALUE(PermissionToggleRowView, kRowSubTitleCameraElementId); -@@ -62,16 +86,12 @@ PermissionToggleRowView::PermissionToggleRowView( +@@ -62,16 +87,12 @@ PermissionToggleRowView::PermissionToggleRowView( // instead of adding it as the only child. SetUseDefaultFillLayout(true); row_view_ = AddChildView(std::make_unique()); @@ -925,7 +926,7 @@ diff --git a/chrome/browser/ui/views/page_info/permission_toggle_row_view.cc b/c if (permission.requesting_origin.has_value()) { std::u16string requesting_origin_string; switch (permission.type) { -@@ -168,6 +188,90 @@ void PermissionToggleRowView::UpdatePermission( +@@ -168,6 +189,90 @@ void PermissionToggleRowView::UpdatePermission( UpdateUiOnPermissionChanged(); } @@ -979,7 +980,7 @@ diff --git a/chrome/browser/ui/views/page_info/permission_toggle_row_view.cc b/c + sources_menu_runner_->RunMenuAt( + choose_button_->GetWidget(), nullptr, + choose_button_->GetAnchorBoundsInScreen(), -+ views::MenuAnchorPosition::kTopLeft, ui::MENU_SOURCE_MOUSE); ++ views::MenuAnchorPosition::kTopLeft, ui::mojom::MenuSourceType::kMouse); +} + +bool PermissionToggleRowView::IsCommandIdChecked(int command_id) const { @@ -1016,12 +1017,15 @@ diff --git a/chrome/browser/ui/views/page_info/permission_toggle_row_view.cc b/c void PermissionToggleRowView::OnToggleButtonPressed() { PageInfoUI::ToggleBetweenAllowAndBlock(permission_); PermissionChanged(); -@@ -176,24 +280,19 @@ void PermissionToggleRowView::OnToggleButtonPressed() { - void PermissionToggleRowView::InitForUserSource( - bool should_show_spacer_view, - const std::u16string& toggle_accessible_name) { -- const int icon_label_spacing = ChromeLayoutProvider::Get()->GetDistanceMetric( -- views::DISTANCE_RELATED_LABEL_HORIZONTAL); +@@ -176,27 +281,19 @@ void PermissionToggleRowView::OnToggleButtonPressed() { + void PermissionToggleRowView::AddToggleButton( + const std::u16string& toggle_accessible_name, + int icon_label_spacing) { +- // This skips adding a toggle for 'CAPTURED_SURFACE_CONTROL' pemrission type. +- // We want to use the toggle inside the submenu and not here. +- if (permission_.type == ContentSettingsType::CAPTURED_SURFACE_CONTROL) { +- return; +- } - - auto toggle_button = std::make_unique( - base::BindRepeating(&PermissionToggleRowView::OnToggleButtonPressed, @@ -1045,10 +1049,10 @@ diff --git a/chrome/browser/ui/views/page_info/permission_toggle_row_view.cc b/c - toggle_button_ = row_view_->AddControl(std::move(toggle_button)); + choose_button_ = row_view_->AddControlUnderLabel(std::move(toggle_button)); + } - const int icon_size = GetLayoutConstant(PAGE_INFO_ICON_SIZE); - -@@ -227,9 +326,6 @@ void PermissionToggleRowView::InitForUserSource( + void PermissionToggleRowView::InitForUserSource( +@@ -238,9 +335,6 @@ void PermissionToggleRowView::InitForUserSource( auto spacer_view = std::make_unique(); spacer_view->SetPreferredSize(gfx::Size(icon_size, icon_size)); spacer_view_ = row_view_->AddControl(std::move(spacer_view)); @@ -1058,20 +1062,22 @@ diff --git a/chrome/browser/ui/views/page_info/permission_toggle_row_view.cc b/c } } } -@@ -256,6 +352,12 @@ void PermissionToggleRowView::InitForManagedSource( +@@ -267,6 +361,14 @@ void PermissionToggleRowView::InitForManagedSource( } void PermissionToggleRowView::UpdateUiOnPermissionChanged() { -+ choose_button_->SetEnabledTextColors(std::nullopt); -+ if (permission_.setting == CONTENT_SETTING_DEFAULT) { -+ choose_button_->SetTextColorId(views::Button::ButtonState::STATE_NORMAL, -+ ui::kColorLabelForeground); ++ if (choose_button_) { ++ choose_button_->SetEnabledTextColors(std::nullopt); ++ if (permission_.setting == CONTENT_SETTING_DEFAULT) { ++ choose_button_->SetTextColorId(views::Button::ButtonState::STATE_NORMAL, ++ ui::kColorLabelForeground); ++ } + } + if (blocked_on_system_level_label_) { if (permission_.setting == CONTENT_SETTING_DEFAULT) { permission_blocked_on_system_level_ = false; -@@ -301,6 +403,37 @@ void PermissionToggleRowView::UpdateUiOnPermissionChanged() { +@@ -312,6 +414,37 @@ void PermissionToggleRowView::UpdateUiOnPermissionChanged() { } } } @@ -1117,7 +1123,7 @@ diff --git a/chrome/browser/ui/views/page_info/permission_toggle_row_view.h b/ch #include "ui/views/view.h" +#include "components/content_settings/core/browser/website_settings_registry.h" -+#include "ui/base/models/simple_menu_model.h" ++#include "ui/menus/simple_menu_model.h" +#include "ui/views/controls/menu/menu_runner.h" +#include "ui/views/controls/button/md_text_button_with_down_arrow.h" + @@ -1145,9 +1151,9 @@ diff --git a/chrome/browser/ui/views/page_info/permission_toggle_row_view.h b/ch + void ExecuteCommand(int command_id, int event_flags) override; + void OnToggleButtonPressed(); - void InitForUserSource(bool should_show_spacer_view, - const std::u16string& toggle_accessible_name); -@@ -84,6 +96,10 @@ class PermissionToggleRowView : public views::View { + void AddToggleButton(const std::u16string& toggle_accessible_name, + int icon_label_spacing); +@@ -86,6 +98,10 @@ class PermissionToggleRowView : public views::View { raw_ptr toggle_button_ = nullptr; raw_ptr spacer_view_ = nullptr; @@ -1169,17 +1175,17 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provide #include "build/branding_buildflags.h" #include "build/build_config.h" #include "build/buildflag.h" -@@ -78,6 +79,9 @@ +@@ -77,6 +78,9 @@ + #include "components/google/core/common/google_util.h" #include "components/history/core/common/pref_names.h" #include "components/history_embeddings/history_embeddings_features.h" - #include "components/omnibox/common/omnibox_features.h" +#include "components/content_settings/core/browser/content_settings_registry.h" +#include "components/content_settings/core/browser/website_settings_info.h" +#include "components/content_settings/core/browser/website_settings_registry.h" #include "components/password_manager/core/browser/leak_detection_dialog_utils.h" #include "components/password_manager/core/browser/manage_passwords_referrer.h" #include "components/password_manager/core/common/password_manager_features.h" -@@ -3809,6 +3813,56 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, +@@ -3773,6 +3777,56 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, policy_indicator::AddLocalizedStrings(html_source); AddSecurityKeysStrings(html_source); @@ -1269,7 +1275,7 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/b struct SiteSettingSourceStringMapping { SiteSettingSource source; -@@ -504,6 +506,13 @@ bool HasRegisteredGroupName(ContentSettingsType type) { +@@ -503,6 +505,13 @@ bool HasRegisteredGroupName(ContentSettingsType type) { return true; } } @@ -1283,7 +1289,7 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/b return false; } -@@ -517,11 +526,24 @@ ContentSettingsType ContentSettingsTypeFromGroupName(std::string_view name) { +@@ -516,11 +525,24 @@ ContentSettingsType ContentSettingsTypeFromGroupName(std::string_view name) { return entry.type; } } @@ -1309,15 +1315,15 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/b for (const auto& entry : kContentSettingsTypeGroupNames) { if (type == entry.type) { // Content setting types that aren't represented in the settings UI -@@ -536,7 +558,6 @@ std::string_view ContentSettingsTypeToGroupName(ContentSettingsType type) { +@@ -535,7 +557,6 @@ std::string_view ContentSettingsTypeToGroupName(ContentSettingsType type) { return entry.name ? entry.name : std::string_view(); } } - - NOTREACHED_IN_MIGRATION() << static_cast(type) - << " is not a recognized content settings type."; - return std::string_view(); -@@ -643,6 +664,13 @@ std::vector GetVisiblePermissionCategories( + NOTREACHED() << static_cast(type) + << " is not a recognized content settings type."; + } +@@ -642,6 +663,13 @@ std::vector GetVisiblePermissionCategories( base_types->push_back(ContentSettingsType::WEB_APP_INSTALLATION); } @@ -1334,7 +1340,7 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/b diff --git a/components/browser_ui/settings/android/BUILD.gn b/components/browser_ui/settings/android/BUILD.gn --- a/components/browser_ui/settings/android/BUILD.gn +++ b/components/browser_ui/settings/android/BUILD.gn -@@ -84,6 +84,7 @@ android_resources("java_resources") { +@@ -86,6 +86,7 @@ android_resources("java_resources") { "java/res/layout/managed_disclaimer_preference_for_radio_groups.xml", "java/res/layout/preference_chrome_image_view.xml", "java/res/layout/preference_spinner.xml", @@ -1497,7 +1503,7 @@ diff --git a/components/browser_ui/settings/android/widget/java/src/org/chromium diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/browser_ui/site_settings/android/BUILD.gn --- a/components/browser_ui/site_settings/android/BUILD.gn +++ b/components/browser_ui/site_settings/android/BUILD.gn -@@ -146,6 +146,23 @@ android_library("java") { +@@ -147,6 +147,23 @@ android_library("java") { ":site_settings_jni_headers", "//components/content_settings/android:java_pref_names_srcjar", ] @@ -1521,7 +1527,7 @@ diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/b } android_library("javatests") { -@@ -194,6 +211,7 @@ robolectric_library("junit") { +@@ -195,6 +212,7 @@ robolectric_library("junit") { } android_resources("java_resources") { @@ -2178,7 +2184,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c int icon, int title, @ContentSettingValues @Nullable Integer defaultEnabledValue, -@@ -425,6 +425,8 @@ public class ContentSettingsResources { +@@ -435,6 +435,8 @@ public class ContentSettingsResources { R.string.website_settings_category_vr_blocked, R.string.website_settings_category_vr_a11y); } @@ -2187,7 +2193,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c assert false; // NOTREACHED return null; } -@@ -583,6 +585,14 @@ public class ContentSettingsResources { +@@ -593,6 +595,14 @@ public class ContentSettingsResources { return getResourceItem(contentType).getDefaultDisabledValue(); } @@ -2202,7 +2208,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c /** * Returns the string resource id for a given ContentSetting to show with a permission category. * -@@ -746,6 +756,8 @@ public class ContentSettingsResources { +@@ -756,6 +766,8 @@ public class ContentSettingsResources { * Blocked states, in that order. */ public static int[] getTriStateSettingDescriptionIDs(int contentType) { @@ -2276,25 +2282,31 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c if (BINARY_TOGGLE_KEY.equals(preference.getKey())) { assert !mCategory.isManaged(); boolean toggleValue = (boolean) newValue; -@@ -812,6 +831,8 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment - .website_settings_allowed_group_heading_request_desktop_site; - break; +@@ -791,7 +810,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment + ? R.string.website_settings_blocked_group_heading_request_desktop_site + : R.string.website_settings_allowed_group_heading_request_desktop_site; } -+ if (resource == 0) -+ resource = BromiteCustomContentSettingImpl.getAddExceptionDialogMessage(mCategory); - assert resource > 0; - return getString(resource); +- return 0; ++ return BromiteCustomContentSettingImpl.getAddExceptionDialogMessage(mCategory); } -@@ -927,6 +948,8 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment + + // OnPreferenceClickListener: +@@ -904,10 +923,11 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment default: break; } +- +- int exceptionDialogMessageResourceId = getAddExceptionDialogMessageResourceId(); +- assert allowSpecifyingExceptions == (exceptionDialogMessageResourceId != 0); + Boolean allow = BromiteCustomContentSettingImpl.allowSpecifyingExceptions(mCategory); + if (allow != null) allowSpecifyingExceptions = (boolean)allow; if (allowSpecifyingExceptions) { ++ int exceptionDialogMessageResourceId = getAddExceptionDialogMessageResourceId(); ++ assert exceptionDialogMessageResourceId != 0; getPreferenceScreen() .addPreference( -@@ -1112,8 +1135,16 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment + new AddExceptionPreference( +@@ -1092,8 +1112,16 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment private boolean isBlocked() { switch (mGlobalToggleLayout) { case GlobalToggleLayout.TRI_STATE_TOGGLE: @@ -2311,7 +2323,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c return (triStateToggle.getCheckedSetting() == ContentSettingValues.BLOCK); case GlobalToggleLayout.TRI_STATE_COOKIE_TOGGLE: TriStateCookieSettingsPreference triStateCookieToggle = -@@ -1180,7 +1211,11 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment +@@ -1160,7 +1188,11 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment } else if (mCategory.getType() == SiteSettingsCategory.Type.STORAGE_ACCESS) { infoText.setSummary(getStorageAccessSummary()); } else { @@ -2324,7 +2336,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c } // Hide the anti-abuse text preferences, as needed. -@@ -1217,6 +1252,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment +@@ -1197,6 +1229,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment } else { screen.removePreference(mLocationTriStatePref); } @@ -2332,7 +2344,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c if (permissionBlockedByOs) { maybeShowOsWarning(screen); -@@ -1373,7 +1409,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment +@@ -1355,7 +1388,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment getSiteSettingsDelegate().getBrowserContextHandle(), contentType); int[] descriptionIds = ContentSettingsResources.getTriStateSettingDescriptionIDs(contentType); @@ -2341,7 +2353,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c } private void configureBinaryToggle(ChromeSwitchPreference binaryToggle, int contentType) { -@@ -1497,6 +1533,14 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment +@@ -1479,6 +1512,14 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment @ContentSettingValues Integer value = site.getContentSetting(browserContextHandle, contentSettingsType); @@ -2367,16 +2379,16 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c /** Shows the permissions and other settings for a particular website. */ public class SingleWebsiteSettings extends BaseSiteSettingsFragment -@@ -172,7 +173,7 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment - case ContentSettingsType.CLIPBOARD_READ_WRITE: - return "clipboard_permission_list"; +@@ -175,7 +176,7 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment + case ContentSettingsType.FILE_SYSTEM_WRITE_GUARD: + return "file_system_write_guard_permission_list"; default: - return null; + return BromiteCustomContentSettingImpl.getProfilePrefKey(type); } } -@@ -543,8 +544,21 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment +@@ -564,8 +565,21 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment private void setupContentSettingsPreferences() { mMaxPermissionOrder = findPreference(PREF_PERMISSIONS_HEADER).getOrder(); @@ -2400,7 +2412,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c preference.setKey(getPreferenceKey(type)); if (type == ContentSettingsType.ADS) { -@@ -1090,20 +1104,32 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment +@@ -1142,20 +1156,32 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment @ContentSettingValues @Nullable Integer value, boolean isEmbargoed, boolean isOneTime) { @@ -2417,7 +2429,9 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c setUpPreferenceCommon(preference, value); - ChromeSwitchPreference switchPreference = (ChromeSwitchPreference) preference; -- switchPreference.setChecked(value == ContentSettingValues.ALLOW); +- @ContentSettingsType.EnumType +- int contentType = getContentSettingsTypeFromPreferenceKey(preference.getKey()); +- switchPreference.setChecked(value == getEnabledValue(contentType)); + Preference switchPreference = preference; + if (preference instanceof ChromeSwitchPreference) { + ((ChromeSwitchPreference)switchPreference).setChecked(value != ContentSettingValues.BLOCK); @@ -2430,18 +2444,18 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c - : getString(ContentSettingsResources.getCategorySummary(value, isOneTime))); + : getString(ContentSettingsResources.getCategorySummary(content_type, value, isOneTime))); switchPreference.setOnPreferenceChangeListener(this); - @ContentSettingsType.EnumType - int contentType = getContentSettingsTypeFromPreferenceKey(preference.getKey()); - if (contentType == mHighlightedPermission) { - switchPreference.setBackgroundColor( ++ @ContentSettingsType.EnumType ++ int contentType = getContentSettingsTypeFromPreferenceKey(preference.getKey()); + if (preference instanceof ChromeSwitchPreference && contentType == mHighlightedPermission) { + ((ChromeSwitchPreference)switchPreference).setBackgroundColor( AppCompatResources.getColorStateList(getContext(), mHighlightColor) .getDefaultColor()); } -@@ -1321,14 +1347,20 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment - permission = - (Boolean) newValue ? ContentSettingValues.ALLOW : ContentSettingValues.BLOCK; +@@ -1376,14 +1402,20 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment + if (newValue instanceof Boolean) { + permission = (Boolean) newValue ? getEnabledValue(type) : ContentSettingValues.BLOCK; } else { - permission = (Integer) newValue; + Integer newPermission = @@ -2491,7 +2505,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c Preference p = findPreference(prefCategory); int contentType = SiteSettingsCategory.contentSettingsType(prefCategory); // p can be null if the Preference was removed in configurePreferences. -@@ -171,19 +172,21 @@ public class SiteSettings extends BaseSiteSettingsFragment +@@ -174,19 +175,21 @@ public class SiteSettings extends BaseSiteSettingsFragment } else if (Type.ZOOM == prefCategory) { // Don't want to set a summary for Zoom because we don't want any message to display // under the Zoom row on site settings. @@ -2528,25 +2542,25 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java -@@ -73,7 +73,7 @@ public class SiteSettingsCategory { - Type.ZOOM, +@@ -74,7 +74,7 @@ public class SiteSettingsCategory { Type.STORAGE_ACCESS, Type.TRACKING_PROTECTION, + Type.FILE_EDITING, - Type.NUM_ENTRIES + Type.NUM_ENTRIES_CHROMIUM }) @Retention(RetentionPolicy.SOURCE) public @interface Type { -@@ -113,7 +113,7 @@ public class SiteSettingsCategory { - int HAND_TRACKING = 31; +@@ -115,7 +115,7 @@ public class SiteSettingsCategory { + int FILE_EDITING = 32; /** Number of handled categories used for calculating array sizes. */ -- int NUM_ENTRIES = 32; -+ int NUM_ENTRIES_CHROMIUM = 32; +- int NUM_ENTRIES = 33; ++ int NUM_ENTRIES_CHROMIUM = 33; } private final BrowserContextHandle mBrowserContextHandle; -@@ -162,6 +162,9 @@ public class SiteSettingsCategory { +@@ -164,6 +164,9 @@ public class SiteSettingsCategory { } else { permission = ""; } @@ -2556,7 +2570,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c return new SiteSettingsCategory(browserContextHandle, type, permission); } -@@ -170,7 +173,7 @@ public class SiteSettingsCategory { +@@ -172,7 +175,7 @@ public class SiteSettingsCategory { @ContentSettingsType.EnumType int contentSettingsType) { assert contentSettingsType != -1; assert Type.ALL_SITES == 0; @@ -2565,7 +2579,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c if (contentSettingsType(i) == contentSettingsType) { return createFromType(browserContextHandle, i); } -@@ -181,7 +184,7 @@ public class SiteSettingsCategory { +@@ -183,7 +186,7 @@ public class SiteSettingsCategory { public static SiteSettingsCategory createFromPreferenceKey( BrowserContextHandle browserContextHandle, String preferenceKey) { assert Type.ALL_SITES == 0; @@ -2574,7 +2588,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c if (preferenceKey(i).equals(preferenceKey)) { return createFromType(browserContextHandle, i); } -@@ -254,8 +257,7 @@ public class SiteSettingsCategory { +@@ -258,8 +261,7 @@ public class SiteSettingsCategory { case Type.TRACKING_PROTECTION: return ContentSettingsType.DEFAULT; // Conversion unavailable. } @@ -2584,7 +2598,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c } /** -@@ -342,8 +344,12 @@ public class SiteSettingsCategory { +@@ -348,8 +350,12 @@ public class SiteSettingsCategory { case Type.ZOOM: return "zoom"; default: @@ -2600,7 +2614,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsDelegate.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsDelegate.java --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsDelegate.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsDelegate.java -@@ -198,6 +198,8 @@ public interface SiteSettingsDelegate { +@@ -217,6 +217,8 @@ public interface SiteSettingsDelegate { */ String getRelatedWebsiteSetOwner(String memberOrigin); @@ -2656,7 +2670,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java -@@ -326,7 +326,11 @@ public final class Website implements WebsiteEntry { +@@ -327,7 +327,11 @@ public final class Website implements WebsiteEntry { RecordUserAction.record("SoundContentSetting.UnmuteBy.SiteSettings"); } } @@ -2672,7 +2686,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePermissionsFetcher.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePermissionsFetcher.java --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePermissionsFetcher.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePermissionsFetcher.java -@@ -108,7 +108,7 @@ public class WebsitePermissionsFetcher { +@@ -110,7 +110,7 @@ public class WebsitePermissionsFetcher { case ContentSettingsType.USB_GUARD: return WebsitePermissionsType.CHOSEN_OBJECT_INFO; default: @@ -2838,7 +2852,7 @@ diff --git a/components/content_settings/core/browser/content_settings_uma_util. diff --git a/components/content_settings/core/browser/content_settings_utils.cc b/components/content_settings/core/browser/content_settings_utils.cc --- a/components/content_settings/core/browser/content_settings_utils.cc +++ b/components/content_settings/core/browser/content_settings_utils.cc -@@ -19,6 +19,7 @@ +@@ -20,6 +20,7 @@ #include "build/build_config.h" #include "components/content_settings/core/browser/content_settings_registry.h" #include "components/content_settings/core/browser/host_content_settings_map.h" @@ -2846,7 +2860,7 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.cc #include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_types.h" #include "components/content_settings/core/common/content_settings_utils.h" -@@ -127,6 +128,17 @@ PatternPair ParsePatternString(const std::string& pattern_str) { +@@ -128,6 +129,17 @@ PatternPair ParsePatternString(const std::string& pattern_str) { void GetRendererContentSettingRules(const HostContentSettingsMap* map, RendererContentSettingRules* rules) { @@ -3291,7 +3305,11 @@ diff --git a/components/page_info/android/java/src/org/chromium/components/page_ diff --git a/components/page_info/android/java/src/org/chromium/components/page_info/PermissionParamsListBuilder.java b/components/page_info/android/java/src/org/chromium/components/page_info/PermissionParamsListBuilder.java --- a/components/page_info/android/java/src/org/chromium/components/page_info/PermissionParamsListBuilder.java +++ b/components/page_info/android/java/src/org/chromium/components/page_info/PermissionParamsListBuilder.java -@@ -109,6 +109,7 @@ public class PermissionParamsListBuilder { +@@ -106,10 +106,10 @@ public class PermissionParamsListBuilder { + + switch (permission.setting) { + case ContentSettingValues.ALLOW: +- case ContentSettingValues.ASK: permissionParams.allowed = true; break; case ContentSettingValues.BLOCK: @@ -3299,6 +3317,19 @@ diff --git a/components/page_info/android/java/src/org/chromium/components/page_ permissionParams.allowed = false; break; default: +@@ -120,6 +120,12 @@ public class PermissionParamsListBuilder { + + permission.type; + } + ++ if (permission.type == ContentSettingsType.FILE_SYSTEM_WRITE_GUARD ++ && permission.setting == ContentSettingValues.ASK) { ++ // see https://source.chromium.org/chromium/chromium/src/+/e3e48613de29440ae1cf11b0ff7fa7c613d9f416 ++ permissionParams.allowed = true; ++ } ++ + return permissionParams; + } + diff --git a/components/page_info/android/page_info_controller_android.cc b/components/page_info/android/page_info_controller_android.cc --- a/components/page_info/android/page_info_controller_android.cc +++ b/components/page_info/android/page_info_controller_android.cc @@ -3310,7 +3341,7 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp #include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_types.h" #include "components/page_info/android/page_info_client.h" -@@ -162,6 +163,15 @@ void PageInfoControllerAndroid::SetPermissionInfo( +@@ -164,6 +165,15 @@ void PageInfoControllerAndroid::SetPermissionInfo( } permissions_to_display.push_back(ContentSettingsType::STORAGE_ACCESS); @@ -3326,7 +3357,7 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp std::map user_specified_settings_to_display; std::map -@@ -221,6 +231,14 @@ std::optional PageInfoControllerAndroid::GetSettingToDisplay( +@@ -223,6 +233,14 @@ std::optional PageInfoControllerAndroid::GetSettingToDisplay( return permission.setting; } @@ -3352,7 +3383,7 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info. #include "components/content_settings/browser/ui/cookie_controls_controller.h" #include "components/content_settings/core/browser/content_settings_registry.h" #include "components/content_settings/core/browser/content_settings_uma_util.h" -@@ -1249,6 +1250,14 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info, +@@ -1262,6 +1263,14 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info, // applies to permissions listed in |kPermissionType|. bool PageInfo::ShouldShowPermission( const PageInfo::PermissionInfo& info) const { @@ -3367,7 +3398,7 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info. // Note |ContentSettingsType::ADS| will show up regardless of its default // value when it has been activated on the current origin. if (info.type == ContentSettingsType::ADS) { -@@ -1370,7 +1379,19 @@ void PageInfo::PresentSitePermissions() { +@@ -1378,7 +1387,19 @@ void PageInfo::PresentSitePermissions() { HostContentSettingsMap* content_settings = GetContentSettings(); DCHECK(web_contents_); @@ -3413,7 +3444,7 @@ diff --git a/components/page_info/page_info_ui.cc b/components/page_info/page_in switch (type) { case ContentSettingsType::GEOLOCATION: message_id = IDS_PAGE_INFO_STATE_TEXT_LOCATION_ASK; -@@ -630,6 +638,12 @@ PageInfoUI::~PageInfoUI() = default; +@@ -627,6 +635,12 @@ PageInfoUI::~PageInfoUI() = default; // static std::u16string PageInfoUI::PermissionTypeToUIString(ContentSettingsType type) { @@ -3426,7 +3457,7 @@ diff --git a/components/page_info/page_info_ui.cc b/components/page_info/page_in for (const PermissionUIInfo& info : GetContentSettingsUIInfo()) { if (info.type == type) return l10n_util::GetStringUTF16(info.string_id); -@@ -641,6 +655,12 @@ std::u16string PageInfoUI::PermissionTypeToUIString(ContentSettingsType type) { +@@ -637,6 +651,12 @@ std::u16string PageInfoUI::PermissionTypeToUIString(ContentSettingsType type) { // static std::u16string PageInfoUI::PermissionTypeToUIStringMidSentence( ContentSettingsType type) { @@ -3439,7 +3470,7 @@ diff --git a/components/page_info/page_info_ui.cc b/components/page_info/page_in for (const PermissionUIInfo& info : GetContentSettingsUIInfo()) { if (info.type == type) return l10n_util::GetStringUTF16(info.string_id_mid_sentence); -@@ -1086,6 +1106,11 @@ bool PageInfoUI::ContentSettingsTypeInPageInfo(ContentSettingsType type) { +@@ -1078,6 +1098,11 @@ bool PageInfoUI::ContentSettingsTypeInPageInfo(ContentSettingsType type) { if (info.type == type) return true; } diff --git a/build/cromite_patches/Dictionary-suggestions-for-the-Omnibox.patch b/build/cromite_patches/Dictionary-suggestions-for-the-Omnibox.patch index 9c93eea9..b1a92dcc 100644 --- a/build/cromite_patches/Dictionary-suggestions-for-the-Omnibox.patch +++ b/build/cromite_patches/Dictionary-suggestions-for-the-Omnibox.patch @@ -10,9 +10,9 @@ Original License: BSD-3-Clause - https://spdx.org/licenses/BSD-3-Clause.html License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- chrome/android/java/res/layout/url_bar.xml | 1 + - .../browser/omnibox/LocationBarMediator.java | 13 +++++++++-- - .../chrome/browser/omnibox/UrlBar.java | 23 +++++++++++++++++++ - 3 files changed, 35 insertions(+), 2 deletions(-) + .../browser/omnibox/LocationBarMediator.java | 13 ++++++++-- + .../chrome/browser/omnibox/UrlBar.java | 24 +++++++++++++++++++ + 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/chrome/android/java/res/layout/url_bar.xml b/chrome/android/java/res/layout/url_bar.xml --- a/chrome/android/java/res/layout/url_bar.xml @@ -27,7 +27,7 @@ diff --git a/chrome/android/java/res/layout/url_bar.xml b/chrome/android/java/re diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java -@@ -288,8 +288,17 @@ class LocationBarMediator +@@ -289,8 +289,17 @@ class LocationBarMediator if (mNativeInitialized) RecordUserAction.record("FocusLocation"); boolean shouldRetainOmniboxOnFocus = OmniboxFeatures.shouldRetainOmniboxOnFocus(); if (!mUrlFocusedWithPastedText && !shouldRetainOmniboxOnFocus) { @@ -58,18 +58,19 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow import android.os.SystemClock; import android.text.Editable; import android.text.InputType; -@@ -114,6 +115,7 @@ public class UrlBar extends AutocompleteEditText { +@@ -107,6 +108,7 @@ public class UrlBar extends AutocompleteEditText { private boolean mAllowFocus = true; - private boolean mTypingStartedEventSent; + private boolean mShouldSendTypingStartedEvent; + private boolean mPendingSelectAll; private boolean mPendingScroll; // Captures the current intended text scroll type. -@@ -355,6 +357,27 @@ public class UrlBar extends AutocompleteEditText { - mPendingScroll = false; - } +@@ -332,6 +334,28 @@ public class UrlBar extends AutocompleteEditText { fixupTextDirection(); + + mShouldSendTypingStartedEvent = focused; ++ + if (mPendingSelectAll) { + UrlBar sender = this; + new Handler().post(new Runnable() { diff --git a/build/cromite_patches/Disable-Accessibility-service-by-default.patch b/build/cromite_patches/Disable-Accessibility-service-by-default.patch index 0be6dca0..df0e1d35 100644 --- a/build/cromite_patches/Disable-Accessibility-service-by-default.patch +++ b/build/cromite_patches/Disable-Accessibility-service-by-default.patch @@ -36,13 +36,13 @@ diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibil + android:summary="@string/enable_accessibility_summary" + android:title="@string/enable_accessibility_title" /> + - diff --git a/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java b/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java --- a/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java +++ b/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java -@@ -1080,6 +1080,11 @@ public class WebContentsAccessibilityImpl extends AccessibilityNodeProviderCompa +@@ -1079,6 +1079,11 @@ public class WebContentsAccessibilityImpl extends AccessibilityNodeProviderCompa structure.setChildCount(0); return; } diff --git a/build/cromite_patches/Disable-PrivacyGuide.patch b/build/cromite_patches/Disable-PrivacyGuide.patch index 1f50879d..8725ae1d 100644 --- a/build/cromite_patches/Disable-PrivacyGuide.patch +++ b/build/cromite_patches/Disable-PrivacyGuide.patch @@ -4,11 +4,9 @@ Subject: Disable PrivacyGuide License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - chrome/android/java/res/xml/privacy_preferences.xml | 1 + - chrome/browser/ui/webui/settings/settings_ui.cc | 3 +-- - .../common/chrome_features_cc/Disable-PrivacyGuide.inc | 6 ++++++ - 3 files changed, 8 insertions(+), 2 deletions(-) - create mode 100644 cromite_flags/chrome/common/chrome_features_cc/Disable-PrivacyGuide.inc + chrome/android/java/res/xml/privacy_preferences.xml | 1 + + chrome/browser/ui/webui/settings/settings_ui.cc | 3 +-- + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml --- a/chrome/android/java/res/xml/privacy_preferences.xml @@ -24,8 +22,8 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi 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 +++ b/chrome/browser/ui/webui/settings/settings_ui.cc -@@ -363,8 +363,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui) - #endif // !BUILDFLAG(IS_CHROMEOS_LACROS) +@@ -354,8 +354,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui) + #endif // BUILDFLAG(IS_CHROMEOS_ASH) bool show_privacy_guide = - base::FeatureList::IsEnabled(features::kPrivacyGuideForceAvailable) || @@ -34,15 +32,4 @@ 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( -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,6 @@ -+#if BUILDFLAG(IS_ANDROID) -+ -+SET_CROMITE_FEATURE_DISABLED(kPrivacyGuideAndroid3); -+SET_CROMITE_FEATURE_DISABLED(kPrivacyGuidePreloadAndroid); -+ -+#endif -- diff --git a/build/cromite_patches/Disable-TLS-resumption.patch b/build/cromite_patches/Disable-TLS-resumption.patch index 40fc24e3..ba73f9c4 100644 --- a/build/cromite_patches/Disable-TLS-resumption.patch +++ b/build/cromite_patches/Disable-TLS-resumption.patch @@ -90,7 +90,7 @@ diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc diff --git a/net/quic/quic_session_pool.cc b/net/quic/quic_session_pool.cc --- a/net/quic/quic_session_pool.cc +++ b/net/quic/quic_session_pool.cc -@@ -82,6 +82,7 @@ +@@ -84,6 +84,7 @@ #include "net/third_party/quiche/src/quiche/quic/platform/api/quic_flags.h" #include "net/traffic_annotation/network_traffic_annotation.h" #include "third_party/boringssl/src/include/openssl/aead.h" @@ -98,7 +98,7 @@ diff --git a/net/quic/quic_session_pool.cc b/net/quic/quic_session_pool.cc #include "url/gurl.h" #include "url/scheme_host_port.h" #include "url/url_constants.h" -@@ -248,6 +249,38 @@ void LogUsingExistingSession(const NetLogWithSource& request_net_log, +@@ -250,6 +251,38 @@ void LogUsingExistingSession(const NetLogWithSource& request_net_log, } // namespace @@ -137,7 +137,7 @@ diff --git a/net/quic/quic_session_pool.cc b/net/quic/quic_session_pool.cc QuicSessionRequest::QuicSessionRequest(QuicSessionPool* pool) : pool_(pool) {} QuicSessionRequest::~QuicSessionRequest() { -@@ -2094,7 +2127,7 @@ QuicSessionPool::CreateCryptoConfigHandle( +@@ -2122,7 +2155,7 @@ QuicSessionPool::CreateCryptoConfigHandle( cert_verifier_, transport_security_state_, sct_auditing_delegate_, HostsFromOrigins(params_.origins_to_force_quic_on), actual_network_anonymization_key), @@ -149,7 +149,7 @@ diff --git a/net/quic/quic_session_pool.cc b/net/quic/quic_session_pool.cc diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket_impl.cc --- a/net/socket/ssl_client_socket_impl.cc +++ b/net/socket/ssl_client_socket_impl.cc -@@ -284,7 +284,33 @@ SSLClientSocketImpl::SSLClientSocketImpl( +@@ -283,7 +283,33 @@ SSLClientSocketImpl::SSLClientSocketImpl( CHECK(context_); } @@ -183,7 +183,7 @@ diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket Disconnect(); } -@@ -672,6 +698,8 @@ int SSLClientSocketImpl::Init() { +@@ -670,6 +696,8 @@ int SSLClientSocketImpl::Init() { } if (session) SSL_set_session(ssl_.get(), session.get()); @@ -192,7 +192,7 @@ diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket } transport_adapter_ = std::make_unique( -@@ -958,6 +986,35 @@ int SSLClientSocketImpl::DoHandshakeComplete(int result) { +@@ -956,6 +984,35 @@ int SSLClientSocketImpl::DoHandshakeComplete(int result) { : SSLHandshakeDetails::kTLS13Full; } } diff --git a/build/cromite_patches/Disable-all-predictors-code.patch b/build/cromite_patches/Disable-all-predictors-code.patch index 2dac667c..f116cd90 100644 --- a/build/cromite_patches/Disable-all-predictors-code.patch +++ b/build/cromite_patches/Disable-all-predictors-code.patch @@ -5,7 +5,7 @@ Subject: Disable all predictors code 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/BUILD.gn | 2 -- + chrome/browser/BUILD.gn | 3 --- .../preloading_model_keyed_service.cc | 3 +++ .../preloading_model_keyed_service_factory.cc | 4 +--- .../optimization_guide/chrome_hints_manager.cc | 1 + @@ -14,12 +14,14 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../predictors/autocomplete_action_predictor.cc | 2 ++ .../predictors/loading_predictor_config.cc | 4 ++-- chrome/browser/predictors/predictors_features.cc | 3 +-- + chrome/browser/safe_browsing/BUILD.gn | 1 - + ...ification_content_detection_service_factory.cc | 5 +++++ chrome/browser/ui/tab_helpers.cc | 1 - .../ui/webui/omnibox/omnibox_page_handler.cc | 2 ++ - .../accessibility/read_aloud_app_model.cc | 8 ++++++++ - .../renderer/accessibility/read_aloud_app_model.h | 7 +++++++ - .../accessibility/read_anything_app_controller.cc | 12 ++++++++++++ - .../accessibility/read_anything_app_controller.h | 4 ++++ + .../read_anything/read_aloud_app_model.cc | 8 ++++++++ + .../read_anything/read_aloud_app_model.h | 7 +++++++ + .../read_anything/read_anything_app_controller.cc | 12 ++++++++++++ + .../read_anything/read_anything_app_controller.h | 4 ++++ chrome/utility/BUILD.gn | 2 +- chrome/utility/services.cc | 8 -------- .../core/browser/autofill_optimization_guide.cc | 5 +++-- @@ -31,6 +33,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../core/prediction_model_fetcher_impl.cc | 1 + components/optimization_guide/features.gni | 3 +-- .../core/page_content_annotations_features.cc | 5 +++++ + components/safe_browsing/core/common/features.cc | 1 + .../Disable-all-predictors-code.inc | 3 +++ .../Disable-all-predictors-code.inc | 1 + .../Disable-all-predictors-code.inc | 1 + @@ -40,7 +43,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html services/webnn/features.gni | 2 +- .../document_speculation_rules.cc | 1 + .../platform/runtime_enabled_features.json5 | 2 +- - 35 files changed, 96 insertions(+), 35 deletions(-) + 38 files changed, 102 insertions(+), 37 deletions(-) create mode 100644 cromite_flags/chrome/browser/browser_features_cc/Disable-all-predictors-code.inc create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-all-predictors-code.inc create mode 100644 cromite_flags/chrome/common/chrome_features_cc/Disable-all-predictors-code.inc @@ -51,7 +54,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -759,8 +759,6 @@ static_library("browser") { +@@ -760,8 +760,6 @@ static_library("browser") { "navigation_predictor/navigation_predictor_keyed_service_factory.h", "navigation_predictor/navigation_predictor_metrics_document_data.cc", "navigation_predictor/navigation_predictor_metrics_document_data.h", @@ -60,6 +63,14 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "navigation_predictor/preloading_model_keyed_service.cc", "navigation_predictor/preloading_model_keyed_service.h", "navigation_predictor/preloading_model_keyed_service_factory.cc", +@@ -2242,7 +2240,6 @@ static_library("browser") { + "//components/safe_browsing/content/browser", + "//components/safe_browsing/content/browser:client_side_detection", + "//components/safe_browsing/content/browser:safe_browsing_service", +- "//components/safe_browsing/content/browser/notification_content_detection", + "//components/safe_browsing/content/browser/password_protection", + "//components/safe_browsing/content/browser/web_ui", + "//components/safe_browsing/core/browser", diff --git a/chrome/browser/navigation_predictor/preloading_model_keyed_service.cc b/chrome/browser/navigation_predictor/preloading_model_keyed_service.cc --- a/chrome/browser/navigation_predictor/preloading_model_keyed_service.cc +++ b/chrome/browser/navigation_predictor/preloading_model_keyed_service.cc @@ -163,7 +174,7 @@ diff --git a/chrome/browser/optimization_guide/model_validator_keyed_service.cc diff --git a/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc b/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc --- a/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc +++ b/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc -@@ -564,7 +564,6 @@ void OptimizationGuideKeyedService::RemoveObserverForOptimizationTargetModel( +@@ -497,7 +497,6 @@ void OptimizationGuideKeyedService::RemoveObserverForOptimizationTargetModel( void OptimizationGuideKeyedService::RegisterOptimizationTypes( const std::vector& optimization_types) { @@ -210,10 +221,50 @@ diff --git a/chrome/browser/predictors/predictors_features.cc b/chrome/browser/p } // namespace +diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsing/BUILD.gn +--- a/chrome/browser/safe_browsing/BUILD.gn ++++ b/chrome/browser/safe_browsing/BUILD.gn +@@ -51,7 +51,6 @@ static_library("safe_browsing") { + "//components/safe_browsing/content/browser", + "//components/safe_browsing/content/browser:client_side_detection", + "//components/safe_browsing/content/browser:client_side_detection_service", +- "//components/safe_browsing/content/browser/notification_content_detection:notification_content_detection", + "//components/safe_browsing/content/browser/triggers:suspicious_site_trigger", + "//components/safe_browsing/content/browser/web_ui", + "//components/safe_browsing/core/browser", +diff --git a/chrome/browser/safe_browsing/notification_content_detection_service_factory.cc b/chrome/browser/safe_browsing/notification_content_detection_service_factory.cc +--- a/chrome/browser/safe_browsing/notification_content_detection_service_factory.cc ++++ b/chrome/browser/safe_browsing/notification_content_detection_service_factory.cc +@@ -14,6 +14,7 @@ + #include "components/safe_browsing/content/browser/notification_content_detection/notification_content_detection_service.h" + #include "components/safe_browsing/core/browser/db/database_manager.h" + #include "components/safe_browsing/core/common/features.h" ++#include "components/optimization_guide/machine_learning_tflite_buildflags.h" + #include "content/public/browser/browser_context.h" + + namespace safe_browsing { +@@ -63,6 +64,7 @@ std::unique_ptr NotificationContentDetectionServiceFactory:: + return nullptr; + } + ++#if BUILDFLAG(BUILD_WITH_TFLITE_LIB) + auto database_manager = + g_browser_process->safe_browsing_service()->database_manager(); + scoped_refptr background_task_runner = +@@ -70,6 +72,9 @@ std::unique_ptr NotificationContentDetectionServiceFactory:: + {base::MayBlock(), base::TaskPriority::BEST_EFFORT}); + return std::make_unique( + opt_guide, background_task_runner, database_manager, context); ++#else ++ return nullptr; ++#endif + } + + } // namespace safe_browsing diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc -@@ -444,7 +444,6 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { +@@ -439,7 +439,6 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { } MixedContentSettingsTabHelper::CreateForWebContents(web_contents); NavigationMetricsRecorder::CreateForWebContents(web_contents); @@ -234,9 +285,9 @@ diff --git a/chrome/browser/ui/webui/omnibox/omnibox_page_handler.cc b/chrome/br #include "components/optimization_guide/machine_learning_tflite_buildflags.h" #include "components/search_engines/template_url.h" #include "content/public/browser/web_ui.h" -diff --git a/chrome/renderer/accessibility/read_aloud_app_model.cc b/chrome/renderer/accessibility/read_aloud_app_model.cc ---- a/chrome/renderer/accessibility/read_aloud_app_model.cc -+++ b/chrome/renderer/accessibility/read_aloud_app_model.cc +diff --git a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.cc b/chrome/renderer/accessibility/read_anything/read_aloud_app_model.cc +--- a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.cc ++++ b/chrome/renderer/accessibility/read_anything/read_aloud_app_model.cc @@ -6,7 +6,9 @@ #include "base/strings/utf_string_conversions.h" @@ -289,18 +340,18 @@ diff --git a/chrome/renderer/accessibility/read_aloud_app_model.cc b/chrome/rend // TODO(crbug.com/40927698): Update to use AXRange to better handle multiple // nodes. This may require updating GetText in ax_range.h to return AXNodeIds. -diff --git a/chrome/renderer/accessibility/read_aloud_app_model.h b/chrome/renderer/accessibility/read_aloud_app_model.h ---- a/chrome/renderer/accessibility/read_aloud_app_model.h -+++ b/chrome/renderer/accessibility/read_aloud_app_model.h +diff --git a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.h b/chrome/renderer/accessibility/read_anything/read_aloud_app_model.h +--- a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.h ++++ b/chrome/renderer/accessibility/read_anything/read_aloud_app_model.h @@ -9,7 +9,10 @@ #include "base/values.h" - #include "chrome/common/accessibility/read_anything.mojom.h" - #include "chrome/common/accessibility/read_anything_constants.h" + #include "chrome/common/read_anything/read_anything.mojom.h" + #include "chrome/common/read_anything/read_anything_constants.h" +#include "components/optimization_guide/machine_learning_tflite_buildflags.h" +#if BUILDFLAG(BUILD_WITH_TFLITE_LIB) #include "chrome/renderer/accessibility/phrase_segmentation/dependency_parser_model.h" +#endif - #include "chrome/renderer/accessibility/read_aloud_traversal_utils.h" + #include "chrome/renderer/accessibility/read_anything/read_aloud_traversal_utils.h" #include "ui/accessibility/ax_node_position.h" @@ -87,7 +90,9 @@ class ReadAloudAppModel { @@ -325,20 +376,20 @@ diff --git a/chrome/renderer/accessibility/read_aloud_app_model.h b/chrome/rende // Whether Read Aloud speech is currently playing or not. bool speech_playing_ = false; -diff --git a/chrome/renderer/accessibility/read_anything_app_controller.cc b/chrome/renderer/accessibility/read_anything_app_controller.cc ---- a/chrome/renderer/accessibility/read_anything_app_controller.cc -+++ b/chrome/renderer/accessibility/read_anything_app_controller.cc +diff --git a/chrome/renderer/accessibility/read_anything/read_anything_app_controller.cc b/chrome/renderer/accessibility/read_anything/read_anything_app_controller.cc +--- a/chrome/renderer/accessibility/read_anything/read_anything_app_controller.cc ++++ b/chrome/renderer/accessibility/read_anything/read_anything_app_controller.cc @@ -21,7 +21,9 @@ #include "base/strings/utf_string_conversions.h" - #include "chrome/common/accessibility/read_anything_constants.h" + #include "chrome/common/read_anything/read_anything_constants.h" #include "chrome/renderer/accessibility/ax_tree_distiller.h" +#if BUILDFLAG(BUILD_WITH_TFLITE_LIB) #include "chrome/renderer/accessibility/phrase_segmentation/dependency_parser_model.h" +#endif - #include "chrome/renderer/accessibility/read_aloud_traversal_utils.h" - #include "chrome/renderer/accessibility/read_anything_node_utils.h" + #include "chrome/renderer/accessibility/read_anything/read_aloud_traversal_utils.h" + #include "chrome/renderer/accessibility/read_anything/read_anything_node_utils.h" #include "components/language/core/common/locale_util.h" -@@ -364,11 +366,13 @@ SkBitmap CorrectColorOfBitMap(SkBitmap& originalBitmap) { +@@ -363,11 +365,13 @@ SkBitmap CorrectColorOfBitMap(SkBitmap& originalBitmap) { return converted; } @@ -352,7 +403,7 @@ diff --git a/chrome/renderer/accessibility/read_anything_app_controller.cc b/chr } // namespace -@@ -1474,6 +1478,7 @@ void ReadAnythingAppController::OnConnected() { +@@ -1457,6 +1461,7 @@ void ReadAnythingAppController::OnConnected() { render_frame()->GetBrowserInterfaceBroker().GetInterface( std::move(page_handler_factory_receiver)); @@ -360,7 +411,7 @@ diff --git a/chrome/renderer/accessibility/read_anything_app_controller.cc b/chr // Get the dependency parser model used by phrase-based highlighting. DependencyParserModel& dependency_parser_model = GetDependencyParserModel(); if (dependency_parser_model.IsAvailable()) { -@@ -1483,6 +1488,7 @@ void ReadAnythingAppController::OnConnected() { +@@ -1466,6 +1471,7 @@ void ReadAnythingAppController::OnConnected() { page_handler_->GetDependencyParserModel( base::BindOnce(&ReadAnythingAppController::UpdateDependencyParserModel, weak_ptr_factory_.GetWeakPtr())); @@ -368,7 +419,7 @@ diff --git a/chrome/renderer/accessibility/read_anything_app_controller.cc b/chr } void ReadAnythingAppController::OnCopy() const { -@@ -1692,6 +1698,7 @@ std::vector ReadAnythingAppController::GetCurrentText() { +@@ -1675,6 +1681,7 @@ std::vector ReadAnythingAppController::GetCurrentText() { } void ReadAnythingAppController::PreprocessTextForSpeech() { @@ -376,7 +427,7 @@ diff --git a/chrome/renderer/accessibility/read_anything_app_controller.cc b/chr const std::set* node_ids = model_.selection_node_ids().empty() ? &model_.display_node_ids() : &model_.selection_node_ids(); -@@ -1701,6 +1708,7 @@ void ReadAnythingAppController::PreprocessTextForSpeech() { +@@ -1684,6 +1691,7 @@ void ReadAnythingAppController::PreprocessTextForSpeech() { DependencyParserModel& model = GetDependencyParserModel(); read_aloud_model_.PreprocessPhrasesForText(model); } @@ -384,7 +435,7 @@ diff --git a/chrome/renderer/accessibility/read_anything_app_controller.cc b/chr } void ReadAnythingAppController::MovePositionToNextGranularity() { -@@ -1874,14 +1882,18 @@ bool ReadAnythingAppController::IsDocsLoadMoreButtonVisible() const { +@@ -1857,14 +1865,18 @@ bool ReadAnythingAppController::IsDocsLoadMoreButtonVisible() const { void ReadAnythingAppController::UpdateDependencyParserModel( base::File model_file) { @@ -403,10 +454,10 @@ diff --git a/chrome/renderer/accessibility/read_anything_app_controller.cc b/chr void ReadAnythingAppController::OnTreeAdded(ui::AXTree* tree) { auto observation = -diff --git a/chrome/renderer/accessibility/read_anything_app_controller.h b/chrome/renderer/accessibility/read_anything_app_controller.h ---- a/chrome/renderer/accessibility/read_anything_app_controller.h -+++ b/chrome/renderer/accessibility/read_anything_app_controller.h -@@ -47,7 +47,9 @@ class MojoUkmRecorder; +diff --git a/chrome/renderer/accessibility/read_anything/read_anything_app_controller.h b/chrome/renderer/accessibility/read_anything/read_anything_app_controller.h +--- a/chrome/renderer/accessibility/read_anything/read_anything_app_controller.h ++++ b/chrome/renderer/accessibility/read_anything/read_anything_app_controller.h +@@ -46,7 +46,9 @@ class MojoUkmRecorder; } // namespace ukm class AXTreeDistiller; @@ -441,7 +492,7 @@ diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn diff --git a/chrome/utility/services.cc b/chrome/utility/services.cc --- a/chrome/utility/services.cc +++ b/chrome/utility/services.cc -@@ -246,13 +246,6 @@ auto RunMirroringService( +@@ -243,13 +243,6 @@ auto RunMirroringService( std::move(receiver), content::UtilityThread::Get()->GetIOTaskRunner()); } @@ -455,7 +506,7 @@ diff --git a/chrome/utility/services.cc b/chrome/utility/services.cc #endif // !BUILDFLAG(IS_ANDROID) #if BUILDFLAG(ENABLE_BROWSER_SPEECH_SERVICE) -@@ -459,7 +452,6 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services) { +@@ -466,7 +459,6 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services) { #if !BUILDFLAG(IS_ANDROID) services.Add(RunProfileImporter); services.Add(RunMirroringService); @@ -466,7 +517,7 @@ diff --git a/chrome/utility/services.cc b/chrome/utility/services.cc 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 -@@ -209,6 +209,7 @@ void AutofillOptimizationGuide::OnDidParseForm( +@@ -208,6 +208,7 @@ void AutofillOptimizationGuide::OnDidParseForm( // If we do not have any optimization types to register, do not do anything. if (!optimization_types.empty()) { // Register all optimization types that we need based on `form_structure`. @@ -474,7 +525,7 @@ diff --git a/components/autofill/core/browser/autofill_optimization_guide.cc b/c decider_->RegisterOptimizationTypes( std::vector( std::move(optimization_types).extract())); -@@ -260,7 +261,7 @@ bool AutofillOptimizationGuide::ShouldBlockSingleFieldSuggestions( +@@ -259,7 +260,7 @@ bool AutofillOptimizationGuide::ShouldBlockSingleFieldSuggestions( const AutofillField* field) const { // If the field's storable type is `IBAN_VALUE`, check whether IBAN // suggestions should be blocked based on `url`. @@ -483,7 +534,7 @@ diff --git a/components/autofill/core/browser/autofill_optimization_guide.cc b/c optimization_guide::OptimizationGuideDecision decision = decider_->CanApplyOptimization( url, optimization_guide::proto::IBAN_AUTOFILL_BLOCKED, -@@ -286,7 +287,7 @@ bool AutofillOptimizationGuide::ShouldBlockFormFieldSuggestion( +@@ -285,7 +286,7 @@ bool AutofillOptimizationGuide::ShouldBlockFormFieldSuggestion( const CreditCard& card) const { if (auto optimization_type = GetVcnMerchantOptOutOptimizationTypeForCard(card); @@ -524,7 +575,7 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/ diff --git a/components/optimization_guide/core/hints_fetcher.cc b/components/optimization_guide/core/hints_fetcher.cc --- a/components/optimization_guide/core/hints_fetcher.cc +++ b/components/optimization_guide/core/hints_fetcher.cc -@@ -198,6 +198,7 @@ bool HintsFetcher::FetchOptimizationGuideServiceHints( +@@ -196,6 +196,7 @@ bool HintsFetcher::FetchOptimizationGuideServiceHints( bool skip_cache, HintsFetchedCallback hints_fetched_callback, std::optional request_context_metadata) { @@ -535,7 +586,7 @@ diff --git a/components/optimization_guide/core/hints_fetcher.cc b/components/op diff --git a/components/optimization_guide/core/hints_manager.cc b/components/optimization_guide/core/hints_manager.cc --- a/components/optimization_guide/core/hints_manager.cc +++ b/components/optimization_guide/core/hints_manager.cc -@@ -393,6 +393,7 @@ void HintsManager::Shutdown() { +@@ -391,6 +391,7 @@ void HintsManager::Shutdown() { OptimizationGuideDecision HintsManager::GetOptimizationGuideDecisionFromOptimizationTypeDecision( OptimizationTypeDecision optimization_type_decision) { @@ -543,7 +594,7 @@ diff --git a/components/optimization_guide/core/hints_manager.cc b/components/op switch (optimization_type_decision) { case OptimizationTypeDecision::kAllowedByOptimizationFilter: case OptimizationTypeDecision::kAllowedByHint: -@@ -1116,6 +1117,7 @@ void HintsManager::CanApplyOptimizationOnDemand( +@@ -1114,6 +1115,7 @@ void HintsManager::CanApplyOptimizationOnDemand( OnDemandOptimizationGuideDecisionRepeatingCallback callback, std::optional request_context_metadata) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); @@ -551,7 +602,7 @@ diff --git a/components/optimization_guide/core/hints_manager.cc b/components/op InsertionOrderedSet urls_to_fetch; InsertionOrderedSet hosts_to_fetch; -@@ -1421,6 +1423,9 @@ OptimizationTypeDecision HintsManager::CanApplyOptimization( +@@ -1417,6 +1419,9 @@ OptimizationTypeDecision HintsManager::CanApplyOptimization( bool skip_cache, OptimizationMetadata* optimization_metadata) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); @@ -576,7 +627,7 @@ diff --git a/components/optimization_guide/core/optimization_guide_features.cc b } // namespace -@@ -415,8 +411,7 @@ size_t MaxURLKeyedHintCacheSize() { +@@ -422,8 +418,7 @@ size_t MaxURLKeyedHintCacheSize() { } bool ShouldPersistHintsToDisk() { @@ -586,7 +637,7 @@ diff --git a/components/optimization_guide/core/optimization_guide_features.cc b } RequestContextSet GetAllowedContextsForPersonalizedMetadata() { -@@ -874,5 +869,13 @@ int GetOnDeviceModelValidationAttemptCount() { +@@ -864,5 +859,13 @@ int GetOnDeviceModelValidationAttemptCount() { return kParam.Get(); } @@ -664,7 +715,7 @@ diff --git a/components/optimization_guide/features.gni b/components/optimizatio diff --git a/components/page_content_annotations/core/page_content_annotations_features.cc b/components/page_content_annotations/core/page_content_annotations_features.cc --- a/components/page_content_annotations/core/page_content_annotations_features.cc +++ b/components/page_content_annotations/core/page_content_annotations_features.cc -@@ -280,4 +280,9 @@ size_t MaxRelatedSearchesCacheSize() { +@@ -263,4 +263,9 @@ size_t MaxRelatedSearchesCacheSize() { "max_related_searches_cache_size", 10); } @@ -674,6 +725,17 @@ diff --git a/components/page_content_annotations/core/page_content_annotations_f +SET_CROMITE_FEATURE_DISABLED(kPageContentAnnotationsValidation); +SET_CROMITE_FEATURE_DISABLED(kPageContentAnnotationsPersistSalientImageMetadata); } // namespace page_content_annotations::features +diff --git a/components/safe_browsing/core/common/features.cc b/components/safe_browsing/core/common/features.cc +--- a/components/safe_browsing/core/common/features.cc ++++ b/components/safe_browsing/core/common/features.cc +@@ -228,6 +228,7 @@ BASE_FEATURE(kLogAccountEnhancedProtectionStateInProtegoPings, + BASE_FEATURE(kOnDeviceNotificationContentDetectionModel, + "OnDeviceNotificationContentDetectionModel", + base::FEATURE_DISABLED_BY_DEFAULT); ++SET_CROMITE_FEATURE_DISABLED(kOnDeviceNotificationContentDetectionModel); + + constexpr base::FeatureParam + kOnDeviceNotificationContentDetectionModelAllowlistSamplingRate{ diff --git a/cromite_flags/chrome/browser/browser_features_cc/Disable-all-predictors-code.inc b/cromite_flags/chrome/browser/browser_features_cc/Disable-all-predictors-code.inc new file mode 100644 --- /dev/null @@ -730,7 +792,7 @@ diff --git a/services/webnn/features.gni b/services/webnn/features.gni diff --git a/third_party/blink/renderer/core/speculation_rules/document_speculation_rules.cc b/third_party/blink/renderer/core/speculation_rules/document_speculation_rules.cc --- a/third_party/blink/renderer/core/speculation_rules/document_speculation_rules.cc +++ b/third_party/blink/renderer/core/speculation_rules/document_speculation_rules.cc -@@ -643,6 +643,7 @@ void DocumentSpeculationRules::UpdateSpeculationCandidates() { +@@ -642,6 +642,7 @@ void DocumentSpeculationRules::UpdateSpeculationCandidates() { return; } @@ -741,7 +803,7 @@ diff --git a/third_party/blink/renderer/core/speculation_rules/document_speculat 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 -@@ -3346,7 +3346,7 @@ +@@ -3363,7 +3363,7 @@ // // It also has some feature params defined throughout the codebase. name: "Prerender2", diff --git a/build/cromite_patches/Disable-all-promo-dialogs.patch b/build/cromite_patches/Disable-all-promo-dialogs.patch index 80e1e5d6..aff148b0 100644 --- a/build/cromite_patches/Disable-all-promo-dialogs.patch +++ b/build/cromite_patches/Disable-all-promo-dialogs.patch @@ -6,18 +6,18 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html --- .../chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java | 1 + chrome/browser/ui/browser_ui_prefs.cc | 2 +- - .../ui/views/user_education/browser_feature_promo_controller.cc | 1 + + .../views/profiles/profile_picker_feature_promo_controller.cc | 1 + + .../user_education/impl/browser_feature_promo_controller_20.cc | 1 + .../chrome/browser/user_education/UserEducationHelper.java | 1 + - components/user_education/common/feature_promo_controller.cc | 1 + - components/user_education/common/feature_promo_registry.cc | 1 + - .../browser/ui/ui_features_cc/Disable-all-promo-dialogs.inc | 1 + - 7 files changed, 7 insertions(+), 1 deletion(-) - create mode 100755 cromite_flags/chrome/browser/ui/ui_features_cc/Disable-all-promo-dialogs.inc + .../common/feature_promo/feature_promo_registry.cc | 2 ++ + .../common/feature_promo/impl/feature_promo_controller_20.cc | 1 + + .../common/feature_promo/impl/feature_promo_controller_25.cc | 1 + + 8 files changed, 9 insertions(+), 1 deletion(-) diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java -@@ -1361,6 +1361,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -1379,6 +1379,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { } private boolean maybeShowPromo(Profile profile) { @@ -37,12 +37,23 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_u registry->RegisterBooleanPref( prefs::kExternalProtocolDialogShowAlwaysOpenCheckbox, true); registry->RegisterBooleanPref(prefs::kScreenCaptureAllowed, true); -diff --git a/chrome/browser/ui/views/user_education/browser_feature_promo_controller.cc b/chrome/browser/ui/views/user_education/browser_feature_promo_controller.cc ---- a/chrome/browser/ui/views/user_education/browser_feature_promo_controller.cc -+++ b/chrome/browser/ui/views/user_education/browser_feature_promo_controller.cc -@@ -82,6 +82,7 @@ ui::ElementContext BrowserFeaturePromoController::GetAnchorContext() const { +diff --git a/chrome/browser/ui/views/profiles/profile_picker_feature_promo_controller.cc b/chrome/browser/ui/views/profiles/profile_picker_feature_promo_controller.cc +--- a/chrome/browser/ui/views/profiles/profile_picker_feature_promo_controller.cc ++++ b/chrome/browser/ui/views/profiles/profile_picker_feature_promo_controller.cc +@@ -38,6 +38,7 @@ ui::ElementContext ProfilePickerFeaturePromoController::GetAnchorContext() - bool BrowserFeaturePromoController::CanShowPromoForElement( + bool ProfilePickerFeaturePromoController::CanShowPromoForElement( + ui::TrackedElement* anchor_element) const { ++ if ((true)) return false; + return ProfilePicker::IsOpen(); + } + +diff --git a/chrome/browser/ui/views/user_education/impl/browser_feature_promo_controller_20.cc b/chrome/browser/ui/views/user_education/impl/browser_feature_promo_controller_20.cc +--- a/chrome/browser/ui/views/user_education/impl/browser_feature_promo_controller_20.cc ++++ b/chrome/browser/ui/views/user_education/impl/browser_feature_promo_controller_20.cc +@@ -59,6 +59,7 @@ ui::ElementContext BrowserFeaturePromoController20::GetAnchorContext() const { + + bool BrowserFeaturePromoController20::CanShowPromoForElement( ui::TrackedElement* anchor_element) const { + if ((true)) return false; // Trying to show an IPH while the browser is closing can cause problems; @@ -51,28 +62,17 @@ diff --git a/chrome/browser/ui/views/user_education/browser_feature_promo_contro diff --git a/chrome/browser/user_education/java/src/org/chromium/chrome/browser/user_education/UserEducationHelper.java b/chrome/browser/user_education/java/src/org/chromium/chrome/browser/user_education/UserEducationHelper.java --- a/chrome/browser/user_education/java/src/org/chromium/chrome/browser/user_education/UserEducationHelper.java +++ b/chrome/browser/user_education/java/src/org/chromium/chrome/browser/user_education/UserEducationHelper.java -@@ -126,6 +126,7 @@ public class UserEducationHelper { +@@ -117,6 +117,7 @@ public class UserEducationHelper { } - private void showIPH(Tracker tracker, IPHCommand iphCommand) { + private void showIph(Tracker tracker, IphCommand iphCommand) { + if ((true)) return; // Activity was destroyed; don't show IPH. View anchorView = iphCommand.anchorView; if (mActivity == null -diff --git a/components/user_education/common/feature_promo_controller.cc b/components/user_education/common/feature_promo_controller.cc ---- a/components/user_education/common/feature_promo_controller.cc -+++ b/components/user_education/common/feature_promo_controller.cc -@@ -640,6 +640,7 @@ FeaturePromoResult FeaturePromoControllerCommon::CanShowPromoCommon( - const FeaturePromoSpecification** display_spec_out, - std::unique_ptr* lifecycle_out, - ui::TrackedElement** anchor_element_out) const { -+ if ((true)) return FeaturePromoResult::kBlockedByContext; - const bool for_demo = source == ShowSource::kDemo; - - // Ensure that this promo isn't already queued for startup. -diff --git a/components/user_education/common/feature_promo_registry.cc b/components/user_education/common/feature_promo_registry.cc ---- a/components/user_education/common/feature_promo_registry.cc -+++ b/components/user_education/common/feature_promo_registry.cc +diff --git a/components/user_education/common/feature_promo/feature_promo_registry.cc b/components/user_education/common/feature_promo/feature_promo_registry.cc +--- a/components/user_education/common/feature_promo/feature_promo_registry.cc ++++ b/components/user_education/common/feature_promo/feature_promo_registry.cc @@ -20,6 +20,7 @@ FeaturePromoRegistry& FeaturePromoRegistry::operator=( FeaturePromoRegistry::~FeaturePromoRegistry() = default; @@ -81,10 +81,34 @@ diff --git a/components/user_education/common/feature_promo_registry.cc b/compon const base::Feature* const iph_feature = spec.feature(); CHECK(iph_feature); CHECK_NE(FeaturePromoSpecification::PromoType::kUnspecified, -diff --git a/cromite_flags/chrome/browser/ui/ui_features_cc/Disable-all-promo-dialogs.inc b/cromite_flags/chrome/browser/ui/ui_features_cc/Disable-all-promo-dialogs.inc -new file mode 100755 ---- /dev/null -+++ b/cromite_flags/chrome/browser/ui/ui_features_cc/Disable-all-promo-dialogs.inc -@@ -0,0 +1 @@ -+SET_CROMITE_FEATURE_DISABLED(kChromeLabs); +@@ -35,6 +36,7 @@ NewBadgeRegistry& NewBadgeRegistry::operator=( + NewBadgeRegistry::~NewBadgeRegistry() = default; + + void NewBadgeRegistry::RegisterFeature(NewBadgeSpecification spec) { ++ if ((true)) return; + const base::Feature* const iph_feature = spec.feature; + CHECK(iph_feature); + FeatureRegistry::RegisterFeature(*iph_feature, +diff --git a/components/user_education/common/feature_promo/impl/feature_promo_controller_20.cc b/components/user_education/common/feature_promo/impl/feature_promo_controller_20.cc +--- a/components/user_education/common/feature_promo/impl/feature_promo_controller_20.cc ++++ b/components/user_education/common/feature_promo/impl/feature_promo_controller_20.cc +@@ -89,6 +89,7 @@ FeaturePromoResult FeaturePromoController20::CanShowPromoCommon( + const FeaturePromoParams& params, + ShowSource source, + CanShowPromoOutputs* outputs) const { ++ if ((true)) return FeaturePromoResult::kBlockedByContext; + const bool for_demo = source == ShowSource::kDemo; + + // Ensure that this promo isn't already queued for startup. +diff --git a/components/user_education/common/feature_promo/impl/feature_promo_controller_25.cc b/components/user_education/common/feature_promo/impl/feature_promo_controller_25.cc +--- a/components/user_education/common/feature_promo/impl/feature_promo_controller_25.cc ++++ b/components/user_education/common/feature_promo/impl/feature_promo_controller_25.cc +@@ -48,6 +48,7 @@ FeaturePromoResult FeaturePromoController25::CanShowPromoCommon( + const FeaturePromoParams& params, + ShowSource source, + CanShowPromoOutputs* outputs) const { ++ if ((true)) return FeaturePromoResult::kBlockedByContext; + return FeaturePromoResult::kError; + } + -- diff --git a/build/cromite_patches/Disable-conversion-measurement-api.patch b/build/cromite_patches/Disable-conversion-measurement-api.patch index 33a5093d..27879db2 100644 --- a/build/cromite_patches/Disable-conversion-measurement-api.patch +++ b/build/cromite_patches/Disable-conversion-measurement-api.patch @@ -20,7 +20,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../render_view_context_menu_base.cc | 3 - .../aggregatable_report_sender.cc | 15 +- .../aggregation_service_features.cc | 1 + - .../attribution_data_host_manager_impl.cc | 1 + + .../attribution_data_host_manager_impl.cc | 2 + .../attribution_reporting/attribution_host.cc | 1 + .../attribution_os_level_manager.cc | 3 +- .../attribution_report_network_sender.cc | 9 + @@ -37,14 +37,14 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html third_party/blink/renderer/core/page/page.cc | 2 +- .../platform/runtime_enabled_features.json5 | 10 +- ui/events/android/motion_event_android.cc | 8 +- - 26 files changed, 78 insertions(+), 382 deletions(-) + 26 files changed, 79 insertions(+), 382 deletions(-) create mode 100644 cromite_flags/services/network/public/cpp/features_cc/Disable-conversion-measurement-api.inc create mode 100644 cromite_flags/third_party/blink/common/features_cc/Disable-conversion-measurement-api.inc diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc --- a/android_webview/browser/aw_content_browser_client.cc +++ b/android_webview/browser/aw_content_browser_client.cc -@@ -1337,6 +1337,7 @@ network::mojom::AttributionSupport +@@ -1321,6 +1321,7 @@ network::mojom::AttributionSupport AwContentBrowserClient::GetAttributionSupport( AttributionReportingOsApiState state, bool client_os_disabled) { @@ -52,7 +52,7 @@ diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webv // WebView only supports OS-level attribution and not web-attribution. switch (state) { case AttributionReportingOsApiState::kDisabled: -@@ -1355,6 +1356,8 @@ bool AwContentBrowserClient::IsAttributionReportingOperationAllowed( +@@ -1339,6 +1340,8 @@ bool AwContentBrowserClient::IsAttributionReportingOperationAllowed( const url::Origin* destination_origin, const url::Origin* reporting_origin, bool* can_bypass) { @@ -93,7 +93,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro + android:orientation="vertical" + tools:ignore="MergeRootFrame"> + +@@ -24,7 +24,7 @@ found in the LICENSE file. + + + RegisterBooleanPref(prefs::kVirtualKeyboardResizesLayoutByDefault, @@ -2166,15 +2176,15 @@ diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/ch import android.os.SystemClock; import android.text.TextUtils; import android.view.Gravity; -@@ -41,6 +42,7 @@ import org.chromium.base.SysUtils; - import org.chromium.base.metrics.RecordHistogram; +@@ -42,6 +43,7 @@ import org.chromium.base.metrics.RecordHistogram; import org.chromium.base.task.PostTask; import org.chromium.base.task.TaskTraits; + import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider.ControlsPosition; +import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.ui.appmenu.internal.R; import org.chromium.components.browser_ui.styles.ChromeColors; import org.chromium.components.browser_ui.widget.chips.ChipView; -@@ -262,6 +264,12 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler +@@ -264,6 +266,12 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler } mListView = (ListView) contentView.findViewById(R.id.app_menu_list); @@ -2187,7 +2197,7 @@ diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/ch int footerHeight = inflateFooter(footerResourceId, contentView, menuWidth); int headerHeight = inflateHeader(headerResourceId, contentView, menuWidth); -@@ -294,7 +302,7 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler +@@ -296,7 +304,7 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler Math.min( Math.abs(mTempLocation[1] - visibleDisplayFrame.top), Math.abs(mTempLocation[1] - visibleDisplayFrame.bottom)); @@ -2196,7 +2206,7 @@ diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/ch menuItemIds, heightList, visibleDisplayFrame, -@@ -314,8 +322,14 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler +@@ -316,8 +324,14 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler sizingPadding, anchorView, popupWidth, @@ -2212,7 +2222,7 @@ diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/ch try { mPopup.showAtLocation( -@@ -376,11 +390,20 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler +@@ -378,11 +392,20 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler Rect padding, View anchorView, int popupWidth, @@ -2234,7 +2244,7 @@ diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/ch int[] offsets = new int[2]; // If we have a hardware menu button, locate the app menu closer to the estimated // hardware menu button location. -@@ -554,7 +577,7 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler +@@ -556,7 +579,7 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler if (mAdapter != null) mAdapter.notifyDataSetChanged(); } @@ -2243,7 +2253,7 @@ diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/ch List menuItemIds, List heightList, Rect appDimensions, -@@ -573,7 +596,13 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler +@@ -575,7 +598,13 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler - footerHeight - headerHeight - anchorViewImpactHeight; @@ -2258,7 +2268,7 @@ diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/ch if (mIsByPermanentButton) availableScreenSpace -= padding.top; if (availableScreenSpace <= 0 && sExceptionReporter != null) { String logMessage = -@@ -603,6 +632,7 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler +@@ -605,6 +634,7 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler menuItemIds, heightList, groupDividerResourceId, availableScreenSpace); menuHeight += footerHeight + headerHeight + padding.top + padding.bottom; mPopup.setHeight(menuHeight); @@ -2275,9 +2285,9 @@ diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/ch import org.chromium.base.metrics.RecordUserAction; +import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.base.supplier.Supplier; + import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider; import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher; - import org.chromium.chrome.browser.lifecycle.ConfigurationChangedObserver; -@@ -229,7 +230,16 @@ class AppMenuHandlerImpl +@@ -235,7 +236,16 @@ class AppMenuHandlerImpl id, customViewBinders, customViewTypeOffsetMap); }, this); @@ -2360,7 +2370,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteCoordinator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteCoordinator.java --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteCoordinator.java +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteCoordinator.java -@@ -47,6 +47,7 @@ import org.chromium.ui.modaldialog.ModalDialogManager; +@@ -48,6 +48,7 @@ import org.chromium.ui.modaldialog.ModalDialogManager; import org.chromium.ui.modelutil.LazyConstructionPropertyMcp; import org.chromium.ui.modelutil.MVCListAdapter.ModelList; import org.chromium.ui.modelutil.PropertyModel; @@ -2368,7 +2378,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow import java.util.ArrayList; import java.util.List; -@@ -65,6 +66,7 @@ public class AutocompleteCoordinator +@@ -66,6 +67,7 @@ public class AutocompleteCoordinator private @Nullable OmniboxSuggestionsDropdown mDropdown; private @NonNull ObserverList mScrollListenerList = new ObserverList<>(); @@ -2376,7 +2386,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow /** An observer watching for changes to the visual state of the omnibox suggestions. */ public interface OmniboxSuggestionsVisualStateObserver { -@@ -101,6 +103,7 @@ public class AutocompleteCoordinator +@@ -102,6 +104,7 @@ public class AutocompleteCoordinator Context context = parent.getContext(); ModelList listItems = new ModelList(); @@ -2384,7 +2394,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow PropertyModel listModel = new PropertyModel.Builder(SuggestionListProperties.ALL_KEYS) .with(SuggestionListProperties.EMBEDDER, dropdownEmbedder) -@@ -218,6 +221,16 @@ public class AutocompleteCoordinator +@@ -222,6 +225,16 @@ public class AutocompleteCoordinator dropdown.forcePhoneStyleOmnibox(forcePhoneStyleOmnibox); dropdown.setAdapter(mAdapter); @@ -2404,7 +2414,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java -@@ -70,6 +70,8 @@ import org.chromium.ui.modelutil.PropertyModel; +@@ -74,6 +74,8 @@ import org.chromium.ui.modelutil.PropertyModel; import org.chromium.ui.mojom.WindowOpenDisposition; import org.chromium.url.GURL; @@ -2413,7 +2423,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.List; -@@ -1178,7 +1180,9 @@ class AutocompleteMediator +@@ -1216,7 +1218,9 @@ class AutocompleteMediator @Override public void onSuggestionDropdownScroll() { mSuggestionsListScrolled = true; @@ -2507,7 +2517,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -1774,6 +1774,12 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1742,6 +1742,12 @@ Your Google account may have other forms of browsing history like searches and a Force Tablet Mode @@ -2523,7 +2533,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro diff --git a/chrome/browser/ui/android/toolbar/BUILD.gn b/chrome/browser/ui/android/toolbar/BUILD.gn --- a/chrome/browser/ui/android/toolbar/BUILD.gn +++ b/chrome/browser/ui/android/toolbar/BUILD.gn -@@ -172,6 +172,7 @@ android_library("java") { +@@ -176,6 +176,7 @@ android_library("java") { "//content/public/android:content_java", "//third_party/android_deps:material_design_java", "//third_party/androidx:androidx_annotation_annotation_experimental_java", @@ -2628,7 +2638,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsMediator.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsMediator.java --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsMediator.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsMediator.java -@@ -28,6 +28,7 @@ import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeUtils; +@@ -28,6 +28,7 @@ import org.chromium.components.browser_ui.edge_to_edge.EdgeToEdgeSupplier.Change import org.chromium.ui.KeyboardVisibilityDelegate; import org.chromium.ui.base.WindowAndroid; import org.chromium.ui.modelutil.PropertyModel; @@ -2649,7 +2659,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow mIsBottomControlsVisible = visible; updateCompositedViewVisibility(); updateAndroidViewVisibility(); -@@ -193,6 +200,7 @@ class BottomControlsMediator +@@ -194,6 +201,7 @@ class BottomControlsMediator int bottomControlsMinHeightOffset, boolean needsAnimate, boolean isVisibilityForced) { @@ -2657,7 +2667,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow // Method call routed to onBrowserControlsOffsetUpdate. if (BottomControlsStacker.isDispatchingYOffset()) return; -@@ -318,11 +326,13 @@ class BottomControlsMediator +@@ -319,11 +327,13 @@ class BottomControlsMediator && !mIsInSwipeLayout && getBrowserControls().getBottomControlOffset() == 0; if (visible) { @@ -2770,7 +2780,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java -@@ -63,6 +63,10 @@ import java.lang.annotation.Retention; +@@ -64,6 +64,10 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.function.BooleanSupplier; @@ -2780,8 +2790,8 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow + /** Layout for the browser controls (omnibox, menu, tab strip, etc..). */ public class ToolbarControlContainer extends OptimizedFrameLayout - implements ControlContainer, DesktopWindowStateProvider.AppHeaderObserver { -@@ -152,6 +156,11 @@ public class ToolbarControlContainer extends OptimizedFrameLayout + implements ControlContainer, DesktopWindowStateManager.AppHeaderObserver { +@@ -167,6 +171,11 @@ public class ToolbarControlContainer extends OptimizedFrameLayout if (view != null) ((MarginLayoutParams)view.getLayoutParams()).topMargin = tab_strip_height; } @@ -2796,7 +2806,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/TopToolbarOverlayCoordinator.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/TopToolbarOverlayCoordinator.java --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/TopToolbarOverlayCoordinator.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/TopToolbarOverlayCoordinator.java -@@ -21,11 +21,14 @@ import org.chromium.chrome.browser.tab.Tab; +@@ -22,11 +22,14 @@ import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.theme.TopUiThemeColorProvider; import org.chromium.chrome.browser.toolbar.R; import org.chromium.components.browser_ui.widget.ClipDrawableProgressBar; @@ -2811,10 +2821,10 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow /** The public interface for the top toolbar texture component. */ public class TopToolbarOverlayCoordinator implements SceneOverlay { /** The view state for this overlay. */ -@@ -62,6 +65,12 @@ public class TopToolbarOverlayCoordinator implements SceneOverlay { - TopToolbarOverlayProperties.CONTENT_OFFSET, +@@ -71,6 +74,12 @@ public class TopToolbarOverlayCoordinator implements SceneOverlay { browserControlsStateProvider.getContentOffset()) .with(TopToolbarOverlayProperties.ANONYMIZE, false) + .with(TopToolbarOverlayProperties.SHOW_SHADOW, showHairline) + .with(TopToolbarOverlayProperties.VIEWPORT_HEIGHT, 0) + .with(TopToolbarOverlayProperties.TOOLBAR_HEIGHT, + browserControlsStateProvider.getTopControlsHeight() @@ -2824,7 +2834,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow .build(); mSceneLayer = new TopToolbarSceneLayer(resourceManagerSupplier); mChangeProcessor = -@@ -113,6 +122,7 @@ public class TopToolbarOverlayCoordinator implements SceneOverlay { +@@ -123,6 +132,7 @@ public class TopToolbarOverlayCoordinator implements SceneOverlay { @Override public SceneOverlayLayer getUpdatedSceneOverlayTree( RectF viewport, RectF visibleViewport, ResourceManager resourceManager, float yOffset) { @@ -2892,7 +2902,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml --- a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml +++ b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml -@@ -65,4 +65,12 @@ found in the LICENSE file. +@@ -60,4 +60,12 @@ found in the LICENSE file. android:key="image_descriptions" android:title="@string/image_descriptions_settings_title" /> @@ -2940,7 +2950,7 @@ diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/ #include "cc/base/math_util.h" #include "cc/input/browser_controls_offset_tags_info.h" #include "cc/slim/layer.h" -@@ -857,6 +858,8 @@ void RenderWidgetHostViewAndroid::OnRenderFrameMetadataChangedBeforeActivation( +@@ -860,6 +861,8 @@ void RenderWidgetHostViewAndroid::OnRenderFrameMetadataChangedBeforeActivation( // factor. Thus, |top_content_offset| in CSS pixels is also in DIPs. float top_content_offset = metadata.top_controls_height * metadata.top_controls_shown_ratio; diff --git a/build/cromite_patches/Move-some-account-settings-back-to-privacy-settings.patch b/build/cromite_patches/Move-some-account-settings-back-to-privacy-settings.patch index b8554dfd..ae678541 100644 --- a/build/cromite_patches/Move-some-account-settings-back-to-privacy-settings.patch +++ b/build/cromite_patches/Move-some-account-settings-back-to-privacy-settings.patch @@ -37,7 +37,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java -@@ -53,6 +53,14 @@ import org.chromium.components.signin.identitymanager.ConsentLevel; +@@ -54,6 +54,14 @@ import org.chromium.components.signin.identitymanager.ConsentLevel; import org.chromium.components.user_prefs.UserPrefs; import org.chromium.ui.text.SpanApplier; @@ -52,7 +52,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting /** Fragment to keep track of the all the privacy related preferences. */ public class PrivacySettings extends ChromeBaseSettingsFragment implements Preference.OnPreferenceChangeListener { -@@ -68,6 +76,16 @@ public class PrivacySettings extends ChromeBaseSettingsFragment +@@ -69,6 +77,16 @@ public class PrivacySettings extends ChromeBaseSettingsFragment private static final String PREF_INCOGNITO_LOCK = "incognito_lock"; @VisibleForTesting static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data"; @VisibleForTesting static final String PREF_DO_NOT_TRACK = "do_not_track"; @@ -69,7 +69,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting @VisibleForTesting static final String PREF_FP_PROTECTION = "fp_protection"; @VisibleForTesting static final String PREF_IP_PROTECTION = "ip_protection"; @VisibleForTesting static final String PREF_THIRD_PARTY_COOKIES = "third_party_cookies"; -@@ -159,6 +177,16 @@ public class PrivacySettings extends ChromeBaseSettingsFragment +@@ -160,6 +178,16 @@ public class PrivacySettings extends ChromeBaseSettingsFragment setHasOptionsMenu(true); @@ -109,7 +109,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -451,6 +451,10 @@ For more settings that use data to improve your Chrome experience, go to diff --git a/build/cromite_patches/OpenSearch-miscellaneous.patch b/build/cromite_patches/OpenSearch-miscellaneous.patch index f9536b41..a7769034 100644 --- a/build/cromite_patches/OpenSearch-miscellaneous.patch +++ b/build/cromite_patches/OpenSearch-miscellaneous.patch @@ -264,7 +264,7 @@ diff --git a/components/search_engines/template_url_service.h b/components/searc // regardless of |url| if the default search provider is managed by policy or // controlled by an extension. bool CanMakeDefault(const TemplateURL* url) const; -@@ -765,9 +768,6 @@ class TemplateURLService final : public WebDataServiceConsumer, +@@ -769,9 +772,6 @@ class TemplateURLService final : public WebDataServiceConsumer, // SetKeywordSearchTermsForURL is invoked. void UpdateKeywordSearchTermsForURL(const URLVisitedDetails& details); diff --git a/build/cromite_patches/Override-Navigator-Language.patch b/build/cromite_patches/Override-Navigator-Language.patch index d420a170..dd64d435 100644 --- a/build/cromite_patches/Override-Navigator-Language.patch +++ b/build/cromite_patches/Override-Navigator-Language.patch @@ -69,7 +69,7 @@ diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content #include "components/metrics/single_sample_metrics.h" #include "components/services/storage/privileged/mojom/indexed_db_control.mojom.h" #include "components/services/storage/public/cpp/buckets/bucket_id.h" -@@ -3217,8 +3218,11 @@ void RenderProcessHostImpl::AppendRendererCommandLine( +@@ -3214,8 +3215,11 @@ void RenderProcessHostImpl::AppendRendererCommandLine( PropagateBrowserCommandLineToRenderer(browser_command_line, command_line); // Pass on the browser locale. diff --git a/build/cromite_patches/Partition-Blink-memory-cache.patch b/build/cromite_patches/Partition-Blink-memory-cache.patch index ec70b38b..120ee7b5 100644 --- a/build/cromite_patches/Partition-Blink-memory-cache.patch +++ b/build/cromite_patches/Partition-Blink-memory-cache.patch @@ -29,7 +29,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/third_party/blink/renderer/core/html/parser/html_srcset_parser.cc b/third_party/blink/renderer/core/html/parser/html_srcset_parser.cc --- a/third_party/blink/renderer/core/html/parser/html_srcset_parser.cc +++ b/third_party/blink/renderer/core/html/parser/html_srcset_parser.cc -@@ -420,7 +420,8 @@ static unsigned AvoidDownloadIfHigherDensityResourceIsInCache( +@@ -418,7 +418,8 @@ static unsigned AvoidDownloadIfHigherDensityResourceIsInCache( auto* resource = MemoryCache::Get()->ResourceForURL( url, document->Fetcher()->GetCacheIdentifier(url, @@ -42,7 +42,7 @@ diff --git a/third_party/blink/renderer/core/html/parser/html_srcset_parser.cc b diff --git a/third_party/blink/renderer/core/inspector/inspector_network_agent.cc b/third_party/blink/renderer/core/inspector/inspector_network_agent.cc --- a/third_party/blink/renderer/core/inspector/inspector_network_agent.cc +++ b/third_party/blink/renderer/core/inspector/inspector_network_agent.cc -@@ -2441,7 +2441,7 @@ bool InspectorNetworkAgent::FetchResourceContent(Document* document, +@@ -2434,7 +2434,7 @@ bool InspectorNetworkAgent::FetchResourceContent(Document* document, if (!cached_resource) { cached_resource = MemoryCache::Get()->ResourceForURL( url, document->Fetcher()->GetCacheIdentifier( @@ -154,8 +154,8 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/memory_cache.h b/t diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc b/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc --- a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc +++ b/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc -@@ -993,7 +993,8 @@ Resource* ResourceFetcher::CreateResourceForStaticData( - return nullptr; +@@ -1006,7 +1006,8 @@ Resource* ResourceFetcher::CreateResourceForStaticData( + } const String cache_identifier = GetCacheIdentifier( - url, params.GetResourceRequest().GetSkipServiceWorker()); @@ -164,7 +164,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.c // Most off-main-thread resource fetches use Resource::kRaw and don't reach // this point, but off-main-thread module fetches might. if (IsMainThread()) { -@@ -1412,7 +1413,8 @@ Resource* ResourceFetcher::RequestResource(FetchParameters& params, +@@ -1431,7 +1432,8 @@ Resource* ResourceFetcher::RequestResource(FetchParameters& params, params.Url(), GetCacheIdentifier( params.Url(), @@ -174,7 +174,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.c if (resource) { policy = DetermineRevalidationPolicy(resource_type, params, *resource, is_static_data); -@@ -1724,7 +1726,8 @@ Resource* ResourceFetcher::CreateResourceForLoading( +@@ -1754,7 +1756,8 @@ Resource* ResourceFetcher::CreateResourceForLoading( const ResourceFactory& factory) { const String cache_identifier = GetCacheIdentifier(params.GetResourceRequest().Url(), @@ -184,7 +184,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.c DCHECK(!IsMainThread() || params.IsStaleRevalidation() || !MemoryCache::Get()->ResourceForURL(params.GetResourceRequest().Url(), cache_identifier)); -@@ -2794,11 +2797,41 @@ void ResourceFetcher::UpdateAllImageResourcePriorities() { +@@ -2862,11 +2865,41 @@ void ResourceFetcher::UpdateAllImageResourcePriorities() { } String ResourceFetcher::GetCacheIdentifier(const KURL& url, @@ -231,9 +231,9 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.c } // Requests that can be satisfied via `archive_` (i.e. MHTML) or -@@ -2811,7 +2844,7 @@ String ResourceFetcher::GetCacheIdentifier(const KURL& url, - if (bundle) +@@ -2881,7 +2914,7 @@ String ResourceFetcher::GetCacheIdentifier(const KURL& url, return bundle->GetCacheIdentifier(); + } - return MemoryCache::DefaultCacheIdentifier(); + return origin_url; diff --git a/build/cromite_patches/Partition-blobs-by-top-frame-URL.patch b/build/cromite_patches/Partition-blobs-by-top-frame-URL.patch index c78ec471..ce546f93 100644 --- a/build/cromite_patches/Partition-blobs-by-top-frame-URL.patch +++ b/build/cromite_patches/Partition-blobs-by-top-frame-URL.patch @@ -8,12 +8,21 @@ or, if not defined, by the same agent cluster. 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 --- - storage/browser/blob/blob_url_store_impl.cc | 28 +++++++++++++++++++ - storage/browser/blob/blob_url_store_impl.h | 9 ++++++ - .../public/mojom/blob/blob_url_store.mojom | 8 ++++-- - .../core/fileapi/public_url_manager.cc | 17 +++++++++++ - 4 files changed, 60 insertions(+), 2 deletions(-) + .../Partition-blobs-by-top-frame-URL.inc | 1 + + storage/browser/blob/blob_url_store_impl.cc | 36 ++++++++++++++++++- + storage/browser/blob/blob_url_store_impl.h | 11 ++++++ + storage/browser/blob/features.cc | 1 + + .../public/mojom/blob/blob_url_store.mojom | 12 +++++-- + .../core/fileapi/public_url_manager.cc | 18 ++++++++++ + 6 files changed, 75 insertions(+), 4 deletions(-) + create mode 100644 cromite_flags/third_party/blink/common/features_cc/Partition-blobs-by-top-frame-URL.inc +diff --git a/cromite_flags/third_party/blink/common/features_cc/Partition-blobs-by-top-frame-URL.inc b/cromite_flags/third_party/blink/common/features_cc/Partition-blobs-by-top-frame-URL.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/third_party/blink/common/features_cc/Partition-blobs-by-top-frame-URL.inc +@@ -0,0 +1 @@ ++SET_CROMITE_FEATURE_ENABLED(kEnforceNoopenerOnBlobURLNavigation); diff --git a/storage/browser/blob/blob_url_store_impl.cc b/storage/browser/blob/blob_url_store_impl.cc --- a/storage/browser/blob/blob_url_store_impl.cc +++ b/storage/browser/blob/blob_url_store_impl.cc @@ -78,10 +87,37 @@ diff --git a/storage/browser/blob/blob_url_store_impl.cc b/storage/browser/blob/ mojo::PendingRemote blob = registry_->GetBlobFromUrl(url); if (!blob) { std::move(callback).Run(std::nullopt); +@@ -162,11 +190,17 @@ void BlobURLStoreImpl::ResolveForNavigation( + void BlobURLStoreImpl::ResolveForWorkerScriptFetch( + const GURL& url, + mojo::PendingReceiver token, ++ const base::UnguessableToken& unsafe_agent_cluster_id, ++ const std::optional& unsafe_top_level_site, + ResolveForNavigationCallback callback) { + if (!registry_) { + std::move(callback).Run(std::nullopt); + return; + } ++ if (!IsSamePartition(url, unsafe_agent_cluster_id, unsafe_top_level_site)) { ++ std::move(callback).Run(std::nullopt); ++ return; ++ } + if (base::FeatureList::IsEnabled( + features::kBlockCrossPartitionBlobUrlFetching) && + !registry_->IsUrlMapped(BlobUrlUtils::ClearUrlFragment(url), +@@ -175,7 +209,7 @@ void BlobURLStoreImpl::ResolveForWorkerScriptFetch( + return; + } + +- ResolveForNavigation(url, std::move(token), std::move(callback)); ++ ResolveForNavigation(url, std::move(token), unsafe_agent_cluster_id, unsafe_top_level_site, std::move(callback)); + } + + bool BlobURLStoreImpl::BlobUrlIsValid(const GURL& url, diff --git a/storage/browser/blob/blob_url_store_impl.h b/storage/browser/blob/blob_url_store_impl.h --- a/storage/browser/blob/blob_url_store_impl.h +++ b/storage/browser/blob/blob_url_store_impl.h -@@ -48,10 +48,14 @@ class COMPONENT_EXPORT(STORAGE_BROWSER) BlobURLStoreImpl +@@ -48,14 +48,20 @@ class COMPONENT_EXPORT(STORAGE_BROWSER) BlobURLStoreImpl void ResolveAsURLLoaderFactory( const GURL& url, mojo::PendingReceiver receiver, @@ -92,11 +128,17 @@ diff --git a/storage/browser/blob/blob_url_store_impl.h b/storage/browser/blob/b const GURL& url, mojo::PendingReceiver token, + const base::UnguessableToken& unsafe_agent_cluster_id, ++ const std::optional& unsafe_top_level_site, + ResolveForNavigationCallback callback) override; + void ResolveForWorkerScriptFetch( + const GURL& url, + mojo::PendingReceiver token, ++ const base::UnguessableToken& unsafe_agent_cluster_id, + const std::optional& unsafe_top_level_site, ResolveForNavigationCallback callback) override; private: -@@ -61,6 +65,11 @@ class COMPONENT_EXPORT(STORAGE_BROWSER) BlobURLStoreImpl +@@ -65,6 +71,11 @@ class COMPONENT_EXPORT(STORAGE_BROWSER) BlobURLStoreImpl // `Revoke()`. bool BlobUrlIsValid(const GURL& url, const char* method) const; @@ -108,6 +150,17 @@ diff --git a/storage/browser/blob/blob_url_store_impl.h b/storage/browser/blob/b const blink::StorageKey storage_key_; // The origin used by the worker/document associated with this BlobURLStore on // the renderer side. This will almost always be the same as `storage_key_`'s +diff --git a/storage/browser/blob/features.cc b/storage/browser/blob/features.cc +--- a/storage/browser/blob/features.cc ++++ b/storage/browser/blob/features.cc +@@ -10,6 +10,7 @@ namespace features { + BASE_FEATURE(kBlockCrossPartitionBlobUrlFetching, + "BlockCrossPartitionBlobUrlFetching", + base::FEATURE_DISABLED_BY_DEFAULT); ++SET_CROMITE_FEATURE_ENABLED(kBlockCrossPartitionBlobUrlFetching); + + // Please keep features in alphabetical order. + diff --git a/third_party/blink/public/mojom/blob/blob_url_store.mojom b/third_party/blink/public/mojom/blob/blob_url_store.mojom --- a/third_party/blink/public/mojom/blob/blob_url_store.mojom +++ b/third_party/blink/public/mojom/blob/blob_url_store.mojom @@ -129,6 +182,17 @@ diff --git a/third_party/blink/public/mojom/blob/blob_url_store.mojom b/third_pa - pending_receiver token) => ( + pending_receiver token, + mojo_base.mojom.UnguessableToken unsafe_agent_cluster_id, ++ network.mojom.SchemefulSite? unsafe_top_level_site) => ( + // TODO(https://crbug.com/1224926): Remove this once experiment is over. + mojo_base.mojom.UnguessableToken? unsafe_agent_cluster_id); + +@@ -58,7 +62,9 @@ interface BlobURLStore { + // currently intended for use when fetching a dedicated / shared worker + // script. + ResolveForWorkerScriptFetch(url.mojom.Url url, +- pending_receiver token) => ( ++ pending_receiver token, ++ mojo_base.mojom.UnguessableToken unsafe_agent_cluster_id, + network.mojom.SchemefulSite? unsafe_top_level_site) => ( // TODO(https://crbug.com/1224926): Remove this once experiment is over. mojo_base.mojom.UnguessableToken? unsafe_agent_cluster_id); @@ -174,4 +238,12 @@ diff --git a/third_party/blink/renderer/core/fileapi/public_url_manager.cc b/thi WTF::BindOnce(metrics_callback, WrapPersistent(GetExecutionContext()))); } +@@ -318,6 +335,7 @@ void PublicURLManager::ResolveForWorkerScriptFetch( + + GetBlobURLStore().ResolveForWorkerScriptFetch( + url, std::move(token_receiver), ++ GetExecutionContext()->GetAgentClusterID(), GetInsecureTopLevelSite(GetExecutionContext()), + WTF::BindOnce(metrics_callback, WrapPersistent(GetExecutionContext()))); + } + -- diff --git a/build/cromite_patches/Re-introduce-modal-dialog-flag-to-close-all-tabs.patch b/build/cromite_patches/Re-introduce-modal-dialog-flag-to-close-all-tabs.patch index 7df903fb..22f6230c 100644 --- a/build/cromite_patches/Re-introduce-modal-dialog-flag-to-close-all-tabs.patch +++ b/build/cromite_patches/Re-introduce-modal-dialog-flag-to-close-all-tabs.patch @@ -45,10 +45,10 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser 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 -@@ -198,6 +198,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { - &kBackGestureMoveToBackDuringStartup, - &kBackGestureRefactorAndroid, - &kBackToHomeAnimation, +@@ -197,6 +197,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { + &kAutomotiveFullscreenToolbarImprovements, + &kAuxiliarySearchDonation, + &kAvoidSelectedTabFocusOnLayoutDoneShowing, + &kCloseAllTabsModalDialog, &kBackgroundThreadPool, &kBlockIntentsWhileLocked, @@ -56,14 +56,14 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse 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 -@@ -278,6 +278,7 @@ public abstract class ChromeFeatureList { - public static final String CCT_PREWARM_TAB = "CCTPrewarmTab"; - public static final String CCT_REPORT_PARALLEL_REQUEST_STATUS = - "CCTReportParallelRequestStatus"; +@@ -276,6 +276,7 @@ public abstract class ChromeFeatureList { + public static final String CHROME_SURVEY_NEXT_ANDROID = "ChromeSurveyNextAndroid"; + public static final String CHROME_SHARE_PAGE_INFO = "ChromeSharePageInfo"; + public static final String CLANK_STARTUP_LATENCY_INJECTION = "ClankStartupLatencyInjection"; + public static final String CLOSE_ALL_TABS_MODAL_DIALOG = "CloseAllTabsModalDialog"; - public static final String CCT_RESIZABLE_FOR_THIRD_PARTIES = "CCTResizableForThirdParties"; - public static final String CCT_REVAMPED_BRANDING = "CCTRevampedBranding"; - public static final String CCT_TAB_MODAL_DIALOG = "CCTTabModalDialog"; + public static final String COLLECT_ANDROID_FRAME_TIMELINE_METRICS = + "CollectAndroidFrameTimelineMetrics"; + public static final String COMMAND_LINE_ON_NON_ROOTED = "CommandLineOnNonRooted"; 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 diff --git a/build/cromite_patches/Re-introduce-override_build_timestamp.patch b/build/cromite_patches/Re-introduce-override_build_timestamp.patch index 5e140523..00464f1e 100644 --- a/build/cromite_patches/Re-introduce-override_build_timestamp.patch +++ b/build/cromite_patches/Re-introduce-override_build_timestamp.patch @@ -16,7 +16,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/base/BUILD.gn b/base/BUILD.gn --- a/base/BUILD.gn +++ b/base/BUILD.gn -@@ -4169,8 +4169,13 @@ action("build_date") { +@@ -4181,8 +4181,13 @@ action("build_date") { args = [ rebase_path("$target_gen_dir/generated_build_date.h", root_build_dir), diff --git a/build/cromite_patches/Reduce-HTTP-headers-in-DoH-requests-to-bare-minimum.patch b/build/cromite_patches/Reduce-HTTP-headers-in-DoH-requests-to-bare-minimum.patch index 987e1ac3..781f1ca8 100644 --- a/build/cromite_patches/Reduce-HTTP-headers-in-DoH-requests-to-bare-minimum.patch +++ b/build/cromite_patches/Reduce-HTTP-headers-in-DoH-requests-to-bare-minimum.patch @@ -23,7 +23,7 @@ diff --git a/net/base/load_flags_list.h b/net/base/load_flags_list.h diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc --- a/net/dns/dns_transaction.cc +++ b/net/dns/dns_transaction.cc -@@ -484,7 +484,7 @@ class DnsHTTPAttempt : public DnsAttempt, public URLRequest::Delegate { +@@ -483,7 +483,7 @@ class DnsHTTPAttempt : public DnsAttempt, public URLRequest::Delegate { // avoid deadlock and enable the use of preconfigured IP addresses. request_->SetSecureDnsPolicy(SecureDnsPolicy::kBootstrap); request_->SetLoadFlags(request_->load_flags() | LOAD_DISABLE_CACHE | @@ -35,7 +35,7 @@ diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc 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 -@@ -520,6 +520,7 @@ void URLRequestHttpJob::OnGotFirstPartySetMetadata( +@@ -499,6 +499,7 @@ void URLRequestHttpJob::OnGotFirstPartySetMetadata( // fields in the referrer. GURL referrer(request_->referrer()); @@ -43,7 +43,7 @@ diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_reque // Our consumer should have made sure that this is a safe referrer (e.g. via // URLRequestJob::ComputeReferrerForPolicy). if (referrer.is_valid()) { -@@ -527,11 +528,14 @@ void URLRequestHttpJob::OnGotFirstPartySetMetadata( +@@ -506,11 +507,14 @@ void URLRequestHttpJob::OnGotFirstPartySetMetadata( request_info_.extra_headers.SetHeader(HttpRequestHeaders::kReferer, referer_value); } @@ -58,7 +58,7 @@ diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_reque AddExtraHeaders(); -@@ -777,10 +781,10 @@ void URLRequestHttpJob::StartTransactionInternal() { +@@ -755,10 +759,10 @@ void URLRequestHttpJob::StartTransactionInternal() { void URLRequestHttpJob::AddExtraHeaders() { request_info_.extra_headers.SetAcceptEncodingIfMissing( request()->url(), request()->accepted_stream_types(), diff --git a/build/cromite_patches/Remove-HTTP-referrals-in-cross-origin-navigation.patch b/build/cromite_patches/Remove-HTTP-referrals-in-cross-origin-navigation.patch index 1194f34a..5478f3de 100644 --- a/build/cromite_patches/Remove-HTTP-referrals-in-cross-origin-navigation.patch +++ b/build/cromite_patches/Remove-HTTP-referrals-in-cross-origin-navigation.patch @@ -44,7 +44,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni --- a/chrome/android/chrome_java_resources.gni +++ b/chrome/android/chrome_java_resources.gni -@@ -633,6 +633,8 @@ chrome_java_resources = [ +@@ -634,6 +634,8 @@ chrome_java_resources = [ "java/res/xml/personalize_google_services_preferences.xml", "java/res/xml/incognito_preferences.xml", "java/res/xml/privacy_preferences.xml", @@ -56,7 +56,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -967,6 +967,8 @@ chrome_java_sources = [ +@@ -962,6 +962,8 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/privacy_sandbox/PrivacySandboxSurveyController.java", "java/src/org/chromium/chrome/browser/privacy_sandbox/TrackingProtectionSnackbarController.java", "java/src/org/chromium/chrome/browser/privacy_sandbox/TrackingProtectionSnackbarLimiter.java", @@ -178,7 +178,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting import org.chromium.chrome.browser.privacy.secure_dns.SecureDnsSettings; import org.chromium.chrome.browser.privacy_guide.PrivacyGuideInteractions; import org.chromium.chrome.browser.privacy_sandbox.PrivacySandboxBridge; -@@ -87,6 +88,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment +@@ -88,6 +89,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment private static final String PREF_USAGE_STATS = "usage_stats_reporting"; private static final String PREF_SAFE_BROWSING = "safe_browsing"; private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link"; @@ -379,7 +379,7 @@ new file mode 100644 diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chrome/browser/extensions/api/settings_private/prefs_util.cc --- a/chrome/browser/extensions/api/settings_private/prefs_util.cc +++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -218,6 +218,11 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() { +@@ -219,6 +219,11 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() { (*s_allowlist)[::prefs::kExpireDaysThreshold] = settings_api::PrefType::kNumber; @@ -394,7 +394,7 @@ diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chro 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 -@@ -601,6 +601,9 @@ SystemNetworkContextManager::SystemNetworkContextManager( +@@ -602,6 +602,9 @@ SystemNetworkContextManager::SystemNetworkContextManager( base::BindRepeating(&SystemNetworkContextManager::UpdateReferrersEnabled, base::Unretained(this))); @@ -404,7 +404,7 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows pref_change_registrar_.Add( prefs::kExplicitlyAllowedNetworkPorts, base::BindRepeating( -@@ -682,6 +685,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) { +@@ -683,6 +686,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) { // the system NetworkContext, and the per-profile pref values are used for // the profile NetworkContexts. registry->RegisterBooleanPref(prefs::kEnableReferrers, true); @@ -415,7 +415,7 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows diff --git a/chrome/browser/renderer_preferences_util.cc b/chrome/browser/renderer_preferences_util.cc --- a/chrome/browser/renderer_preferences_util.cc +++ b/chrome/browser/renderer_preferences_util.cc -@@ -114,6 +114,7 @@ void UpdateFromSystemSettings(blink::RendererPreferences* prefs, +@@ -110,6 +110,7 @@ void UpdateFromSystemSettings(blink::RendererPreferences* prefs, prefs->accept_languages = GetLanguageListForProfile( profile, pref_service->GetString(language::prefs::kAcceptLanguages)); prefs->enable_referrers = pref_service->GetBoolean(prefs::kEnableReferrers); @@ -464,7 +464,7 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.ts b/ch /** * Preferences state. */ -@@ -500,6 +511,12 @@ export class SettingsPrivacyPageElement extends SettingsPrivacyPageElementBase { +@@ -507,6 +518,12 @@ export class SettingsPrivacyPageElement extends SettingsPrivacyPageElementBase { Router.getInstance().navigateTo(routes.TRACKING_PROTECTION); } @@ -480,7 +480,7 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.ts b/ch diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -1217,6 +1217,30 @@ For more settings that use data to improve your Chrome experience, go to @@ -522,7 +522,7 @@ diff --git a/chrome/browser/ui/prefs/pref_watcher.cc b/chrome/browser/ui/prefs/p + renderer_callback); profile_pref_change_registrar_.Add(prefs::kEnableEncryptedMedia, renderer_callback); - profile_pref_change_registrar_.Add( + profile_pref_change_registrar_.Add(prefs::kWebRTCIPHandlingPolicy, diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/prefs/prefs_tab_helper.cc --- a/chrome/browser/ui/prefs/prefs_tab_helper.cc +++ b/chrome/browser/ui/prefs/prefs_tab_helper.cc @@ -533,12 +533,12 @@ diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/pre + registry->RegisterIntegerPref( + prefs::kReferrersPolicy, 2); // NoCrossOriginReferer registry->RegisterBooleanPref(prefs::kEnableEncryptedMedia, true); - registry->RegisterStringPref(prefs::kPrefixedVideoFullscreenApiAvailability, - "runtime-enabled"); + registry->RegisterBooleanPref(prefs::kScrollToTextFragmentEnabled, false); + #if BUILDFLAG(IS_ANDROID) diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -1903,6 +1903,10 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source, +@@ -1881,6 +1881,10 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source, {"dayHistory", IDS_SETTINGS_DAY_HISTORY_DESCRIPTION}, {"daysHistory", IDS_SETTINGS_DAYS_HISTORY_DESCRIPTION}, {"foreverHistory", IDS_SETTINGS_FOREVER_HISTORY_DESCRIPTION}, @@ -552,9 +552,9 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provide diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h --- a/chrome/common/pref_names.h +++ b/chrome/common/pref_names.h -@@ -1617,6 +1617,9 @@ inline constexpr char kEnableEncryptedMedia[] = - inline constexpr char kPrefixedVideoFullscreenApiAvailability[] = - "media.prefixed_fullscreen_video_api_availability"; +@@ -1579,6 +1579,9 @@ inline constexpr char kEnableReferrers[] = "enable_referrers"; + inline constexpr char kEnableEncryptedMedia[] = + "webkit.webprefs.encrypted_media_enabled"; +// Set referrer policy. +inline constexpr char kReferrersPolicy[] = "referrers_policy"; @@ -634,7 +634,7 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/brows diff --git a/services/network/public/cpp/resource_request.h b/services/network/public/cpp/resource_request.h --- a/services/network/public/cpp/resource_request.h +++ b/services/network/public/cpp/resource_request.h -@@ -148,7 +148,7 @@ struct COMPONENT_EXPORT(NETWORK_CPP_BASE) ResourceRequest { +@@ -149,7 +149,7 @@ struct COMPONENT_EXPORT(NETWORK_CPP_BASE) ResourceRequest { std::vector navigation_redirect_chain; GURL referrer; diff --git a/build/cromite_patches/Remove-SMS-integration.patch b/build/cromite_patches/Remove-SMS-integration.patch index e626bcfc..5a3589a0 100644 --- a/build/cromite_patches/Remove-SMS-integration.patch +++ b/build/cromite_patches/Remove-SMS-integration.patch @@ -383,9 +383,9 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/sms/Sm diff --git a/content/public/android/java/src/org/chromium/content/browser/sms/Wrappers.java b/content/public/android/java/src/org/chromium/content/browser/sms/Wrappers.java --- a/content/public/android/java/src/org/chromium/content/browser/sms/Wrappers.java +++ b/content/public/android/java/src/org/chromium/content/browser/sms/Wrappers.java -@@ -14,27 +14,15 @@ import android.os.Handler; - - import androidx.annotation.RequiresApi; +@@ -11,27 +11,15 @@ import android.content.Intent; + import android.content.IntentFilter; + import android.os.Handler; -import com.google.android.gms.auth.api.phone.SmsCodeBrowserClient; -import com.google.android.gms.auth.api.phone.SmsCodeRetriever; @@ -412,7 +412,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/sms/Wr } public void setContext(WebOTPServiceContext context) { -@@ -44,14 +32,6 @@ class Wrappers { +@@ -41,14 +29,6 @@ class Wrappers { public WebOTPServiceContext getContext() { return mContext; } @@ -427,7 +427,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/sms/Wr } /** -@@ -81,11 +61,6 @@ class Wrappers { +@@ -78,11 +58,6 @@ class Wrappers { } private void onRegisterReceiver(BroadcastReceiver receiver, IntentFilter filter) { diff --git a/build/cromite_patches/Remove-binary-blob-integrations.patch b/build/cromite_patches/Remove-binary-blob-integrations.patch index ccd2282f..305061e4 100644 --- a/build/cromite_patches/Remove-binary-blob-integrations.patch +++ b/build/cromite_patches/Remove-binary-blob-integrations.patch @@ -29,17 +29,15 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html build/config/android/config.gni | 4 +- chrome/android/BUILD.gn | 46 +- chrome/android/chrome_java_sources.gni | 5 - - .../features/cablev2_authenticator/BUILD.gn | 2 - chrome/android/java/AndroidManifest.xml | 50 -- .../org/chromium/chrome/browser/AppHooks.java | 1 - .../browser/ChromeBackgroundService.java | 11 +- .../browser/PlayServicesVersionInfo.java | 11 +- .../ChromeBackgroundTaskFactory.java | 3 - .../gcore/ChromeGoogleApiClientImpl.java | 25 +- - .../browser/gcore/GoogleApiClientHelper.java | 89 +-- + .../browser/gcore/GoogleApiClientHelper.java | 89 +- .../instantapps/InstantAppsHandler.java | 6 +- .../settings/PasswordSettings.java | 9 - - .../modules/chrome_feature_modules.gni | 3 - chrome/browser/language/android/BUILD.gn | 3 - .../language/AppLanguagePromoDialog.java | 31 - .../language/settings/LanguageSettings.java | 6 - @@ -50,7 +48,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../PasswordManagerHelper.java | 9 - ...swordSyncControllerDelegateBridgeImpl.java | 7 - .../push_messaging_service_factory.cc | 8 +- - chrome/browser/resources/settings/route.ts | 2 - chrome/browser/ui/BUILD.gn | 3 - chrome/browser/ui/android/omnibox/BUILD.gn | 4 - .../FullscreenSigninMediator.java | 12 +- @@ -83,17 +80,17 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../media_router/caf/CastUtils.java | 8 - .../CafExpandedControllerActivity.java | 35 +- .../CafRemotingMediaRouteProvider.java | 4 +- - .../remoting/FlingingControllerAdapter.java | 89 --- + .../remoting/FlingingControllerAdapter.java | 89 -- .../caf/remoting/RemotingMediaSource.java | 8 +- .../remoting/RemotingSessionController.java | 30 - .../test/android/cast_emulator/BUILD.gn | 1 - components/module_installer/android/BUILD.gn | 4 - components/signin/public/android/BUILD.gn | 3 - .../signin/AccountRenameChecker.java | 16 - - components/webauthn/android/BUILD.gn | 14 +- - .../webauthn/AuthenticatorImpl.java | 81 +- + components/webauthn/android/BUILD.gn | 15 +- + .../webauthn/AuthenticatorImpl.java | 79 +- .../webauthn/ConditionalUiState.java | 15 + - .../components/webauthn/GmsCoreUtils.java | 25 +- + .../components/webauthn/GmsCoreUtils.java | 28 +- .../webauthn/WebauthnModeProvider.java | 15 - .../webauthn/cred_man/CredManHelper.java | 16 +- .../cred_man/CredManMetricsHelper.java | 2 +- @@ -102,14 +99,16 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../webid/IdentityCredentialsDelegate.java | 84 +- content/test/BUILD.gn | 4 - device/BUILD.gn | 3 - + device/fido/features.cc | 1 + services/BUILD.gn | 9 - services/device/geolocation/BUILD.gn | 4 - services/shape_detection/BUILD.gn | 2 - - third_party/android_deps/BUILD.gn | 721 +----------------- + third_party/android_deps/BUILD.gn | 764 +----------------- .../preconditions/javatests/BUILD.gn | 1 - .../gms/ChromiumPlayServicesAvailability.java | 10 +- + third_party/androidx/customizations.gni | 13 +- third_party/cardboard/BUILD.gn | 4 - - 85 files changed, 116 insertions(+), 2320 deletions(-) + 84 files changed, 129 insertions(+), 2359 deletions(-) create mode 100644 components/webauthn/android/java/src/org/chromium/components/webauthn/ConditionalUiState.java diff --git a/android_webview/expectations/system_webview_bundle.AndroidManifest.expected b/android_webview/expectations/system_webview_bundle.AndroidManifest.expected @@ -163,7 +162,7 @@ diff --git a/build/config/android/config.gni b/build/config/android/config.gni diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -306,14 +306,6 @@ if (current_toolchain == default_toolchain) { +@@ -312,14 +312,6 @@ if (current_toolchain == default_toolchain) { ":google_api_keys_java", ":java_overlay_resources", ":usage_stats_proto_java", @@ -178,7 +177,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//base:content_uri_utils_java", "//base:service_loader_java", "//base/version_info/android:version_constants_java", -@@ -689,13 +681,23 @@ if (current_toolchain == default_toolchain) { +@@ -703,13 +695,23 @@ if (current_toolchain == default_toolchain) { "//services/shape_detection:shape_detection_java", "//services/shape_detection/public/mojom:mojom_java", "//skia/public/mojom:mojom_java", @@ -204,7 +203,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//third_party/android_deps:protobuf_lite_runtime_java", "//third_party/android_media:android_media_java", "//third_party/android_swipe_refresh:android_swipe_refresh_java", -@@ -959,12 +961,6 @@ if (current_toolchain == default_toolchain) { +@@ -976,12 +978,6 @@ if (current_toolchain == default_toolchain) { ":chrome_jni_headers", ":chrome_unit_test_util_java", ":delegate_public_impl_java", @@ -217,7 +216,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//base:base_java_test_support", "//base:base_java_test_support_uncommon", "//base:base_junit_test_support", -@@ -1659,13 +1655,6 @@ if (current_toolchain == default_toolchain) { +@@ -1685,13 +1681,6 @@ if (current_toolchain == default_toolchain) { ":chrome_app_java_resources", ":chrome_test_util_java", ":delegate_public_impl_java", @@ -231,7 +230,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//base:base_java", "//base:base_java_test_support", "//base:base_java_test_support_uncommon", -@@ -2579,7 +2568,6 @@ if (current_toolchain == default_toolchain) { +@@ -2610,7 +2599,6 @@ if (current_toolchain == default_toolchain) { ] deps = [ ":chrome_java", @@ -239,7 +238,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//base:base_java", "//base:base_java_test_support", "//build/android:build_java", -@@ -2681,7 +2669,6 @@ if (current_toolchain == default_toolchain) { +@@ -2712,7 +2700,6 @@ if (current_toolchain == default_toolchain) { # is in a DFM. android_library("base_module_java") { sources = [ @@ -247,7 +246,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "java/src/org/chromium/chrome/app/TrichromeZygotePreload.java", "java/src/org/chromium/chrome/browser/ChromeBackgroundService.java", "java/src/org/chromium/chrome/browser/DeferredStartupHandler.java", -@@ -2698,8 +2685,6 @@ if (current_toolchain == default_toolchain) { +@@ -2729,8 +2716,6 @@ if (current_toolchain == default_toolchain) { "java/src/org/chromium/chrome/browser/base/SplitCompatBackupAgent.java", "java/src/org/chromium/chrome/browser/base/SplitCompatContentProvider.java", "java/src/org/chromium/chrome/browser/base/SplitCompatCustomTabsService.java", @@ -256,7 +255,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "java/src/org/chromium/chrome/browser/base/SplitCompatIntentService.java", "java/src/org/chromium/chrome/browser/base/SplitCompatJobService.java", "java/src/org/chromium/chrome/browser/base/SplitCompatMinidumpUploadJobService.java", -@@ -2723,15 +2708,10 @@ if (current_toolchain == default_toolchain) { +@@ -2754,15 +2739,10 @@ if (current_toolchain == default_toolchain) { "java/src/org/chromium/chrome/browser/notifications/NotificationService.java", "java/src/org/chromium/chrome/browser/photo_picker/DecoderService.java", "java/src/org/chromium/chrome/browser/provider/ChromeBrowserProvider.java", @@ -272,15 +271,15 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//base:base_java", "//chrome/browser/download/android:file_provider_java", "//chrome/browser/flags:java", -@@ -2745,7 +2725,6 @@ if (current_toolchain == default_toolchain) { - "//components/media_router/browser/android:cast_options_provider_java", +@@ -2777,7 +2757,6 @@ if (current_toolchain == default_toolchain) { "//components/minidump_uploader:minidump_uploader_java", "//components/module_installer/android:module_installer_java", + "//third_party/android_deps:com_google_dagger_hilt_core_java", - "//third_party/android_deps:playcore_java", "//third_party/androidx:androidx_annotation_annotation_java", "//third_party/androidx:androidx_collection_collection_java", "//third_party/jni_zero:jni_zero_java", -@@ -2765,7 +2744,6 @@ if (current_toolchain == default_toolchain) { +@@ -2797,7 +2776,6 @@ if (current_toolchain == default_toolchain) { # Deps to pull services into base module. # TODO(crbug.com/40148088): Consider moving these to the chrome module to # reduce base dex size. @@ -291,7 +290,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -12,7 +12,6 @@ chrome_java_sources = [ +@@ -13,7 +13,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/ChromeActionModeHandler.java", "java/src/org/chromium/chrome/browser/ChromeActivitySessionTracker.java", "java/src/org/chromium/chrome/browser/ChromeApplicationImpl.java", @@ -299,7 +298,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java "java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java", "java/src/org/chromium/chrome/browser/ChromeInactivityTracker.java", "java/src/org/chromium/chrome/browser/ChromeKeyboardVisibilityDelegate.java", -@@ -993,10 +992,6 @@ chrome_java_sources = [ +@@ -988,10 +987,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/segmentation_platform/ReaderModeActionProvider.java", "java/src/org/chromium/chrome/browser/segmentation_platform/SignalAccumulator.java", "java/src/org/chromium/chrome/browser/selection/ChromeSelectionDropdownMenuDelegate.java", @@ -310,18 +309,6 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java "java/src/org/chromium/chrome/browser/settings/FragmentDependencyProvider.java", "java/src/org/chromium/chrome/browser/settings/MainSettings.java", "java/src/org/chromium/chrome/browser/settings/SettingsActivity.java", -diff --git a/chrome/android/features/cablev2_authenticator/BUILD.gn b/chrome/android/features/cablev2_authenticator/BUILD.gn ---- a/chrome/android/features/cablev2_authenticator/BUILD.gn -+++ b/chrome/android/features/cablev2_authenticator/BUILD.gn -@@ -16,8 +16,6 @@ android_library("java") { - - deps = [ - ":java_resources", -- "$google_play_services_package:google_play_services_base_java", -- "$google_play_services_package:google_play_services_tasks_java", - "//base:base_java", - "//build/android:build_java", - "//chrome/browser/webauthn/android:java_resources", diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml @@ -362,7 +349,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro @@ -389,7 +376,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro -@@ -1014,15 +979,6 @@ by a child template that "extends" this file. +@@ -999,15 +964,6 @@ by a child template that "extends" this file. android:exported="false" android:permission="android.permission.BIND_JOB_SERVICE"/> @@ -405,7 +392,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro -@@ -1276,12 +1232,6 @@ by a child template that "extends" this file. +@@ -1268,12 +1224,6 @@ by a child template that "extends" this file. {% endif %} @@ -470,7 +457,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/PlayServicesVer final long installedGmsVersion = getApkVersionNumber(); final String accessType; -@@ -49,11 +47,6 @@ public class PlayServicesVersionInfo { +@@ -48,11 +46,6 @@ public class PlayServicesVersionInfo { * package is not found. */ public static int getApkVersionNumber() { @@ -486,7 +473,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/PlayServicesVer diff --git a/chrome/android/java/src/org/chromium/chrome/browser/background_task_scheduler/ChromeBackgroundTaskFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/background_task_scheduler/ChromeBackgroundTaskFactory.java --- a/chrome/android/java/src/org/chromium/chrome/browser/background_task_scheduler/ChromeBackgroundTaskFactory.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/background_task_scheduler/ChromeBackgroundTaskFactory.java -@@ -15,7 +15,6 @@ import org.chromium.chrome.browser.notifications.scheduler.NotificationScheduler +@@ -16,7 +16,6 @@ import org.chromium.chrome.browser.notifications.scheduler.NotificationScheduler import org.chromium.chrome.browser.offlinepages.OfflineBackgroundTask; import org.chromium.chrome.browser.omaha.OmahaService; import org.chromium.chrome.browser.safety_hub.SafetyHubFetchTask; @@ -494,7 +481,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/background_task import org.chromium.chrome.browser.webapps.WebApkUpdateTask; import org.chromium.components.background_task_scheduler.BackgroundTask; import org.chromium.components.background_task_scheduler.BackgroundTaskFactory; -@@ -57,8 +56,6 @@ public class ChromeBackgroundTaskFactory implements BackgroundTaskFactory { +@@ -58,8 +57,6 @@ public class ChromeBackgroundTaskFactory implements BackgroundTaskFactory { switch (taskId) { case TaskIds.OMAHA_JOB_ID: return new OmahaService(); @@ -761,7 +748,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage if (mTrustedVaultBannerState == TrustedVaultBannerState.OPTED_IN) { createTrustedVaultBanner( -@@ -525,10 +520,6 @@ public class PasswordSettings extends ChromeBaseSettingsFragment +@@ -527,10 +522,6 @@ public class PasswordSettings extends ChromeBaseSettingsFragment // by the system. if (getActivity().isFinishing()) { PasswordManagerHandlerProvider.getForProfile(getProfile()).removeObserver(this); @@ -772,26 +759,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage } } -diff --git a/chrome/android/modules/chrome_feature_modules.gni b/chrome/android/modules/chrome_feature_modules.gni ---- a/chrome/android/modules/chrome_feature_modules.gni -+++ b/chrome/android/modules/chrome_feature_modules.gni -@@ -5,8 +5,6 @@ - import("//build/config/android/config.gni") - import("//chrome/android/features/dev_ui/dev_ui_module.gni") - import("//chrome/android/modules/buildflags.gni") --import( -- "//chrome/android/modules/cablev2_authenticator/cablev2_authenticator_module.gni") - import("//chrome/android/modules/stack_unwinder/stack_unwinder_module.gni") - import("//chrome/android/modules/test_dummy/test_dummy_module.gni") - import("//device/vr/buildflags/buildflags.gni") -@@ -34,7 +32,6 @@ if (enable_arcore) { - # Each new module needs to add a desc to one of the lists below. - - chrome_module_descs = [ -- cablev2_authenticator_module_desc, - test_dummy_module_desc, - stack_unwinder_module_desc, - ] diff --git a/chrome/browser/language/android/BUILD.gn b/chrome/browser/language/android/BUILD.gn --- a/chrome/browser/language/android/BUILD.gn +++ b/chrome/browser/language/android/BUILD.gn @@ -814,7 +781,7 @@ diff --git a/chrome/browser/language/android/BUILD.gn b/chrome/browser/language/ diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/AppLanguagePromoDialog.java b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/AppLanguagePromoDialog.java --- a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/AppLanguagePromoDialog.java +++ b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/AppLanguagePromoDialog.java -@@ -583,12 +583,6 @@ public class AppLanguagePromoDialog { +@@ -584,12 +584,6 @@ public class AppLanguagePromoDialog { mLoadingModal.set(ModalDialogProperties.CUSTOM_VIEW, customView); @@ -824,10 +791,10 @@ diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browse - mModalDialogManager.showDialog(mLoadingModal, ModalDialogManager.ModalDialogType.APP); - } - - boolean isSelectedCurrentUI = AppLocaleUtils.isAppLanguagePref(selectedLanguage.getCode()); - if (!isSelectedCurrentUI) { + boolean isSelectedCurrentUi = AppLocaleUtils.isAppLanguagePref(selectedLanguage.getCode()); + if (!isSelectedCurrentUi) { // Only record isTopLanguage if the app language has changed. -@@ -596,31 +590,6 @@ public class AppLanguagePromoDialog { +@@ -597,31 +591,6 @@ public class AppLanguagePromoDialog { } AndroidLanguageMetricsBridge.reportAppLanguagePromptLanguage( selectedLanguage.isSystemDefault() ? "" : selectedLanguage.getCode()); @@ -837,7 +804,7 @@ diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browse - selectedLanguage.getCode(), - (success) -> { - if (success) { -- if (!isSelectedCurrentUI) { +- if (!isSelectedCurrentUi) { - // Only restart if the new language is different than the current UI. - mRestartAction.restart(); - } @@ -873,7 +840,7 @@ diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browse @@ -138,11 +137,6 @@ public class LanguageSettings extends ChromeBaseSettingsFragment * translate target language, and detailed translate preferences. */ - private void createDetailedPreferences(Bundle savedInstanceState) { + private void createDetailedPreferences() { - // Log currently installed language splits. - String installedLanguages = - TextUtils.join(",", LanguageSplitInstaller.getInstance().getInstalledLanguages()); @@ -913,7 +880,7 @@ diff --git a/chrome/browser/password_manager/android/BUILD.gn b/chrome/browser/p "//chrome/browser/settings:factory_java", "//components/browser_ui/settings/android:java", ] -@@ -309,8 +306,6 @@ robolectric_binary("password_manager_junit_tests") { +@@ -310,8 +307,6 @@ robolectric_binary("password_manager_junit_tests") { ":test_support_java", ":unified_password_manager_proto_java", ":utils_java", @@ -1046,7 +1013,7 @@ diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrom import org.jni_zero.JniType; import org.jni_zero.NativeMethods; -@@ -517,13 +515,6 @@ public class PasswordManagerHelper { +@@ -603,13 +601,6 @@ public class PasswordManagerHelper { // If the exception is not a Chrome-defined one, it means that the call failed at the // API call level. It could have either failed with a known ApiException or because of a // different error (e.g. a different exception thrown by the implementation of the API). @@ -1102,31 +1069,19 @@ diff --git a/chrome/browser/push_messaging/push_messaging_service_factory.cc b/c } // static -diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resources/settings/route.ts ---- a/chrome/browser/resources/settings/route.ts -+++ b/chrome/browser/resources/settings/route.ts -@@ -58,8 +58,6 @@ function addPrivacyChildRoutes(r: Partial) { - - if (loadTimeData.getBoolean('enableSecurityKeysSubpage')) { - r.SECURITY_KEYS = r.SECURITY.createChild('/securityKeys'); -- r.SECURITY_KEYS_PHONES = -- r.SECURITY_KEYS.createChild('/securityKeys/phones'); - // - } else { - r.SECURITY_KEYS_PHONES = r.SECURITY.createChild('/securityKeys/phones'); diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -210,8 +210,6 @@ static_library("ui") { +@@ -194,8 +194,6 @@ static_library("ui") { "webui/flags/flags_ui.h", "webui/flags/flags_ui_handler.cc", "webui/flags/flags_ui_handler.h", - "webui/gcm_internals_ui.cc", - "webui/gcm_internals_ui.h", + "webui/history_clusters/history_clusters_internals_ui_config.cc", + "webui/history_clusters/history_clusters_internals_ui_config.h", "webui/internals/internals_ui.cc", - "webui/internals/internals_ui.h", - "webui/interstitials/interstitial_ui.cc", -@@ -494,7 +492,6 @@ static_library("ui") { +@@ -487,7 +485,6 @@ static_library("ui") { "//components/find_in_page", "//components/fingerprinting_protection_filter/browser", "//components/flags_ui", @@ -1146,7 +1101,7 @@ diff --git a/chrome/browser/ui/android/omnibox/BUILD.gn b/chrome/browser/ui/andr "//base:base_java", "//build/android:build_java", "//chrome/browser/android/lifecycle:java", -@@ -464,8 +462,6 @@ robolectric_library("junit") { +@@ -466,8 +464,6 @@ robolectric_library("junit") { deps = [ ":java", ":java_resources", @@ -1158,7 +1113,7 @@ diff --git a/chrome/browser/ui/android/omnibox/BUILD.gn b/chrome/browser/ui/andr diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/fullscreen_signin/FullscreenSigninMediator.java b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/fullscreen_signin/FullscreenSigninMediator.java --- a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/fullscreen_signin/FullscreenSigninMediator.java +++ b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/fullscreen_signin/FullscreenSigninMediator.java -@@ -222,21 +222,17 @@ public class FullscreenSigninMediator +@@ -227,21 +227,17 @@ public class FullscreenSigninMediator * also means that native has been initialized. */ void onInitialLoadCompleted(boolean hasPolicies) { @@ -1187,7 +1142,7 @@ diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/brows diff --git a/chrome/browser/ui/webauthn/sheet_models.cc b/chrome/browser/ui/webauthn/sheet_models.cc --- a/chrome/browser/ui/webauthn/sheet_models.cc +++ b/chrome/browser/ui/webauthn/sheet_models.cc -@@ -1491,16 +1491,9 @@ AuthenticatorMultiSourcePickerSheetModel:: +@@ -1527,16 +1527,9 @@ AuthenticatorMultiSourcePickerSheetModel:: bool AuthenticatorMultiSourcePickerSheetModel::IsManageDevicesButtonVisible() const { @@ -1208,14 +1163,14 @@ diff --git a/chrome/browser/ui/webauthn/sheet_models.cc b/chrome/browser/ui/weba diff --git a/chrome/browser/ui/webui/chrome_web_ui_configs.cc b/chrome/browser/ui/webui/chrome_web_ui_configs.cc --- a/chrome/browser/ui/webui/chrome_web_ui_configs.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_configs.cc -@@ -220,7 +220,6 @@ void RegisterChromeWebUIConfigs() { +@@ -227,7 +227,6 @@ void RegisterChromeWebUIConfigs() { map.AddWebUIConfig(std::make_unique()); map.AddWebUIConfig(std::make_unique()); map.AddWebUIConfig(std::make_unique()); - map.AddWebUIConfig(std::make_unique()); - map.AddWebUIConfig(std::make_unique()); - map.AddWebUIConfig(std::make_unique()); - map.AddWebUIConfig(std::make_unique()); + map.AddWebUIConfig( + std::make_unique< + history_clusters_internals::HistoryClustersInternalsUIConfig>()); diff --git a/chrome/browser/webauthn/android/BUILD.gn b/chrome/browser/webauthn/android/BUILD.gn --- a/chrome/browser/webauthn/android/BUILD.gn +++ b/chrome/browser/webauthn/android/BUILD.gn @@ -1230,24 +1185,24 @@ diff --git a/chrome/browser/webauthn/android/BUILD.gn b/chrome/browser/webauthn/ diff --git a/chrome/browser/webauthn/android/java/src/org/chromium/chrome/browser/webauthn/CableAuthenticatorModuleProvider.java b/chrome/browser/webauthn/android/java/src/org/chromium/chrome/browser/webauthn/CableAuthenticatorModuleProvider.java --- a/chrome/browser/webauthn/android/java/src/org/chromium/chrome/browser/webauthn/CableAuthenticatorModuleProvider.java +++ b/chrome/browser/webauthn/android/java/src/org/chromium/chrome/browser/webauthn/CableAuthenticatorModuleProvider.java -@@ -29,8 +29,6 @@ import androidx.fragment.app.FragmentTransaction; - import androidx.vectordrawable.graphics.drawable.Animatable2Compat; - import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat; +@@ -11,8 +11,6 @@ import android.os.Parcel; + + import androidx.core.app.NotificationManagerCompat; -import com.google.android.gms.tasks.Task; - import org.jni_zero.CalledByNative; import org.jni_zero.NativeMethods; -@@ -46,7 +44,6 @@ import org.chromium.chrome.browser.notifications.NotificationWrapperBuilderFacto - import org.chromium.chrome.browser.notifications.channels.ChromeChannelDefinitions; - import org.chromium.chrome.modules.cablev2_authenticator.Cablev2AuthenticatorModule; +@@ -22,7 +20,6 @@ import org.chromium.base.PackageUtils; + import org.chromium.base.ThreadUtils; + import org.chromium.chrome.browser.enterprise.util.EnterpriseInfo; import org.chromium.components.externalauth.ExternalAuthUtils; -import org.chromium.components.webauthn.Fido2ApiCall; /** - * Provides a UI that attempts to install the caBLEv2 Authenticator module. If already installed, or -@@ -285,37 +282,7 @@ public class CableAuthenticatorModuleProvider extends Fragment implements OnClic + * Provides linking information to the native side. +@@ -86,37 +83,7 @@ public class CableAuthenticatorModuleProvider { ok = false; } @@ -1302,7 +1257,7 @@ diff --git a/chrome/browser/webauthn/cablev2_devices.cc b/chrome/browser/webauth diff --git a/chrome/test/android/BUILD.gn b/chrome/test/android/BUILD.gn --- a/chrome/test/android/BUILD.gn +++ b/chrome/test/android/BUILD.gn -@@ -359,8 +359,6 @@ android_library("chrome_java_integration_test_support") { +@@ -361,8 +361,6 @@ android_library("chrome_java_integration_test_support") { deps = [ ":chrome_java_test_support_common", @@ -1314,7 +1269,7 @@ diff --git a/chrome/test/android/BUILD.gn b/chrome/test/android/BUILD.gn diff --git a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java --- a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java +++ b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java -@@ -2580,14 +2580,6 @@ public class ExternalNavigationHandler { +@@ -2574,14 +2574,6 @@ public class ExternalNavigationHandler { * @return Whether the given intent is going to open an Instant App. */ private static boolean isIntentToInstantApp(Intent intent) { @@ -3142,7 +3097,7 @@ diff --git a/components/signin/public/android/BUILD.gn b/components/signin/publi "//base:base_java", "//base:service_loader_java", "//build/android:build_java", -@@ -184,7 +182,6 @@ robolectric_library("junit") { +@@ -186,7 +184,6 @@ robolectric_library("junit") { deps = [ ":java", ":signin_java_test_support", @@ -3195,7 +3150,7 @@ diff --git a/components/webauthn/android/BUILD.gn b/components/webauthn/android/ "java/src/org/chromium/components/webauthn/InternalAuthenticator.java", "java/src/org/chromium/components/webauthn/WebauthnBrowserBridge.java", "java/src/org/chromium/components/webauthn/WebauthnModeProvider.java", -@@ -37,11 +35,7 @@ android_library("java") { +@@ -37,12 +35,7 @@ android_library("java") { "java/src/org/chromium/components/webauthn/AuthenticatorImpl.java", "java/src/org/chromium/components/webauthn/Barrier.java", "java/src/org/chromium/components/webauthn/CreateConfirmationUiDelegate.java", @@ -3203,12 +3158,13 @@ diff --git a/components/webauthn/android/BUILD.gn b/components/webauthn/android/ - "java/src/org/chromium/components/webauthn/Fido2ApiCall.java", - "java/src/org/chromium/components/webauthn/Fido2ApiCallHelper.java", - "java/src/org/chromium/components/webauthn/Fido2CredentialRequest.java", +- "java/src/org/chromium/components/webauthn/Fido2GetCredentialsComparator.java", - "java/src/org/chromium/components/webauthn/FidoErrorResponseCallback.java", + "java/src/org/chromium/components/webauthn/ConditionalUiState.java", "java/src/org/chromium/components/webauthn/FidoIntentSender.java", "java/src/org/chromium/components/webauthn/GetAssertionResponseCallback.java", "java/src/org/chromium/components/webauthn/GetMatchingCredentialIdsResponseCallback.java", -@@ -67,9 +61,6 @@ android_library("java") { +@@ -68,9 +61,6 @@ android_library("java") { ] deps = [ @@ -3218,7 +3174,7 @@ diff --git a/components/webauthn/android/BUILD.gn b/components/webauthn/android/ "//base:base_java", "//base:service_loader_java", "//base/version_info/android:version_constants_java", -@@ -138,8 +129,6 @@ android_library("test_support_java") { +@@ -139,8 +129,6 @@ android_library("test_support_java") { source_set("android") { sources = [ "cred_man_support.h", @@ -3227,7 +3183,7 @@ diff --git a/components/webauthn/android/BUILD.gn b/components/webauthn/android/ "internal_authenticator_android.cc", "internal_authenticator_android.h", "webauthn_browser_bridge.cc", -@@ -209,7 +198,6 @@ robolectric_library("junit") { +@@ -211,7 +199,6 @@ robolectric_library("junit") { deps = [ ":java", ":test_support_java", @@ -3277,14 +3233,13 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut /** * Called by InternalAuthenticatorAndroid, which facilitates WebAuthn for processes that * originate from the browser process. Since the request is from the browser process, the -@@ -169,16 +148,6 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon +@@ -169,15 +148,6 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon } private void continueMakeCredential(PublicKeyCredentialCreationOptions options) { - mPendingFido2CredentialRequest = getFido2CredentialRequest(); - mPendingFido2CredentialRequest.handleMakeCredentialRequest( - options, -- /* maybeClientDataHash= */ null, - maybeCreateBrowserOptions(), - mOrigin, - mTopOrigin, @@ -3294,7 +3249,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut } private @Nullable Bundle maybeCreateBrowserOptions() { -@@ -209,17 +178,6 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon +@@ -208,16 +178,6 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon onError(AuthenticatorStatus.NOT_IMPLEMENTED); return; } @@ -3302,7 +3257,6 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut - mPendingFido2CredentialRequest = getFido2CredentialRequest(); - mPendingFido2CredentialRequest.handleGetAssertionRequest( - options, -- /* maybeClientDataHash= */ null, - mOrigin, - mTopOrigin, - mPayment, @@ -3312,7 +3266,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut } @Override -@@ -252,10 +210,6 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon +@@ -250,10 +210,6 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon decoratedCallback.call(false); return; } @@ -3323,7 +3277,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut } @Override -@@ -285,19 +239,7 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon +@@ -283,19 +239,7 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon return; } @@ -3344,7 +3298,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut } // Helper function to create WebAuthnClientCapability instances -@@ -327,14 +269,6 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon +@@ -325,14 +269,6 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon callback.onResponse(new ArrayList()); return; } @@ -3359,7 +3313,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut } @Override -@@ -344,13 +278,6 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon +@@ -342,13 +278,6 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon callback.call(false); return; } @@ -3373,7 +3327,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut } @Override -@@ -362,8 +289,6 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon +@@ -360,8 +289,6 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon if (!mIsOperationPending || mGetAssertionCallback == null) { return; } @@ -3382,7 +3336,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut } /** Callbacks for receiving responses from the internal handlers. */ -@@ -398,7 +323,6 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon +@@ -396,7 +323,6 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon } else if (mGetAssertionCallback != null) { mGetAssertionCallback.call(status, null, null); } @@ -3390,7 +3344,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut cleanupRequest(); } -@@ -439,13 +363,10 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon +@@ -434,13 +360,10 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon mIsOperationPending = false; mMakeCredentialCallback = null; mGetAssertionCallback = null; @@ -3427,7 +3381,7 @@ new file mode 100644 diff --git a/components/webauthn/android/java/src/org/chromium/components/webauthn/GmsCoreUtils.java b/components/webauthn/android/java/src/org/chromium/components/webauthn/GmsCoreUtils.java --- a/components/webauthn/android/java/src/org/chromium/components/webauthn/GmsCoreUtils.java +++ b/components/webauthn/android/java/src/org/chromium/components/webauthn/GmsCoreUtils.java -@@ -7,24 +7,13 @@ package org.chromium.components.webauthn; +@@ -7,27 +7,13 @@ package org.chromium.components.webauthn; import org.chromium.base.PackageUtils; public class GmsCoreUtils { @@ -3435,6 +3389,9 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut - private static final int GMSCORE_MIN_VERSION_GET_MATCHING_CRED_IDS = 223300000; - private static final int GMSCORE_MIN_VERSION_HYBRID_API = 231206000; - private static final int GMSCORE_MIN_VERSION_RESULT_RECEIVER = 240700000; +- // This version is the minimum needed for dynamic lookup of services, which +- // the persistent API requires. +- static final int GMSCORE_MIN_VERSION_DYNAMIC_LOOKUP = 17895000; - static final int GMSCORE_MIN_VERSION = 16890000; - - private static int sGmsCorePackageVersion; @@ -3454,7 +3411,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut } /** -@@ -33,20 +22,16 @@ public class GmsCoreUtils { +@@ -36,20 +22,16 @@ public class GmsCoreUtils { * version. */ public static boolean isGetMatchingCredentialIdsSupported() { @@ -3579,7 +3536,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut diff --git a/content/browser/push_messaging/push_messaging_manager.cc b/content/browser/push_messaging/push_messaging_manager.cc --- a/content/browser/push_messaging/push_messaging_manager.cc +++ b/content/browser/push_messaging/push_messaging_manager.cc -@@ -803,7 +803,7 @@ void PushMessagingManager::GetSubscriptionInfo( +@@ -801,7 +801,7 @@ void PushMessagingManager::GetSubscriptionInfo( } PushMessagingService* PushMessagingManager::GetService() { @@ -3591,7 +3548,7 @@ diff --git a/content/browser/push_messaging/push_messaging_manager.cc b/content/ diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn --- a/content/public/android/BUILD.gn +++ b/content/public/android/BUILD.gn -@@ -157,11 +157,6 @@ android_library("content_full_java") { +@@ -158,11 +158,6 @@ android_library("content_full_java") { ":content_java_resources", ":content_main_dex_java", ":content_util_java", @@ -3706,7 +3663,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/webid/ diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn --- a/content/test/BUILD.gn +++ b/content/test/BUILD.gn -@@ -3628,10 +3628,6 @@ if (is_android) { +@@ -3658,10 +3658,6 @@ if (is_android) { testonly = true sources = content_java_sources_needing_jni deps = [ @@ -3720,7 +3677,7 @@ diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn diff --git a/device/BUILD.gn b/device/BUILD.gn --- a/device/BUILD.gn +++ b/device/BUILD.gn -@@ -529,9 +529,6 @@ if (is_android) { +@@ -534,9 +534,6 @@ if (is_android) { "gamepad/android/junit/src/org/chromium/device/gamepad/GamepadMappingsTest.java", ] deps = [ @@ -3730,6 +3687,17 @@ diff --git a/device/BUILD.gn b/device/BUILD.gn "//base:base_java_test_support", "//base:base_junit_test_support", "//device/gamepad:java", +diff --git a/device/fido/features.cc b/device/fido/features.cc +--- a/device/fido/features.cc ++++ b/device/fido/features.cc +@@ -131,6 +131,7 @@ BASE_FEATURE(kWebAuthniCloudKeychainPrf, + BASE_FEATURE(kWebAuthnHybridLinking, + "WebAuthenticationHybridLinking", + base::FEATURE_ENABLED_BY_DEFAULT); ++SET_CROMITE_FEATURE_DISABLED(kWebAuthnHybridLinking); + + // Update the "last used" timestamp for GPM passkeys when asserted. + BASE_FEATURE(kWebAuthnUpdateLastUsed, diff --git a/services/BUILD.gn b/services/BUILD.gn --- a/services/BUILD.gn +++ b/services/BUILD.gn @@ -3809,15 +3777,14 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD. } # The section below is generated by running -@@ -315,253 +306,6 @@ if (!limit_android_deps) { - "//third_party/hamcrest:hamcrest_library_java", +@@ -316,296 +307,6 @@ if (!limit_android_deps) { ] } -- + - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead. - if (google_play_services_package == "//third_party/android_deps") { - android_aar_prebuilt("google_play_services_auth_java") { -- aar_path = "cipd/libs/com_google_android_gms_play_services_auth/play-services-auth-20.1.0.aar" +- aar_path = "cipd/libs/com_google_android_gms_play_services_auth/play-services-auth-21.1.1.aar" - info_path = "libs/com_google_android_gms_play_services_auth/com_google_android_gms_play_services_auth.info" - enable_bytecode_checks = false - deps = [ @@ -3825,6 +3792,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD. - "$google_play_services_package:google_play_services_auth_base_java", - "$google_play_services_package:google_play_services_base_java", - "$google_play_services_package:google_play_services_basement_java", +- "$google_play_services_package:google_play_services_fido_java", - "$google_play_services_package:google_play_services_tasks_java", - "//third_party/androidx:androidx_fragment_fragment_java", - "//third_party/androidx:androidx_loader_loader_java", @@ -3835,7 +3803,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD. - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead. - if (google_play_services_package == "//third_party/android_deps") { - android_aar_prebuilt("google_play_services_auth_api_phone_java") { -- aar_path = "cipd/libs/com_google_android_gms_play_services_auth_api_phone/play-services-auth-api-phone-18.0.1.aar" +- aar_path = "cipd/libs/com_google_android_gms_play_services_auth_api_phone/play-services-auth-api-phone-18.0.2.aar" - info_path = "libs/com_google_android_gms_play_services_auth_api_phone/com_google_android_gms_play_services_auth_api_phone.info" - enable_bytecode_checks = false - deps = [ @@ -3849,7 +3817,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD. - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead. - if (google_play_services_package == "//third_party/android_deps") { - android_aar_prebuilt("google_play_services_auth_base_java") { -- aar_path = "cipd/libs/com_google_android_gms_play_services_auth_base/play-services-auth-base-18.0.2.aar" +- aar_path = "cipd/libs/com_google_android_gms_play_services_auth_base/play-services-auth-base-18.0.10.aar" - info_path = "libs/com_google_android_gms_play_services_auth_base/com_google_android_gms_play_services_auth_base.info" - enable_bytecode_checks = false - deps = [ @@ -3863,6 +3831,21 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD. - - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead. - if (google_play_services_package == "//third_party/android_deps") { +- android_aar_prebuilt("google_play_services_auth_blockstore_java") { +- aar_path = "cipd/libs/com_google_android_gms_play_services_auth_blockstore/play-services-auth-blockstore-16.4.0.aar" +- info_path = "libs/com_google_android_gms_play_services_auth_blockstore/com_google_android_gms_play_services_auth_blockstore.info" +- enable_bytecode_checks = false +- deps = [ +- "$google_play_services_package:google_play_services_base_java", +- "$google_play_services_package:google_play_services_basement_java", +- "$google_play_services_package:google_play_services_tasks_java", +- "//third_party/kotlin_stdlib:kotlin_stdlib_java", +- ] +- } +- } +- +- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead. +- if (google_play_services_package == "//third_party/android_deps") { - android_aar_prebuilt("google_play_services_base_java") { - aar_path = "cipd/libs/com_google_android_gms_play_services_base/play-services-base-18.5.0.aar" - info_path = "libs/com_google_android_gms_play_services_base/com_google_android_gms_play_services_base.info" @@ -3943,6 +3926,22 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD. - - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead. - if (google_play_services_package == "//third_party/android_deps") { +- android_aar_prebuilt("google_play_services_fido_java") { +- aar_path = "cipd/libs/com_google_android_gms_play_services_fido/play-services-fido-21.1.0.aar" +- info_path = "libs/com_google_android_gms_play_services_fido/com_google_android_gms_play_services_fido.info" +- enable_bytecode_checks = false +- deps = [ +- ":org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm_java", +- "$google_play_services_package:google_play_services_base_java", +- "$google_play_services_package:google_play_services_basement_java", +- "$google_play_services_package:google_play_services_tasks_java", +- "//third_party/kotlin_stdlib:kotlin_stdlib_java", +- ] +- } +- } +- +- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead. +- if (google_play_services_package == "//third_party/android_deps") { - android_aar_prebuilt("google_play_services_gcm_java") { - aar_path = "cipd/libs/com_google_android_gms_play_services_gcm/play-services-gcm-17.0.0.aar" - info_path = "libs/com_google_android_gms_play_services_gcm/com_google_android_gms_play_services_gcm.info" @@ -4059,11 +4058,23 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD. - ] - } - } +- +- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead. +- android_aar_prebuilt( +- "com_google_android_libraries_identity_googleid_googleid_java") { +- aar_path = "cipd/libs/com_google_android_libraries_identity_googleid_googleid/googleid-1.1.1.aar" +- info_path = "libs/com_google_android_libraries_identity_googleid_googleid/com_google_android_libraries_identity_googleid_googleid.info" +- enable_bytecode_checks = false +- deps = [ +- "//third_party/androidx:androidx_credentials_credentials_java", +- "//third_party/kotlin_stdlib:kotlin_stdlib_java", +- ] +- } - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead. if (!defined(material_design_target)) { android_aar_prebuilt("com_google_android_material_material_java") { -@@ -609,24 +353,6 @@ if (!limit_android_deps) { +@@ -653,24 +354,6 @@ if (!limit_android_deps) { } } @@ -4088,7 +4099,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD. # This is generated, do not edit. Update BuildConfigGenerator.groovy instead. if (!defined(dagger_java_target)) { java_prebuilt("com_google_dagger_dagger_java") { -@@ -667,56 +393,6 @@ if (!limit_android_deps) { +@@ -711,56 +394,6 @@ if (!limit_android_deps) { ] } @@ -4145,7 +4156,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD. # This is generated, do not edit. Update BuildConfigGenerator.groovy instead. if (!defined(guava_android_target)) { java_prebuilt("com_google_guava_guava_android_java") { -@@ -842,20 +518,6 @@ if (!limit_android_deps) { +@@ -886,20 +519,6 @@ if (!limit_android_deps) { requires_android = true } @@ -4166,7 +4177,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD. # This is generated, do not edit. Update BuildConfigGenerator.groovy instead. java_prebuilt("io_grpc_grpc_context_java") { jar_path = "cipd/libs/io_grpc_grpc_context/grpc-context-1.49.0.jar" -@@ -1133,357 +795,6 @@ if (!limit_android_deps) { +@@ -1177,357 +796,6 @@ if (!limit_android_deps) { is_robolectric = true } @@ -4524,7 +4535,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD. # This is generated, do not edit. Update BuildConfigGenerator.groovy instead. java_prebuilt("com_squareup_javawriter_java") { jar_path = "cipd/libs/com_squareup_javawriter/javawriter-2.1.1.jar" -@@ -1520,33 +831,6 @@ if (!limit_android_deps) { +@@ -1564,33 +832,6 @@ if (!limit_android_deps) { ] } @@ -4558,7 +4569,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD. # This is generated, do not edit. Update BuildConfigGenerator.groovy instead. java_prebuilt("io_perfmark_perfmark_api_java") { jar_path = "cipd/libs/io_perfmark_perfmark_api/perfmark-api-0.25.0.jar" -@@ -1785,7 +1069,6 @@ if (!limit_android_deps) { +@@ -1829,7 +1070,6 @@ if (!limit_android_deps) { ] testonly = true deps = [ @@ -4566,7 +4577,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD. ":org_robolectric_pluginapi_java", ":org_robolectric_utils_java", "//third_party/android_deps:guava_android_java", -@@ -1807,7 +1090,6 @@ if (!limit_android_deps) { +@@ -1851,7 +1091,6 @@ if (!limit_android_deps) { ] testonly = true deps = [ @@ -4574,7 +4585,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD. ":org_robolectric_annotations_java", ":org_robolectric_pluginapi_java", ":org_robolectric_utils_java", -@@ -1877,7 +1159,6 @@ if (!limit_android_deps) { +@@ -1921,7 +1160,6 @@ if (!limit_android_deps) { ] testonly = true deps = [ @@ -4626,6 +4637,36 @@ diff --git a/third_party/android_deps/util/org/chromium/gms/ChromiumPlayServices + return 16; // API_UNAVAILABLE } } +diff --git a/third_party/androidx/customizations.gni b/third_party/androidx/customizations.gni +--- a/third_party/androidx/customizations.gni ++++ b/third_party/androidx/customizations.gni +@@ -126,7 +126,7 @@ template("androidx_java_prebuilt") { + } + } + +-template("androidx_android_aar_prebuilt") { ++template("androidx_android_aar_prebuilt_cromite") { + _androidx_prebuilt(target_name) { + forward_variables_from(invoker, "*") + target_type = "android_aar_prebuilt" +@@ -142,6 +142,17 @@ template("androidx_android_aar_prebuilt") { + } + } + ++template("androidx_android_aar_prebuilt") { ++ if (target_name == "androidx_credentials_credentials_play_services_auth_java") { ++ forward_variables_from(invoker, "*") ++ not_needed(["deps", "aar_path", "info_path", "enable_bytecode_checks"]) ++ } else { ++ androidx_android_aar_prebuilt_cromite(target_name) { ++ forward_variables_from(invoker, "*") ++ } ++ } ++} ++ + template("androidx_java_group") { + _androidx_prebuilt(target_name) { + forward_variables_from(invoker, "*") diff --git a/third_party/cardboard/BUILD.gn b/third_party/cardboard/BUILD.gn --- a/third_party/cardboard/BUILD.gn +++ b/third_party/cardboard/BUILD.gn diff --git a/build/cromite_patches/Remove-help-menu-item.patch b/build/cromite_patches/Remove-help-menu-item.patch index 2d2146d5..f562730f 100644 --- a/build/cromite_patches/Remove-help-menu-item.patch +++ b/build/cromite_patches/Remove-help-menu-item.patch @@ -29,7 +29,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml --- a/chrome/android/java/res/menu/main_menu.xml +++ b/chrome/android/java/res/menu/main_menu.xml -@@ -149,9 +149,6 @@ found in the LICENSE file. +@@ -152,9 +152,6 @@ found in the LICENSE file. @@ -53,7 +53,7 @@ diff --git a/chrome/android/java/res/menu/save_password_preferences_action_bar_m diff --git a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java --- a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java -@@ -635,9 +635,6 @@ public class KeyboardShortcuts { +@@ -646,9 +646,6 @@ public class KeyboardShortcuts { case KeyboardShortcutsSemanticMeaning.GO_FORWARD: if (currentTab != null && currentTab.canGoForward()) currentTab.goForward(); return true; @@ -66,7 +66,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcu 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 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java -@@ -2520,15 +2520,6 @@ public abstract class ChromeActivity +@@ -2447,15 +2447,6 @@ public abstract class ChromeActivity final Tab currentTab = getActivityTab(); @@ -85,7 +85,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillPaymentMethodsFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillPaymentMethodsFragment.java --- a/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillPaymentMethodsFragment.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillPaymentMethodsFragment.java -@@ -123,6 +123,7 @@ public class AutofillPaymentMethodsFragment extends ChromeBaseSettingsFragment +@@ -117,6 +117,7 @@ public class AutofillPaymentMethodsFragment extends ChromeBaseSettingsFragment MenuItem help = menu.add(Menu.NONE, R.id.menu_id_targeted_help, Menu.NONE, R.string.menu_help); help.setIcon(R.drawable.ic_help_and_feedback); @@ -107,7 +107,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill/settin diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java --- a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java -@@ -898,6 +898,7 @@ public abstract class ClearBrowsingDataFragment extends PreferenceFragmentCompat +@@ -892,6 +892,7 @@ public abstract class ClearBrowsingDataFragment extends PreferenceFragmentCompat TraceEventVectorDrawableCompat.create( getResources(), R.drawable.ic_help_and_feedback, getActivity().getTheme())); help.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); @@ -118,7 +118,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java -@@ -774,7 +774,6 @@ public abstract class BaseCustomTabActivity extends ChromeActivity kMaxDefaultBrowserCardImpressions{ + &kEducationalTipModule, "max_default_browser_card_impressions", + /*default_value=*/4}; +SET_CROMITE_FEATURE_DISABLED(kSegmentationPlatformFeature); +SET_CROMITE_FEATURE_DISABLED(kSegmentationPlatformFeedSegmentFeature); diff --git a/build/cromite_patches/Remove-voice-recognition-integration.patch b/build/cromite_patches/Remove-voice-recognition-integration.patch index 9fdcef5a..a897e0f2 100644 --- a/build/cromite_patches/Remove-voice-recognition-integration.patch +++ b/build/cromite_patches/Remove-voice-recognition-integration.patch @@ -133,15 +133,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/search/Sear diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java -@@ -64,7 +64,6 @@ import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory; +@@ -64,7 +64,6 @@ import org.chromium.chrome.browser.profiles.ProfileProvider; + import org.chromium.chrome.browser.rlz.RevenueStats; + import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory; import org.chromium.chrome.browser.tab.Tab; - import org.chromium.chrome.browser.tab.TabBuilder; - import org.chromium.chrome.browser.tab.TabLaunchType; -import org.chromium.chrome.browser.toolbar.VoiceToolbarButtonController; import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager; import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarManageable; import org.chromium.chrome.browser.ui.native_page.NativePage; -@@ -325,7 +324,7 @@ public class SearchActivity extends AsyncInitializationActivity +@@ -327,7 +326,7 @@ public class SearchActivity extends AsyncInitializationActivity /*omniboxUma*/ (url, transition, isNtp) -> {}, TabWindowManagerSingleton::getInstance, /* bookmarkState= */ (url) -> false, @@ -153,16 +153,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivityLocationBarLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivityLocationBarLayout.java --- a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivityLocationBarLayout.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivityLocationBarLayout.java -@@ -24,7 +24,6 @@ import org.chromium.chrome.browser.omnibox.UrlBarCoordinator.SelectionState; - import org.chromium.chrome.browser.omnibox.UrlBarData; +@@ -28,7 +28,6 @@ import org.chromium.chrome.browser.omnibox.UrlBarData; import org.chromium.chrome.browser.omnibox.status.StatusCoordinator; + import org.chromium.chrome.browser.omnibox.styles.OmniboxResourceProvider; import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteCoordinator; -import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler; import org.chromium.chrome.browser.toolbar.top.ToolbarPhone; import org.chromium.chrome.browser.ui.searchactivityutils.SearchActivityExtras.IntentOrigin; import org.chromium.chrome.browser.ui.searchactivityutils.SearchActivityExtras.SearchType; -@@ -196,13 +195,6 @@ public class SearchActivityLocationBarLayout extends LocationBarLayout { - mUrlBar.post(() -> mUrlBar.clearFocus()); +@@ -209,13 +208,6 @@ public class SearchActivityLocationBarLayout extends LocationBarLayout { + mUrlBar.clearFocus(); } - @Override @@ -178,7 +178,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java -@@ -95,7 +95,6 @@ import org.chromium.chrome.browser.omnibox.OmniboxStub; +@@ -96,7 +96,6 @@ import org.chromium.chrome.browser.omnibox.OmniboxStub; import org.chromium.chrome.browser.omnibox.OverrideUrlLoadingDelegateImpl; import org.chromium.chrome.browser.omnibox.UrlFocusChangeListener; import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestionsDropdownScrollListener; @@ -186,7 +186,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar import org.chromium.chrome.browser.page_info.ChromePageInfo; import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations; import org.chromium.chrome.browser.preferences.ChromeSharedPreferences; -@@ -2517,10 +2516,6 @@ public class ToolbarManager +@@ -2594,10 +2593,6 @@ public class ToolbarManager return mLocationBar.getOmniboxStub(); } @@ -200,7 +200,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java -@@ -99,8 +99,6 @@ import org.chromium.chrome.browser.metrics.UmaSessionStats; +@@ -101,8 +101,6 @@ import org.chromium.chrome.browser.metrics.UmaSessionStats; import org.chromium.chrome.browser.omnibox.OmniboxFocusReason; import org.chromium.chrome.browser.omnibox.geo.GeolocationHeader; import org.chromium.chrome.browser.omnibox.suggestions.action.OmniboxActionDelegateImpl; @@ -209,7 +209,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi import org.chromium.chrome.browser.paint_preview.DemoPaintPreview; import org.chromium.chrome.browser.password_manager.ManagePasswordsReferrer; import org.chromium.chrome.browser.password_manager.PasswordManagerLauncher; -@@ -143,7 +141,6 @@ import org.chromium.chrome.browser.theme.TopUiThemeColorProvider; +@@ -145,7 +143,6 @@ import org.chromium.chrome.browser.theme.TopUiThemeColorProvider; import org.chromium.chrome.browser.toolbar.ButtonDataProvider; import org.chromium.chrome.browser.toolbar.ToolbarIntentMetadata; import org.chromium.chrome.browser.toolbar.ToolbarManager; @@ -217,7 +217,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi import org.chromium.chrome.browser.toolbar.adaptive.AdaptiveButtonActionMenuCoordinator; import org.chromium.chrome.browser.toolbar.adaptive.AdaptiveToolbarButtonController; import org.chromium.chrome.browser.toolbar.adaptive.AdaptiveToolbarButtonVariant; -@@ -304,7 +301,6 @@ public class RootUiCoordinator +@@ -305,7 +302,6 @@ public class RootUiCoordinator private LayoutManagerImpl mLayoutManager; protected OneshotSupplier mIntentMetadataOneshotSupplier; protected OneshotSupplierImpl mPromoShownOneshotSupplier = new OneshotSupplierImpl<>(); @@ -225,7 +225,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi private MediaCaptureOverlayController mCaptureController; private @Nullable ScrollCaptureManager mScrollCaptureManager; protected final ActivityLifecycleDispatcher mActivityLifecycleDispatcher; -@@ -638,9 +634,6 @@ public class RootUiCoordinator +@@ -640,9 +636,6 @@ public class RootUiCoordinator } if (mToolbarManager != null) { @@ -235,7 +235,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi mToolbarManager.destroy(); mToolbarManager = null; } -@@ -1441,39 +1434,12 @@ public class RootUiCoordinator +@@ -1456,39 +1449,12 @@ public class RootUiCoordinator () -> mToolbarManager.setUrlBarFocus( false, OmniboxFocusReason.UNFOCUS)); @@ -275,7 +275,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi OptionalNewTabButtonController newTabButtonController = new OptionalNewTabButtonController( mActivity, -@@ -1520,8 +1486,6 @@ public class RootUiCoordinator +@@ -1535,8 +1501,6 @@ public class RootUiCoordinator AdaptiveToolbarButtonVariant.NEW_TAB, newTabButtonController); adaptiveToolbarButtonController.addButtonVariant( AdaptiveToolbarButtonVariant.SHARE, shareButtonController); @@ -284,7 +284,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi adaptiveToolbarButtonController.addButtonVariant( AdaptiveToolbarButtonVariant.ADD_TO_BOOKMARKS, addToBookmarksToolbarButtonController); -@@ -1641,13 +1605,6 @@ public class RootUiCoordinator +@@ -1655,13 +1619,6 @@ public class RootUiCoordinator if (!mSupportsAppMenuSupplier.getAsBoolean()) { mToolbarManager.getToolbar().disableMenuButton(); } @@ -343,7 +343,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory; import org.chromium.chrome.browser.share.ShareDelegate; -@@ -474,13 +473,6 @@ public class LocationBarCoordinator +@@ -471,13 +470,6 @@ public class LocationBarCoordinator return mLocationBarLayout.getSecurityIconView(); } @@ -357,7 +357,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow @Nullable @Override public OmniboxStub getOmniboxStub() { -@@ -775,11 +767,6 @@ public class LocationBarCoordinator +@@ -779,11 +771,6 @@ public class LocationBarCoordinator // End tablet-specific methods. @@ -395,7 +395,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java -@@ -53,7 +53,6 @@ import org.chromium.chrome.browser.omnibox.status.StatusCoordinator; +@@ -54,7 +54,6 @@ import org.chromium.chrome.browser.omnibox.status.StatusCoordinator; import org.chromium.chrome.browser.omnibox.styles.OmniboxResourceProvider; import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteCoordinator; import org.chromium.chrome.browser.omnibox.suggestions.OmniboxLoadUrlParams; @@ -403,7 +403,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow import org.chromium.chrome.browser.prefetch.settings.PreloadPagesSettingsBridge; import org.chromium.chrome.browser.prefetch.settings.PreloadPagesState; import org.chromium.chrome.browser.profiles.Profile; -@@ -94,8 +93,6 @@ import java.util.function.BooleanSupplier; +@@ -95,8 +94,6 @@ import java.util.function.BooleanSupplier; class LocationBarMediator implements LocationBarDataProvider.Observer, OmniboxStub, @@ -412,7 +412,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow UrlBarDelegate, OnKeyListener, ComponentCallbacks, -@@ -160,7 +157,6 @@ class LocationBarMediator +@@ -161,7 +158,6 @@ class LocationBarMediator }; private final LocationBarLayout mLocationBarLayout; @@ -420,7 +420,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow private final LocationBarDataProvider mLocationBarDataProvider; private final LocationBarEmbedderUiOverrides mEmbedderUiOverrides; private StatusCoordinator mStatusCoordinator; -@@ -233,8 +229,6 @@ class LocationBarMediator +@@ -234,8 +230,6 @@ class LocationBarMediator mEmbedderUiOverrides = embedderUiOverrides; mOverrideUrlLoadingDelegate = overrideUrlLoadingDelegate; mLocaleManager = localeManager; @@ -429,7 +429,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow mProfileSupplier = profileSupplier; mProfileSupplier.addObserver(mCallbackController.makeCancelable(this::setProfile)); mTemplateUrlServiceSupplier = templateUrlServiceSupplier; -@@ -277,9 +271,6 @@ class LocationBarMediator +@@ -278,9 +272,6 @@ class LocationBarMediator mStatusCoordinator = null; mAutocompleteCoordinator = null; mUrlCoordinator = null; @@ -439,7 +439,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow mLocationBarDataProvider.removeObserver(this); mDeferredNativeRunnables.clear(); mUrlFocusChangeListeners.clear(); -@@ -409,11 +400,6 @@ class LocationBarMediator +@@ -410,11 +401,6 @@ class LocationBarMediator mLocationBarLayout.setUnfocusedWidth(unfocusedWidth); } @@ -451,7 +451,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow /* package */ void setLensControllerForTesting(LensController lensController) { mLensController = lensController; } -@@ -677,10 +663,6 @@ class LocationBarMediator +@@ -678,10 +664,6 @@ class LocationBarMediator // Hide keyboard before launch voice search to avoid keyboard action announcement in // TalkBack to be picked up by voice search. mUrlCoordinator.setKeyboardVisibility(false, false); @@ -462,7 +462,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow } /** package */ -@@ -1154,10 +1136,7 @@ class LocationBarMediator +@@ -1155,10 +1137,7 @@ class LocationBarMediator private boolean shouldShowMicButton() { if (shouldShowDeleteButton()) return false; @@ -474,7 +474,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow return false; } boolean isToolbarMicEnabled = mIsToolbarMicEnabledSupplier.getAsBoolean(); -@@ -1174,6 +1153,7 @@ class LocationBarMediator +@@ -1175,6 +1154,7 @@ class LocationBarMediator } private boolean shouldShowLensButton() { @@ -482,7 +482,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow if (shouldShowDeleteButton()) return false; // When this method is called on UI inflation, return false as the native is not ready. -@@ -1392,11 +1372,6 @@ class LocationBarMediator +@@ -1399,11 +1379,6 @@ class LocationBarMediator } } @@ -494,7 +494,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow @Override public void addUrlFocusChangeListener(UrlFocusChangeListener listener) { mUrlFocusChangeListeners.addObserver(listener); -@@ -1412,31 +1387,13 @@ class LocationBarMediator +@@ -1419,31 +1394,13 @@ class LocationBarMediator return mUrlHasFocus; } @@ -528,7 +528,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow public void setSearchQuery(String query) { if (TextUtils.isEmpty(query)) return; -@@ -1459,20 +1416,6 @@ class LocationBarMediator +@@ -1466,20 +1423,6 @@ class LocationBarMediator mUrlCoordinator.setKeyboardVisibility(true, false); } @@ -635,7 +635,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.share.ShareDelegate; import org.chromium.chrome.browser.tab.Tab; -@@ -288,13 +287,6 @@ public class AutocompleteCoordinator +@@ -292,13 +291,6 @@ public class AutocompleteCoordinator mRecycledViewPool.ifPresent(p -> p.onNativeInitialized()); } @@ -652,7 +652,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java -@@ -41,7 +41,6 @@ import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteDelegate.Auto +@@ -43,7 +43,6 @@ import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteDelegate.Auto import org.chromium.chrome.browser.omnibox.suggestions.action.OmniboxActionFactoryImpl; import org.chromium.chrome.browser.omnibox.suggestions.action.OmniboxAnswerAction; import org.chromium.chrome.browser.omnibox.suggestions.basic.BasicSuggestionProcessor.BookmarkState; @@ -660,7 +660,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.share.ShareDelegate; import org.chromium.chrome.browser.tab.Tab; -@@ -497,13 +496,6 @@ class AutocompleteMediator +@@ -501,13 +500,6 @@ class AutocompleteMediator mShouldPreventOmniboxAutocomplete = prevent; } @@ -677,7 +677,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/toolbar/BUILD.gn b/chrome/browser/ui/android/toolbar/BUILD.gn --- a/chrome/browser/ui/android/toolbar/BUILD.gn +++ b/chrome/browser/ui/android/toolbar/BUILD.gn -@@ -36,7 +36,6 @@ android_library("java") { +@@ -37,7 +37,6 @@ android_library("java") { "java/src/org/chromium/chrome/browser/toolbar/ToolbarProgressBarAnimatingView.java", "java/src/org/chromium/chrome/browser/toolbar/ToolbarTabController.java", "java/src/org/chromium/chrome/browser/toolbar/ToolbarTabControllerImpl.java", diff --git a/build/cromite_patches/Remove-window-name-on-cross-origin-navigation.patch b/build/cromite_patches/Remove-window-name-on-cross-origin-navigation.patch index 0ac2b873..c683d5c8 100644 --- a/build/cromite_patches/Remove-window-name-on-cross-origin-navigation.patch +++ b/build/cromite_patches/Remove-window-name-on-cross-origin-navigation.patch @@ -21,7 +21,7 @@ new file mode 100644 diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_party/blink/renderer/core/loader/document_loader.cc --- a/third_party/blink/renderer/core/loader/document_loader.cc +++ b/third_party/blink/renderer/core/loader/document_loader.cc -@@ -2920,7 +2920,7 @@ void DocumentLoader::CommitNavigation() { +@@ -2973,7 +2973,7 @@ void DocumentLoader::CommitNavigation() { // that the name would be nulled and if the name is accessed after we will // fire a UseCounter. If we decide to move forward with this change, we'd // actually clean the name here. @@ -30,7 +30,7 @@ diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_p frame_->Tree().ExperimentalSetNulledName(); } -@@ -2931,6 +2931,7 @@ void DocumentLoader::CommitNavigation() { +@@ -2984,6 +2984,7 @@ void DocumentLoader::CommitNavigation() { // TODO(shuuran): CrossSiteCrossBrowsingContextGroupSetNulledName will just // record the fact that the name would be nulled and if the name is accessed // after we will fire a UseCounter. diff --git a/build/cromite_patches/Restore-BookmarkToolbar-setCurrentFolder.patch b/build/cromite_patches/Restore-BookmarkToolbar-setCurrentFolder.patch index ada0a27c..a2d63f95 100644 --- a/build/cromite_patches/Restore-BookmarkToolbar-setCurrentFolder.patch +++ b/build/cromite_patches/Restore-BookmarkToolbar-setCurrentFolder.patch @@ -66,7 +66,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarCoordinator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarCoordinator.java -@@ -55,6 +55,7 @@ public class BookmarkToolbarCoordinator { +@@ -54,6 +54,7 @@ public class BookmarkToolbarCoordinator { searchDelegate, R.string.bookmark_toolbar_search, R.id.search_menu_id); mModel = new PropertyModel.Builder(BookmarkToolbarProperties.ALL_KEYS).build(); diff --git a/build/cromite_patches/Restore-LastTabStandingTracker.patch b/build/cromite_patches/Restore-LastTabStandingTracker.patch index 086da828..9b616dbe 100644 --- a/build/cromite_patches/Restore-LastTabStandingTracker.patch +++ b/build/cromite_patches/Restore-LastTabStandingTracker.patch @@ -27,7 +27,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -1707,6 +1707,16 @@ static_library("browser") { +@@ -1679,6 +1679,16 @@ static_library("browser") { "webid/identity_provider_permission_request.h", ] @@ -52,10 +52,10 @@ diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.c #include "chrome/browser/content_settings/one_time_permission_provider.h" #include "chrome/browser/permissions/one_time_permissions_tracker_factory.h" +#include "chrome/browser/permissions/last_tab_standing_tracker_factory.h" - #include "chrome/browser/profiles/off_the_record_profile_impl.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_key.h" -@@ -59,6 +60,7 @@ HostContentSettingsMapFactory::HostContentSettingsMapFactory() + #include "chrome/browser/profiles/profiles_state.h" +@@ -58,6 +59,7 @@ HostContentSettingsMapFactory::HostContentSettingsMapFactory() .WithAshInternals(ProfileSelection::kOwnInstance) .Build()) { DependsOn(SupervisedUserSettingsServiceFactory::GetInstance()); @@ -381,7 +381,7 @@ new file mode 100644 diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -124,6 +124,7 @@ +@@ -129,6 +129,7 @@ #include "chrome/browser/password_manager/password_reuse_manager_factory.h" #include "chrome/browser/password_manager/profile_password_store_factory.h" #include "chrome/browser/permissions/adaptive_quiet_notification_permission_ui_enabler.h" @@ -389,7 +389,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc #include "chrome/browser/permissions/notifications_engagement_service_factory.h" #include "chrome/browser/permissions/one_time_permissions_tracker_factory.h" #include "chrome/browser/permissions/origin_keyed_permission_action_service_factory.h" -@@ -1010,6 +1011,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1030,6 +1031,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #if BUILDFLAG(BUILD_WITH_TFLITE_LIB) OnDeviceTailModelServiceFactory::GetInstance(); #endif @@ -408,7 +408,7 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc #include "chrome/browser/permissions/one_time_permissions_tracker_helper.h" #include "chrome/browser/predictors/loading_predictor_factory.h" #include "chrome/browser/predictors/loading_predictor_tab_helper.h" -@@ -430,6 +431,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { +@@ -425,6 +426,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { HistoryEmbeddingsTabHelper::CreateForWebContents(web_contents); HttpsOnlyModeTabHelper::CreateForWebContents(web_contents); webapps::InstallableManager::CreateForWebContents(web_contents); diff --git a/build/cromite_patches/Restore-Search-Ready-Omnibox-flag.patch b/build/cromite_patches/Restore-Search-Ready-Omnibox-flag.patch index 506c2d8b..e623ff87 100644 --- a/build/cromite_patches/Restore-Search-Ready-Omnibox-flag.patch +++ b/build/cromite_patches/Restore-Search-Ready-Omnibox-flag.patch @@ -23,7 +23,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 -@@ -299,6 +299,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -300,6 +300,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kReaderModeInCCT, &kRecordSuppressionMetrics, &kReengagementNotification, @@ -34,10 +34,10 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse 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 -@@ -384,6 +384,7 @@ public abstract class ChromeFeatureList { +@@ -372,6 +372,7 @@ public abstract class ChromeFeatureList { + public static final String MAGIC_STACK_ANDROID = "MagicStackAndroid"; public static final String MAYLAUNCHURL_USES_SEPARATE_STORAGE_PARTITION = "MayLaunchUrlUsesSeparateStoragePartition"; - public static final String MESSAGES_FOR_ANDROID_ADS_BLOCKED = "MessagesForAndroidAdsBlocked"; + public static final String SEARCH_READY_OMNIBOX = "SearchReadyOmnibox"; public static final String MOST_VISITED_TILES_RESELECT = "MostVisitedTilesReselect"; public static final String MUlTI_INSTANCE_APPLICATION_STATUS_CLEANUP = @@ -53,7 +53,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow import org.chromium.base.supplier.Supplier; import org.chromium.chrome.browser.omnibox.UrlBarEditingTextStateProvider; import org.chromium.chrome.browser.omnibox.styles.OmniboxImageSupplier; -@@ -48,6 +49,7 @@ class DropdownItemViewInfoListBuilder { +@@ -49,6 +50,7 @@ class DropdownItemViewInfoListBuilder { private @Nullable Supplier mShareDelegateSupplier; private @NonNull Optional mImageSupplier; private @NonNull BookmarkState mBookmarkState; @@ -61,7 +61,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow DropdownItemViewInfoListBuilder( @NonNull Supplier tabSupplier, @NonNull BookmarkState bookmarkState) { -@@ -80,9 +82,11 @@ class DropdownItemViewInfoListBuilder { +@@ -81,9 +83,11 @@ class DropdownItemViewInfoListBuilder { mGroupSeparatorProcessor = new GroupSeparatorProcessor(context); mHeaderProcessor = new HeaderProcessor(context); @@ -75,7 +75,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow registerSuggestionProcessor( new AnswerSuggestionProcessor(context, host, textProvider, mImageSupplier)); registerSuggestionProcessor( -@@ -168,6 +172,9 @@ class DropdownItemViewInfoListBuilder { +@@ -169,6 +173,9 @@ class DropdownItemViewInfoListBuilder { mHeaderProcessor.onNativeInitialized(); mImageSupplier.ifPresent(s -> s.onNativeInitialized()); diff --git a/build/cromite_patches/Restore-Simplified-NTP-launch.patch b/build/cromite_patches/Restore-Simplified-NTP-launch.patch index cabbb529..9e464715 100644 --- a/build/cromite_patches/Restore-Simplified-NTP-launch.patch +++ b/build/cromite_patches/Restore-Simplified-NTP-launch.patch @@ -22,8 +22,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../chrome/browser/ntp/NewTabPageLayout.java | 25 ++- .../SuggestionsNavigationDelegate.java | 17 ++ .../mostvisited/MostVisitedSitesBridge.java | 2 +- - .../tile/MostVisitedTilesCoordinator.java | 10 +- - .../tile/MostVisitedTilesGridLayout.java | 194 ++++++++++++++++++ + .../tile/MostVisitedTilesCoordinator.java | 7 +- + .../tile/MostVisitedTilesGridLayout.java | 193 ++++++++++++++++++ .../tile/MostVisitedTilesMediator.java | 9 +- .../engagement/important_sites_util.cc | 2 +- .../flags/android/chrome_feature_list.cc | 1 + @@ -32,7 +32,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../Restore-Simplified-NTP-launch.inc | 12 ++ .../Restore-Simplified-NTP-launch.inc | 5 + .../Restore-Simplified-NTP-launch.inc | 1 + - 26 files changed, 399 insertions(+), 34 deletions(-) + 26 files changed, 398 insertions(+), 31 deletions(-) create mode 100644 chrome/android/java/res/layout/ntp_shortcuts.xml create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/feedback/SimplifiedNtpFeedbackSource.java create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/suggestions/tile/MostVisitedTilesGridLayout.java @@ -43,7 +43,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni --- a/chrome/android/chrome_java_resources.gni +++ b/chrome/android/chrome_java_resources.gni -@@ -537,6 +537,7 @@ chrome_java_resources = [ +@@ -538,6 +538,7 @@ chrome_java_resources = [ "java/res/layout/new_tab_page_layout.xml", "java/res/layout/new_tab_page_tile_grid_placeholder.xml", "java/res/layout/open_full_chrome_history_header.xml", @@ -54,7 +54,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -631,6 +631,7 @@ chrome_java_sources = [ +@@ -628,6 +628,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/feedback/FeedFeedbackCollector.java", "java/src/org/chromium/chrome/browser/feedback/HelpAndFeedbackLauncherImpl.java", "java/src/org/chromium/chrome/browser/feedback/ScreenshotTask.java", @@ -62,7 +62,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java "java/src/org/chromium/chrome/browser/findinpage/FindToolbar.java", "java/src/org/chromium/chrome/browser/findinpage/FindToolbarManager.java", "java/src/org/chromium/chrome/browser/findinpage/FindToolbarObserver.java", -@@ -1051,6 +1052,7 @@ chrome_java_sources = [ +@@ -1046,6 +1047,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/suggestions/mostvisited/MostVisitedSitesMetadataUtils.java", "java/src/org/chromium/chrome/browser/suggestions/tile/MostVisitedTilesCoordinator.java", "java/src/org/chromium/chrome/browser/suggestions/tile/MostVisitedTilesLayout.java", @@ -309,7 +309,7 @@ new file mode 100644 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/IdentityDiscController.java b/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/IdentityDiscController.java --- a/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/IdentityDiscController.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/IdentityDiscController.java -@@ -153,7 +153,10 @@ public class IdentityDiscController +@@ -155,7 +155,10 @@ public class IdentityDiscController mButtonData.setButtonSpec( buttonSpecWithDrawableAndDescription(mButtonData.getButtonSpec(), email)); @@ -378,7 +378,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL initializeSearchBoxTextView(); initializeVoiceSearchButton(); initializeLensButton(); -@@ -589,7 +594,7 @@ public class NewTabPageLayout extends LinearLayout { +@@ -585,7 +590,7 @@ public class NewTabPageLayout extends LinearLayout { && mInitialized) { return; } @@ -387,7 +387,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL mSearchProviderIsGoogle = isGoogle; if (!mSearchProviderIsGoogle) { -@@ -924,6 +929,22 @@ public class NewTabPageLayout extends LinearLayout { +@@ -918,6 +923,22 @@ public class NewTabPageLayout extends LinearLayout { return mMostVisitedTilesCoordinator; } @@ -420,7 +420,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/Sug +import org.chromium.chrome.browser.bookmarks.BookmarkUtils; +import org.chromium.chrome.browser.download.DownloadUtils; +import org.chromium.chrome.browser.download.DownloadOpenSource; -+import org.chromium.chrome.browser.profiles.OTRProfileID; ++import org.chromium.chrome.browser.profiles.OtrProfileId; + /** Extension of {@link NativePageNavigationDelegate} with suggestions-specific methods. */ public class SuggestionsNavigationDelegate extends NativePageNavigationDelegateImpl { @@ -434,9 +434,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/Sug + } + + public void navigateToDownloadManager() { -+ OTRProfileID otrProfileID = null; ++ OtrProfileId otrProfileID = null; + if (mProfile != null && mTab != null && mTab.isIncognito()) { -+ otrProfileID = mProfile.getOTRProfileID(); ++ otrProfileID = mProfile.getOtrProfileId(); + } + DownloadUtils.showDownloadManager(mActivity, mTab, otrProfileID, DownloadOpenSource.NEW_TAB_PAGE); + } @@ -459,16 +459,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/mos diff --git a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/tile/MostVisitedTilesCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/suggestions/tile/MostVisitedTilesCoordinator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/tile/MostVisitedTilesCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/suggestions/tile/MostVisitedTilesCoordinator.java -@@ -38,7 +38,7 @@ public class MostVisitedTilesCoordinator implements ConfigurationChangedObserver +@@ -38,6 +38,7 @@ public class MostVisitedTilesCoordinator implements ConfigurationChangedObserver private final MostVisitedTilesMediator mMediator; private final WindowAndroid mWindowAndroid; private final UiConfig mUiConfig; -- private final PropertyModelChangeProcessor mModelChangeProcessor; + private PropertyModelChangeProcessor mModelChangeProcessor; private TileRenderer mRenderer; private ContextMenuManager mContextMenuManager; private OfflinePageBridge mOfflinePageBridge; -@@ -66,17 +66,11 @@ public class MostVisitedTilesCoordinator implements ConfigurationChangedObserver +@@ -65,15 +66,11 @@ public class MostVisitedTilesCoordinator implements ConfigurationChangedObserver mWindowAndroid = windowAndroid; ((ViewStub) mvTilesContainerLayout.findViewById(R.id.mv_tiles_layout_stub)).inflate(); @@ -478,12 +477,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/til mUiConfig = new UiConfig(tilesLayout); PropertyModel propertyModel = new PropertyModel(MostVisitedTilesProperties.ALL_KEYS); -- mModelChangeProcessor = -- PropertyModelChangeProcessor.create( -- propertyModel, -- new MostVisitedTilesViewBinder.ViewHolder( -- mvTilesContainerLayout, tilesLayout), -- MostVisitedTilesViewBinder::bind); +- PropertyModelChangeProcessor.create( +- propertyModel, +- new MostVisitedTilesViewBinder.ViewHolder(mvTilesContainerLayout, tilesLayout), +- MostVisitedTilesViewBinder::bind); mRenderer = new TileRenderer( mActivity, SuggestionsConfig.getTileStyle(mUiConfig), TITLE_LINES, null); @@ -491,7 +488,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/til new file mode 100644 --- /dev/null +++ b/chrome/android/java/src/org/chromium/chrome/browser/suggestions/tile/MostVisitedTilesGridLayout.java -@@ -0,0 +1,194 @@ +@@ -0,0 +1,193 @@ +// Copyright 2015 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -514,7 +511,6 @@ new file mode 100644 +import org.chromium.base.library_loader.LibraryLoader; +import org.chromium.chrome.R; +import org.chromium.chrome.browser.flags.ChromeFeatureList; -+import org.chromium.chrome.browser.ntp.FeedPositionUtils; +import org.chromium.chrome.browser.suggestions.SiteSuggestion; +import org.chromium.ui.base.DeviceFormFactor; + @@ -741,9 +737,9 @@ diff --git a/chrome/browser/engagement/important_sites_util.cc b/chrome/browser/ 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 -@@ -265,6 +265,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -266,6 +266,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { + &kHideTabletToolbarDownloadButton, &kLockBackPressHandlerAtStart, - &kIncognitoReauthenticationForAndroid, &kIncognitoScreenshot, + &kSimplifiedNTP, &kLensOnQuickActionSearchWidget, @@ -752,15 +748,15 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse 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 -@@ -385,6 +385,7 @@ public abstract class ChromeFeatureList { +@@ -373,6 +373,7 @@ public abstract class ChromeFeatureList { + public static final String MAGIC_STACK_ANDROID = "MagicStackAndroid"; public static final String MAYLAUNCHURL_USES_SEPARATE_STORAGE_PARTITION = "MayLaunchUrlUsesSeparateStoragePartition"; - public static final String MESSAGES_FOR_ANDROID_ADS_BLOCKED = "MessagesForAndroidAdsBlocked"; + public static final String SIMPLIFIED_NTP = "SimplifiedNTP"; public static final String SEARCH_READY_OMNIBOX = "SearchReadyOmnibox"; public static final String MOST_VISITED_TILES_RESELECT = "MostVisitedTilesReselect"; public static final String MUlTI_INSTANCE_APPLICATION_STATUS_CLEANUP = -@@ -694,7 +695,7 @@ public abstract class ChromeFeatureList { +@@ -664,7 +665,7 @@ public abstract class ChromeFeatureList { public static final CachedFlag sLogoPolish = newCachedFlag(LOGO_POLISH, true); public static final CachedFlag sLogoPolishAnimationKillSwitch = newCachedFlag(LOGO_POLISH_ANIMATION_KILL_SWITCH, true); diff --git a/build/cromite_patches/Restore-adaptive-button-in-top-toolbar-customization.patch b/build/cromite_patches/Restore-adaptive-button-in-top-toolbar-customization.patch index ac14c20c..3b64820f 100644 --- a/build/cromite_patches/Restore-adaptive-button-in-top-toolbar-customization.patch +++ b/build/cromite_patches/Restore-adaptive-button-in-top-toolbar-customization.patch @@ -43,7 +43,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe 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 -@@ -433,6 +433,10 @@ static jlong JNI_ChromeFeatureMap_GetNativeMap(JNIEnv* env) { +@@ -429,6 +429,10 @@ static jlong JNI_ChromeFeatureMap_GetNativeMap(JNIEnv* env) { // Alphabetical: @@ -57,7 +57,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse 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 -@@ -162,6 +162,7 @@ public abstract class ChromeFeatureList { +@@ -156,6 +156,7 @@ public abstract class ChromeFeatureList { public static final String ACCOUNT_REAUTHENTICATION_RECENT_TIME_WINDOW = "AccountReauthenticationRecentTimeWindow"; public static final String ALLOW_USER_CERTIFICATES = "AllowUserCertificates"; diff --git a/build/cromite_patches/Restore-chrome-password-store.patch b/build/cromite_patches/Restore-chrome-password-store.patch index 52be9ec7..cf8e8901 100644 --- a/build/cromite_patches/Restore-chrome-password-store.patch +++ b/build/cromite_patches/Restore-chrome-password-store.patch @@ -7,9 +7,10 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html chrome/browser/resources/password_manager/user_utils_mixin.ts | 4 ++-- chrome/browser/ui/android/strings/android_chrome_strings.grd | 2 +- components/password_manager/core/browser/buildflags.gni | 2 +- - components/sync/base/features.cc | 1 + + .../browser/features/password_manager_features_util_common.cc | 1 + + components/sync/service/sync_prefs.cc | 2 +- .../password_features_cc/Restore-chrome-password-store.inc | 1 + - 5 files changed, 6 insertions(+), 4 deletions(-) + 6 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 cromite_flags/components/password_manager/core/browser/features/password_features_cc/Restore-chrome-password-store.inc diff --git a/chrome/browser/resources/password_manager/user_utils_mixin.ts b/chrome/browser/resources/password_manager/user_utils_mixin.ts @@ -32,7 +33,7 @@ diff --git a/chrome/browser/resources/password_manager/user_utils_mixin.ts b/chr diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -738,7 +738,7 @@ For more settings that use data to improve your Chrome experience, go to @@ -53,17 +54,29 @@ diff --git a/components/password_manager/core/browser/buildflags.gni b/component } # Drawables from the downstream clank/ repository are -diff --git a/components/sync/base/features.cc b/components/sync/base/features.cc ---- a/components/sync/base/features.cc -+++ b/components/sync/base/features.cc -@@ -82,6 +82,7 @@ BASE_FEATURE(kEnablePasswordsAccountStorageForSyncingUsers, - BASE_FEATURE(kEnablePasswordsAccountStorageForNonSyncingUsers, - "EnablePasswordsAccountStorageForNonSyncingUsers", - base::FEATURE_ENABLED_BY_DEFAULT); -+SET_CROMITE_FEATURE_DISABLED(kEnablePasswordsAccountStorageForNonSyncingUsers); - - BASE_FEATURE(kSyncEnableContactInfoDataTypeForDasherUsers, - "SyncEnableContactInfoDataTypeForDasherUsers", +diff --git a/components/password_manager/core/browser/features/password_manager_features_util_common.cc b/components/password_manager/core/browser/features/password_manager_features_util_common.cc +--- a/components/password_manager/core/browser/features/password_manager_features_util_common.cc ++++ b/components/password_manager/core/browser/features/password_manager_features_util_common.cc +@@ -54,6 +54,7 @@ bool CanAccountStorageBeEnabled(const PrefService* pref_service, + // no way to enter the passphrase yet). + bool IsUserEligibleForAccountStorage(const PrefService* pref_service, + const syncer::SyncService* sync_service) { ++ if ((true)) return false; + if (!sync_service) { + return false; + } +diff --git a/components/sync/service/sync_prefs.cc b/components/sync/service/sync_prefs.cc +--- a/components/sync/service/sync_prefs.cc ++++ b/components/sync/service/sync_prefs.cc +@@ -725,7 +725,7 @@ bool SyncPrefs::IsTypeSupportedInTransportMode(UserSelectableType type) { + return base::FeatureList::IsEnabled(kReplaceSyncPromosWithSignInPromos) && + base::FeatureList::IsEnabled(kEnablePreferencesAccountStorage); + case UserSelectableType::kPasswords: +- return true; ++ return false; + case UserSelectableType::kAutofill: + return base::FeatureList::IsEnabled( + kSyncEnableContactInfoDataTypeInTransportMode); diff --git a/cromite_flags/components/password_manager/core/browser/features/password_features_cc/Restore-chrome-password-store.inc b/cromite_flags/components/password_manager/core/browser/features/password_features_cc/Restore-chrome-password-store.inc new file mode 100644 --- /dev/null diff --git a/build/cromite_patches/Restore-offline-indicator-v2-flag.patch b/build/cromite_patches/Restore-offline-indicator-v2-flag.patch index 0baafbb8..6ac85f6d 100644 --- a/build/cromite_patches/Restore-offline-indicator-v2-flag.patch +++ b/build/cromite_patches/Restore-offline-indicator-v2-flag.patch @@ -92,7 +92,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/in diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java -@@ -1104,7 +1104,8 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -1116,7 +1116,8 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { private void initStatusIndicatorCoordinator(LayoutManagerImpl layoutManager) { // TODO(crbug.com/40112282): Disable on tablets for now as we need to do one or two extra // things for tablets. @@ -102,7 +102,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab return; } -@@ -1137,6 +1138,11 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -1149,6 +1150,11 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { hubManager.setStatusIndicatorHeight(mStatusIndicatorHeight); }); @@ -117,7 +117,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab 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 -@@ -281,6 +281,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -282,6 +282,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kNotificationPermissionVariant, &kNotificationPermissionBottomSheet, &kNotificationTrampoline, @@ -128,7 +128,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse 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 -@@ -402,6 +402,7 @@ public abstract class ChromeFeatureList { +@@ -390,6 +390,7 @@ public abstract class ChromeFeatureList { public static final String NOTIFICATION_PERMISSION_BOTTOM_SHEET = "NotificationPermissionBottomSheet"; public static final String NOTIFICATION_TRAMPOLINE = "NotificationTrampoline"; diff --git a/build/cromite_patches/Revert-Permit-blocking-of-view-source.patch b/build/cromite_patches/Revert-Permit-blocking-of-view-source.patch index ab8df6b8..1676aaa9 100644 --- a/build/cromite_patches/Revert-Permit-blocking-of-view-source.patch +++ b/build/cromite_patches/Revert-Permit-blocking-of-view-source.patch @@ -12,7 +12,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/components/policy/content/policy_blocklist_navigation_throttle.cc b/components/policy/content/policy_blocklist_navigation_throttle.cc --- a/components/policy/content/policy_blocklist_navigation_throttle.cc +++ b/components/policy/content/policy_blocklist_navigation_throttle.cc -@@ -63,6 +63,7 @@ PolicyBlocklistNavigationThrottle::~PolicyBlocklistNavigationThrottle() { +@@ -64,6 +64,7 @@ PolicyBlocklistNavigationThrottle::~PolicyBlocklistNavigationThrottle() { } bool PolicyBlocklistNavigationThrottle::IsBlockedViewSourceNavigation() { diff --git a/build/cromite_patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch b/build/cromite_patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch index 48eb25c7..cb8d04e8 100644 --- a/build/cromite_patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch +++ b/build/cromite_patches/Revert-flags-remove-disable-pull-to-refresh-effect.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 -@@ -2204,6 +2204,10 @@ +@@ -2140,6 +2140,10 @@ "yangsharon@google.com", "alexmos@google.com", "creis@google.com" ], "expiry_milestone": 140 }, diff --git a/build/cromite_patches/Revert-removal-of-execution-context-address-space.patch b/build/cromite_patches/Revert-removal-of-execution-context-address-space.patch index 29a1cb63..373829a8 100644 --- a/build/cromite_patches/Revert-removal-of-execution-context-address-space.patch +++ b/build/cromite_patches/Revert-removal-of-execution-context-address-space.patch @@ -66,7 +66,7 @@ new file mode 100644 diff --git a/third_party/blink/renderer/core/execution_context/execution_context.cc b/third_party/blink/renderer/core/execution_context/execution_context.cc --- a/third_party/blink/renderer/core/execution_context/execution_context.cc +++ b/third_party/blink/renderer/core/execution_context/execution_context.cc -@@ -519,6 +519,15 @@ void ExecutionContext::SetReferrerPolicy( +@@ -518,6 +518,15 @@ void ExecutionContext::SetReferrerPolicy( policy_container_->UpdateReferrerPolicy(referrer_policy); } @@ -171,7 +171,7 @@ diff --git a/third_party/blink/renderer/core/frame/policy_container.h b/third_pa diff --git a/third_party/blink/renderer/core/frame/web_frame_test.cc b/third_party/blink/renderer/core/frame/web_frame_test.cc --- a/third_party/blink/renderer/core/frame/web_frame_test.cc +++ b/third_party/blink/renderer/core/frame/web_frame_test.cc -@@ -8089,6 +8089,40 @@ TEST_F(WebFrameTest, PushStateStartsAndStops) { +@@ -8090,6 +8090,40 @@ TEST_F(WebFrameTest, PushStateStartsAndStops) { EXPECT_EQ(client.StopLoadingCount(), 2); } @@ -256,7 +256,7 @@ diff --git a/third_party/blink/renderer/core/loader/modulescript/worker_module_s #include "services/network/public/mojom/referrer_policy.mojom-blink.h" #include "third_party/blink/public/common/features.h" #include "third_party/blink/public/common/loader/network_utils.h" -@@ -185,7 +186,7 @@ void WorkerModuleScriptFetcher::NotifyClient( +@@ -184,7 +185,7 @@ void WorkerModuleScriptFetcher::NotifyClient( // Step 12.3-12.6 are implemented in Initialize(). global_scope_->Initialize( @@ -276,7 +276,7 @@ diff --git a/third_party/blink/renderer/core/workers/dedicated_worker.cc b/third String() /* source_code */, reject_coep_unsafe_none, std::move(back_forward_cache_controller_host)); return; -@@ -430,6 +431,7 @@ void DedicatedWorker::OnScriptLoadStarted( +@@ -429,6 +430,7 @@ void DedicatedWorker::OnScriptLoadStarted( ContinueStart(script_request_url_, std::move(worker_main_script_load_params), network::mojom::ReferrerPolicy::kDefault, Vector(), @@ -284,7 +284,7 @@ diff --git a/third_party/blink/renderer/core/workers/dedicated_worker.cc b/third String() /* source_code */, RejectCoepUnsafeNone(false), std::move(back_forward_cache_controller_host)); } -@@ -502,6 +504,7 @@ void DedicatedWorker::OnFinished( +@@ -501,6 +503,7 @@ void DedicatedWorker::OnFinished( ? mojo::Clone(classic_script_loader_->GetContentSecurityPolicy() ->GetParsedPolicies()) : Vector(), @@ -292,7 +292,7 @@ diff --git a/third_party/blink/renderer/core/workers/dedicated_worker.cc b/third classic_script_loader_->SourceText(), RejectCoepUnsafeNone(false), std::move(back_forward_cache_controller_host)); probe::ScriptImported(GetExecutionContext(), -@@ -518,6 +521,7 @@ void DedicatedWorker::ContinueStart( +@@ -517,6 +520,7 @@ void DedicatedWorker::ContinueStart( network::mojom::ReferrerPolicy referrer_policy, Vector response_content_security_policies, @@ -300,7 +300,7 @@ diff --git a/third_party/blink/renderer/core/workers/dedicated_worker.cc b/third const String& source_code, RejectCoepUnsafeNone reject_coep_unsafe_none, mojo::PendingRemote -@@ -540,6 +544,7 @@ void DedicatedWorker::ContinueStart( +@@ -539,6 +543,7 @@ void DedicatedWorker::ContinueStart( std::move(worker_main_script_load_params), std::move(referrer_policy), std::move(response_content_security_policies), @@ -308,7 +308,7 @@ diff --git a/third_party/blink/renderer/core/workers/dedicated_worker.cc b/third source_code, reject_coep_unsafe_none, std::move(back_forward_cache_controller_host)), base::Milliseconds(features::kDedicatedWorkerStartDelayInMs.Get())); -@@ -548,6 +553,7 @@ void DedicatedWorker::ContinueStart( +@@ -547,6 +552,7 @@ void DedicatedWorker::ContinueStart( ContinueStartInternal(script_url, std::move(worker_main_script_load_params), std::move(referrer_policy), std::move(response_content_security_policies), @@ -316,7 +316,7 @@ diff --git a/third_party/blink/renderer/core/workers/dedicated_worker.cc b/third source_code, reject_coep_unsafe_none, std::move(back_forward_cache_controller_host)); } -@@ -559,6 +565,7 @@ void DedicatedWorker::ContinueStartInternal( +@@ -558,6 +564,7 @@ void DedicatedWorker::ContinueStartInternal( network::mojom::ReferrerPolicy referrer_policy, Vector response_content_security_policies, @@ -324,7 +324,7 @@ diff --git a/third_party/blink/renderer/core/workers/dedicated_worker.cc b/third const String& source_code, RejectCoepUnsafeNone reject_coep_unsafe_none, mojo::PendingRemote -@@ -570,7 +577,8 @@ void DedicatedWorker::ContinueStartInternal( +@@ -569,7 +576,8 @@ void DedicatedWorker::ContinueStartInternal( context_proxy_->StartWorkerGlobalScope( CreateGlobalScopeCreationParams( script_url, referrer_policy, @@ -334,7 +334,7 @@ diff --git a/third_party/blink/renderer/core/workers/dedicated_worker.cc b/third std::move(worker_main_script_load_params), options_, script_url, *outside_fetch_client_settings_object_, v8_stack_trace_id_, source_code, reject_coep_unsafe_none, token_, -@@ -607,7 +615,8 @@ DedicatedWorker::CreateGlobalScopeCreationParams( +@@ -606,7 +614,8 @@ DedicatedWorker::CreateGlobalScopeCreationParams( const KURL& script_url, network::mojom::ReferrerPolicy referrer_policy, Vector @@ -344,7 +344,7 @@ diff --git a/third_party/blink/renderer/core/workers/dedicated_worker.cc b/third base::UnguessableToken parent_devtools_token; std::unique_ptr settings; ExecutionContext* execution_context = GetExecutionContext(); -@@ -656,6 +665,7 @@ DedicatedWorker::CreateGlobalScopeCreationParams( +@@ -655,6 +664,7 @@ DedicatedWorker::CreateGlobalScopeCreationParams( execution_context->GetSecurityOrigin(), execution_context->IsSecureContext(), execution_context->GetHttpsState(), MakeGarbageCollected(), CreateWebContentSettingsClient(), diff --git a/build/cromite_patches/Revert-remove-allowscript-content-setting-secondary-url.patch b/build/cromite_patches/Revert-remove-allowscript-content-setting-secondary-url.patch index 773ad647..504b06f6 100644 --- a/build/cromite_patches/Revert-remove-allowscript-content-setting-secondary-url.patch +++ b/build/cromite_patches/Revert-remove-allowscript-content-setting-secondary-url.patch @@ -196,7 +196,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_p #include "third_party/blink/renderer/bindings/core/v8/binding_security.h" #include "third_party/blink/renderer/bindings/core/v8/capture_source_location.h" #include "third_party/blink/renderer/bindings/core/v8/isolated_world_csp.h" -@@ -486,7 +487,10 @@ bool LocalDOMWindow::CanExecuteScripts( +@@ -487,7 +488,10 @@ bool LocalDOMWindow::CanExecuteScripts( } return false; } @@ -211,7 +211,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_p diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc --- a/third_party/blink/renderer/core/frame/local_frame.cc +++ b/third_party/blink/renderer/core/frame/local_frame.cc -@@ -4055,19 +4055,6 @@ bool LocalFrame::IsSameOrigin() { +@@ -4068,19 +4068,6 @@ bool LocalFrame::IsSameOrigin() { return security_origin->IsSameOriginWith(top_security_origin); } @@ -234,7 +234,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/ diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/blink/renderer/core/frame/local_frame.h --- a/third_party/blink/renderer/core/frame/local_frame.h +++ b/third_party/blink/renderer/core/frame/local_frame.h -@@ -919,12 +919,6 @@ class CORE_EXPORT LocalFrame final +@@ -928,12 +928,6 @@ class CORE_EXPORT LocalFrame final return *v8_local_compile_hints_producer_; } @@ -246,11 +246,11 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/b - const WebPrintParams& GetPrintParams() const; - // Return a keep alive handle for the browser side NavigationStateKeepAlive. + // Returns the `Frame` for which `provisional_frame_ == this`. May only be diff --git a/third_party/blink/renderer/core/html/html_meta_element.cc b/third_party/blink/renderer/core/html/html_meta_element.cc --- a/third_party/blink/renderer/core/html/html_meta_element.cc +++ b/third_party/blink/renderer/core/html/html_meta_element.cc -@@ -787,7 +787,9 @@ void HTMLMetaElement::ProcessMetaCH(Document& document, +@@ -786,7 +786,9 @@ void HTMLMetaElement::ProcessMetaCH(Document& document, return; } @@ -264,7 +264,7 @@ diff --git a/third_party/blink/renderer/core/html/html_meta_element.cc b/third_p diff --git a/third_party/blink/renderer/core/loader/base_fetch_context.cc b/third_party/blink/renderer/core/loader/base_fetch_context.cc --- a/third_party/blink/renderer/core/loader/base_fetch_context.cc +++ b/third_party/blink/renderer/core/loader/base_fetch_context.cc -@@ -254,7 +254,7 @@ BaseFetchContext::CanRequestInternal( +@@ -256,7 +256,7 @@ BaseFetchContext::CanRequestInternal( } if (type == ResourceType::kScript) { @@ -298,7 +298,7 @@ diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/thi return; } -@@ -913,15 +914,26 @@ void FrameFetchContext::SetFirstPartyCookie(ResourceRequest& request) { +@@ -933,15 +934,26 @@ void FrameFetchContext::SetFirstPartyCookie(ResourceRequest& request) { request.SetSiteForCookies(GetSiteForCookies()); } @@ -354,7 +354,7 @@ diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.h b/thir static ResourceFetcher* CreateFetcherForCommittedDocument(DocumentLoader&, Document&); FrameFetchContext(DocumentLoader& document_loader, -@@ -165,7 +176,7 @@ class CORE_EXPORT FrameFetchContext final : public BaseFetchContext, +@@ -168,7 +179,7 @@ class CORE_EXPORT FrameFetchContext final : public BaseFetchContext, // BaseFetchContext overrides: net::SiteForCookies GetSiteForCookies() const override; SubresourceFilter* GetSubresourceFilter() const override; diff --git a/build/cromite_patches/Show-site-settings-for-cookies-javascript-and-ads.patch b/build/cromite_patches/Show-site-settings-for-cookies-javascript-and-ads.patch index 5078e5d6..23602db3 100644 --- a/build/cromite_patches/Show-site-settings-for-cookies-javascript-and-ads.patch +++ b/build/cromite_patches/Show-site-settings-for-cookies-javascript-and-ads.patch @@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java -@@ -567,6 +567,8 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment +@@ -588,6 +588,8 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment setUpSoundPreference(preference); } else if (type == ContentSettingsType.JAVASCRIPT) { setUpJavascriptPreference(preference); @@ -24,7 +24,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c } else if (type == ContentSettingsType.GEOLOCATION) { setUpLocationPreference(preference); } else if (type == ContentSettingsType.NOTIFICATIONS) { -@@ -1018,17 +1020,8 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment +@@ -1070,17 +1072,8 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment private void setUpAdsInformationalBanner() { // Add the informational banner which shows at the top of the UI if ad blocking is // activated on this site. @@ -42,7 +42,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c } private SiteSettingsCategory getWarningCategory() { -@@ -1230,12 +1223,13 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment +@@ -1282,12 +1275,13 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment @Nullable Integer currentValue = mSite.getContentSetting(browserContextHandle, ContentSettingsType.JAVASCRIPT); @@ -62,7 +62,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c } // Not possible to embargo JAVASCRIPT. setupContentSettingsPreference( -@@ -1245,6 +1239,29 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment +@@ -1297,6 +1291,29 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment isOneTime(ContentSettingsType.JAVASCRIPT)); } @@ -92,7 +92,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c /** * Updates the ads list preference based on whether the site is a candidate for blocking. This * has some custom behavior. -@@ -1263,9 +1280,7 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment +@@ -1315,9 +1332,7 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment } // If the ad blocker is activated, then this site will have ads blocked unless there is an // explicit permission disallowing the blocking. @@ -106,7 +106,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java -@@ -281,7 +281,19 @@ public final class Website implements WebsiteEntry { +@@ -282,7 +282,19 @@ public final class Website implements WebsiteEntry { new ContentSettingException( ContentSettingsType.ADS, getAddress().getOrigin(), diff --git a/build/cromite_patches/Site-setting-for-images.patch b/build/cromite_patches/Site-setting-for-images.patch index 91cf2da5..13613f1d 100644 --- a/build/cromite_patches/Site-setting-for-images.patch +++ b/build/cromite_patches/Site-setting-for-images.patch @@ -323,7 +323,7 @@ diff --git a/third_party/blink/public/platform/web_content_settings_client.h b/t diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc --- a/third_party/blink/renderer/core/frame/local_frame.cc +++ b/third_party/blink/renderer/core/frame/local_frame.cc -@@ -4042,19 +4042,6 @@ bool LocalFrame::IsSameOrigin() { +@@ -4055,19 +4055,6 @@ bool LocalFrame::IsSameOrigin() { return security_origin->IsSameOriginWith(top_security_origin); } @@ -346,7 +346,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/ diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/blink/renderer/core/frame/local_frame.h --- a/third_party/blink/renderer/core/frame/local_frame.h +++ b/third_party/blink/renderer/core/frame/local_frame.h -@@ -918,12 +918,6 @@ class CORE_EXPORT LocalFrame final +@@ -927,12 +927,6 @@ class CORE_EXPORT LocalFrame final return *v8_local_compile_hints_producer_; } @@ -424,7 +424,7 @@ diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.h b/thir diff --git a/third_party/blink/renderer/core/page/page.cc b/third_party/blink/renderer/core/page/page.cc --- a/third_party/blink/renderer/core/page/page.cc +++ b/third_party/blink/renderer/core/page/page.cc -@@ -1039,9 +1039,8 @@ void Page::SettingsChanged(ChangeType change_type) { +@@ -1017,9 +1017,8 @@ void Page::SettingsChanged(ChangeType change_type) { for (Frame* frame = MainFrame(); frame; frame = frame->Tree().TraverseNext()) { if (auto* local_frame = DynamicTo(frame)) { @@ -439,7 +439,7 @@ diff --git a/third_party/blink/renderer/core/page/page.cc b/third_party/blink/re diff --git a/third_party/blink/renderer/platform/loader/fetch/fetch_context.h b/third_party/blink/renderer/platform/loader/fetch/fetch_context.h --- a/third_party/blink/renderer/platform/loader/fetch/fetch_context.h +++ b/third_party/blink/renderer/platform/loader/fetch/fetch_context.h -@@ -106,7 +106,7 @@ class PLATFORM_EXPORT FetchContext : public GarbageCollected { +@@ -107,7 +107,7 @@ class PLATFORM_EXPORT FetchContext : public GarbageCollected { virtual void AddResourceTiming(mojom::blink::ResourceTimingInfoPtr, const AtomicString& initiator_type); @@ -451,7 +451,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/fetch_context.h b/ diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc b/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc --- a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc +++ b/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc -@@ -790,6 +790,7 @@ ResourceFetcher::ResourceFetcher(const ResourceFetcherInit& init) +@@ -798,6 +798,7 @@ ResourceFetcher::ResourceFetcher(const ResourceFetcherInit& init) blob_registry_remote_(init.context_lifecycle_notifier), context_lifecycle_notifier_(init.context_lifecycle_notifier), auto_load_images_(true), @@ -459,16 +459,16 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.c allow_stale_resources_(false), image_fetched_(false), transparent_image_optimization_enabled_(base::FeatureList::IsEnabled( -@@ -1924,7 +1925,7 @@ bool ResourceFetcher::IsImageResourceDisallowedToBeReused( - if (existing_resource.GetType() != ResourceType::kImage) +@@ -1961,7 +1962,7 @@ bool ResourceFetcher::IsImageResourceDisallowedToBeReused( return false; + } - return !Context().AllowImage(); + return !Context().AllowImage(images_enabled_, existing_resource.Url()); } ResourceFetcher::RevalidationPolicy -@@ -2167,8 +2168,20 @@ void ResourceFetcher::SetAutoLoadImages(bool enable) { +@@ -2206,8 +2207,20 @@ void ResourceFetcher::SetAutoLoadImages(bool enable) { ReloadImagesIfNotDeferred(); } @@ -501,7 +501,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.h FetchContext& Context() const; void ClearContext(); -@@ -694,6 +695,7 @@ class PLATFORM_EXPORT ResourceFetcher +@@ -698,6 +699,7 @@ class PLATFORM_EXPORT ResourceFetcher // 27 bits left bool auto_load_images_ : 1; diff --git a/build/cromite_patches/Switch-to-fstack-protector-strong.patch b/build/cromite_patches/Switch-to-fstack-protector-strong.patch index 1c006fff..4aee772b 100644 --- a/build/cromite_patches/Switch-to-fstack-protector-strong.patch +++ b/build/cromite_patches/Switch-to-fstack-protector-strong.patch @@ -19,8 +19,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -371,7 +371,7 @@ config("compiler") { - } else if ((is_posix && !is_chromeos && !is_nacl) || is_fuchsia) { +@@ -372,7 +372,7 @@ config("compiler") { + } else if ((is_posix && !is_nacl) || is_fuchsia) { if (current_os != "aix") { # Not available on aix. - cflags += [ "-fstack-protector" ] diff --git a/build/cromite_patches/Timezone-customization.patch b/build/cromite_patches/Timezone-customization.patch index f01b30b9..da6c6cd6 100644 --- a/build/cromite_patches/Timezone-customization.patch +++ b/build/cromite_patches/Timezone-customization.patch @@ -32,7 +32,11 @@ Require: Content-settings-infrastructure.patch .../content_settings/core/common/pref_names.h | 3 + .../renderer/content_settings_agent_impl.cc | 77 +++++++ .../renderer/content_settings_agent_impl.h | 11 + - 22 files changed, 678 insertions(+), 1 deletion(-) + .../blink/renderer/core/timezone/build.gni | 2 + + .../timezone/external_timezone_controller.cc | 37 ++++ + .../timezone/external_timezone_controller.h | 33 +++ + .../core/timezone/timezone_controller.h | 6 +- + 26 files changed, 755 insertions(+), 2 deletions(-) create mode 100755 components/browser_ui/site_settings/android/java/res/layout/time_zone_select_dialog.xml create mode 100755 components/browser_ui/site_settings/android/java/res/layout/timezoneoverride_site_settings_preference.xml create mode 100755 components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/TimezoneOverrideSiteSettingsPreference.java @@ -40,11 +44,13 @@ Require: Content-settings-infrastructure.patch create mode 100644 components/browser_ui/strings/bromite_content_settings/timezone.grdp create mode 100644 components/content_settings/core/browser/bromite_content_settings/timezone_override.inc create mode 100644 components/content_settings/core/common/bromite_content_settings/TIMEZONE.inc + create mode 100644 third_party/blink/renderer/core/timezone/external_timezone_controller.cc + create mode 100644 third_party/blink/renderer/core/timezone/external_timezone_controller.h diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/browser_ui/site_settings/android/BUILD.gn --- a/components/browser_ui/site_settings/android/BUILD.gn +++ b/components/browser_ui/site_settings/android/BUILD.gn -@@ -98,6 +98,7 @@ android_library("java") { +@@ -99,6 +99,7 @@ android_library("java") { "java/src/org/chromium/components/browser_ui/site_settings/WebsitePreference.java", "java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java", "java/src/org/chromium/components/browser_ui/site_settings/WebsiteRowPreference.java", @@ -52,7 +58,7 @@ diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/b ] resources_package = "org.chromium.components.browser_ui.site_settings" -@@ -279,6 +280,8 @@ android_resources("java_resources") { +@@ -282,6 +283,8 @@ android_resources("java_resources") { "java/res/xml/site_settings_preferences.xml", "java/res/xml/storage_access_settings.xml", "java/res/xml/website_preferences.xml", @@ -559,7 +565,7 @@ new file mode 100644 diff --git a/components/browser_ui/site_settings/android/website_preference_bridge.cc b/components/browser_ui/site_settings/android/website_preference_bridge.cc --- a/components/browser_ui/site_settings/android/website_preference_bridge.cc +++ b/components/browser_ui/site_settings/android/website_preference_bridge.cc -@@ -1122,3 +1122,19 @@ JNI_WebsitePreferenceBridge_ToHostOnlyPattern( +@@ -1129,3 +1129,19 @@ JNI_WebsitePreferenceBridge_ToHostOnlyPattern( ContentSettingsPattern::FromString(pattern_string)); return ConvertUTF8ToJavaString(env, host_only_pattern.ToString()); } @@ -714,7 +720,7 @@ diff --git a/components/content_settings/core/browser/content_settings_pref_prov diff --git a/components/content_settings/core/browser/content_settings_utils.cc b/components/content_settings/core/browser/content_settings_utils.cc --- a/components/content_settings/core/browser/content_settings_utils.cc +++ b/components/content_settings/core/browser/content_settings_utils.cc -@@ -150,6 +150,11 @@ void GetRendererContentSettingRules(const HostContentSettingsMap* map, +@@ -151,6 +151,11 @@ void GetRendererContentSettingRules(const HostContentSettingsMap* map, ContentSettingToValue(CONTENT_SETTING_BLOCK), ProviderType::kNone, map->IsOffTheRecord())); #endif @@ -729,7 +735,7 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.cc diff --git a/components/content_settings/core/browser/host_content_settings_map.cc b/components/content_settings/core/browser/host_content_settings_map.cc --- a/components/content_settings/core/browser/host_content_settings_map.cc +++ b/components/content_settings/core/browser/host_content_settings_map.cc -@@ -664,6 +664,14 @@ void HostContentSettingsMap::SetClockForTesting(const base::Clock* clock) { +@@ -667,6 +667,14 @@ void HostContentSettingsMap::SetClockForTesting(const base::Clock* clock) { } } @@ -875,7 +881,7 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc + * all else fails, we return GMT, which is probably not what the + * user wants, but at least is a functioning TimeZone object. + */ -+ String timezone_id; ++ std::string timezone_id; + + if (setting == CONTENT_SETTING_ALLOW) { + // system time @@ -893,7 +899,7 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc + const char* tzID; + int32_t length; + if ((tzID = timezones->next(&length, ec)) != NULL) { -+ timezone_id = String(tzID); ++ timezone_id = tzID; + } + delete timezones; + } @@ -901,13 +907,13 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc + if (timezone_override_value.empty()) + timezone_id = "Europe/London"; + else -+ timezone_id = String(timezone_override_value.c_str()); ++ timezone_id = timezone_override_value; + } + -+ if (blink::TimeZoneController::HasTimeZoneOverride() == false) { ++ if (!blink::ExternalTimeZoneController::HasTimeZoneOverride()) { + timezone_override_.reset(); + timezone_override_ = -+ blink::TimeZoneController::SetTimeZoneOverride(timezone_id); ++ blink::ExternalTimeZoneController::SetTimeZoneOverride(timezone_id); + if (!timezone_override_) { + DLOG(WARNING) << "UpdateTimeZoneOverride - Invalid timezone id '" + << timezone_id << "'"; @@ -934,7 +940,7 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.h #include "url/origin.h" +#include "third_party/blink/renderer/core/inspector/locale_controller.h" -+#include "third_party/blink/renderer/core/timezone/timezone_controller.h" ++#include "third_party/blink/renderer/core/timezone/external_timezone_controller.h" +#include "third_party/icu/source/common/unicode/strenum.h" +#include "third_party/icu/source/i18n/unicode/timezone.h" + @@ -946,7 +952,7 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.h mojo::AssociatedReceiverSet receivers_; + -+ std::unique_ptr timezone_override_; ++ std::unique_ptr timezone_override_; + + bool UpdateOverrides(); + bool UpdateTimeZoneOverride(ContentSetting setting, const std::string& timezone_override_value); @@ -954,4 +960,124 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.h }; } // namespace content_settings +diff --git a/third_party/blink/renderer/core/timezone/build.gni b/third_party/blink/renderer/core/timezone/build.gni +--- a/third_party/blink/renderer/core/timezone/build.gni ++++ b/third_party/blink/renderer/core/timezone/build.gni +@@ -5,4 +5,6 @@ + blink_core_sources_timezone = [ + "timezone_controller.cc", + "timezone_controller.h", ++ "external_timezone_controller.cc", ++ "external_timezone_controller.h", + ] +diff --git a/third_party/blink/renderer/core/timezone/external_timezone_controller.cc b/third_party/blink/renderer/core/timezone/external_timezone_controller.cc +new file mode 100644 +--- /dev/null ++++ b/third_party/blink/renderer/core/timezone/external_timezone_controller.cc +@@ -0,0 +1,37 @@ ++// Copyright 2019 The Chromium Authors ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++ ++#include "third_party/blink/renderer/core/timezone/external_timezone_controller.h" ++#include "third_party/blink/renderer/core/timezone/timezone_controller.h" ++#include "third_party/blink/renderer/platform/wtf/wtf.h" ++ ++namespace blink { ++ ++ExternalTimeZoneController::ExternalTimeZoneController() { ++ DCHECK(IsMainThread()); ++} ++ ++// static ++std::unique_ptr ++ExternalTimeZoneController::SetTimeZoneOverride(const std::string& timezone_id) { ++ auto timezone = String(timezone_id.c_str()); ++ ++ auto timezone_override = TimeZoneController::SetTimeZoneOverride(timezone); ++ if (!timezone_override) return nullptr; ++ ++ timezone_override->clear_at_destruction_ = false; ++ return std::unique_ptr(new TimeZoneOverride()); ++} ++ ++// static ++bool ExternalTimeZoneController::HasTimeZoneOverride() { ++ return TimeZoneController::HasTimeZoneOverride(); ++} ++ ++// static ++void ExternalTimeZoneController::ClearTimeZoneOverride() { ++ TimeZoneController::ClearTimeZoneOverride(); ++} ++ ++} // namespace blink +diff --git a/third_party/blink/renderer/core/timezone/external_timezone_controller.h b/third_party/blink/renderer/core/timezone/external_timezone_controller.h +new file mode 100644 +--- /dev/null ++++ b/third_party/blink/renderer/core/timezone/external_timezone_controller.h +@@ -0,0 +1,33 @@ ++#ifndef THIRD_PARTY_BLINK_RENDERER_CORE_TIMEZONE_EXTERNAL_TIMEZONE_CONTROLLER_H_ ++#define THIRD_PARTY_BLINK_RENDERER_CORE_TIMEZONE_EXTERNAL_TIMEZONE_CONTROLLER_H_ ++ ++#include ++ ++#include "third_party/blink/renderer/core/core_export.h" ++ ++namespace blink { ++ ++class CORE_EXPORT ExternalTimeZoneController final { ++ public: ++ class TimeZoneOverride { ++ friend ExternalTimeZoneController; ++ TimeZoneOverride() = default; ++ ++ public: ++ ~TimeZoneOverride() { ClearTimeZoneOverride(); } ++ }; ++ ++ static std::unique_ptr SetTimeZoneOverride( ++ const std::string& timezone_id); ++ ++ static bool HasTimeZoneOverride(); ++ ++ private: ++ static void ClearTimeZoneOverride(); ++ ++ ExternalTimeZoneController(); ++}; ++ ++} // namespace blink ++ ++#endif // THIRD_PARTY_BLINK_RENDERER_CORE_TIMEZONE_EXTERNAL_TIMEZONE_CONTROLLER_H_ +diff --git a/third_party/blink/renderer/core/timezone/timezone_controller.h b/third_party/blink/renderer/core/timezone/timezone_controller.h +--- a/third_party/blink/renderer/core/timezone/timezone_controller.h ++++ b/third_party/blink/renderer/core/timezone/timezone_controller.h +@@ -11,6 +11,7 @@ + #include "services/device/public/mojom/time_zone_monitor.mojom-blink.h" + #include "third_party/blink/renderer/core/core_export.h" + #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h" ++#include "third_party/blink/renderer/core/timezone/external_timezone_controller.h" + + namespace blink { + +@@ -25,6 +26,7 @@ namespace blink { + // current host system time zone is assumed. + class CORE_EXPORT TimeZoneController final + : public device::mojom::blink::TimeZoneMonitorClient { ++ friend ExternalTimeZoneController; + public: + ~TimeZoneController() override; + +@@ -39,7 +41,9 @@ class CORE_EXPORT TimeZoneController final + ChangeTimeZoneOverride(timezone_id); + } + +- ~TimeZoneOverride() { ClearTimeZoneOverride(); } ++ bool clear_at_destruction_ = true; ++ ++ ~TimeZoneOverride() { if (clear_at_destruction_) ClearTimeZoneOverride(); } + }; + + static std::unique_ptr SetTimeZoneOverride( -- diff --git a/build/cromite_patches/Use-browser-navigation-handler.patch b/build/cromite_patches/Use-browser-navigation-handler.patch index 231a08c0..1f178d21 100644 --- a/build/cromite_patches/Use-browser-navigation-handler.patch +++ b/build/cromite_patches/Use-browser-navigation-handler.patch @@ -86,15 +86,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/gesturenav/Gest diff --git a/chrome/android/java/src/org/chromium/chrome/browser/gesturenav/HistoryNavigationCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/gesturenav/HistoryNavigationCoordinator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/gesturenav/HistoryNavigationCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/gesturenav/HistoryNavigationCoordinator.java -@@ -12,6 +12,7 @@ import androidx.annotation.Nullable; - +@@ -14,6 +14,7 @@ import org.chromium.base.BuildInfo; import org.chromium.base.supplier.ObservableSupplier; import org.chromium.base.supplier.Supplier; + import org.chromium.chrome.browser.flags.ChromeFeatureList; +import org.chromium.chrome.browser.flags.cromite.sUseBrowserNavigationHandler; + import org.chromium.chrome.browser.fullscreen.FullscreenManager; + import org.chromium.chrome.browser.fullscreen.FullscreenOptions; import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher; - import org.chromium.chrome.browser.lifecycle.PauseResumeWithNativeObserver; - import org.chromium.chrome.browser.tab.CurrentTabObserver; -@@ -155,6 +156,9 @@ public class HistoryNavigationCoordinator +@@ -197,6 +198,9 @@ public class HistoryNavigationCoordinator * @return {@code} true if the feature is enabled. */ private boolean isFeatureEnabled() { @@ -139,7 +139,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/gesturenav/Navi import static org.chromium.chrome.browser.gesturenav.GestureNavigationProperties.EDGE; import android.app.Activity; -@@ -276,7 +276,11 @@ class NavigationHandler implements TouchEventObserver { +@@ -289,7 +289,11 @@ class NavigationHandler implements TouchEventObserver { boolean forward = isForward(); @@ -152,7 +152,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/gesturenav/Navi mModel.set(EDGE, mInitiatingEdge); if (canNavigate(forward)) { if (mState != GestureState.STARTED) mModel.set(ACTION, GestureAction.RESET_BUBBLE); -@@ -483,12 +487,14 @@ class NavigationHandler implements TouchEventObserver { +@@ -510,12 +514,14 @@ class NavigationHandler implements TouchEventObserver { } private boolean isForward() { @@ -227,7 +227,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/gesturenav/Side diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java -@@ -57,6 +57,7 @@ import org.chromium.chrome.browser.firstrun.FirstRunStatus; +@@ -58,6 +58,7 @@ import org.chromium.chrome.browser.firstrun.FirstRunStatus; import org.chromium.chrome.browser.flags.ActivityType; import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.flags.ChromeSwitches; @@ -235,7 +235,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab import org.chromium.chrome.browser.fullscreen.BrowserControlsManager; import org.chromium.chrome.browser.fullscreen.FullscreenManager; import org.chromium.chrome.browser.gesturenav.BackActionDelegate; -@@ -628,6 +629,8 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -634,6 +635,8 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { @Override public void onInflationComplete() { mCoordinator = mActivity.findViewById(R.id.coordinator); @@ -302,7 +302,7 @@ new file mode 100644 diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml --- a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml +++ b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml -@@ -108,4 +108,13 @@ found in the LICENSE file. +@@ -103,4 +103,13 @@ found in the LICENSE file. android:summary="@string/selection_popup_smart_text_summary" android:title="@string/selection_popup_smart_text_title" /> diff --git a/build/cromite_patches/User-agent-customization.patch b/build/cromite_patches/User-agent-customization.patch index 79d84fb9..6debf0a1 100644 --- a/build/cromite_patches/User-agent-customization.patch +++ b/build/cromite_patches/User-agent-customization.patch @@ -56,7 +56,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/base/base_switches.cc b/base/base_switches.cc --- a/base/base_switches.cc +++ b/base/base_switches.cc -@@ -176,6 +176,8 @@ const char kPackageName[] = "package-name"; +@@ -173,6 +173,8 @@ const char kPackageName[] = "package-name"; const char kPackageVersionName[] = "package-version-name"; #endif @@ -68,7 +68,7 @@ diff --git a/base/base_switches.cc b/base/base_switches.cc diff --git a/base/base_switches.h b/base/base_switches.h --- a/base/base_switches.h +++ b/base/base_switches.h -@@ -64,6 +64,8 @@ extern const char kPackageVersionName[]; +@@ -63,6 +63,8 @@ extern const char kPackageVersionName[]; extern const char kSchedulerBoostUrgent[]; #endif @@ -80,7 +80,7 @@ diff --git a/base/base_switches.h b/base/base_switches.h diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni --- a/chrome/android/chrome_java_resources.gni +++ b/chrome/android/chrome_java_resources.gni -@@ -634,4 +634,6 @@ chrome_java_resources = [ +@@ -635,4 +635,6 @@ chrome_java_resources = [ "java/res/xml/search_widget_info.xml", "java/res/xml/tracing_preferences.xml", "java/res/xml/unified_account_settings_preferences.xml", @@ -90,7 +90,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -937,6 +937,7 @@ chrome_java_sources = [ +@@ -932,6 +932,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/payments/ui/DimmingDialog.java", "java/src/org/chromium/chrome/browser/payments/ui/LineItem.java", "java/src/org/chromium/chrome/browser/payments/ui/PaymentAppComparator.java", @@ -139,7 +139,7 @@ new file mode 100644 + @@ -170,7 +170,7 @@ new file mode 100644 + @@ -257,7 +257,7 @@ new file mode 100644 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 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java -@@ -2668,6 +2668,7 @@ public abstract class ChromeActivity +@@ -2595,6 +2595,7 @@ public abstract class ChromeActivity TabUtils.switchUserAgent( currentTab, usingDesktopUserAgent, @@ -539,7 +539,7 @@ new file mode 100644 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/RequestDesktopUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/RequestDesktopUtils.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/RequestDesktopUtils.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/RequestDesktopUtils.java -@@ -133,6 +133,7 @@ public class RequestDesktopUtils { +@@ -131,6 +131,7 @@ public class RequestDesktopUtils { */ public static void setRequestDesktopSiteContentSettingsForUrl( Profile profile, GURL url, boolean useDesktopUserAgent) { @@ -550,7 +550,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/RequestDesk diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java -@@ -65,6 +65,9 @@ import org.chromium.components.autofill.AutofillFeatures; +@@ -66,6 +66,9 @@ import org.chromium.components.autofill.AutofillFeatures; import org.chromium.components.autofill.AutofillProvider; import org.chromium.components.autofill.AutofillSelectionActionMenuDelegate; import org.chromium.components.autofill.AutofillSelectionMenuItemHelper; @@ -560,7 +560,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav import org.chromium.components.dom_distiller.core.DomDistillerUrlUtils; import org.chromium.components.embedder_support.contextmenu.ContextMenuPopulatorFactory; import org.chromium.components.embedder_support.util.UrlConstants; -@@ -101,6 +104,9 @@ import org.chromium.chrome.browser.preferences.Pref; +@@ -104,6 +107,9 @@ import org.chromium.chrome.browser.preferences.Pref; import org.chromium.chrome.browser.profiles.ProfileManager; import org.chromium.components.user_prefs.UserPrefs; @@ -570,7 +570,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav /** * Implementation of the interface {@link Tab}. Contains and manages a {@link ContentView}. This * class is not intended to be extended. -@@ -2018,9 +2024,6 @@ class TabImpl implements Tab { +@@ -2030,9 +2036,6 @@ class TabImpl implements Tab, SensitiveContentClient.Observer { } if (mWebContents != null) { @@ -580,7 +580,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav mWebContents.getNavigationController().loadIfNecessary(); } mIsBeingRestored = true; -@@ -2347,6 +2350,11 @@ class TabImpl implements Tab { +@@ -2366,6 +2369,11 @@ class TabImpl implements Tab, SensitiveContentClient.Observer { url = webContents.getVisibleUrl(); } @@ -592,7 +592,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav // Do not override UA if there is a tab level setting. if (tabUserAgent != TabUserAgent.DEFAULT) { recordHistogramUseDesktopUserAgent(currentRequestDesktopSite); -@@ -2392,7 +2400,7 @@ class TabImpl implements Tab { +@@ -2411,7 +2419,7 @@ class TabImpl implements Tab, SensitiveContentClient.Observer { } boolean usingDesktopUserAgent = getWebContents().getNavigationController().getUseDesktopUserAgent(); @@ -601,8 +601,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav } /** Sets the TabLaunchType for tabs launched with an unset launch type. */ -@@ -2449,6 +2457,54 @@ class TabImpl implements Tab { - } +@@ -2481,6 +2489,54 @@ class TabImpl implements Tab, SensitiveContentClient.Observer { + setTabHasSensitiveContent(contentIsSensitive); } + int overrideUserAgentWhenUnFrozen = (int)UserAgentOverrideOption.INHERIT; @@ -669,8 +669,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabUtils.ja + import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; - -@@ -125,11 +129,8 @@ public class TabUtils { + import java.util.ArrayList; +@@ -128,11 +132,8 @@ public class TabUtils { * @param switchToDesktop Whether switching the user agent to desktop. * @param caller The caller of this method. */ @@ -956,7 +956,7 @@ diff --git a/chrome/browser/content_settings/request_desktop_site_web_contents_o diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java -@@ -1041,8 +1041,6 @@ public final class ChromePreferenceKeys { +@@ -1039,8 +1039,6 @@ public final class ChromePreferenceKeys { SIGNIN_PROMO_NTP_LAST_SHOWN_TIME, SYNC_PROMO_TOTAL_SHOW_COUNT, SEARCH_RESUMPTION_MODULE_COLLAPSE_ON_NTP, @@ -998,7 +998,7 @@ diff --git a/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/Tab.jav diff --git a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManager.java b/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManager.java --- a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManager.java +++ b/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManager.java -@@ -115,6 +115,8 @@ public interface TabWindowManager { +@@ -119,6 +119,8 @@ public interface TabWindowManager { */ Tab getTabById(int tabId); @@ -1010,7 +1010,7 @@ diff --git a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browse diff --git a/chrome/browser/tabmodel/internal/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManagerImpl.java b/chrome/browser/tabmodel/internal/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManagerImpl.java --- a/chrome/browser/tabmodel/internal/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManagerImpl.java +++ b/chrome/browser/tabmodel/internal/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManagerImpl.java -@@ -416,6 +416,24 @@ public class TabWindowManagerImpl implements ActivityStateListener, TabWindowMan +@@ -419,6 +419,24 @@ public class TabWindowManagerImpl implements ActivityStateListener, TabWindowMan return null; } @@ -1074,7 +1074,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h --- a/chrome/common/pref_names.h +++ b/chrome/common/pref_names.h -@@ -1956,6 +1956,14 @@ inline constexpr char kNaviOnboardGroup[] = "browser.navi_onboard_group"; +@@ -1922,6 +1922,14 @@ inline constexpr char kNaviOnboardGroup[] = "browser.navi_onboard_group"; inline constexpr char kHadThreeConsecutiveNotificationPermissionDenies[] = "profile.content_settings.had_three_consecutive_denies.notifications"; @@ -1217,7 +1217,7 @@ diff --git a/components/browser_ui/widget/android/java/src/org/chromium/componen 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 +++ b/components/embedder_support/user_agent_utils.cc -@@ -526,7 +526,8 @@ void SetDesktopUserAgentOverride(content::WebContents* web_contents, +@@ -581,7 +581,8 @@ void SetDesktopUserAgentOverride(content::WebContents* web_contents, blink::UserAgentOverride spoofed_ua; spoofed_ua.ua_string_override = content::BuildUserAgentFromOSAndProduct( @@ -1262,7 +1262,7 @@ diff --git a/content/browser/renderer_host/navigation_controller_android.h b/con diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc -@@ -3476,6 +3476,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( +@@ -3474,6 +3474,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( switches::kLacrosUseChromeosProtectedMedia, switches::kLacrosUseChromeosProtectedAv1, #endif @@ -1281,7 +1281,7 @@ diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser #include "base/base_switches.h" #include "base/check_op.h" #include "base/command_line.h" -@@ -2305,8 +2306,6 @@ void WebContentsImpl::SetUserAgentOverride( +@@ -2311,8 +2312,6 @@ void WebContentsImpl::SetUserAgentOverride( OPTIONAL_TRACE_EVENT2("content", "WebContentsImpl::SetUserAgentOverride", "ua_override", ua_override.ua_string_override, "override_in_new_tabs", override_in_new_tabs); @@ -1290,7 +1290,7 @@ diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser if (GetUserAgentOverride() == ua_override) { return; -@@ -3354,6 +3353,9 @@ const blink::web_pref::WebPreferences WebContentsImpl::ComputeWebPreferences() { +@@ -3457,6 +3456,9 @@ const blink::web_pref::WebPreferences WebContentsImpl::ComputeWebPreferences() { #else prefs.viewport_meta_enabled = false; #endif @@ -1323,7 +1323,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/frameh diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc -@@ -882,7 +882,6 @@ void RenderThreadImpl::InitializeRenderer( +@@ -911,7 +911,6 @@ void RenderThreadImpl::InitializeRenderer( const blink::UserAgentMetadata& user_agent_metadata, const std::vector& cors_exempt_header_list, blink::mojom::OriginTrialsSettingsPtr origin_trials_settings) { diff --git a/build/cromite_patches/Welcome-screen.patch b/build/cromite_patches/Welcome-screen.patch index 281742da..7a7454a7 100644 --- a/build/cromite_patches/Welcome-screen.patch +++ b/build/cromite_patches/Welcome-screen.patch @@ -15,13 +15,13 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../DefaultSearchEngineFirstRunFragment.java | 3 - .../browser/firstrun/FirstRunActivity.java | 32 +- .../firstrun/FirstRunActivityBase.java | 6 +- - .../firstrun/FirstRunFlowSequencer.java | 70 +--- + .../firstrun/FirstRunFlowSequencer.java | 73 +--- .../browser/firstrun/FirstRunUtils.java | 1 + .../firstrun/ToSAndUMAFirstRunFragment.java | 335 +++++++++++++++++ .../firstrun/TosAndUmaFragmentView.java | 336 ++++++++++++++++++ .../browser/locale/LocaleManagerDelegate.java | 5 +- .../Welcome-screen.grdp | 27 ++ - 15 files changed, 915 insertions(+), 110 deletions(-) + 15 files changed, 915 insertions(+), 113 deletions(-) create mode 100644 chrome/android/java/res/layout/fre_tosanduma.xml create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/firstrun/TosAndUmaFragmentView.java @@ -35,13 +35,13 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja "java/res/layout/find_toolbar.xml", "java/res/layout/fre_tos_privacy_disclaimer.xml", + "java/res/layout/fre_tosanduma.xml", + "java/res/layout/hats_survey_container.xml", "java/res/layout/history_clear_browsing_data_header.xml", "java/res/layout/history_item_view.xml", - "java/res/layout/history_main.xml", diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -658,6 +658,8 @@ chrome_java_sources = [ +@@ -655,6 +655,8 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/firstrun/SkipTosDialogPolicyListener.java", "java/src/org/chromium/chrome/browser/firstrun/SyncConsentFirstRunFragment.java", "java/src/org/chromium/chrome/browser/firstrun/TosDialogBehaviorSharedPrefInvalidator.java", @@ -414,11 +414,12 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencer.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencer.java --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencer.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencer.java -@@ -28,14 +28,9 @@ import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomiza +@@ -29,15 +29,9 @@ import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomiza import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.profiles.ProfileProvider; import org.chromium.chrome.browser.search_engines.SearchEnginePromoType; -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider; +-import org.chromium.chrome.browser.signin.services.SigninPreferencesManager; -import org.chromium.chrome.browser.ui.signin.history_sync.HistorySyncHelper; import org.chromium.components.crash.CrashKeyIndex; import org.chromium.components.crash.CrashKeys; @@ -429,7 +430,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR /** * A helper to determine what should be the sequence of First Run Experience screens, and whether -@@ -63,46 +58,17 @@ public abstract class FirstRunFlowSequencer { +@@ -65,46 +59,17 @@ public abstract class FirstRunFlowSequencer { /** Returns true if the sync consent promo page should be shown. */ boolean shouldShowSyncConsentPage(boolean isChild) { @@ -479,7 +480,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR } } -@@ -154,18 +120,8 @@ public abstract class FirstRunFlowSequencer { +@@ -156,18 +121,8 @@ public abstract class FirstRunFlowSequencer { * method. */ void start() { @@ -500,7 +501,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR } @VisibleForTesting -@@ -188,14 +144,10 @@ public abstract class FirstRunFlowSequencer { +@@ -190,14 +145,10 @@ public abstract class FirstRunFlowSequencer { } private void maybeProcessFreEnvironmentPreNative() { @@ -515,7 +516,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR onFlowIsKnown(freProperties); } -@@ -206,8 +158,8 @@ public abstract class FirstRunFlowSequencer { +@@ -208,8 +159,8 @@ public abstract class FirstRunFlowSequencer { * @param freProperties Resulting FRE properties bundle. */ public void updateFirstRunProperties(Bundle freProperties) { @@ -526,7 +527,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR boolean isHistorySyncEnabled = ChromeFeatureList.isEnabled( ChromeFeatureList.REPLACE_SYNC_PROMOS_WITH_SIGN_IN_PROMOS); -@@ -322,13 +274,17 @@ public abstract class FirstRunFlowSequencer { +@@ -237,8 +188,6 @@ public abstract class FirstRunFlowSequencer { + + // Mark the FRE flow as complete. + FirstRunStatus.setFirstRunFlowComplete(true); +- SigninPreferencesManager.getInstance() +- .setCctMismatchNoticeSuppressionPeriodStart(TimeUtils.currentTimeMillis()); + } + + /** +@@ -327,13 +276,17 @@ public abstract class FirstRunFlowSequencer { if (!(caller instanceof Activity)) { freIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); } @@ -1241,7 +1251,7 @@ new file mode 100644 diff --git a/chrome/browser/locale/java/src/org/chromium/chrome/browser/locale/LocaleManagerDelegate.java b/chrome/browser/locale/java/src/org/chromium/chrome/browser/locale/LocaleManagerDelegate.java --- a/chrome/browser/locale/java/src/org/chromium/chrome/browser/locale/LocaleManagerDelegate.java +++ b/chrome/browser/locale/java/src/org/chromium/chrome/browser/locale/LocaleManagerDelegate.java -@@ -312,8 +312,9 @@ public class LocaleManagerDelegate { +@@ -375,8 +375,9 @@ public class LocaleManagerDelegate { /** @see LocaleManager#getSearchEnginesForPromoDialog */ public List getSearchEnginesForPromoDialog(@SearchEnginePromoType int promoType) { diff --git a/build/cromite_patches/autofill-miscellaneous.patch b/build/cromite_patches/autofill-miscellaneous.patch index 82f49791..da0f782b 100644 --- a/build/cromite_patches/autofill-miscellaneous.patch +++ b/build/cromite_patches/autofill-miscellaneous.patch @@ -22,7 +22,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 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 -@@ -1327,7 +1327,7 @@ void RegisterProfilePrefsForMigration( +@@ -1255,7 +1255,7 @@ void RegisterProfilePrefsForMigration( #endif // Deprecated 12/2023. @@ -34,7 +34,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse diff --git a/chrome/browser/ui/autofill/chrome_autofill_client.cc b/chrome/browser/ui/autofill/chrome_autofill_client.cc --- a/chrome/browser/ui/autofill/chrome_autofill_client.cc +++ b/chrome/browser/ui/autofill/chrome_autofill_client.cc -@@ -243,12 +243,7 @@ ChromeAutofillClient::GetURLLoaderFactory() { +@@ -245,12 +245,7 @@ ChromeAutofillClient::GetURLLoaderFactory() { } AutofillCrowdsourcingManager* ChromeAutofillClient::GetCrowdsourcingManager() { @@ -156,7 +156,7 @@ diff --git a/components/autofill/core/browser/crowdsourcing/autofill_crowdsourci diff --git a/components/autofill/core/common/autofill_features.cc b/components/autofill/core/common/autofill_features.cc --- a/components/autofill/core/common/autofill_features.cc +++ b/components/autofill/core/common/autofill_features.cc -@@ -869,6 +869,8 @@ BASE_FEATURE(kAutofillUploadThrottling, +@@ -842,6 +842,8 @@ BASE_FEATURE(kAutofillUploadThrottling, "AutofillUploadThrottling", base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/build/cromite_patches/bromite-build-utils.patch b/build/cromite_patches/bromite-build-utils.patch index cd33a72d..c32f5e4f 100644 --- a/build/cromite_patches/bromite-build-utils.patch +++ b/build/cromite_patches/bromite-build-utils.patch @@ -426,7 +426,7 @@ new file mode 100644 diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn --- a/build/config/BUILDCONFIG.gn +++ b/build/config/BUILDCONFIG.gn -@@ -728,6 +728,7 @@ set_defaults("component") { +@@ -734,6 +734,7 @@ set_defaults("component") { configs = default_component_configs } @@ -437,7 +437,7 @@ diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni --- a/build/config/android/rules.gni +++ b/build/config/android/rules.gni -@@ -208,7 +208,7 @@ if (!is_robolectric && enable_java_templates) { +@@ -209,7 +209,7 @@ if (!is_robolectric && enable_java_templates) { # } template("java_cpp_enum") { action_with_pydeps(target_name) { @@ -446,7 +446,7 @@ diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni # The sources aren't compiled so don't check their dependencies. check_includes = false -@@ -219,6 +219,10 @@ if (!is_robolectric && enable_java_templates) { +@@ -220,6 +220,10 @@ if (!is_robolectric && enable_java_templates) { _rebased_sources = rebase_path(invoker.sources, root_build_dir) args = [ "--srcjar=$_rebased_srcjar_path" ] + _rebased_sources @@ -594,7 +594,7 @@ new file mode 100755 @@ -0,0 +1,46 @@ +package org.chromium.chrome.browser.flags; + -+import org.chromium.base.cached_flags.CachedFlagsSharedPreferences; ++import org.chromium.components.cached_flags.CachedFlagsSharedPreferences; +import org.chromium.components.cached_flags.CachedFlag; +import org.chromium.chrome.browser.flags.ChromeFeatureList; + @@ -649,12 +649,12 @@ diff --git a/mojo/public/tools/mojom/mojom_parser.py b/mojo/public/tools/mojom/m from collections import defaultdict from mojom.generate import module -@@ -176,11 +177,26 @@ def _CollectAllowedImportsFromBuildMetadata(build_metadata_filename): +@@ -177,11 +178,26 @@ def _CollectAllowedImportsFromBuildMetadata(build_metadata_filename): collect(build_metadata_filename) return allowed_imports +def _ResolveInclude(mojom_abspath, input_root_paths): -+ mojom_abspath = _ResolveRelativeImportPath(mojom_abspath, input_root_paths) ++ mojom_abspath = _ResolveRelativeImportPath(mojom_abspath, mojom_abspath, input_root_paths) + with codecs.open(mojom_abspath, encoding='utf-8') as f: + src = f.read() + @@ -678,7 +678,7 @@ diff --git a/mojo/public/tools/mojom/mojom_parser.py b/mojo/public/tools/mojom/m conditional_features.RemoveDisabledDefinitions(ast, enabled_features) return mojom_abspath, ast -@@ -300,7 +316,7 @@ def _ParseMojoms(mojom_files, +@@ -301,7 +317,7 @@ def _ParseMojoms(mojom_files, (path, abs_path) for abs_path, path in mojom_files_to_parse.items()) logging.info('Parsing %d .mojom into ASTs', len(mojom_files_to_parse)) diff --git a/build/cromite_patches/disable-AdsBlockedInfoBar.patch b/build/cromite_patches/disable-AdsBlockedInfoBar.patch index d67ea8dd..f3e2b226 100644 --- a/build/cromite_patches/disable-AdsBlockedInfoBar.patch +++ b/build/cromite_patches/disable-AdsBlockedInfoBar.patch @@ -4,72 +4,18 @@ Subject: disable AdsBlockedInfoBar License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - .../browser/profile_interaction_manager.cc | 48 ------------------- - 1 file changed, 48 deletions(-) + .../content/browser/profile_interaction_manager.cc | 1 + + 1 file changed, 1 insertion(+) diff --git a/components/subresource_filter/content/browser/profile_interaction_manager.cc b/components/subresource_filter/content/browser/profile_interaction_manager.cc --- a/components/subresource_filter/content/browser/profile_interaction_manager.cc +++ b/components/subresource_filter/content/browser/profile_interaction_manager.cc -@@ -21,13 +21,6 @@ - #include "content/public/browser/render_frame_host.h" - #include "content/public/browser/web_contents.h" - --#if BUILDFLAG(IS_ANDROID) --#include "components/infobars/content/content_infobar_manager.h" // nogncheck --#include "components/messages/android/message_dispatcher_bridge.h" --#include "components/messages/android/messages_feature.h" --#include "components/subresource_filter/content/browser/ads_blocked_infobar_delegate.h" --#endif -- - namespace subresource_filter { +@@ -129,6 +129,7 @@ mojom::ActivationLevel ProfileInteractionManager::OnPageActivationComputed( + } - ProfileInteractionManager::ProfileInteractionManager( -@@ -136,47 +129,6 @@ void ProfileInteractionManager::MaybeShowNotification() { + void ProfileInteractionManager::MaybeShowNotification() { ++ if ((true)) return; + // The caller should make sure this is only called from pages that are // currently primary. CHECK(page_, base::NotFatalUntil::M129); - CHECK(page_->IsPrimary(), base::NotFatalUntil::M129); -- -- const GURL& top_level_url = page_->GetMainDocument().GetLastCommittedURL(); -- if (profile_context_->settings_manager()->ShouldShowUIForSite( -- top_level_url)) { --#if BUILDFLAG(IS_ANDROID) -- if (messages::IsAdsBlockedMessagesUiEnabled() && -- messages::MessageDispatcherBridge::Get() -- ->IsMessagesEnabledForEmbedder()) { -- subresource_filter::AdsBlockedMessageDelegate::CreateForWebContents( -- GetWebContents()); -- ads_blocked_message_delegate_ = -- subresource_filter::AdsBlockedMessageDelegate::FromWebContents( -- GetWebContents()); -- ads_blocked_message_delegate_->ShowMessage(); -- } else { -- // NOTE: It is acceptable for the embedder to not have installed an -- // infobar manager. -- if (auto* infobar_manager = -- infobars::ContentInfoBarManager::FromWebContents( -- GetWebContents())) { -- subresource_filter::AdsBlockedInfobarDelegate::Create(infobar_manager); -- } -- } --#endif -- -- // TODO(crbug.com/40139135): Plumb the actual frame reference here -- // (it comes from -- // ContentSubresourceFilterThrottleManager::DidDisallowFirstSubresource, -- // which comes from a specific frame). -- content_settings::PageSpecificContentSettings* content_settings = -- content_settings::PageSpecificContentSettings::GetForFrame( -- &page_->GetMainDocument()); -- content_settings->OnContentBlocked(ContentSettingsType::ADS); -- -- ContentSubresourceFilterThrottleManager::LogAction( -- SubresourceFilterAction::kUIShown); -- profile_context_->settings_manager()->OnDidShowUI(top_level_url); -- } else { -- ContentSubresourceFilterThrottleManager::LogAction( -- SubresourceFilterAction::kUISuppressed); -- } - } - - content_settings::CookieSettings* -- diff --git a/build/cromite_patches/dns-send-IPv6-connectivity-probes-to-RIPE-DNS.patch b/build/cromite_patches/dns-send-IPv6-connectivity-probes-to-RIPE-DNS.patch index e276b2c9..773ecccf 100644 --- a/build/cromite_patches/dns-send-IPv6-connectivity-probes-to-RIPE-DNS.patch +++ b/build/cromite_patches/dns-send-IPv6-connectivity-probes-to-RIPE-DNS.patch @@ -46,7 +46,7 @@ diff --git a/net/dns/host_resolver_manager_request_impl.cc b/net/dns/host_resolv namespace net { HostResolverManager::RequestImpl::RequestImpl( -@@ -280,6 +282,9 @@ void HostResolverManager::RequestImpl::OnIOComplete(int rv) { +@@ -279,6 +281,9 @@ void HostResolverManager::RequestImpl::OnIOComplete(int rv) { int HostResolverManager::RequestImpl::DoIPv6Reachability() { next_state_ = STATE_GET_PARAMETERS; diff --git a/build/cromite_patches/enable-ftrivial-auto-var-init-zero.patch b/build/cromite_patches/enable-ftrivial-auto-var-init-zero.patch index 292ae19c..5efb4e13 100644 --- a/build/cromite_patches/enable-ftrivial-auto-var-init-zero.patch +++ b/build/cromite_patches/enable-ftrivial-auto-var-init-zero.patch @@ -11,7 +11,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -387,6 +387,10 @@ config("compiler") { +@@ -388,6 +388,10 @@ config("compiler") { cflags += [ "-fwrapv" ] } diff --git a/build/cromite_patches/eyeo-beta-118.0.5993.48-android_api.patch b/build/cromite_patches/eyeo-beta-118.0.5993.48-android_api.patch index b7834891..dd0496c7 100644 --- a/build/cromite_patches/eyeo-beta-118.0.5993.48-android_api.patch +++ b/build/cromite_patches/eyeo-beta-118.0.5993.48-android_api.patch @@ -97,7 +97,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn import("//build/android/resource_sizes.gni") import("//build/config/android/config.gni") -@@ -512,6 +516,7 @@ if (current_toolchain == default_toolchain) { +@@ -523,6 +527,7 @@ if (current_toolchain == default_toolchain) { "//chrome/browser/xsurface_provider:java", "//components/android_autofill/browser:java", "//components/autofill/android:autofill_features_java", @@ -105,7 +105,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//components/autofill/android:autofill_java", "//components/background_task_scheduler:background_task_scheduler_java", "//components/background_task_scheduler:background_task_scheduler_task_ids_java", -@@ -1675,6 +1680,7 @@ if (current_toolchain == default_toolchain) { +@@ -1701,6 +1706,7 @@ if (current_toolchain == default_toolchain) { "//chrome/android/webapk/libs/client:client_java", "//chrome/android/webapk/libs/common:common_java", "//chrome/android/webapk/libs/runtime_library:webapk_service_aidl_java", @@ -113,7 +113,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//chrome/browser/android/browserservices/intents:java", "//chrome/browser/android/browserservices/verification:java", "//chrome/browser/android/browserservices/verification:javatests", -@@ -2050,6 +2056,7 @@ if (current_toolchain == default_toolchain) { +@@ -2081,6 +2087,7 @@ if (current_toolchain == default_toolchain) { srcjar_deps = [ "//chrome/browser:tos_dialog_behavior_generated_enum" ] data = [ @@ -121,7 +121,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//chrome/test/data/android/", "//chrome/test/data/autofill/", "//chrome/test/data/background_sync/", -@@ -3939,6 +3946,7 @@ group("jni_headers") { +@@ -3974,6 +3981,7 @@ group("jni_headers") { "//chrome/browser/util:jni_headers", "//chrome/browser/webauthn/android:jni_headers", "//components/browser_ui/device_lock/android:device_lock_bridge_jni_headers", @@ -132,7 +132,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2556,6 +2556,18 @@ static_library("browser") { +@@ -2537,6 +2537,18 @@ static_library("browser") { } if (is_android) { @@ -643,7 +643,7 @@ new file mode 100644 diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -300,6 +300,11 @@ +@@ -305,6 +305,11 @@ #include "components/commerce/core/commerce_feature_list.h" #include "components/commerce/core/proto/merchant_signal_db_content.pb.h" @@ -655,7 +655,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc #else #include "chrome/browser/accessibility/live_caption/live_caption_controller_factory.h" -@@ -878,6 +883,11 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -898,6 +903,11 @@ void ChromeBrowserMainExtraPartsProfiles:: #if BUILDFLAG(IS_ANDROID) FastCheckoutCapabilitiesFetcherFactory::GetInstance(); diff --git a/build/cromite_patches/eyeo-beta-118.0.5993.48-android_settings.patch b/build/cromite_patches/eyeo-beta-118.0.5993.48-android_settings.patch index 38072f2b..0dbbde47 100644 --- a/build/cromite_patches/eyeo-beta-118.0.5993.48-android_settings.patch +++ b/build/cromite_patches/eyeo-beta-118.0.5993.48-android_settings.patch @@ -243,7 +243,7 @@ Pre-requisites: eyeo Browser Ad filtering Solution: Base Module and Android API diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -285,6 +285,10 @@ if (current_toolchain == default_toolchain) { +@@ -287,6 +287,10 @@ if (current_toolchain == default_toolchain) { "//third_party/androidx:androidx_preference_preference_java", ] @@ -254,7 +254,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn if (plus_addresses_use_internal_android_resources) { deps += [ "//clank/components/plus_addresses:java_resources" ] } else { -@@ -746,6 +750,10 @@ if (current_toolchain == default_toolchain) { +@@ -760,6 +764,10 @@ if (current_toolchain == default_toolchain) { "//url/mojom:url_mojom_gurl_java", ] diff --git a/build/cromite_patches/eyeo-beta-118.0.5993.48-base.patch b/build/cromite_patches/eyeo-beta-118.0.5993.48-base.patch index fa101de2..f0f33ee0 100644 --- a/build/cromite_patches/eyeo-beta-118.0.5993.48-base.patch +++ b/build/cromite_patches/eyeo-beta-118.0.5993.48-base.patch @@ -435,7 +435,7 @@ diff --git a/DEPS b/DEPS # By default, do not check out WebKit for iOS, as it is not needed unless # running against ToT WebKit rather than system WebKit. This can be overridden # e.g. with custom_vars. -@@ -272,6 +276,8 @@ vars = { +@@ -258,6 +262,8 @@ vars = { 'download_libvpx_testdata': False, 'android_git': 'https://android.googlesource.com', @@ -444,9 +444,9 @@ diff --git a/DEPS b/DEPS 'aomedia_git': 'https://aomedia.googlesource.com', 'boringssl_git': 'https://boringssl.googlesource.com', 'chrome_git': 'https://chrome-internal.googlesource.com', -@@ -496,6 +502,11 @@ vars = { +@@ -482,6 +488,11 @@ vars = { # and whatever else without interference from each other. - 'betocore_revision': '89563fec14c756482afa08b016eeba9087c8d1e3', + 'llvm_libc_revision': 'ca74a72e2b32ad804522bbef04dfe32560a10206', + # Three lines of non-changing comments so that + # the commit queue can handle CLs rolling feed @@ -455,8 +455,8 @@ diff --git a/DEPS b/DEPS + # If you change this, also update the libc++ revision in # //buildtools/deps_revisions.gni. - 'libcxx_revision': '6a68fd412b9aecd515a20a7cf84d11b598bfaf96', -@@ -1289,6 +1300,10 @@ deps = { + 'libcxx_revision': '8e31ad42561900383e10dbefc1d3e8f38cedfbe9', +@@ -1285,6 +1296,10 @@ deps = { 'condition': 'checkout_android and checkout_src_internal', }, @@ -465,9 +465,9 @@ diff --git a/DEPS b/DEPS + }, + 'src/docs/website': { - 'url': Var('chromium_git') + '/website.git' + '@' + '4811f9e01c4cfcbf9c6957015063eaaa0d92be91', + 'url': Var('chromium_git') + '/website.git' + '@' + 'be9c3dfd3781964fc0bab0d6c91d9ad117b71b02', }, -@@ -1424,6 +1439,13 @@ deps = { +@@ -1420,6 +1435,13 @@ deps = { 'dep_type': 'cipd', }, @@ -551,7 +551,7 @@ diff --git a/build/install-build-deps.py b/build/install-build-deps.py import argparse import functools import os -@@ -558,7 +566,7 @@ def backwards_compatible_list(options): +@@ -562,7 +570,7 @@ def backwards_compatible_list(options): "msttcorefonts", "python-dev", "python-setuptools", @@ -573,7 +573,7 @@ diff --git a/components/BUILD.gn b/components/BUILD.gn import("//base/debug/debug.gni") import("//build/config/chrome_build.gni") -@@ -176,6 +179,14 @@ test("components_unittests") { +@@ -178,6 +181,14 @@ test("components_unittests") { deps = [ "//base", @@ -52295,7 +52295,7 @@ diff --git a/content/browser/loader/navigation_url_loader_impl.cc b/content/brow #include "content/browser/loader/navigation_url_loader_impl.h" #include -@@ -1132,7 +1136,7 @@ void NavigationURLLoaderImpl::OnReceiveRedirect( +@@ -1131,7 +1135,7 @@ void NavigationURLLoaderImpl::OnReceiveRedirect( LogQueueTimeHistogram("Navigation.QueueTime.OnReceiveRedirect", resource_request_->is_outermost_main_frame); net::Error error = net::OK; @@ -52318,7 +52318,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b #include "content/browser/renderer_host/render_frame_host_impl.h" -@@ -3174,6 +3178,12 @@ void RenderFrameHostImpl::ExecuteJavaScriptMethod( +@@ -3183,6 +3187,12 @@ void RenderFrameHostImpl::ExecuteJavaScriptMethod( std::move(callback)); } @@ -52345,7 +52345,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.h b/content/br #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_FRAME_HOST_IMPL_H_ #define CONTENT_BROWSER_RENDERER_HOST_RENDER_FRAME_HOST_IMPL_H_ -@@ -484,6 +488,10 @@ class CONTENT_EXPORT RenderFrameHostImpl +@@ -488,6 +492,10 @@ class CONTENT_EXPORT RenderFrameHostImpl const std::u16string& method_name, base::Value::List arguments, JavaScriptResultCallback callback) override; @@ -52419,7 +52419,7 @@ diff --git a/extensions/browser/api/web_request/web_request_proxying_url_loader_ #include "extensions/browser/api/web_request/web_request_proxying_url_loader_factory.h" #include -@@ -470,6 +474,7 @@ void WebRequestProxyingURLLoaderFactory::InProgressRequest::OnReceiveRedirect( +@@ -469,6 +473,7 @@ void WebRequestProxyingURLLoaderFactory::InProgressRequest::OnReceiveRedirect( TRACE_EVENT_FLAG_FLOW_IN | TRACE_EVENT_FLAG_FLOW_OUT); if (redirect_url_ != redirect_info.new_url && @@ -52488,7 +52488,7 @@ diff --git a/third_party/blink/public/mojom/frame/frame.mojom b/third_party/blin module blink.mojom; -@@ -964,6 +968,10 @@ interface LocalFrame { +@@ -969,6 +973,10 @@ interface LocalFrame { // the given point in the view coordinate space. PluginActionAt(gfx.mojom.Point location, blink.mojom.PluginActionType action); @@ -52600,7 +52600,7 @@ diff --git a/third_party/blink/renderer/core/exported/web_document.cc b/third_pa diff --git a/third_party/blink/renderer/core/frame/local_frame_mojo_handler.cc b/third_party/blink/renderer/core/frame/local_frame_mojo_handler.cc --- a/third_party/blink/renderer/core/frame/local_frame_mojo_handler.cc +++ b/third_party/blink/renderer/core/frame/local_frame_mojo_handler.cc -@@ -355,6 +355,14 @@ LocalFrameMojoHandler::LocalFrameMojoHandler(blink::LocalFrame& frame) +@@ -350,6 +350,14 @@ LocalFrameMojoHandler::LocalFrameMojoHandler(blink::LocalFrame& frame) WrapWeakPersistent(this))); } @@ -52629,7 +52629,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame_mojo_handler.h b/ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_FRAME_LOCAL_FRAME_MOJO_HANDLER_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_FRAME_LOCAL_FRAME_MOJO_HANDLER_H_ -@@ -111,6 +115,7 @@ class LocalFrameMojoHandler +@@ -112,6 +116,7 @@ class LocalFrameMojoHandler void AddMessageToConsole(mojom::blink::ConsoleMessageLevel level, const WTF::String& message, bool discard_duplicates) final; @@ -52651,7 +52651,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/url_loader/mojo_ur #include "third_party/blink/renderer/platform/loader/fetch/url_loader/mojo_url_loader_client.h" #include -@@ -390,7 +394,7 @@ void MojoURLLoaderClient::OnReceiveRedirect( +@@ -389,7 +393,7 @@ void MojoURLLoaderClient::OnReceiveRedirect( OnComplete(network::URLLoaderCompletionStatus(net::ERR_ABORTED)); return; } @@ -53109,7 +53109,7 @@ diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ # This file is used to assign starting resource ids for resources and strings # used by Chromium. This is done to ensure that resource ids are unique # across all the grd files. If you are adding a new grd file, please add -@@ -1382,7 +1386,12 @@ +@@ -1391,7 +1395,12 @@ "<(SHARED_INTERMEDIATE_DIR)/third_party/blink/public/strings/permission_element_generated_strings.grd": { "META": {"sizes": {"messages": [2000],}}, "messages": [10080], @@ -53118,7 +53118,7 @@ diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ + + "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/adblock_internals/resources.grd": { + "META": {"sizes": {"includes": [10]}}, -+ "includes": [10100], ++ "includes": [12100], + }, # END "everything else" section. diff --git a/build/cromite_patches/eyeo-beta-118.0.5993.48-chrome_integration.patch b/build/cromite_patches/eyeo-beta-118.0.5993.48-chrome_integration.patch index 0d430a57..8cf743c2 100644 --- a/build/cromite_patches/eyeo-beta-118.0.5993.48-chrome_integration.patch +++ b/build/cromite_patches/eyeo-beta-118.0.5993.48-chrome_integration.patch @@ -10,7 +10,7 @@ Pre-requisites: eyeo Browser Ad filtering Solution: Base Module chrome/browser/BUILD.gn | 26 ++ chrome/browser/adblock/README.md | 3 + .../adblock/adblock_content_browser_client.cc | 320 ++++++++++++++++++ - .../adblock/adblock_content_browser_client.h | 100 ++++++ + .../adblock/adblock_content_browser_client.h | 101 ++++++ ...adblock_content_browser_client_unittest.cc | 203 +++++++++++ .../adblock/adblock_controller_factory.cc | 67 ++++ .../adblock/adblock_controller_factory.h | 49 +++ @@ -49,12 +49,12 @@ Pre-requisites: eyeo Browser Ad filtering Solution: Base Module .../adblock_internals_page_handler_impl.cc | 115 +++++++ .../adblock_internals_page_handler_impl.h | 51 +++ .../adblock_internals/adblock_internals_ui.cc | 47 +++ - .../adblock_internals/adblock_internals_ui.h | 48 +++ - .../webui/chrome_web_ui_controller_factory.cc | 8 + + .../adblock_internals/adblock_internals_ui.h | 57 ++++ + .../browser/ui/webui/chrome_web_ui_configs.cc | 3 + chrome/common/BUILD.gn | 3 + chrome/common/webui_url_constants.cc | 4 + chrome/common/webui_url_constants.h | 5 + - 48 files changed, 2288 insertions(+), 2 deletions(-) + 48 files changed, 2293 insertions(+), 2 deletions(-) create mode 100644 chrome/browser/adblock/README.md create mode 100644 chrome/browser/adblock/adblock_content_browser_client.cc create mode 100644 chrome/browser/adblock/adblock_content_browser_client.h @@ -110,7 +110,7 @@ diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegat #include "chrome/browser/buildflags.h" #include "chrome/browser/chrome_content_browser_client.h" #include "chrome/browser/chrome_resource_bundle_helper.h" -@@ -1822,7 +1827,7 @@ content::ContentClient* ChromeMainDelegate::CreateContentClient() { +@@ -1745,7 +1750,7 @@ content::ContentClient* ChromeMainDelegate::CreateContentClient() { content::ContentBrowserClient* ChromeMainDelegate::CreateContentBrowserClient() { chrome_content_browser_client_ = @@ -132,7 +132,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn import("//base/allocator/allocator.gni") import("//build/buildflag_header.gni") -@@ -157,6 +160,26 @@ static_library("browser") { +@@ -159,6 +162,26 @@ static_library("browser") { "accessibility/prefers_default_scrollbar_styles_prefs.h", "affiliations/affiliation_service_factory.cc", "affiliations/affiliation_service_factory.h", @@ -159,7 +159,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "after_startup_task_utils.cc", "after_startup_task_utils.h", "app_mode/app_mode_utils.cc", -@@ -1997,6 +2020,9 @@ static_library("browser") { +@@ -1991,6 +2014,9 @@ static_library("browser") { "//chrome/common/notifications", "//chrome/installer/util:with_no_strings", "//chrome/services/speech/buildflags", @@ -506,7 +506,7 @@ diff --git a/chrome/browser/adblock/adblock_content_browser_client.h b/chrome/br new file mode 100644 --- /dev/null +++ b/chrome/browser/adblock/adblock_content_browser_client.h -@@ -0,0 +1,100 @@ +@@ -0,0 +1,101 @@ +/* + * This file is part of eyeo Chromium SDK, + * Copyright (C) 2006-present eyeo GmbH @@ -528,6 +528,7 @@ new file mode 100644 +#define CHROME_BROWSER_ADBLOCK_ADBLOCK_CONTENT_BROWSER_CLIENT_H_ + +#include "build/buildflag.h" ++#include "extensions/buildflags/buildflags.h" +#include "chrome/browser/chrome_content_browser_client.h" + +namespace adblock { @@ -2015,15 +2016,15 @@ diff --git a/chrome/browser/chrome_browser_interface_binders.cc b/chrome/browser #include "chrome/browser/chrome_browser_interface_binders.h" -@@ -38,6 +42,7 @@ - #include "chrome/browser/ui/search_engines/search_engine_tab_helper.h" +@@ -36,6 +40,7 @@ #include "chrome/browser/ui/ui_features.h" - #include "chrome/browser/ui/views/side_panel/companion/companion_utils.h" + #include "chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals.mojom.h" + #include "chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals_ui.h" +#include "chrome/browser/ui/webui/adblock_internals/adblock_internals_ui.h" #include "chrome/browser/ui/webui/browsing_topics/browsing_topics_internals_ui.h" #include "chrome/browser/ui/webui/data_sharing_internals/data_sharing_internals_ui.h" #include "chrome/browser/ui/webui/engagement/site_engagement_ui.h" -@@ -1137,6 +1142,10 @@ void PopulateChromeWebUIFrameBinders( +@@ -930,6 +935,10 @@ void PopulateChromeWebUIFrameBinders( media::mojom::MediaEngagementScoreDetailsProvider, MediaEngagementUI>( map); @@ -2121,7 +2122,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" #include "chrome/browser/autocomplete/document_suggestions_service_factory.h" #include "chrome/browser/autocomplete/in_memory_url_index_factory.h" -@@ -286,6 +299,8 @@ +@@ -291,6 +304,8 @@ #include "chrome/browser/signin/signin_manager_android_factory.h" #include "components/commerce/core/commerce_feature_list.h" #include "components/commerce/core/proto/merchant_signal_db_content.pb.h" @@ -2130,7 +2131,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc #else #include "chrome/browser/accessibility/live_caption/live_caption_controller_factory.h" #include "chrome/browser/accessibility/live_translate_controller_factory.h" -@@ -851,8 +866,19 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -871,8 +886,19 @@ void ChromeBrowserMainExtraPartsProfiles:: // Makes manual testing possible. FakeSmartCardDeviceServiceFactory::GetInstance(); #endif @@ -2163,7 +2164,7 @@ diff --git a/chrome/browser/resources/BUILD.gn b/chrome/browser/resources/BUILD. import("//build/config/chromeos/ui_mode.gni") import("//chrome/browser/buildflags.gni") -@@ -261,6 +264,7 @@ if (!is_android) { +@@ -254,6 +257,7 @@ if (!is_android) { group("dev_ui_resources") { public_deps = [ "accessibility:resources", @@ -2171,7 +2172,7 @@ diff --git a/chrome/browser/resources/BUILD.gn b/chrome/browser/resources/BUILD. "bluetooth_internals:resources", "browsing_topics:resources", "components:resources", -@@ -323,6 +327,7 @@ repack("dev_ui_paks") { +@@ -316,6 +320,7 @@ repack("dev_ui_paks") { sources = [ "$root_gen_dir/chrome/accessibility_resources.pak", @@ -2318,7 +2319,7 @@ diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc b/ #include "components/safe_browsing/content/browser/safe_browsing_blocking_page.h" -@@ -688,6 +692,8 @@ class SafeBrowsingBlockingPageBrowserTest +@@ -685,6 +689,8 @@ class SafeBrowsingBlockingPageBrowserTest {tag_and_attribute, add_warning_shown_timestamp_csbrrs, create_warning_shown_csbrrs, abusive_notification_revocation}, {}); @@ -2373,7 +2374,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn import("//build/config/buildflags_paint_preview.gni") import("//build/config/chromeos/ui_mode.gni") -@@ -170,6 +174,10 @@ static_library("ui") { +@@ -152,6 +156,10 @@ static_library("ui") { "webui/about/about_ui.h", "webui/accessibility/accessibility_ui.cc", "webui/accessibility/accessibility_ui.h", @@ -2384,7 +2385,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn "webui/autofill_and_password_manager_internals/autofill_internals_ui.cc", "webui/autofill_and_password_manager_internals/autofill_internals_ui.h", "webui/autofill_and_password_manager_internals/internals_ui_handler.cc", -@@ -395,6 +403,7 @@ static_library("ui") { +@@ -380,6 +388,7 @@ static_library("ui") { "//chrome/browser/signin", "//chrome/browser/signin:identity_manager_provider", "//chrome/browser/signin:impl", @@ -2392,7 +2393,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn "//chrome/browser/storage_access_api", "//chrome/browser/sync", "//chrome/browser/task_manager/common", -@@ -436,6 +445,7 @@ static_library("ui") { +@@ -429,6 +438,7 @@ static_library("ui") { "//components/access_code_cast/common:metrics", "//components/account_id", "//components/affiliations/core/browser:affiliations", @@ -2449,7 +2450,7 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/breadcrumbs/breadcrumb_manager_tab_helper.h" #include "chrome/browser/browser_process.h" -@@ -115,6 +122,7 @@ +@@ -114,6 +121,7 @@ #include "chrome/common/chrome_features.h" #include "chrome/common/chrome_isolated_world_ids.h" #include "chrome/common/chrome_switches.h" @@ -2457,7 +2458,7 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc #include "components/autofill/content/browser/content_autofill_client.h" #include "components/autofill/content/browser/content_autofill_driver_factory.h" #include "components/autofill/core/browser/browser_autofill_manager.h" -@@ -368,6 +376,16 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { +@@ -355,6 +363,16 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { optimization_guide_decider); } } @@ -2759,7 +2760,7 @@ diff --git a/chrome/browser/ui/webui/adblock_internals/adblock_internals_ui.h b/ new file mode 100644 --- /dev/null +++ b/chrome/browser/ui/webui/adblock_internals/adblock_internals_ui.h -@@ -0,0 +1,48 @@ +@@ -0,0 +1,57 @@ +/* + * This file is part of eyeo Chromium SDK, + * Copyright (C) 2006-present eyeo GmbH @@ -2781,6 +2782,8 @@ new file mode 100644 +#define CHROME_BROWSER_UI_WEBUI_ADBLOCK_INTERNALS_ADBLOCK_INTERNALS_UI_H_ + +#include "chrome/browser/ui/webui/adblock_internals/adblock_internals.mojom.h" ++#include "chrome/common/webui_url_constants.h" ++#include "content/public/browser/webui_config.h" +#include "mojo/public/cpp/bindings/pending_receiver.h" +#include "ui/webui/mojo_web_ui_controller.h" + @@ -2807,39 +2810,32 @@ new file mode 100644 + handler_; +}; + ++class AdblockInternalsUIConfig : public content::DefaultWebUIConfig { ++ public: ++ AdblockInternalsUIConfig() ++ : DefaultWebUIConfig(content::kChromeUIScheme, ++ chrome::kChromeUIAdblockInternalsHost) {} ++}; ++ +#endif // CHROME_BROWSER_UI_WEBUI_ADBLOCK_INTERNALS_ADBLOCK_INTERNALS_UI_H_ -diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc ---- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -1,6 +1,10 @@ - // Copyright 2012 The Chromium Authors - // Use of this source code is governed by a BSD-style license that can be - // found in the LICENSE file. -+// -+// This source code is a part of eyeo Chromium SDK. -+// Use of this source code is governed by the GPLv3 that can be found in the -+// components/adblock/LICENSE file. - - #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" +diff --git a/chrome/browser/ui/webui/chrome_web_ui_configs.cc b/chrome/browser/ui/webui/chrome_web_ui_configs.cc +--- a/chrome/browser/ui/webui/chrome_web_ui_configs.cc ++++ b/chrome/browser/ui/webui/chrome_web_ui_configs.cc +@@ -56,6 +56,8 @@ + #include "extensions/buildflags/buildflags.h" + #include "printing/buildflags/buildflags.h" -@@ -30,6 +34,7 @@ - #include "chrome/browser/profiles/profile.h" - #include "chrome/browser/safe_browsing/chrome_safe_browsing_local_state_delegate.h" - #include "chrome/browser/ui/webui/about/about_ui.h" +#include "chrome/browser/ui/webui/adblock_internals/adblock_internals_ui.h" - #include "chrome/browser/ui/webui/components/components_ui.h" - #include "chrome/browser/ui/webui/crashes_ui.h" ++ #include "chrome/browser/ui/webui/proxy_config_ui.h" -@@ -276,6 +281,9 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, - if (url.host_piece() == chrome::kChromeUISettingsHost) - return &NewWebUI; + + #if BUILDFLAG(IS_ANDROID) +@@ -428,4 +430,5 @@ void RegisterChromeWebUIConfigs() { + #if BUILDFLAG(IS_ANDROID) + map.AddWebUIConfig(std::make_unique()); #endif // BUILDFLAG(IS_ANDROID) -+ if (url.host_piece() == chrome::kChromeUIAdblockInternalsHost) { -+ return &NewWebUI; -+ } - #if !BUILDFLAG(IS_ANDROID) - if (url.host_piece() == chrome::kChromeUINewTabHost) { - // The URL chrome://newtab/ can be either a virtual or a real URL, ++ map.AddWebUIConfig(std::make_unique()); + } diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn --- a/chrome/common/BUILD.gn +++ b/chrome/common/BUILD.gn diff --git a/build/cromite_patches/eyeo-beta-118.0.5993.48-extension_api.patch b/build/cromite_patches/eyeo-beta-118.0.5993.48-extension_api.patch index a6d5dccb..6c267a2f 100644 --- a/build/cromite_patches/eyeo-beta-118.0.5993.48-extension_api.patch +++ b/build/cromite_patches/eyeo-beta-118.0.5993.48-extension_api.patch @@ -65,16 +65,16 @@ diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUIL "api/bookmark_manager_private/bookmark_manager_private_api.cc", "api/bookmark_manager_private/bookmark_manager_private_api.h", "api/bookmarks/bookmark_api_helpers.cc", -@@ -117,6 +123,8 @@ source_set("extensions") { - "api/extension_action/extension_action_api.h", - "api/extension_action/extension_page_actions_api_constants.cc", - "api/extension_action/extension_page_actions_api_constants.h", +@@ -111,6 +117,8 @@ source_set("extensions") { + "api/enterprise_reporting_private/conversion_utils.h", + "api/enterprise_reporting_private/enterprise_reporting_private_api.cc", + "api/enterprise_reporting_private/enterprise_reporting_private_api.h", + "api/eyeo_filtering_private/eyeo_filtering_private_api.cc", + "api/eyeo_filtering_private/eyeo_filtering_private_api.h", "api/feedback_private/chrome_feedback_private_delegate.cc", "api/feedback_private/chrome_feedback_private_delegate.h", "api/file_system/chrome_file_system_delegate.cc", -@@ -793,6 +801,7 @@ source_set("extensions") { +@@ -786,6 +794,7 @@ source_set("extensions") { "//chrome/browser/ui/safety_hub", "//chrome/browser/ui/tabs:tab_enums", "//chrome/browser/web_applications", @@ -96,7 +96,7 @@ diff --git a/chrome/browser/extensions/api/BUILD.gn b/chrome/browser/extensions/ import("//chrome/common/extensions/api/api_sources.gni") import("//chrome/common/features.gni") -@@ -118,6 +122,7 @@ function_registration("api_registration") { +@@ -126,6 +130,7 @@ function_registration("api_registration") { # include generated headers from these targets. # TODO(brettw) this should be made unnecessary if possible. "//chrome/common/extensions/api", @@ -2125,14 +2125,14 @@ diff --git a/chrome/browser/extensions/api/api_browser_context_keyed_service_fac #include "chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h" #include "chrome/browser/extensions/api/bookmarks/bookmarks_api.h" @@ -12,6 +17,7 @@ + #include "chrome/browser/extensions/api/braille_display_private/braille_display_private_api.h" #include "chrome/browser/extensions/api/cookies/cookies_api.h" #include "chrome/browser/extensions/api/developer_private/developer_private_api.h" - #include "chrome/browser/extensions/api/extension_action/extension_action_api.h" +#include "chrome/browser/extensions/api/eyeo_filtering_private/eyeo_filtering_private_api.h" #include "chrome/browser/extensions/api/font_settings/font_settings_api.h" #include "chrome/browser/extensions/api/history/history_api.h" #include "chrome/browser/extensions/api/identity/identity_api.h" -@@ -66,6 +72,7 @@ namespace chrome_extensions { +@@ -69,6 +75,7 @@ namespace chrome_extensions { void EnsureApiBrowserContextKeyedServiceFactoriesBuilt() { extensions::ActivityLogAPI::GetFactoryInstance(); @@ -2140,10 +2140,10 @@ diff --git a/chrome/browser/extensions/api/api_browser_context_keyed_service_fac extensions::AutofillPrivateEventRouterFactory::GetInstance(); extensions::BluetoothLowEnergyAPI::GetFactoryInstance(); extensions::BookmarksAPI::GetFactoryInstance(); -@@ -78,6 +85,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt() { +@@ -82,6 +89,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt() { extensions::DocumentScanAPIHandler::GetFactoryInstance(); #endif - extensions::ExtensionActionAPI::GetFactoryInstance(); + extensions::ExtensionNotificationDisplayHelperFactory::GetInstance(); + extensions::EyeoFilteringPrivateAPI::GetFactoryInstance(); extensions::FontSettingsAPI::GetFactoryInstance(); extensions::HistoryAPI::GetFactoryInstance(); @@ -3478,7 +3478,7 @@ diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chro #include "components/autofill/core/common/autofill_prefs.h" #include "components/bookmarks/common/bookmark_pref_names.h" #include "components/browsing_data/core/pref_names.h" -@@ -173,6 +178,20 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() { +@@ -174,6 +179,20 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() { } s_allowlist = new PrefsUtil::TypedPrefMap(); @@ -4133,15 +4133,15 @@ diff --git a/extensions/common/mojom/api_permission_id.mojom b/extensions/common diff --git a/tools/metrics/histograms/metadata/extensions/enums.xml b/tools/metrics/histograms/metadata/extensions/enums.xml --- a/tools/metrics/histograms/metadata/extensions/enums.xml +++ b/tools/metrics/histograms/metadata/extensions/enums.xml -@@ -761,6 +761,7 @@ Called by update_extension_histograms.py.--> - label="ACCESSIBILITY_PRIVATE_ON_TOGGLE_GESTURE_INFO_FOR_SETTINGS"/> - +@@ -763,6 +763,7 @@ Called by update_extension_histograms.py.--> -+ + + ++ -@@ -3159,6 +3160,8 @@ Called by update_extension_permission.py.--> +@@ -3165,6 +3166,8 @@ Called by update_extension_permission.py.--> diff --git a/build/cromite_patches/kill-Location-fall-back-to-system.patch b/build/cromite_patches/kill-Location-fall-back-to-system.patch index 00a5720e..e368e2fa 100644 --- a/build/cromite_patches/kill-Location-fall-back-to-system.patch +++ b/build/cromite_patches/kill-Location-fall-back-to-system.patch @@ -56,7 +56,7 @@ diff --git a/services/device/public/cpp/device_features.cc b/services/device/pub #if BUILDFLAG(IS_CHROMEOS) // Enables crash key logging for USB device open operations on ChromeOS. See -@@ -80,7 +81,7 @@ const base::FeatureParam::Option +@@ -88,7 +89,7 @@ const base::FeatureParam::Option const base::FeatureParam kLocationProviderManagerParam{ &kLocationProviderManager, "LocationProviderManagerMode", diff --git a/build/cromite_patches/kill-Vision.patch b/build/cromite_patches/kill-Vision.patch index cffb9705..53d44138 100644 --- a/build/cromite_patches/kill-Vision.patch +++ b/build/cromite_patches/kill-Vision.patch @@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -314,8 +314,6 @@ if (current_toolchain == default_toolchain) { +@@ -320,8 +320,6 @@ if (current_toolchain == default_toolchain) { "$google_play_services_package:google_play_services_gcm_java", "$google_play_services_package:google_play_services_iid_java", "$google_play_services_package:google_play_services_tasks_java", diff --git a/build/cromite_patches/mime_util-force-text-x-suse-ymp-to-be-downloaded.patch b/build/cromite_patches/mime_util-force-text-x-suse-ymp-to-be-downloaded.patch index 4052fc75..7e3929d8 100644 --- a/build/cromite_patches/mime_util-force-text-x-suse-ymp-to-be-downloaded.patch +++ b/build/cromite_patches/mime_util-force-text-x-suse-ymp-to-be-downloaded.patch @@ -13,7 +13,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/third_party/blink/common/mime_util/mime_util.cc b/third_party/blink/common/mime_util/mime_util.cc --- a/third_party/blink/common/mime_util/mime_util.cc +++ b/third_party/blink/common/mime_util/mime_util.cc -@@ -86,6 +86,7 @@ constexpr auto kUnsupportedTextTypes = +@@ -87,6 +87,7 @@ constexpr auto kUnsupportedTextTypes = "text/x-csv", "text/x-vcf", "text/rtf", diff --git a/build/cromite_patches/prefs-always-prompt-for-download-directory.patch b/build/cromite_patches/prefs-always-prompt-for-download-directory.patch index 79384c6a..5bf8e4c0 100644 --- a/build/cromite_patches/prefs-always-prompt-for-download-directory.patch +++ b/build/cromite_patches/prefs-always-prompt-for-download-directory.patch @@ -31,7 +31,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/download/download_prefs.cc b/chrome/browser/download/download_prefs.cc --- a/chrome/browser/download/download_prefs.cc +++ b/chrome/browser/download/download_prefs.cc -@@ -275,7 +275,7 @@ void DownloadPrefs::RegisterProfilePrefs( +@@ -276,7 +276,7 @@ void DownloadPrefs::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( prefs::kPromptForDownload, diff --git a/build/cromite_patches/ungoogled-chromium-Disable-profile-avatar.patch b/build/cromite_patches/ungoogled-chromium-Disable-profile-avatar.patch index ea89ee55..d197d51f 100644 --- a/build/cromite_patches/ungoogled-chromium-Disable-profile-avatar.patch +++ b/build/cromite_patches/ungoogled-chromium-Disable-profile-avatar.patch @@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -1289,8 +1289,6 @@ static_library("browser") { +@@ -1265,8 +1265,6 @@ static_library("browser") { "profiles/keep_alive/scoped_profile_keep_alive.h", "profiles/off_the_record_profile_impl.cc", "profiles/off_the_record_profile_impl.h", @@ -42,7 +42,7 @@ diff --git a/chrome/browser/profiles/profile_attributes_entry.cc b/chrome/browse diff --git a/chrome/browser/profiles/profile_attributes_storage.cc b/chrome/browser/profiles/profile_attributes_storage.cc --- a/chrome/browser/profiles/profile_attributes_storage.cc +++ b/chrome/browser/profiles/profile_attributes_storage.cc -@@ -972,7 +972,7 @@ void ProfileAttributesStorage::DownloadHighResAvatarIfNeeded( +@@ -971,7 +971,7 @@ void ProfileAttributesStorage::DownloadHighResAvatarIfNeeded( void ProfileAttributesStorage::DownloadHighResAvatar( size_t icon_index, const base::FilePath& profile_path) { diff --git a/build/cromite_patches/ungoogled-chromium-Disable-translate-integration.patch b/build/cromite_patches/ungoogled-chromium-Disable-translate-integration.patch index a4169ac0..2a7d1890 100644 --- a/build/cromite_patches/ungoogled-chromium-Disable-translate-integration.patch +++ b/build/cromite_patches/ungoogled-chromium-Disable-translate-integration.patch @@ -173,7 +173,7 @@ diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browse diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -2097,9 +2097,6 @@ Your Google account may have other forms of browsing history like searches and a +@@ -2087,9 +2087,6 @@ Your Google account may have other forms of browsing history like searches and a Let websites know the languages you speak. They’ll show content in those languages, when possible. diff --git a/build/cromite_patches/ungoogled-chromium-no-special-hosts-domains.patch b/build/cromite_patches/ungoogled-chromium-no-special-hosts-domains.patch index a644bf42..6db1587e 100644 --- a/build/cromite_patches/ungoogled-chromium-no-special-hosts-domains.patch +++ b/build/cromite_patches/ungoogled-chromium-no-special-hosts-domains.patch @@ -53,25 +53,25 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html components/domain_reliability/uploader.cc | 2 +- components/google/core/common/google_util.cc | 313 +----------------- components/google/core/common/google_util.h | 15 +- - .../browser/page_load_metrics_util.cc | 4 +- - .../common/page_load_metrics_util.cc | 33 +- + .../browser/page_load_metrics_util.cc | 3 +- + .../google/browser/google_url_util.cc | 1 + .../search_engines/search_engine_utils.cc | 1 + .../search_engines/search_terms_data.cc | 4 +- components/search_engines/template_url.cc | 6 +- components/search_provider_logos/BUILD.gn | 2 - .../logo_service_impl.cc | 16 +- - components/url_matcher/url_util.cc | 83 ----- + components/url_matcher/url_util.cc | 89 ----- .../webid/identity_url_loader_throttle.cc | 1 + ...gled-chromium-no-special-hosts-domains.inc | 1 + net/base/url_util.cc | 25 +- services/network/network_context.cc | 2 +- - 58 files changed, 53 insertions(+), 823 deletions(-) + 58 files changed, 53 insertions(+), 796 deletions(-) create mode 100644 cromite_flags/content/public/common/content_features_cc/ungoogled-chromium-no-special-hosts-domains.inc diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java -@@ -97,7 +97,6 @@ import org.chromium.chrome.browser.messages.MessageContainerObserver; +@@ -99,7 +99,6 @@ import org.chromium.chrome.browser.messages.MessageContainerObserver; import org.chromium.chrome.browser.messages.MessagesResourceMapperInitializer; import org.chromium.chrome.browser.metrics.UmaSessionStats; import org.chromium.chrome.browser.omnibox.OmniboxFocusReason; @@ -79,7 +79,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi import org.chromium.chrome.browser.omnibox.suggestions.action.OmniboxActionDelegateImpl; import org.chromium.chrome.browser.paint_preview.DemoPaintPreview; import org.chromium.chrome.browser.password_manager.ManagePasswordsReferrer; -@@ -1182,10 +1181,8 @@ public class RootUiCoordinator +@@ -1197,10 +1196,8 @@ public class RootUiCoordinator String url = TemplateUrlServiceFactory.getForProfile(tab.getProfile()) .getUrlForSearchQuery(query); @@ -93,7 +93,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -890,10 +890,6 @@ static_library("browser") { +@@ -889,10 +889,6 @@ static_library("browser") { "page_info/page_info_features.h", "page_load_metrics/observers/bookmark_bar_page_load_metrics_observer.cc", "page_load_metrics/observers/bookmark_bar_page_load_metrics_observer.h", @@ -104,7 +104,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "page_load_metrics/observers/core/amp_page_load_metrics_observer.cc", "page_load_metrics/observers/core/amp_page_load_metrics_observer.h", "page_load_metrics/observers/core/ukm_page_load_metrics_observer.cc", -@@ -902,10 +898,6 @@ static_library("browser") { +@@ -901,10 +897,6 @@ static_library("browser") { "page_load_metrics/observers/document_write_page_load_metrics_observer.h", "page_load_metrics/observers/foreground_duration_ukm_observer.cc", "page_load_metrics/observers/foreground_duration_ukm_observer.h", @@ -115,7 +115,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "page_load_metrics/observers/histogram_suffixes.cc", "page_load_metrics/observers/histogram_suffixes.h", "page_load_metrics/observers/https_engagement_metrics/https_engagement_page_load_metrics_observer.cc", -@@ -1552,8 +1544,6 @@ static_library("browser") { +@@ -1528,8 +1520,6 @@ static_library("browser") { "supervised_user/classify_url_navigation_throttle.h", "supervised_user/supervised_user_browser_utils.cc", "supervised_user/supervised_user_browser_utils.h", @@ -124,7 +124,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "supervised_user/supervised_user_interstitial_tab_closer.cc", "supervised_user/supervised_user_interstitial_tab_closer.h", "supervised_user/supervised_user_metrics_service_factory.cc", -@@ -1746,9 +1736,6 @@ static_library("browser") { +@@ -1718,9 +1708,6 @@ static_library("browser") { "//chrome/browser/commerce:impl", "//chrome/browser/devtools", "//chrome/browser/favicon", @@ -134,7 +134,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "//chrome/browser/media/webrtc", "//chrome/browser/navigation_predictor:impl", "//chrome/browser/file_system_access:impl", -@@ -1823,7 +1810,6 @@ static_library("browser") { +@@ -1806,7 +1793,6 @@ static_library("browser") { # New dependencies inside of //chrome/browser that generate header files # should be added to browser_generated_files. ":browser_public_dependencies", @@ -165,7 +165,7 @@ diff --git a/chrome/browser/android/metrics/uma_session_stats.cc b/chrome/browse diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc -@@ -1219,7 +1219,6 @@ BrowserProcessImpl::component_updater() { +@@ -1214,7 +1214,6 @@ BrowserProcessImpl::component_updater() { std::make_unique(); std::string brand; @@ -176,7 +176,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc -@@ -557,11 +557,6 @@ void ProcessSingletonNotificationCallbackImpl( +@@ -558,11 +558,6 @@ void ProcessSingletonNotificationCallbackImpl( StartupBrowserCreator::ProcessCommandLineAlreadyRunning( command_line, current_directory, startup_profile_path_info); @@ -188,7 +188,7 @@ diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_brows } #endif // BUILDFLAG(ENABLE_PROCESS_SINGLETON) -@@ -1830,11 +1825,6 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { +@@ -1837,11 +1832,6 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { upgrade_util::SaveLastModifiedTimeOfExe(); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) @@ -203,7 +203,7 @@ diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_brows diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -3000,7 +3000,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( +@@ -3004,7 +3004,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( switches::kForcePNaClSubzero, #endif switches::kForceUIDirection, @@ -211,7 +211,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch switches::kJavaScriptHarmony, switches::kEnableExperimentalWebAssemblyFeatures, embedder_support::kOriginTrialDisabledFeatures, -@@ -5460,9 +5459,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( +@@ -5465,9 +5464,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( } #endif @@ -221,7 +221,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch if (base::FeatureList::IsEnabled( supervised_user::kClassifyUrlOnProcessResponseEvent)) { -@@ -6060,7 +6056,8 @@ GetClientDataHeader(content::FrameTreeNodeId frame_tree_node_id) { +@@ -6058,7 +6054,8 @@ GetClientDataHeader(content::FrameTreeNodeId frame_tree_node_id) { } #endif @@ -231,7 +231,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch #if BUILDFLAG(IS_ANDROID) const std::string& client_data_header, #endif -@@ -6100,7 +6097,7 @@ std::unique_ptr CreateGoogleURLLoaderThrottle( +@@ -6098,7 +6095,7 @@ std::unique_ptr CreateGoogleURLLoaderThrottle( std::move(bound_session_request_throttled_handler), #endif std::move(dynamic_params)); @@ -240,7 +240,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch std::vector> ChromeContentBrowserClient::CreateURLLoaderThrottles( -@@ -6157,15 +6154,6 @@ ChromeContentBrowserClient::CreateURLLoaderThrottles( +@@ -6155,15 +6152,6 @@ ChromeContentBrowserClient::CreateURLLoaderThrottles( GetClientDataHeader(frame_tree_node_id); #endif @@ -256,7 +256,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch { auto* factory = ProtocolHandlerRegistryFactory::GetForBrowserContext(browser_context); -@@ -6220,20 +6208,6 @@ ChromeContentBrowserClient::CreateURLLoaderThrottlesForKeepAlive( +@@ -6218,20 +6206,6 @@ ChromeContentBrowserClient::CreateURLLoaderThrottlesForKeepAlive( } #endif @@ -326,7 +326,7 @@ diff --git a/chrome/browser/domain_reliability/service_factory.cc b/chrome/brows diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn -@@ -781,7 +781,6 @@ source_set("extensions") { +@@ -774,7 +774,6 @@ source_set("extensions") { "//chrome/browser/devtools", "//chrome/browser/extensions:cws_item_service_proto", "//chrome/browser/favicon", @@ -583,7 +583,7 @@ diff --git a/chrome/browser/metrics/metrics_reporting_state.cc b/chrome/browser/ 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 -@@ -852,7 +852,6 @@ void SystemNetworkContextManager::AddSSLConfigToNetworkContextParams( +@@ -853,7 +853,6 @@ void SystemNetworkContextManager::AddSSLConfigToNetworkContextParams( void SystemNetworkContextManager::ConfigureDefaultNetworkContextParams( network::mojom::NetworkContextParams* network_context_params) { variations::UpdateCorsExemptHeaderForVariations(network_context_params); @@ -638,7 +638,7 @@ diff --git a/chrome/browser/page_load_metrics/observers/from_gws_page_load_metri diff --git a/chrome/browser/page_load_metrics/page_load_metrics_initialize.cc b/chrome/browser/page_load_metrics/page_load_metrics_initialize.cc --- a/chrome/browser/page_load_metrics/page_load_metrics_initialize.cc +++ b/chrome/browser/page_load_metrics/page_load_metrics_initialize.cc -@@ -170,12 +170,7 @@ void PageLoadMetricsEmbedder::RegisterObservers( +@@ -163,12 +163,7 @@ void PageLoadMetricsEmbedder::RegisterObservers( tracker->AddObserver(std::make_unique()); tracker->AddObserver(std::make_unique()); tracker->AddObserver(std::make_unique()); @@ -665,7 +665,7 @@ diff --git a/chrome/browser/profile_resetter/BUILD.gn b/chrome/browser/profile_r diff --git a/chrome/browser/profile_resetter/profile_resetter.cc b/chrome/browser/profile_resetter/profile_resetter.cc --- a/chrome/browser/profile_resetter/profile_resetter.cc +++ b/chrome/browser/profile_resetter/profile_resetter.cc -@@ -100,8 +100,7 @@ ProfileResetter::ProfileResetter(Profile* profile) +@@ -104,8 +104,7 @@ ProfileResetter::ProfileResetter(Profile* profile) DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); DCHECK(profile_); @@ -736,7 +736,7 @@ diff --git a/chrome/browser/signin/android/signin_manager_android.cc b/chrome/br diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -364,7 +364,6 @@ static_library("ui") { +@@ -350,7 +350,6 @@ static_library("ui") { "//chrome/browser/feedback:feedback_impl", "//chrome/browser/file_system_access", "//chrome/browser/fingerprinting_protection", @@ -753,7 +753,7 @@ diff --git a/chrome/browser/ui/android/omnibox/BUILD.gn b/chrome/browser/ui/andr "java/src/org/chromium/chrome/browser/omnibox/UrlFocusChangeListener.java", - "java/src/org/chromium/chrome/browser/omnibox/geo/GeolocationHeader.java", - "java/src/org/chromium/chrome/browser/omnibox/geo/GeolocationTracker.java", - "java/src/org/chromium/chrome/browser/omnibox/status/PageInfoIPHController.java", + "java/src/org/chromium/chrome/browser/omnibox/status/PageInfoIphController.java", "java/src/org/chromium/chrome/browser/omnibox/status/StatusCoordinator.java", "java/src/org/chromium/chrome/browser/omnibox/status/StatusIconView.java", diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java @@ -767,7 +767,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow import org.chromium.chrome.browser.omnibox.status.StatusCoordinator; import org.chromium.chrome.browser.omnibox.status.StatusCoordinator.PageInfoAction; import org.chromium.chrome.browser.omnibox.status.StatusView; -@@ -390,7 +389,6 @@ public class LocationBarCoordinator +@@ -387,7 +386,6 @@ public class LocationBarCoordinator mLocationBarMediator.destroy(); mLocationBarMediator = null; @@ -778,7 +778,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java -@@ -48,7 +48,6 @@ import org.chromium.chrome.browser.lifecycle.PauseResumeWithNativeObserver; +@@ -49,7 +49,6 @@ import org.chromium.chrome.browser.lifecycle.PauseResumeWithNativeObserver; import org.chromium.chrome.browser.locale.LocaleManager; import org.chromium.chrome.browser.omnibox.UrlBar.UrlBarDelegate; import org.chromium.chrome.browser.omnibox.UrlBarCoordinator.SelectionState; @@ -786,7 +786,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow import org.chromium.chrome.browser.omnibox.status.StatusCoordinator; import org.chromium.chrome.browser.omnibox.styles.OmniboxResourceProvider; import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteCoordinator; -@@ -303,24 +302,6 @@ class LocationBarMediator +@@ -304,24 +303,6 @@ class LocationBarMediator if (!mUrlFocusedWithoutAnimations) handleUrlFocusAnimation(hasFocus); @@ -811,7 +811,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow if (!hasFocus && mLocationBarDataProvider.hasTab()) { setUrl( mLocationBarDataProvider.getCurrentGurl(), -@@ -336,8 +317,6 @@ class LocationBarMediator +@@ -337,8 +318,6 @@ class LocationBarMediator templateUrlService.addObserver(this); if (OmniboxFeatures.sUseFusedLocationProvider.isEnabled() && templateUrlService.isDefaultSearchEngineGoogle()) { @@ -820,7 +820,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow } }); -@@ -570,7 +549,6 @@ class LocationBarMediator +@@ -571,7 +550,6 @@ class LocationBarMediator LoadUrlParams loadUrlParams = new LoadUrlParams(url); try (TimingMetric record = TimingMetric.shortUptime("Android.Omnibox.SetGeolocationHeadersTime")) { @@ -828,7 +828,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow } loadUrlParams.setTransitionType( omniboxLoadUrlParams.transitionType | PageTransition.FROM_ADDRESS_BAR); -@@ -1546,15 +1524,12 @@ class LocationBarMediator +@@ -1553,8 +1531,6 @@ class LocationBarMediator if (OmniboxFeatures.sUseFusedLocationProvider.isEnabled() && mProfileSupplier.hasValue() && mTemplateUrlServiceSupplier.hasValue()) { @@ -837,8 +837,9 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow } } - @Override +@@ -1562,7 +1538,6 @@ class LocationBarMediator public void onPauseWithNative() { + OmniboxFeatures.updateLastExitTimestamp(); if (OmniboxFeatures.sUseFusedLocationProvider.isEnabled()) { - GeolocationHeader.stopListeningForLocationUpdates(); } @@ -847,7 +848,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc b/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc --- a/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc +++ b/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc -@@ -467,11 +467,6 @@ content::WebUIDataSource* CreateAndAddNewTabPageUiHtmlSource(Profile* profile) { +@@ -463,11 +463,6 @@ content::WebUIDataSource* CreateAndAddNewTabPageUiHtmlSource(Profile* profile) { // chrome-untrusted://new-tab-page for other external content and resources. // NOTE: Use caution when overriding content security policies as that cean // lead to subtle security bugs such as https://crbug.com/1251541. @@ -924,7 +925,7 @@ diff --git a/chrome/renderer/url_loader_throttle_provider_impl.cc b/chrome/rende diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -6183,7 +6183,6 @@ test("unit_tests") { +@@ -6255,7 +6255,6 @@ test("unit_tests") { "//chrome/browser/file_system_access:unit_tests", "//chrome/browser/fingerprinting_protection", "//chrome/browser/first_party_sets", @@ -1022,7 +1023,7 @@ diff --git a/components/domain_reliability/google_configs.cc b/components/domain // Origins with subdomains and same-origin collectors. Currently, all // origins with same-origin collectors also run collectors on their www // subdomain. (e.g., both foo.com and www.foo.com.) -@@ -552,11 +552,11 @@ std::unique_ptr CreateGoogleConfig( +@@ -553,11 +553,11 @@ std::unique_ptr CreateGoogleConfig( config->failure_sample_rate = 1.00; config->path_prefixes.clear(); return config; @@ -1036,7 +1037,7 @@ diff --git a/components/domain_reliability/google_configs.cc b/components/domain const std::string& hostname) { bool is_www_subdomain = base::StartsWith(hostname, "www.", base::CompareCase::SENSITIVE); -@@ -606,6 +606,6 @@ GetAllGoogleConfigsForTesting() { +@@ -607,6 +607,6 @@ GetAllGoogleConfigsForTesting() { configs_out.push_back(CreateGoogleConfig(params, true)); } return configs_out; @@ -1503,60 +1504,27 @@ diff --git a/components/google/core/common/google_util.h b/components/google/cor diff --git a/components/page_load_metrics/browser/page_load_metrics_util.cc b/components/page_load_metrics/browser/page_load_metrics_util.cc --- a/components/page_load_metrics/browser/page_load_metrics_util.cc +++ b/components/page_load_metrics/browser/page_load_metrics_util.cc -@@ -285,9 +285,7 @@ bool DidObserveLoadingBehaviorInAnyFrame( +@@ -285,8 +285,7 @@ bool DidObserveLoadingBehaviorInAnyFrame( } - bool IsGoogleSearchHostname(const GURL& url) { -- std::optional result = -- page_load_metrics::GetGoogleHostnamePrefix(url); -- return result && result.value() == "www"; + bool IsZstdUrl(const GURL& url) { +- return url.DomainIs("facebook.com") || url.DomainIs("instagram.com") || +- url.DomainIs("whatsapp.com") || url.DomainIs("messenger.com"); + return false; } - bool IsProbablyGoogleSearchUrl(const GURL& url) { -diff --git a/components/page_load_metrics/common/page_load_metrics_util.cc b/components/page_load_metrics/common/page_load_metrics_util.cc ---- a/components/page_load_metrics/common/page_load_metrics_util.cc -+++ b/components/page_load_metrics/common/page_load_metrics_util.cc -@@ -25,38 +25,7 @@ const int kExtraBufferTimerDelayMillis = 50; - } // namespace + bool QueryContainsComponent(std::string_view query, +diff --git a/components/page_load_metrics/google/browser/google_url_util.cc b/components/page_load_metrics/google/browser/google_url_util.cc +--- a/components/page_load_metrics/google/browser/google_url_util.cc ++++ b/components/page_load_metrics/google/browser/google_url_util.cc +@@ -14,6 +14,7 @@ + namespace page_load_metrics { std::optional GetGoogleHostnamePrefix(const GURL& url) { -- const size_t registry_length = -- net::registry_controlled_domains::GetRegistryLength( -- url, -- -- // Do not include unknown registries (registries that don't have any -- // matches in effective TLD names). -- net::registry_controlled_domains::EXCLUDE_UNKNOWN_REGISTRIES, -- -- // Do not include private registries, such as appspot.com. We don't -- // want to match URLs like www.google.appspot.com. -- net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES); -- -- const std::string_view hostname = url.host_piece(); -- if (registry_length == 0 || registry_length == std::string::npos || -- registry_length >= hostname.length()) { -- return std::nullopt; -- } -- -- // Removes the tld and the preceding dot. -- const std::string_view hostname_minus_registry = -- hostname.substr(0, hostname.length() - (registry_length + 1)); -- -- if (hostname_minus_registry == "google") -- return std::string(""); -- -- if (!base::EndsWith(hostname_minus_registry, ".google", -- base::CompareCase::INSENSITIVE_ASCII)) { -- return std::nullopt; -- } -- -- return std::string(hostname_minus_registry.substr( -- 0, hostname_minus_registry.length() - strlen(".google"))); -+ return std::nullopt; - } - - bool IsGoogleHostname(const GURL& url) { ++ if ((true)) return std::nullopt; + const size_t registry_length = + net::registry_controlled_domains::GetRegistryLength( + url, diff --git a/components/search_engines/search_engine_utils.cc b/components/search_engines/search_engine_utils.cc --- a/components/search_engines/search_engine_utils.cc +++ b/components/search_engines/search_engine_utils.cc @@ -1689,7 +1657,7 @@ diff --git a/components/url_matcher/url_util.cc b/components/url_matcher/url_uti void ProcessQueryToConditions( url_matcher::URLMatcherConditionFactory* condition_factory, const std::string& query, -@@ -118,77 +106,6 @@ class EmbeddedURLExtractor { +@@ -118,87 +106,10 @@ class EmbeddedURLExtractor { // Implements url_filter::GetEmbeddedURL(). GURL GetEmbeddedURL(const GURL& url) { @@ -1706,17 +1674,9 @@ diff --git a/components/url_matcher/url_util.cc b/components/url_matcher/url_uti - } - - // Check for "www.google.TLD/amp/" URLs. -- if (google_util::IsGoogleDomainUrl( -- url, google_util::DISALLOW_SUBDOMAIN, -- google_util::DISALLOW_NON_STANDARD_PORTS)) { -- std::string s; -- std::string embedded; -- if (re2::RE2::FullMatch(url.path(), google_amp_viewer_path_regex_, &s, -- &embedded)) { -- // The embedded URL may be percent-encoded. Undo that. -- embedded = base::UnescapeBinaryURLComponent(embedded); -- return BuildURL(!s.empty(), embedded); -- } +- if (GURL google_amp_embedded_url = GetGoogleAmpViewerEmbeddedURL(url); +- !google_amp_embedded_url.is_empty()) { +- return google_amp_embedded_url; - } - - // Check for Google web cache URLs @@ -1763,6 +1723,24 @@ diff --git a/components/url_matcher/url_util.cc b/components/url_matcher/url_uti - return url_formatter::FixupURL(embedded, /*desired_tld=*/std::string()); - } - } +- + return GURL(); + } + + GURL GetGoogleAmpViewerEmbeddedURL(const GURL& url) const { +- // Check for "www.google.TLD/amp/" URLs. +- if (google_util::IsGoogleDomainUrl( +- url, google_util::DISALLOW_SUBDOMAIN, +- google_util::DISALLOW_NON_STANDARD_PORTS)) { +- std::string s; +- std::string embedded; +- if (re2::RE2::FullMatch(url.path(), google_amp_viewer_path_regex_, &s, +- &embedded)) { +- // The embedded URL may be percent-encoded. Undo that. +- embedded = base::UnescapeBinaryURLComponent(embedded); +- return BuildURL(!s.empty(), embedded); +- } +- } - return GURL(); } @@ -1826,7 +1804,7 @@ diff --git a/net/base/url_util.cc b/net/base/url_util.cc diff --git a/services/network/network_context.cc b/services/network/network_context.cc --- a/services/network/network_context.cc +++ b/services/network/network_context.cc -@@ -2899,7 +2899,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( +@@ -2973,7 +2973,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( } #endif // BUILDFLAG(IS_CT_SUPPORTED) diff --git a/build/cromite_patches/webRTC-do-not-expose-local-IP-addresses.patch b/build/cromite_patches/webRTC-do-not-expose-local-IP-addresses.patch index e327e07f..809789d9 100644 --- a/build/cromite_patches/webRTC-do-not-expose-local-IP-addresses.patch +++ b/build/cromite_patches/webRTC-do-not-expose-local-IP-addresses.patch @@ -40,7 +40,7 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/peer_connection_d } bool IsValidPortRange(uint16_t min_port, uint16_t max_port) { -@@ -899,7 +901,7 @@ PeerConnectionDependencyFactory::CreatePortAllocator( +@@ -897,7 +899,7 @@ PeerConnectionDependencyFactory::CreatePortAllocator( break; } diff --git a/build/cromite_patches/webview-Hard-no-to-persistent-histograms.patch b/build/cromite_patches/webview-Hard-no-to-persistent-histograms.patch index cb486e64..88773afc 100644 --- a/build/cromite_patches/webview-Hard-no-to-persistent-histograms.patch +++ b/build/cromite_patches/webview-Hard-no-to-persistent-histograms.patch @@ -18,7 +18,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/android_webview/browser/aw_field_trials.cc b/android_webview/browser/aw_field_trials.cc --- a/android_webview/browser/aw_field_trials.cc +++ b/android_webview/browser/aw_field_trials.cc -@@ -92,13 +92,6 @@ class AwFeatureOverrides { +@@ -94,13 +94,6 @@ class AwFeatureOverrides { } // namespace void AwFieldTrials::OnVariationsSetupComplete() { diff --git a/update_cromite_patches.sh b/update_cromite_patches.sh index 8f089c8c..db4961a8 100755 --- a/update_cromite_patches.sh +++ b/update_cromite_patches.sh @@ -4,7 +4,7 @@ root_dir=$(dirname "$(readlink -f "$0")") cd $root_dir/build -branch="v131.0.6778.140-625c295dad7acb16d8f756582e95468b50f1d9f6" +branch="v132.0.6834.83-36e27b9c60c551348fe4e65a537d16c76d9b48e8" if [ -d cromite ]; then cd cromite git fetch origin $branch -- GitLab From 34df4e412c755bda4b58650af3ac46dd2cb34c5a Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Fri, 24 Jan 2025 13:51:49 +0530 Subject: [PATCH 03/10] Update domain substitution --- domain_substitution/domain_substitution.list | 1018 +++--------------- domain_substitution/prune_binaries.py | 46 +- update_domain_substitution.sh | 2 +- 3 files changed, 190 insertions(+), 876 deletions(-) diff --git a/domain_substitution/domain_substitution.list b/domain_substitution/domain_substitution.list index 15c52bc1..23590045 100644 --- a/domain_substitution/domain_substitution.list +++ b/domain_substitution/domain_substitution.list @@ -1,34 +1,6 @@ BUILD.gn PRESUBMIT.py PRESUBMIT_test.py -android_webview/browser/aw_asset_domain_list_include_handler.h -android_webview/browser/aw_browser_context.cc -android_webview/browser/aw_content_browser_client.h -android_webview/browser/aw_field_trials.cc -android_webview/browser/aw_javascript_dialog_manager.cc -android_webview/browser/aw_permission_manager_unittest.cc -android_webview/browser/aw_settings.cc -android_webview/browser/enterprise_authentication_app_link_policy_handler.cc -android_webview/browser/metrics/aw_metrics_service_client.cc -android_webview/browser/network_service/aw_web_resource_request.h -android_webview/browser/permission/media_access_permission_request_unittest.cc -android_webview/browser/permission/permission_request_handler_unittest.cc -android_webview/browser/renderer_host/auto_login_parser_unittest.cc -android_webview/browser/safe_browsing/aw_safe_browsing_allowlist_manager.cc -android_webview/browser/safe_browsing/aw_safe_browsing_allowlist_manager.h -android_webview/browser/safe_browsing/aw_safe_browsing_allowlist_manager_unittest.cc -android_webview/common/url_constants.cc -android_webview/js_sandbox/service/js_sandbox_isolate.cc -android_webview/nonembedded/java/res_devui/values/strings.xml -android_webview/test/data/components/fake_component_manifest.json -android_webview/test/data/components/fake_component_update_response.json -android_webview/tools/cts_archive/3pp/fetch.py -android_webview/tools/cts_config/webview_cts_gcs_path.json -android_webview/tools/cts_config/webview_cts_hostside_gcs_path.json -android_webview/tools/record_netlog.py -android_webview/tools/remove_preinstalled_webview.py -android_webview/tools/system_webview_shell/lint-suppressions.xml -android_webview/tools/update_cts.py ash/accelerators/accelerator_notifications.cc ash/accelerators/ash_accelerator_configuration_unittest.cc ash/ambient/ambient_controller.cc @@ -43,6 +15,7 @@ ash/app_list/app_list_controller_impl_unittest.cc ash/app_list/app_list_feature_usage_metrics_unittest.cc ash/app_list/views/app_list_nudge_controller_unittest.cc ash/app_list/views/app_list_view_pixeltest.cc +ash/app_list/views/search_box_view_unittest.cc ash/ash_strings.grd ash/assistant/PRESUBMIT.py ash/assistant/assistant_setup_controller.cc @@ -57,7 +30,6 @@ ash/birch/birch_model_unittest.cc ash/capture_mode/capture_mode_camera_unittests.cc ash/capture_mode/capture_mode_controller.cc ash/capture_mode/capture_mode_unittests.cc -ash/capture_mode/search_results_panel.cc ash/child_accounts/parent_access_controller_impl_unittest.cc ash/clipboard/clipboard_history_controller_unittest.cc ash/clipboard/clipboard_history_menu_model_adapter_unittest.cc @@ -87,18 +59,18 @@ ash/glanceables/tasks/glanceables_tasks_view_unittest.cc ash/glanceables/tasks/test/glanceables_tasks_test_util.cc ash/login/ui/auth_icon_view.cc ash/login/ui/login_remove_account_dialog_unittest.cc -ash/picker/picker_asset_fetcher_impl.cc -ash/picker/picker_controller.cc -ash/picker/picker_controller_unittest.cc -ash/picker/picker_insert_media.cc -ash/picker/search/picker_search_aggregator_unittest.cc -ash/picker/search/picker_search_controller.cc -ash/picker/search/picker_search_controller_unittest.cc -ash/picker/search/picker_search_request.cc -ash/picker/search/picker_search_request_unittest.cc ash/projector/projector_metadata_model.cc ash/public/cpp/android_intent_helper_unittest.cc ash/public/cpp/system_notification_builder_unittest.cc +ash/quick_insert/quick_insert_asset_fetcher_impl.cc +ash/quick_insert/quick_insert_controller.cc +ash/quick_insert/quick_insert_controller_unittest.cc +ash/quick_insert/quick_insert_insert_media.cc +ash/quick_insert/search/quick_insert_search_aggregator_unittest.cc +ash/quick_insert/search/quick_insert_search_controller.cc +ash/quick_insert/search/quick_insert_search_controller_unittest.cc +ash/quick_insert/search/quick_insert_search_request.cc +ash/quick_insert/search/quick_insert_search_request_unittest.cc ash/quick_pair/companion_app/companion_app_broker_impl_unittest.cc ash/quick_pair/fast_pair_handshake/fast_pair_data_encryptor.h ash/quick_pair/fast_pair_handshake/fast_pair_data_encryptor_impl_unittest.cc @@ -121,6 +93,7 @@ ash/quick_pair/ui/fast_pair/fast_pair_presenter_impl.cc ash/resources/PRESUBMIT.py ash/scanner/scanner_action_handler.cc ash/scanner/scanner_action_handler_unittest.cc +ash/scanner/scanner_session_unittest.cc ash/session/fullscreen_controller_unittest.cc ash/shelf/launcher_nudge_controller_unittest.cc ash/shelf/scrollable_shelf_view_pixeltest.cc @@ -188,7 +161,6 @@ ash/webui/camera_app_ui/resources/js/i18n_string.ts ash/webui/camera_app_ui/resources/js/metrics.ts ash/webui/camera_app_ui/resources/js/untrusted_ga_helper.ts ash/webui/camera_app_ui/resources/js/views/camera_intent.ts -ash/webui/camera_app_ui/resources/js/views/dialog.ts ash/webui/camera_app_ui/resources/js/views/document_fix_mode.ts ash/webui/camera_app_ui/resources/js/views/settings/primary.ts ash/webui/camera_app_ui/resources/strings/camera_strings.grd @@ -213,6 +185,7 @@ ash/webui/firmware_update_ui/resources/PRESUBMIT.py ash/webui/graduation/graduation_ui_handler_unittest.cc ash/webui/graduation/resources/js/graduation_takeout_ui.ts ash/webui/graduation/url_constants.cc +ash/webui/graduation/webview_auth_handler_unittest.cc ash/webui/help_app_ui/help_app_kids_magazine_untrusted_ui.cc ash/webui/help_app_ui/resources/js/help_app.d.ts ash/webui/media_app_ui/media_app_guest_ui.cc @@ -467,6 +440,7 @@ build/config/BUILDCONFIG.gn build/config/android/BUILD.gn build/config/android/internal_rules.gni build/config/android/rules.gni +build/config/arm.gni build/config/c++/c++.gni build/config/chrome_build.gni build/config/chromeos/args.gni @@ -492,13 +466,13 @@ build/gn_ast/gn_ast.py build/gn_ast/json_gn_editor.py build/install-build-deps.py build/ios/presubmit_support.py -build/lacros/test_runner.py build/linux/install-chromeos-fonts.py build/linux/sysroot_scripts/sysroots.json build/linux/unbundle/remove_bundled_libraries.py build/mac_toolchain.py build/nocompile.gni build/rust/rustc_wrapper.py +build/rust/std/remap_alloc.cc build/rust/std/rules/BUILD.gn build/sanitizers/lsan_suppressions.cc build/sanitizers/tsan_suppressions.cc @@ -509,7 +483,6 @@ build/toolchain/gcc_toolchain.gni build/toolchain/nacl/BUILD.gn build/toolchain/win/midl.py build/toolchain/win/rc/rc.py -build/util/lib/common/perf_tests_results_helper.py build/util/lib/proto/PRESUBMIT.py build/util/lib/results/result_sink.py build/vs_toolchain.py @@ -571,8 +544,7 @@ chrome/browser/PRESUBMIT.py chrome/browser/about_flags.cc chrome/browser/accessibility/live_caption/live_caption_speech_recognition_host_browsertest.cc chrome/browser/ai/ai_assistant.cc -chrome/browser/ai/ai_assistant_unittest.cc -chrome/browser/ai/ai_test_utils.cc +chrome/browser/ai/ai_data_keyed_service.cc chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.cc chrome/browser/android/cookies/cookies_fetcher_restore_util_browsertest.cc chrome/browser/android/customtabs/custom_tabs_browsertest.cc @@ -710,7 +682,6 @@ chrome/browser/ash/child_accounts/family_user_device_metrics_browsertest.cc chrome/browser/ash/child_accounts/parent_access_code/parent_access_service_browsertest.cc chrome/browser/ash/child_accounts/time_limits/app_time_limit_utils_unittest.cc chrome/browser/ash/child_accounts/website_approval_notifier_unittest.cc -chrome/browser/ash/crosapi/browser_manager_unittest.cc chrome/browser/ash/crosapi/browser_util_unittest.cc chrome/browser/ash/crosapi/local_printer_ash_unittest.cc chrome/browser/ash/crosapi/network_settings_translation_unittest.cc @@ -720,12 +691,12 @@ chrome/browser/ash/crostini/crostini_installer.h chrome/browser/ash/crostini/crostini_simple_types.h chrome/browser/ash/crostini/crostini_util.h chrome/browser/ash/customization/customization_document.h +chrome/browser/ash/dbus/arc_crosh_service_provider_unittest.cc chrome/browser/ash/dbus/proxy_resolution_service_provider.h chrome/browser/ash/dbus/proxy_resolution_service_provider_browsertest.cc chrome/browser/ash/dbus/proxy_resolution_service_provider_unittest.cc chrome/browser/ash/drive/drivefs_test_support.cc chrome/browser/ash/drive/file_system_util_unittest.cc -chrome/browser/ash/extensions/file_manager/file_manager_private_apitest.cc chrome/browser/ash/extensions/file_manager/system_notification_manager_unittest.cc chrome/browser/ash/extensions/users_private/users_private_apitest.cc chrome/browser/ash/file_manager/file_browser_handlers.h @@ -778,6 +749,7 @@ chrome/browser/ash/login/oobe_quick_start/connectivity/connection_unittest.cc chrome/browser/ash/login/oobe_quick_start/second_device_auth_broker.cc chrome/browser/ash/login/oobe_quick_start/second_device_auth_broker_unittest.cc chrome/browser/ash/login/password_change_browsertest.cc +chrome/browser/ash/login/post_login_deferred_task_browsertest.cc chrome/browser/ash/login/profile_auth_data_unittest.cc chrome/browser/ash/login/reset_browsertest.cc chrome/browser/ash/login/saml/password_sync_token_fetcher.cc @@ -858,12 +830,12 @@ chrome/browser/ash/release_notes/release_notes_notification_unittest.cc chrome/browser/ash/release_notes/release_notes_storage_unittest.cc chrome/browser/ash/scalable_iph/scalable_iph_browsertest.cc chrome/browser/ash/scalable_iph/scalable_iph_delegate_impl.cc +chrome/browser/ash/scanner/scanner_keyed_service.cc chrome/browser/ash/scanning/chrome_scanning_app_delegate_unittest.cc chrome/browser/ash/scheduler_config/scheduler_configuration_manager.h chrome/browser/ash/settings/cros_settings_unittest.cc chrome/browser/ash/settings/device_settings_provider_unittest.cc chrome/browser/ash/smb_client/smb_service_helper.h -chrome/browser/ash/sync/synced_session_client_ash_unittest.cc chrome/browser/ash/system_web_apps/apps/camera_app/camera_app_integration_browsertest.cc chrome/browser/ash/system_web_apps/apps/files_internals_ui_delegate.cc chrome/browser/ash/system_web_apps/apps/help_app/help_app_notification_controller_unittest.cc @@ -888,8 +860,8 @@ chrome/browser/autofill/automated_tests/cache_replayer.cc chrome/browser/autofill/automated_tests/cache_replayer.h chrome/browser/autofill/automated_tests/cache_replayer_unittest.cc chrome/browser/autofill/captured_sites_test_utils.cc -chrome/browser/autofill_prediction_improvements/autofill_prediction_improvements_browsertest.cc -chrome/browser/autofill_prediction_improvements/chrome_autofill_prediction_improvements_client_unittest.cc +chrome/browser/autofill_ai/autofill_ai_browsertest.cc +chrome/browser/autofill_ai/chrome_autofill_ai_client_unittest.cc chrome/browser/background/background_contents_service.cc chrome/browser/background_sync/periodic_background_sync_permission_context.cc chrome/browser/bluetooth/web_bluetooth_browsertest.cc @@ -925,6 +897,7 @@ chrome/browser/cart/fetch_discount_worker_unittest.cc chrome/browser/cart/resources/cart_domain_cart_url_mapping.json chrome/browser/cart/resources/cart_domain_name_mapping.json chrome/browser/chrome_browser_application_mac.mm +chrome/browser/chrome_browser_main_win.cc chrome/browser/chrome_browser_main_win_unittest.cc chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client_browsertest.cc @@ -938,11 +911,10 @@ chrome/browser/chromeos/cros_apps/api/cros_apps_api_infos.cc chrome/browser/chromeos/enterprise/cloud_storage/one_drive_pref_observer_browsertest.cc chrome/browser/chromeos/extensions/desk_api/desk_api_extension_manager.cc chrome/browser/chromeos/extensions/desk_api/desk_api_extension_manager.h +chrome/browser/chromeos/extensions/login_screen/login/shared_session_handler.cc chrome/browser/chromeos/extensions/odfs_config_private/odfs_config_private_api_unittest.cc chrome/browser/chromeos/extensions/telemetry/api/common/api_guard_delegate_unittest.cc chrome/browser/chromeos/network/network_portal_signin_window_ash_browsertest.cc -chrome/browser/chromeos/platform_keys/extension_key_permissions_service.cc -chrome/browser/chromeos/platform_keys/extension_platform_keys_service.cc chrome/browser/chromeos/policy/default_notifications_setting_browsertest.cc chrome/browser/chromeos/policy/dino_easter_egg_browsertest.cc chrome/browser/chromeos/policy/dlp/data_transfer_dlp_controller_browsertest.cc @@ -954,8 +926,6 @@ chrome/browser/chromeos/policy/dlp/dlp_scoped_file_access_delegate_unittest.cc chrome/browser/chromeos/printing/print_preview/print_settings_converter_unittest.cc chrome/browser/chromeos/reporting/metric_reporting_prefs_unittest.cc chrome/browser/chromeos/tablet_mode/chrome_content_browser_client_tablet_mode_part_unittest.cc -chrome/browser/companion/core/utils.cc -chrome/browser/companion/core/utils_unittest.cc chrome/browser/complex_tasks/task_tab_helper_unittest.cc chrome/browser/component_updater/recovery_component_installer.cc chrome/browser/component_updater/translate_kit_component_installer.cc @@ -1150,6 +1120,7 @@ chrome/browser/extensions/script_injection_tracker_browsertest.cc chrome/browser/extensions/updater/chrome_extension_downloader_factory.cc chrome/browser/extensions/updater/chrome_update_client_config.cc chrome/browser/extensions/updater/extension_updater_unittest.cc +chrome/browser/extensions/user_script_extension_browsertest.cc chrome/browser/extensions/user_script_listener_unittest.cc chrome/browser/extensions/webstore_domain_browsertest.cc chrome/browser/extensions/webstore_installer_browsertest.cc @@ -1199,7 +1170,6 @@ chrome/browser/lacros/app_mode/kiosk_session_service_browsertest.cc chrome/browser/lacros/browser_service_lacros.cc chrome/browser/lacros/net/network_settings_observer_browsertest.cc chrome/browser/lacros/net/network_settings_translation_unittest.cc -chrome/browser/lacros/sync/crosapi_session_sync_favicon_delegate_unittest.cc chrome/browser/lifetime/switch_utils_unittest.cc chrome/browser/loader/keep_alive_url_browsertest.cc chrome/browser/local_discovery/service_discovery_client_mac.mm @@ -1283,9 +1253,9 @@ chrome/browser/new_tab_page/modules/file_suggestion/drive_service.cc chrome/browser/new_tab_page/modules/file_suggestion/drive_service_unittest.cc chrome/browser/new_tab_page/modules/new_tab_page_modules_interactive_uitest.cc chrome/browser/new_tab_page/modules/new_tab_page_modules_unittest.cc +chrome/browser/new_tab_page/modules/v2/calendar/calendar_fake_data_helper.cc chrome/browser/new_tab_page/modules/v2/calendar/google_calendar_page_handler.cc chrome/browser/new_tab_page/modules/v2/calendar/google_calendar_page_handler_unittest.cc -chrome/browser/new_tab_page/modules/v2/calendar/outlook_calendar_page_handler.cc chrome/browser/new_tab_page/modules/v2/most_relevant_tab_resumption/most_relevant_tab_resumption_page_handler.cc chrome/browser/new_tab_page/modules/v2/most_relevant_tab_resumption/most_relevant_tab_resumption_page_handler_unittest.cc chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc @@ -1302,6 +1272,7 @@ chrome/browser/notifications/platform_notification_service_unittest.cc chrome/browser/notifications/win/notification_template_builder.cc chrome/browser/ntp_tiles/ntp_tiles_browsertest.cc chrome/browser/obsolete_system/obsolete_system_linux.cc +chrome/browser/on_device_translation/on_device_translation_browsertest.cc chrome/browser/optimization_guide/chrome_hints_manager_unittest.cc chrome/browser/optimization_guide/hints_fetcher_browsertest.cc chrome/browser/optimization_guide/model_execution/model_execution_browsertest.cc @@ -1416,7 +1387,7 @@ chrome/browser/preloading/preview/preview_navigation_throttle.h chrome/browser/preloading/preview/preview_zoom_controller.h chrome/browser/printing/print_preview_dialog_controller_unittest.cc chrome/browser/privacy/secure_dns_bridge.cc -chrome/browser/privacy_sandbox/privacy_sandbox_service.h +chrome/browser/privacy_sandbox/privacy_sandbox_activity_types_service.h chrome/browser/privacy_sandbox/privacy_sandbox_service_impl.cc chrome/browser/privacy_sandbox/privacy_sandbox_service_impl_unittest.cc chrome/browser/private_network_access/private_network_device_chooser_controller_unittest.cc @@ -1427,6 +1398,7 @@ chrome/browser/profile_resetter/profile_resetter.cc chrome/browser/profile_resetter/profile_resetter_unittest.cc chrome/browser/profile_resetter/reset_report_uploader.cc chrome/browser/profiles/batch_upload/batch_upload_browsertest.cc +chrome/browser/profiles/batch_upload/batch_upload_service_unittest.cc chrome/browser/profiles/gaia_info_update_service_unittest.cc chrome/browser/profiles/profile.h chrome/browser/profiles/profile_attributes_entry.h @@ -1451,6 +1423,7 @@ chrome/browser/push_notification/server_client/push_notification_server_client_d chrome/browser/reading_list/android/reading_list_manager_impl_unittest.cc chrome/browser/renderer_context_menu/link_to_text_menu_observer_interactive_uitest.cc chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc +chrome/browser/renderer_context_menu/render_view_context_menu_interactive_uitest.cc chrome/browser/renderer_context_menu/render_view_context_menu_unittest.cc chrome/browser/renderer_host/chrome_navigation_ui_data.h chrome/browser/request_header_integrity/request_header_integrity_url_loader_throttle_unittest.cc @@ -1573,7 +1546,6 @@ chrome/browser/resources/new_tab_page/app.ts chrome/browser/resources/new_tab_page/doodle_share_dialog.ts chrome/browser/resources/new_tab_page/lens_form.html chrome/browser/resources/new_tab_page/lens_form.ts -chrome/browser/resources/new_tab_page/modules/drive/module.ts chrome/browser/resources/new_tab_page/modules/v2/calendar/google_calendar_module.html chrome/browser/resources/new_tab_page/modules/v2/file_suggestion/drive_module.ts chrome/browser/resources/new_tab_page/transparency.ts @@ -1642,6 +1614,7 @@ chrome/browser/safe_browsing/tailored_security/tailored_security_url_observer_un chrome/browser/search/background/ntp_background_service.cc chrome/browser/search/background/ntp_backgrounds.cc chrome/browser/search/background/ntp_custom_background_service.cc +chrome/browser/search/ntp_features_unittest.cc chrome/browser/search/search.h chrome/browser/search_engine_choice/search_engine_choice_dialog_browsertest.cc chrome/browser/search_engines/template_url_parser_unittest.cc @@ -1669,6 +1642,7 @@ chrome/browser/sharing/shared_clipboard/remote_copy_message_handler.cc chrome/browser/sharing_hub/sharing_hub_model_unittest.cc chrome/browser/shell_integration_linux_unittest.cc chrome/browser/signin/account_id_from_account_info_unittest.cc +chrome/browser/signin/accounts_policy_manager_unittest.cc chrome/browser/signin/android/web_signin_bridge_unittest.cc chrome/browser/signin/bound_session_credentials/bound_session_cookie_controller_impl_unittest.cc chrome/browser/signin/bound_session_credentials/bound_session_cookie_observer_unittest.cc @@ -1807,13 +1781,15 @@ chrome/browser/ui/ash/holding_space/holding_space_keyed_service_unittest.cc chrome/browser/ui/ash/in_session_auth/in_session_auth_dialog_client.cc chrome/browser/ui/ash/input_method/candidate_window_view.cc chrome/browser/ui/ash/login/captive_portal_view.cc -chrome/browser/ui/ash/network/network_portal_signin_controller_browsertest.cc chrome/browser/ui/ash/network/network_portal_signin_controller_unittest.cc -chrome/browser/ui/ash/picker/picker_client_impl_unittest.cc -chrome/browser/ui/ash/picker/picker_link_suggester.cc chrome/browser/ui/ash/projector/pending_screencast_manager.cc chrome/browser/ui/ash/projector/pending_screencast_manager_browsertest.cc chrome/browser/ui/ash/projector/projector_navigation_throttle_browsertest.cc +chrome/browser/ui/ash/quick_answers/quick_answers_state_ash_unittest.cc +chrome/browser/ui/ash/quick_answers/ui/quick_answers_util.cc +chrome/browser/ui/ash/quick_answers/ui/quick_answers_view_unittest.cc +chrome/browser/ui/ash/quick_insert/quick_insert_client_impl_unittest.cc +chrome/browser/ui/ash/quick_insert/quick_insert_link_suggester.cc chrome/browser/ui/ash/session/session_controller_client_impl_unittest.cc chrome/browser/ui/ash/shelf/app_shortcut_shelf_item_controller.cc chrome/browser/ui/ash/shelf/browser_app_shelf_item_controller.cc @@ -1875,6 +1851,7 @@ chrome/browser/ui/hid/hid_chooser_controller_unittest.cc chrome/browser/ui/intent_picker_tab_helper_unittest.cc chrome/browser/ui/lens/lens_overlay_controller_browsertest.cc chrome/browser/ui/lens/lens_overlay_gen204_controller.cc +chrome/browser/ui/lens/lens_overlay_languages_controller.cc chrome/browser/ui/lens/lens_overlay_query_controller.cc chrome/browser/ui/lens/lens_overlay_query_controller_unittest.cc chrome/browser/ui/lens/lens_overlay_side_panel_coordinator.cc @@ -1899,10 +1876,8 @@ chrome/browser/ui/passwords/password_manager_navigation_throttle_unittest.cc chrome/browser/ui/passwords/well_known_change_password_navigation_throttle.cc chrome/browser/ui/passwords/well_known_change_password_navigation_throttle_browsertest.cc chrome/browser/ui/passwords/well_known_change_password_navigation_throttle_unittest.cc +chrome/browser/ui/plus_addresses/plus_address_menu_model_unittest.cc chrome/browser/ui/profiles/profile_picker_unittest.cc -chrome/browser/ui/quick_answers/quick_answers_state_ash_unittest.cc -chrome/browser/ui/quick_answers/ui/quick_answers_util.cc -chrome/browser/ui/quick_answers/ui/quick_answers_view_unittest.cc chrome/browser/ui/safety_hub/notification_permission_review_service_unittest.cc chrome/browser/ui/safety_hub/password_status_check_service_unittest.cc chrome/browser/ui/search/ntp_user_data_logger_unittest.cc @@ -1927,19 +1902,21 @@ chrome/browser/ui/tabs/pinned_tab_codec_unittest.cc chrome/browser/ui/tabs/pinned_tab_service_browsertest.cc chrome/browser/ui/tabs/pinned_tab_service_unittest.cc chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_keyed_service_unittest.cc +chrome/browser/ui/tabs/saved_tab_groups/tab_group_sync_delegate_browsertest.cc chrome/browser/ui/tabs/tab_strip_model_unittest.cc chrome/browser/ui/test/popup_browsertest.cc chrome/browser/ui/toolbar/app_menu_model_interactive_uitest.cc chrome/browser/ui/toolbar/cast/cast_contextual_menu.cc chrome/browser/ui/toolbar/location_bar_model_unittest.cc +chrome/browser/ui/ui_features.cc chrome/browser/ui/url_identity_unittest.cc chrome/browser/ui/views/accelerator_table.cc chrome/browser/ui/views/apps/app_dialog/app_uninstall_dialog_view.cc +chrome/browser/ui/views/autofill/payments/filled_card_information_bubble_views_interactive_uitest.cc chrome/browser/ui/views/autofill/payments/iban_bubble_view_uitest.cc chrome/browser/ui/views/autofill/payments/local_card_migration_uitest.cc chrome/browser/ui/views/autofill/payments/offer_notification_bubble_views_test_base.cc chrome/browser/ui/views/autofill/payments/save_card_bubble_views_browsertest.cc -chrome/browser/ui/views/autofill/payments/virtual_card_manual_fallback_bubble_views_interactive_uitest.cc chrome/browser/ui/views/autofill/popup/password_favicon_loader_unittest.cc chrome/browser/ui/views/autofill/popup/popup_row_factory_utils_browsertest.cc chrome/browser/ui/views/autofill/popup/popup_separator_view.h @@ -1956,11 +1933,11 @@ chrome/browser/ui/views/borealis/borealis_disallowed_dialog.cc chrome/browser/ui/views/commerce/price_tracking_bubble_dialog_view_unittest.cc chrome/browser/ui/views/commerce/price_tracking_email_dialog_view.cc chrome/browser/ui/views/commerce/price_tracking_icon_view_integration_test.cc -chrome/browser/ui/views/compose/compose_interactive_uitest.cc chrome/browser/ui/views/download/bubble/download_bubble_contents_view_unittest.cc chrome/browser/ui/views/download/bubble/download_toolbar_button_view_unittest.cc chrome/browser/ui/views/extensions/device_chooser_extension_browsertest.cc chrome/browser/ui/views/extensions/extension_install_dialog_view_browsertest.cc +chrome/browser/ui/views/extensions/extension_installed_bubble_view_signin_browsertest.cc chrome/browser/ui/views/extensions/extension_uninstall_dialog_view_browsertest.cc chrome/browser/ui/views/extensions/web_file_handlers/web_file_handlers_file_launch_dialog.cc chrome/browser/ui/views/file_system_access/file_system_access_usage_bubble_view_browsertest.cc @@ -2012,7 +1989,6 @@ chrome/browser/ui/views/sharing_hub/sharing_hub_bubble_view_impl_unittest.cc chrome/browser/ui/views/side_panel/companion/exps_registration_success_observer_unittest.cc chrome/browser/ui/views/side_panel/lens/lens_core_tab_side_panel_helper_browsertest.cc chrome/browser/ui/views/side_panel/lens/lens_unified_side_panel_view.cc -chrome/browser/ui/views/side_panel/search_companion/companion_live_test.cc chrome/browser/ui/views/side_panel/search_companion/companion_side_panel_controller.cc chrome/browser/ui/views/site_data/page_specific_site_data_dialog_unittest.cc chrome/browser/ui/views/sync/inline_login_ui_browsertest.cc @@ -2024,7 +2000,6 @@ chrome/browser/ui/views/web_apps/force_installed_preinstalled_deprecated_app_dia chrome/browser/ui/views/web_apps/frame_toolbar/web_app_frame_toolbar_browsertest.cc chrome/browser/ui/views/webid/account_selection_view_base.cc chrome/browser/ui/views/webid/fedcm_account_selection_view_desktop_browsertest.cc -chrome/browser/ui/web_applications/diagnostics/web_app_icon_health_checks_browsertest.cc chrome/browser/ui/web_applications/sub_apps_admin_policy_browsertest.cc chrome/browser/ui/web_applications/web_app_browsertest.cc chrome/browser/ui/web_applications/web_app_navigate_browsertest.cc @@ -2103,7 +2078,6 @@ chrome/browser/ui/webui/settings/settings_utils_unittest.cc chrome/browser/ui/webui/settings/settings_utils_win.cc chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc chrome/browser/ui/webui/settings/site_settings_helper_unittest.cc -chrome/browser/ui/webui/side_panel/companion/companion_side_panel_untrusted_ui.cc chrome/browser/ui/webui/side_panel/customize_chrome/customize_chrome_page_handler.cc chrome/browser/ui/webui/side_panel/customize_chrome/customize_chrome_page_handler_unittest.cc chrome/browser/ui/webui/side_panel/customize_chrome/wallpaper_search/wallpaper_search_handler.cc @@ -2117,7 +2091,6 @@ chrome/browser/ui/webui/signin/ash/signin_helper_browsertest.cc chrome/browser/ui/webui/signin/ash/user_cloud_signin_restriction_policy_fetcher.cc chrome/browser/ui/webui/signin/ash/user_cloud_signin_restriction_policy_fetcher.h chrome/browser/ui/webui/signin/ash/user_cloud_signin_restriction_policy_fetcher_unittest.cc -chrome/browser/ui/webui/signin/profile_picker_handler_unittest.cc chrome/browser/ui/webui/signin/signin_error_handler_unittest.cc chrome/browser/ui/webui/signin/signin_reauth_ui.h chrome/browser/ui/webui/signin/sync_confirmation_handler_unittest.cc @@ -2149,7 +2122,6 @@ chrome/browser/visited_url_ranking/desktop_tab_model_url_visit_data_fetcher_unit chrome/browser/vr/PRESUBMIT.py chrome/browser/vr/test/gl_test_environment_unittest.cc chrome/browser/wallet/android/boarding_pass_detector_unittest.cc -chrome/browser/web_applications/ash/migrations/migrate_preinstalls_to_aps_browsertest.cc chrome/browser/web_applications/chromeos_web_app_experiments_browsertest.cc chrome/browser/web_applications/commands/fetch_manifest_and_install_command.cc chrome/browser/web_applications/commands/install_app_from_verified_manifest_command.cc @@ -2160,7 +2132,7 @@ chrome/browser/web_applications/os_integration/web_app_handler_registration_util chrome/browser/web_applications/os_integration/web_app_handler_registration_utils_win.h chrome/browser/web_applications/os_integration/web_app_handler_registration_utils_win_unittest.cc chrome/browser/web_applications/preinstalled_web_app_manager_unittest.cc -chrome/browser/web_applications/preinstalled_web_apps/container.cc +chrome/browser/web_applications/preinstalled_web_apps/gemini.cc chrome/browser/web_applications/preinstalled_web_apps/gmail.cc chrome/browser/web_applications/preinstalled_web_apps/google_calendar.cc chrome/browser/web_applications/preinstalled_web_apps/google_chat.cc @@ -2357,10 +2329,10 @@ chrome/installer/util/shell_util.h chrome/installer/util/work_item.h chrome/notification_helper/notification_activator.h chrome/notification_helper/notification_helper.cc -chrome/renderer/accessibility/read_aloud_traversal_utils.cc -chrome/renderer/accessibility/read_anything_app_controller_browsertest.cc -chrome/renderer/accessibility/read_anything_app_model.cc -chrome/renderer/accessibility/read_anything_node_utils.cc +chrome/renderer/accessibility/read_anything/read_aloud_traversal_utils.cc +chrome/renderer/accessibility/read_anything/read_anything_app_controller_browsertest.cc +chrome/renderer/accessibility/read_anything/read_anything_app_model.cc +chrome/renderer/accessibility/read_anything/read_anything_node_utils.cc chrome/renderer/app_categorizer_unittest.cc chrome/renderer/ash_merge_session_loader_throttle_unittest.cc chrome/renderer/autofill/autofill_renderer_browsertest.cc @@ -2368,16 +2340,12 @@ chrome/renderer/autofill/form_autofill_browsertest.cc chrome/renderer/autofill/page_passwords_analyser_browsertest.cc chrome/renderer/autofill/password_autofill_agent_browsertest.cc chrome/renderer/bound_session_credentials/bound_session_request_throttled_in_renderer_manager_unittest.cc -chrome/renderer/cart/commerce_hint_agent.cc -chrome/renderer/cart/commerce_hint_agent_browsertest.cc -chrome/renderer/cart/commerce_hint_agent_unittest.cc chrome/renderer/chrome_content_renderer_client_browsertest.cc chrome/renderer/chrome_content_renderer_client_unittest.cc chrome/renderer/extensions/api/extension_hooks_delegate_unittest.cc chrome/renderer/google_accounts_private_api_extension.h chrome/renderer/media/flash_embed_rewrite.cc chrome/renderer/media/flash_embed_rewrite_unittest.cc -chrome/renderer/resources/cart/skip_add_to_cart_request_domain_mapping.json chrome/renderer/resources/extensions/identity_custom_bindings.js chrome/renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc chrome/renderer/searchbox/searchbox.h @@ -2488,6 +2456,7 @@ chrome/updater/enterprise/win/google/build_group_policy_template_unittest.py chrome/updater/enterprise/win/google/public_apps.py chrome/updater/external_constants_builder_unittest.cc chrome/updater/external_constants_override_unittest.cc +chrome/updater/fix_licenses.py chrome/updater/mac/launcher_main.c chrome/updater/mac/setup/ks_tickets.mm chrome/updater/mac/setup/ks_tickets_unittest.mm @@ -2500,8 +2469,10 @@ chrome/updater/util/util_unittest.cc chrome/updater/util/util_win_unittest.cc chrome/updater/util/win_util.cc chrome/updater/util/win_util.h +chrome/updater/win/installer/installer_main.cc chrome/updater/win/protocol_parser_xml_unittest.cc chrome/updater/win/signing/PRESUBMIT.py +chrome/updater/win/signing/enterprise_standalone_installer.wxs.xml chrome/updater/win/signing/msi_from_standalone.py chrome/updater/win/task_scheduler.cc chrome/utility/importer/bookmark_html_reader.h @@ -2515,33 +2486,21 @@ chrome/utility/importer/nss_decryptor_system_nss.cc chrome/utility/importer/nss_decryptor_win.h chrome/version.gni chrome/windows_services/service_program/service.cc -chromecast/app/resources/shell_devtools_discovery_page.html -chromecast/base/chromecast_switches.cc -chromecast/browser/renderer_prelauncher_test.cc -chromecast/browser/webui/cast_webui.cc -chromecast/cast_core/runtime/browser/grpc_resource_data_source.cc -chromecast/cast_core/runtime/browser/grpc_resource_data_source_unittest.cc -chromecast/cast_core/runtime/browser/grpc_webui_controller.cc -chromecast/chromecast.gni -chromecast/common/activity_url_filter_unittest.cc -chromecast/crash/linux/minidump_uploader.cc -chromecast/media/cma/backend/android/audio_sink_android_audiotrack_impl.h -chromecast/net/connectivity_checker_impl.h -chromecast/net/net_switches.cc -chromecast/public/bluetooth/gatt.h -chromecast/public/output_restrictions.h -chromecast/starboard/media/cdm/starboard_decryptor_cast.cc -chromecast/starboard/media/cdm/starboard_decryptor_cast_test.cc -chromecast/starboard/media/media/mime_utils.cc -chromecast/starboard/media/media/mime_utils_test.cc chromeos/BUILD.gn chromeos/ash/components/attestation/attestation_flow_adaptive_unittest.cc chromeos/ash/components/attestation/attestation_flow_integrated_unittest.cc +chromeos/ash/components/boca/babelorca/babel_orca_consumer.cc chromeos/ash/components/boca/babelorca/tachyon_constants.h +chromeos/ash/components/boca/babelorca/tachyon_registrar.cc +chromeos/ash/components/boca/babelorca/transcript_receiver.cc +chromeos/ash/components/boca/babelorca/transcript_sender_impl.cc +chromeos/ash/components/boca/boca_metrics_manager_unittest.cc +chromeos/ash/components/boca/boca_role_util_unittest.cc chromeos/ash/components/boca/boca_session_manager_unittest.cc chromeos/ash/components/boca/session_api/constants.h chromeos/ash/components/boca/session_api/create_session_request_unittest.cc chromeos/ash/components/boca/session_api/get_session_request_unittest.cc +chromeos/ash/components/boca/session_api/join_session_request_unittest.cc chromeos/ash/components/boca/session_api/session_parser_unittest.cc chromeos/ash/components/boca/session_api/update_session_request_unittest.cc chromeos/ash/components/boca/session_api/update_student_activities_request_unittest.cc @@ -2689,13 +2648,14 @@ components/autofill/core/browser/data_model/autofill_profile_unittest.cc components/autofill/core/browser/form_data_importer_unittest.cc components/autofill/core/browser/form_filler_unittest.cc components/autofill/core/browser/form_structure_unittest.cc -components/autofill/core/browser/metrics/autofill_metrics.cc components/autofill/core/browser/metrics/autofill_metrics_test_base.cc components/autofill/core/browser/metrics/autofill_metrics_unittest.cc +components/autofill/core/browser/metrics/form_interactions_ukm_logger.cc +components/autofill/core/browser/metrics/form_interactions_ukm_logger_unittest.cc +components/autofill/core/browser/metrics/prediction_quality_metrics_unittest.cc components/autofill/core/browser/metrics/profile_deduplication_metrics_unittest.cc components/autofill/core/browser/metrics/quality_metrics_unittest.cc -components/autofill/core/browser/ml_model/autofill_ml_prediction_model_handler.cc -components/autofill/core/browser/ml_model/autofill_ml_prediction_model_handler_unittest.cc +components/autofill/core/browser/ml_model/field_classification_model_handler.cc components/autofill/core/browser/payments/autofill_offer_manager_unittest.cc components/autofill/core/browser/payments/constants.h components/autofill/core/browser/payments/credit_card_access_manager_test_base.cc @@ -2740,7 +2700,6 @@ components/bookmarks/managed/managed_bookmarks_tracker_unittest.cc components/breadcrumbs/core/breadcrumb_manager_tab_helper.cc components/breadcrumbs/core/breadcrumb_manager_tab_helper.h components/browser_sync/PRESUBMIT.py -components/browser_sync/sync_client_utils_unittest.cc components/browser_sync/sync_internals_message_handler_unittest.cc components/browser_ui/strings/android/browser_ui_strings.grd components/browser_ui/strings/android/site_settings.grdp @@ -2775,6 +2734,7 @@ components/commerce/core/subscriptions/subscriptions_server_proxy.cc components/commerce/core/subscriptions/subscriptions_server_proxy_unittest.cc components/commerce_strings.grdp components/component_updater/component_updater_url_constants.cc +components/component_updater/installer_policies/masked_domain_list_component_installer_policy.cc components/components_google_chrome_strings.grd components/content_relationship_verification/digital_asset_links_handler.cc components/content_relationship_verification/digital_asset_links_handler.h @@ -2803,6 +2763,7 @@ components/cronet/gn2bp/PRESUBMIT.py components/cronet/gn2bp/gen_android_bp.py components/cronet/gn2bp/gn_utils.py components/cronet/license/license_utils.py +components/cronet/license/tests/license_converter_test.py components/cronet/native/cronet.idl components/cronet/native/perftest/perf_test.cc components/cronet/tools/cr_cronet.py @@ -2813,6 +2774,7 @@ components/data_sharing/internal/group_data_proto_utils_unittest.cc components/data_sharing/internal/preview_server_proxy.cc components/data_sharing/public/data_sharing_network_utils.h components/data_sharing/public/features.cc +components/data_sharing/public/group_data.h components/desks_storage/core/admin_template_service_unittests.cc components/desks_storage/core/desk_model_wrapper_unittests.cc components/desks_storage/core/desk_sync_bridge_unittest.cc @@ -2849,9 +2811,6 @@ components/enterprise/data_controls/core/browser/rule_unittest.cc components/enterprise/obfuscation/core/utils.h components/error_page/common/localized_error.cc components/error_page_strings.grdp -components/exo/data_offer_unittest.cc -components/exo/drag_drop_operation_unittest.cc -components/exo/seat_unittest.cc components/exo/ui_lock_controller.h components/eye_dropper/eye_dropper_view.cc components/facilitated_payments/content/browser/security_checker.h @@ -2883,6 +2842,7 @@ components/feedback/feedback_uploader_dispatch_unittest.cc components/feedback/redaction_tool/redaction_tool_unittest.cc components/feedback/redaction_tool/url_parse.h components/fingerprinting_protection_filter/browser/fingerprinting_protection_web_contents_helper.cc +components/fingerprinting_protection_filter/common/fingerprinting_protection_breakage_exception_unittest.cc components/flags_ui/flags_test_helpers.cc components/flags_ui/resources/app.html.ts components/gcm_driver/gcm_account_mapper.cc @@ -2937,7 +2897,6 @@ components/history_clusters/core/ranking_cluster_finalizer_unittest.cc components/history_clusters/core/similar_visit_deduper_cluster_finalizer_unittest.cc components/history_clusters/core/single_visit_cluster_finalizer_unittest.cc components/history_clusters_strings.grdp -components/history_embeddings/ml_answerer_unittest.cc components/history_strings.grdp components/infobars/content/content_infobar_manager.cc components/input/android/scoped_input_receiver.h @@ -2952,6 +2911,7 @@ components/invalidation/impl/per_user_topic_subscription_manager.cc components/invalidation/impl/per_user_topic_subscription_manager_unittest.cc components/ip_protection/common/ip_protection_config_http.cc components/ip_protection/common/ip_protection_proxy_config_direct_fetcher.cc +components/ip_protection/common/ip_protection_token_manager_impl.cc components/ip_protection/common/masked_domain_list_manager_unittest.cc components/javascript_dialogs/tab_modal_dialog_manager.cc components/javascript_dialogs_strings.grdp @@ -2994,6 +2954,7 @@ components/metrics/metrics_state_manager_unittest.cc components/metrics/net/net_metrics_log_uploader.cc components/metrics/persistent_histograms.cc components/metrics/url_constants.cc +components/metrics/url_constants.grd components/mirroring/service/mirror_settings.h components/mirroring/service/remoting_sender.h components/mirroring/service/rtp_stream.h @@ -3075,7 +3036,6 @@ components/omnibox/browser/shortcuts_backend.cc components/omnibox/browser/shortcuts_backend_unittest.cc components/omnibox/browser/shortcuts_database_unittest.cc components/omnibox/browser/shortcuts_provider_unittest.cc -components/omnibox/browser/suggestion_answer.h components/omnibox/browser/suggestion_group_unittest.cc components/omnibox/browser/titled_url_match_utils.cc components/omnibox/browser/titled_url_match_utils_unittest.cc @@ -3087,15 +3047,12 @@ components/omnibox_pedal_ui_strings.grdp components/omnibox_strings.grdp components/optimization_guide/core/hints_component_util_unittest.cc components/optimization_guide/core/hints_manager_unittest.cc -components/optimization_guide/core/model_execution/aqa_response_parser.cc components/optimization_guide/core/model_execution/json_response_parser_unittest.cc components/optimization_guide/core/model_execution/model_execution_fetcher.cc components/optimization_guide/core/model_execution/model_execution_fetcher_unittest.cc components/optimization_guide/core/model_execution/model_execution_manager_unittest.cc components/optimization_guide/core/model_execution/on_device_model_adaptation_loader.cc components/optimization_guide/core/model_execution/on_device_model_adaptation_loader_unittest.cc -components/optimization_guide/core/model_execution/on_device_model_service_controller_unittest.cc -components/optimization_guide/core/model_execution/test/fake_model_assets.cc components/optimization_guide/core/model_handler_unittest.cc components/optimization_guide/core/model_quality/model_quality_logs_uploader_service.cc components/optimization_guide/core/optimization_filter_unittest.cc @@ -3129,11 +3086,11 @@ components/page_load_metrics/browser/observers/use_counter_page_load_metrics_obs components/page_load_metrics/browser/observers/zstd_page_load_metrics_observer_unittest.cc components/page_load_metrics/browser/page_load_metrics_observer_interface.h components/page_load_metrics/browser/page_load_metrics_util.cc -components/page_load_metrics/browser/page_load_metrics_util.h -components/page_load_metrics/browser/page_load_metrics_util_unittest.cc components/page_load_metrics/browser/page_load_tracker.h -components/page_load_metrics/common/page_load_metrics_util.cc -components/page_load_metrics/common/page_load_metrics_util.h +components/page_load_metrics/google/browser/google_url_util.cc +components/page_load_metrics/google/browser/google_url_util.h +components/page_load_metrics/google/browser/google_url_util_unittest.cc +components/page_load_metrics/google/browser/gws_page_load_metrics_observer.cc components/page_load_metrics/renderer/fake_page_timing_sender.h components/paint_preview/browser/file_manager_unittest.cc components/paint_preview/browser/paint_preview_base_service_unittest.cc @@ -3233,6 +3190,7 @@ components/password_manager/ios/shared_password_controller_unittest.mm components/password_manager/ios/test_helpers.cc components/password_manager/services/csv_password/public/mojom/csv_password_parser_traits_unittest.cc components/password_manager_strings.grdp +components/payments/content/android/payment_feature_map.h components/payments/content/android_app_communication_unittest.cc components/payments/content/android_payment_app_factory_unittest.cc components/payments/content/payment_app.h @@ -3262,19 +3220,20 @@ components/permissions/pepc_initiated_permission_request_unittest.cc components/permissions/permission_context_base.cc components/permissions/permission_context_base_unittest.cc components/permissions/permission_decision_auto_blocker_unittest.cc +components/permissions/permission_indicators_tab_data_unittest.cc components/permissions/permission_manager_unittest.cc components/permissions/permission_request_manager.cc components/permissions/permission_request_manager_unittest.cc components/permissions/permission_uma_util.h components/permissions/permission_uma_util_unittest.cc components/permissions/prediction_service/prediction_common.h +components/permissions/prediction_service/prediction_model_handler.cc components/permissions/prediction_service/prediction_service_base.h components/permissions/test/mock_permission_request.h components/permissions_strings.grdp components/plus_addresses/metrics/plus_address_submission_logger_unittest.cc components/plus_addresses/plus_address_http_client_impl.cc components/plus_addresses/plus_address_http_client_impl_unittest.cc -components/plus_addresses/plus_address_suggestion_generator_unittest.cc components/plus_addresses/resources/strings/plus_addresses_strings.grd components/policy/PRESUBMIT.py components/policy/core/browser/browser_policy_connector.cc @@ -3297,7 +3256,6 @@ components/policy/core/common/cloud/user_info_fetcher.cc components/policy/core/common/cloud/user_info_fetcher_unittest.cc components/policy/core/common/default_chrome_apps_migrator.cc components/policy/core/common/default_chrome_apps_migrator_unittest.cc -components/policy/core/common/features.h components/policy/core/common/policy_loader_common.cc components/policy/core/common/policy_loader_common_unittest.cc components/policy/core/common/policy_loader_lacros_unittest.cc @@ -3308,7 +3266,7 @@ components/policy/core/common/registry_dict_unittest.cc components/policy/core/common/scoped_critical_policy_section.cc components/policy/core/common/values_util.h components/policy/resources/policy_templates.py -components/policy/resources/webui/policy.html +components/policy/resources/webui/policy_promotion.html components/policy/test/data/pref_mapping/AllHttpAuthSchemesAllowedForOrigins.json components/policy/test/data/pref_mapping/AllowedDomainsForApps.json components/policy/test/data/pref_mapping/AllowedDomainsForAppsList.json @@ -3499,7 +3457,6 @@ components/rlz/rlz_tracker.h components/safe_browsing/android/real_time_url_checks_allowlist_resource_file_unittest.cc components/safe_browsing/android/real_time_url_checks_allowlist_unittest.cc components/safe_browsing/content/browser/client_side_detection_service.cc -components/safe_browsing/content/browser/client_side_phishing_model_unittest.cc components/safe_browsing/content/browser/password_protection/password_protection_service_unittest.cc components/safe_browsing/content/browser/triggers/ad_sampler_trigger_unittest.cc components/safe_browsing/content/browser/triggers/suspicious_site_trigger.cc @@ -3598,7 +3555,6 @@ components/services/app_service/public/cpp/preferred_apps_list_unittest.cc components/services/font/pdf_fontconfig_matching.cc components/services/heap_profiling/connection_manager.cc components/services/paint_preview_compositor/paint_preview_compositor_impl_unittest.cc -components/services/print_compositor/print_compositor_impl.cc components/services/quarantine/quarantine_mac.mm components/services/quarantine/quarantine_win.cc components/services/storage/partition_impl_unittest.cc @@ -3817,9 +3773,9 @@ content/browser/accessibility/accessibility_action_browsertest.cc content/browser/accessibility/accessibility_auralinux_browsertest.cc content/browser/accessibility/browser_accessibility_manager_android.cc content/browser/accessibility/hit_testing_browsertest.cc -content/browser/aggregation_service/aggregation_service_features.cc content/browser/android/nfc_host_unittest.cc content/browser/attribution_reporting/attribution_os_level_manager_android.cc +content/browser/attribution_reporting/attribution_suitable_context_unittest.cc content/browser/back_forward_cache_basics_browsertest.cc content/browser/back_forward_cache_features_browsertest.cc content/browser/back_forward_cache_internal_browsertest.cc @@ -3876,6 +3832,7 @@ content/browser/interest_group/ad_auction_url_loader_interceptor_unittest.cc content/browser/interest_group/auction_runner_unittest.cc content/browser/interest_group/bidding_and_auction_server_key_fetcher.cc content/browser/interest_group/bidding_and_auction_server_key_fetcher.h +content/browser/interest_group/interest_group_browsertest.cc content/browser/interest_group/interest_group_update_manager.cc content/browser/interest_group/trusted_signals_fetcher.cc content/browser/loader/file_url_loader_factory_unittest.cc @@ -4073,11 +4030,14 @@ content/zygote/zygote_linux.cc content/zygote/zygote_linux.h content/zygote/zygote_main_linux.cc crypto/chaps_support.cc +crypto/hmac.h crypto/hmac_unittest.cc crypto/kdf.h crypto/nss_util.cc crypto/rsa_private_key_unittest.cc +crypto/secure_hash.h crypto/secure_util.h +crypto/sha2.h crypto/symmetric_key.h crypto/unexportable_key.h crypto/unexportable_key_unittest.cc @@ -4144,7 +4104,6 @@ extensions/browser/event_listener_map.h extensions/browser/event_listener_map_unittest.cc extensions/browser/event_router_unittest.cc extensions/browser/extension_prefs_observer.h -extensions/browser/image_sanitizer.cc extensions/browser/permissions_manager.h extensions/browser/script_injection_tracker.cc extensions/browser/suggest_permission_util.cc @@ -4240,6 +4199,7 @@ google_apis/classroom/classroom_api_list_students_request.h google_apis/classroom/classroom_api_student_submissions_response_types.h google_apis/classroom/classroom_api_students_response_types.h google_apis/common/api_key_request_util.h +google_apis/common/base_requests.cc google_apis/drive/drive_api_parser.cc google_apis/drive/drive_api_parser.h google_apis/drive/drive_api_parser_unittest.cc @@ -4278,6 +4238,9 @@ google_apis/gcm/engine/registration_request_unittest.cc google_apis/gcm/tools/mcs_probe.cc google_apis/google_api_keys.cc google_apis/google_api_keys.h +google_apis/people/people_api_request_types.h +google_apis/people/people_api_requests.h +google_apis/people/people_api_response_types.h google_apis/tasks/tasks_api_requests.h google_apis/tasks/tasks_api_response_types.h google_apis/tasks/tasks_api_response_types_unittest.cc @@ -4304,8 +4267,8 @@ google_apis/youtube_music/youtube_music_api_request_types.cc google_apis/youtube_music/youtube_music_api_request_types_unittest.cc google_apis/youtube_music/youtube_music_api_requests.cc google_apis/youtube_music/youtube_music_api_requests.h +google_apis/youtube_music/youtube_music_api_requests_unittest.cc google_apis/youtube_music/youtube_music_api_response_types.h -google_update/google_update_idl.idl gpu/GLES2/extensions/ANGLE/EGL_ANGLE_sync_control_rate.txt gpu/GLES2/extensions/CHROMIUM/EGL_CHROMIUM_sync_control.txt gpu/PRESUBMIT.py @@ -4378,6 +4341,7 @@ ios/chrome/browser/commerce/model/shopping_persisted_data_tab_helper_unittest.mm ios/chrome/browser/context_menu/ui_bundled/context_menu_configuration_provider_unittest.mm ios/chrome/browser/crash_report/model/breadcrumbs/breadcrumb_manager_tab_helper_unittest.mm ios/chrome/browser/credential_provider/model/credential_provider_service_unittest.mm +ios/chrome/browser/credential_provider/model/ios_credential_provider_infobar_delegate_unittest.mm ios/chrome/browser/credential_provider_promo/ui_bundled/resources/CPE_promo_animation_edu_autofill.json ios/chrome/browser/credential_provider_promo/ui_bundled/resources/CPE_promo_animation_edu_autofill_darkmode.json ios/chrome/browser/dialogs/ui_bundled/nsurl_protection_space_util_unittest.mm @@ -4466,7 +4430,6 @@ ios/chrome/browser/ui/infobars/modals/autofill_address_profile/infobar_save_addr ios/chrome/browser/ui/infobars/test/test_infobar_password_delegate.mm ios/chrome/browser/ui/omnibox/omnibox_egtest.mm ios/chrome/browser/ui/omnibox/zero_suggest_prefetch_helper_unittest.mm -ios/chrome/browser/ui/page_info/page_info_egtest.mm ios/chrome/browser/ui/page_info/page_info_security_egtest.mm ios/chrome/browser/ui/popup_menu/overflow_menu/overflow_menu_mediator_unittest.mm ios/chrome/browser/ui/popup_menu/popup_menu_mediator_unittest.mm @@ -4488,6 +4451,7 @@ ios/chrome/browser/ui/settings/password/password_exporter_unittest.mm ios/chrome/browser/ui/settings/password/password_issues/password_issues_table_view_controller_unittest.mm ios/chrome/browser/ui/settings/password/password_manager_egtest.mm ios/chrome/browser/ui/settings/password/password_manager_view_controller_unittest.mm +ios/chrome/browser/ui/settings/password/password_settings/password_settings_mediator_unittest.mm ios/chrome/browser/ui/settings/password/password_sharing/family_picker_coordinator_unittest.mm ios/chrome/browser/ui/settings/password/password_sharing/family_picker_view_controller_unittest.mm ios/chrome/browser/ui/settings/password/password_sharing/family_promo_coordinator_unittest.mm @@ -4523,6 +4487,7 @@ ios/chrome/common/ns_regular_expression_unittest.mm ios/chrome/common/string_util_unittest.mm ios/chrome/common/x_callback_url_unittest.cc ios/chrome/credential_provider_extension/strings/ios_credential_provider_extension_strings.grd +ios/chrome/credential_provider_extension/ui/passkey_welcome_screen_view_controller_unittest.mm ios/chrome/test/data/policy/PRESUBMIT.py ios/chrome/test/data/policy/pref_mapping/ManagedBookmarks.json ios/chrome/test/data/policy/pref_mapping/NewTabPageLocation.json @@ -4537,6 +4502,7 @@ ios/chrome/test/providers/omaha/test_omaha.cc ios/chrome/test/xcuitest/device_check_xctest.mm ios/components/cookie_util/cookie_util_unittest.mm ios/components/credential_provider_extension/password_spec_fetcher.mm +ios/components/credential_provider_extension/password_util_unittest.mm ios/components/security_interstitials/https_only_mode/https_only_mode_blocking_page.mm ios/net/cookies/cookie_cache_unittest.cc ios/net/cookies/cookie_store_ios_test_util.mm @@ -4716,139 +4682,6 @@ mojo/core/channel.h mojo/core/node_channel.h mojo/core/platform_handle_in_transit.cc mojo/public/interfaces/bindings/tests/PRESUBMIT.py -native_client_sdk/doc_generated/cds2014/cpp.html -native_client_sdk/doc_generated/cds2014/python.html -native_client_sdk/doc_generated/community/application-gallery.html -native_client_sdk/doc_generated/community/index.html -native_client_sdk/doc_generated/community/middleware.html -native_client_sdk/doc_generated/community/security-contest/contest-announcement.html -native_client_sdk/doc_generated/community/security-contest/contest-faq.html -native_client_sdk/doc_generated/community/security-contest/contest-terms.html -native_client_sdk/doc_generated/community/security-contest/index.html -native_client_sdk/doc_generated/devguide/coding/3D-graphics.html -native_client_sdk/doc_generated/devguide/coding/application-structure.html -native_client_sdk/doc_generated/devguide/coding/audio.html -native_client_sdk/doc_generated/devguide/coding/file-io.html -native_client_sdk/doc_generated/devguide/devcycle/building.html -native_client_sdk/doc_generated/devguide/devcycle/debugging.html -native_client_sdk/doc_generated/devguide/devcycle/dynamic-loading.html -native_client_sdk/doc_generated/devguide/devcycle/running.html -native_client_sdk/doc_generated/devguide/devcycle/vs-addin.html -native_client_sdk/doc_generated/devguide/distributing.html -native_client_sdk/doc_generated/devguide/index.html -native_client_sdk/doc_generated/devguide/tutorial/tutorial-part1.html -native_client_sdk/doc_generated/devguide/tutorial/tutorial-part2.html -native_client_sdk/doc_generated/faq.html -native_client_sdk/doc_generated/help.html -native_client_sdk/doc_generated/index.html -native_client_sdk/doc_generated/io2014.html -native_client_sdk/doc_generated/migration/index.html -native_client_sdk/doc_generated/nacl-and-pnacl.html -native_client_sdk/doc_generated/overview.html -native_client_sdk/doc_generated/pepper_beta/c/struct_p_p_b___file_system__1__0.html -native_client_sdk/doc_generated/pepper_beta/c/struct_p_p_b___host_resolver__1__0.html -native_client_sdk/doc_generated/pepper_beta/c/struct_p_p_b___network_monitor__1__0.html -native_client_sdk/doc_generated/pepper_beta/c/struct_p_p_b___network_proxy__1__0.html -native_client_sdk/doc_generated/pepper_beta/c/struct_p_p_b___t_c_p_socket__1__2.html -native_client_sdk/doc_generated/pepper_beta/c/struct_p_p_b___u_d_p_socket__1__2.html -native_client_sdk/doc_generated/pepper_beta/cpp/classpp_1_1_file_system.html -native_client_sdk/doc_generated/pepper_beta/cpp/classpp_1_1_host_resolver.html -native_client_sdk/doc_generated/pepper_beta/cpp/classpp_1_1_network_proxy.html -native_client_sdk/doc_generated/pepper_beta/cpp/classpp_1_1_t_c_p_socket.html -native_client_sdk/doc_generated/pepper_beta/cpp/classpp_1_1_u_d_p_socket.html -native_client_sdk/doc_generated/pepper_dev/c/struct_p_p_b___file_system__1__0.html -native_client_sdk/doc_generated/pepper_dev/c/struct_p_p_b___host_resolver__1__0.html -native_client_sdk/doc_generated/pepper_dev/c/struct_p_p_b___network_monitor__1__0.html -native_client_sdk/doc_generated/pepper_dev/c/struct_p_p_b___network_proxy__1__0.html -native_client_sdk/doc_generated/pepper_dev/c/struct_p_p_b___t_c_p_socket__1__2.html -native_client_sdk/doc_generated/pepper_dev/c/struct_p_p_b___u_d_p_socket__1__2.html -native_client_sdk/doc_generated/pepper_dev/cpp/classpp_1_1_file_system.html -native_client_sdk/doc_generated/pepper_dev/cpp/classpp_1_1_host_resolver.html -native_client_sdk/doc_generated/pepper_dev/cpp/classpp_1_1_network_proxy.html -native_client_sdk/doc_generated/pepper_dev/cpp/classpp_1_1_t_c_p_socket.html -native_client_sdk/doc_generated/pepper_dev/cpp/classpp_1_1_u_d_p_socket.html -native_client_sdk/doc_generated/pepper_stable/c/struct_p_p_b___file_system__1__0.html -native_client_sdk/doc_generated/pepper_stable/c/struct_p_p_b___host_resolver__1__0.html -native_client_sdk/doc_generated/pepper_stable/c/struct_p_p_b___network_monitor__1__0.html -native_client_sdk/doc_generated/pepper_stable/c/struct_p_p_b___network_proxy__1__0.html -native_client_sdk/doc_generated/pepper_stable/c/struct_p_p_b___t_c_p_socket__1__2.html -native_client_sdk/doc_generated/pepper_stable/c/struct_p_p_b___u_d_p_socket__1__2.html -native_client_sdk/doc_generated/pepper_stable/cpp/classpp_1_1_file_system.html -native_client_sdk/doc_generated/pepper_stable/cpp/classpp_1_1_host_resolver.html -native_client_sdk/doc_generated/pepper_stable/cpp/classpp_1_1_network_proxy.html -native_client_sdk/doc_generated/pepper_stable/cpp/classpp_1_1_t_c_p_socket.html -native_client_sdk/doc_generated/pepper_stable/cpp/classpp_1_1_u_d_p_socket.html -native_client_sdk/doc_generated/publications-and-presentations.html -native_client_sdk/doc_generated/reference/design-docs.html -native_client_sdk/doc_generated/reference/ideas.html -native_client_sdk/doc_generated/reference/pnacl-c-cpp-language-support.html -native_client_sdk/doc_generated/reference/pnacl-undefined-behavior.html -native_client_sdk/doc_generated/reference/sandbox_internals/arm-32-bit-sandbox.html -native_client_sdk/doc_generated/reference/sandbox_internals/index.html -native_client_sdk/doc_generated/reference/sandbox_internals/x86-64-sandbox.html -native_client_sdk/doc_generated/rest-devsite-examples.html -native_client_sdk/doc_generated/sdk/download.html -native_client_sdk/doc_generated/sdk/release-notes.html -native_client_sdk/src/build_tools/build_artifacts.py -native_client_sdk/src/build_tools/build_paths.py -native_client_sdk/src/build_tools/build_sdk.py -native_client_sdk/src/build_tools/buildbot_common.py -native_client_sdk/src/build_tools/buildbot_run.py -native_client_sdk/src/build_tools/json/naclsdk_manifest.json -native_client_sdk/src/build_tools/json/naclsdk_manifest0.json -native_client_sdk/src/build_tools/json/naclsdk_manifest2.json -native_client_sdk/src/build_tools/make_simple.py -native_client_sdk/src/build_tools/nacl-mono-buildbot.py -native_client_sdk/src/build_tools/nacl-mono-builder.py -native_client_sdk/src/build_tools/sdk_tools/cacerts.txt -native_client_sdk/src/build_tools/sdk_tools/config.py -native_client_sdk/src/build_tools/sdk_tools/sdk_update_main.py -native_client_sdk/src/build_tools/sdk_tools/third_party/fancy_urllib/__init__.py -native_client_sdk/src/build_tools/tests/build_version_test.py -native_client_sdk/src/build_tools/tests/update_nacl_manifest_test.py -native_client_sdk/src/build_tools/update_nacl_manifest.py -native_client_sdk/src/build_tools/update_sdktools.py -native_client_sdk/src/doc/Makefile -native_client_sdk/src/doc/_sphinxext/chromesite_builder.py -native_client_sdk/src/doc/_sphinxext/devsite_builder.py -native_client_sdk/src/doc/community/security-contest/contest-warning.txt -native_client_sdk/src/doc/conf.py -native_client_sdk/src/doc/doxygen/generate_docs.py -native_client_sdk/src/doc/migration/apps.html -native_client_sdk/src/doc/migration/public.html -native_client_sdk/src/examples/api/socket/index.html -native_client_sdk/src/examples/api/url_loader/url_loader_handler.h -native_client_sdk/src/examples/demo/drive/drive.cc -native_client_sdk/src/examples/demo/drive/index.html -native_client_sdk/src/examples/demo/nacl_io_demo/index.html -native_client_sdk/src/gonacl_appengine/gonacl.py -native_client_sdk/src/gonacl_appengine/static/bullet/fullscreen.html -native_client_sdk/src/gonacl_appengine/static/bullet/index.html -native_client_sdk/src/gonacl_appengine/static/bullet/main.js -native_client_sdk/src/gonacl_appengine/static/cube/example.js -native_client_sdk/src/gonacl_appengine/static/cube/index.html -native_client_sdk/src/gonacl_appengine/static/earth/example.js -native_client_sdk/src/gonacl_appengine/static/earth/index.html -native_client_sdk/src/gonacl_appengine/static/home/index.html -native_client_sdk/src/gonacl_appengine/static/index.html -native_client_sdk/src/gonacl_appengine/static/life/example.js -native_client_sdk/src/gonacl_appengine/static/life/index.html -native_client_sdk/src/gonacl_appengine/static/lua/index.html -native_client_sdk/src/gonacl_appengine/static/lua/lua.js -native_client_sdk/src/gonacl_appengine/static/lua/naclterm.js -native_client_sdk/src/gonacl_appengine/static/smoothlife/example.js -native_client_sdk/src/gonacl_appengine/static/smoothlife/index.html -native_client_sdk/src/gonacl_appengine/static/voronoi/example.js -native_client_sdk/src/gonacl_appengine/static/voronoi/index.html -native_client_sdk/src/libraries/nacl_io/include/sys/time.h -native_client_sdk/src/libraries/nacl_io/include/utime.h -native_client_sdk/src/libraries/nacl_io/syscalls/isatty.c -native_client_sdk/src/libraries/nacl_io/syscalls/truncate.c -native_client_sdk/src/resources/common.js -native_client_sdk/src/tests/nacl_io_test/host_resolver_test.cc -native_client_sdk/src/tests/nacl_io_test/socket_test.cc -native_client_sdk/src/tools/fix_manifest.py -native_client_sdk/src/web/manifest.html net/BUILD.gn net/PRESUBMIT.py net/android/http_auth_negotiate_android.h @@ -4858,7 +4691,6 @@ net/android/unittest_support/AndroidManifest.xml net/base/address_tracker_linux.cc net/base/apple/url_conversions_unittest.mm net/base/data_url.cc -net/base/features.cc net/base/file_stream_context.h net/base/filename_util.cc net/base/filename_util_internal.cc @@ -5145,8 +4977,7 @@ printing/test/PRESUBMIT.py remoting/base/corp_auth_util.cc remoting/base/is_google_email.cc remoting/base/service_urls.cc -remoting/client/notification/gstatic_json_fetcher.cc -remoting/client/notification/json_fetcher.h +remoting/base/session_policies.h remoting/codec/video_encoder_vpx.cc remoting/codec/webrtc_video_encoder_vpx.cc remoting/host/crash/crash_file_uploader.cc @@ -5178,9 +5009,6 @@ remoting/host/win/etw_trace_controller.cc remoting/host/win/rdp_client_window.cc remoting/host/win/trust_util.cc remoting/host/xmpp_register_support_host_request_unittest.cc -remoting/ios/app/help_view_controller.mm -remoting/ios/app/host_setup_view_controller.mm -remoting/ios/app/remoting_menu_view_controller.mm remoting/protocol/authenticator_test_base.h remoting/protocol/fake_session.cc remoting/protocol/jingle_messages_unittest.cc @@ -5196,8 +5024,6 @@ remoting/signaling/signaling_id_util.cc remoting/signaling/signaling_id_util.h remoting/signaling/signaling_id_util_unittest.cc remoting/signaling/xmpp_log_to_server_unittest.cc -remoting/test/ftl_services_playground.cc -remoting/test/ftl_signaling_playground.cc remoting/test/it2me_cli_host.cc remoting/test/session_authz_playground.cc remoting/test/test_oauth_token_getter.cc @@ -5347,7 +5173,6 @@ testing/buildbot/filters/PRESUBMIT.py testing/buildbot/generate_buildbot_json.py testing/buildbot/query_optimal_shard_counts.py testing/buildbot/scripts/upload_test_result_artifacts.py -testing/buildbot/waterfalls.pyl testing/chromoting/browser_test_commands_linux.txt testing/chromoting/chromoting_test_driver_commands_linux.txt testing/flake_suppressor_common/expectations.py @@ -5440,12 +5265,14 @@ third_party/android_deps/libs/com_google_android_datatransport_transport_api/3pp third_party/android_deps/libs/com_google_android_gms_play_services_auth/3pp/fetch.py third_party/android_deps/libs/com_google_android_gms_play_services_auth_api_phone/3pp/fetch.py third_party/android_deps/libs/com_google_android_gms_play_services_auth_base/3pp/fetch.py +third_party/android_deps/libs/com_google_android_gms_play_services_auth_blockstore/3pp/fetch.py third_party/android_deps/libs/com_google_android_gms_play_services_base/3pp/fetch.py third_party/android_deps/libs/com_google_android_gms_play_services_basement/3pp/fetch.py third_party/android_deps/libs/com_google_android_gms_play_services_cast/3pp/fetch.py third_party/android_deps/libs/com_google_android_gms_play_services_cast_framework/3pp/fetch.py third_party/android_deps/libs/com_google_android_gms_play_services_clearcut/3pp/fetch.py third_party/android_deps/libs/com_google_android_gms_play_services_cloud_messaging/3pp/fetch.py +third_party/android_deps/libs/com_google_android_gms_play_services_fido/3pp/fetch.py third_party/android_deps/libs/com_google_android_gms_play_services_flags/3pp/fetch.py third_party/android_deps/libs/com_google_android_gms_play_services_gcm/3pp/fetch.py third_party/android_deps/libs/com_google_android_gms_play_services_identity_credentials/3pp/fetch.py @@ -5457,6 +5284,7 @@ third_party/android_deps/libs/com_google_android_gms_play_services_stats/3pp/fet third_party/android_deps/libs/com_google_android_gms_play_services_tasks/3pp/fetch.py third_party/android_deps/libs/com_google_android_gms_play_services_vision/3pp/fetch.py third_party/android_deps/libs/com_google_android_gms_play_services_vision_common/3pp/fetch.py +third_party/android_deps/libs/com_google_android_libraries_identity_googleid_googleid/3pp/fetch.py third_party/android_deps/libs/com_google_android_material_material/3pp/fetch.py third_party/android_deps/libs/com_google_android_play_core_common/3pp/fetch.py third_party/android_deps/libs/com_google_android_play_feature_delivery/3pp/fetch.py @@ -5472,8 +5300,6 @@ third_party/android_deps/libs/com_google_firebase_firebase_installations_interop third_party/android_deps/libs/com_google_firebase_firebase_measurement_connector/3pp/fetch.py third_party/android_deps/libs/com_google_firebase_firebase_messaging/3pp/fetch.py third_party/android_deps/licenses/Android_SDK_License-December_9_2016.txt -third_party/android_platform/development/scripts/PRESUBMIT.py -third_party/android_platform/development/scripts/stack.py third_party/android_toolchain/3pp/fetch.py third_party/androidx/fetch_all_androidx.py third_party/angle/BUILD.gn @@ -5549,8 +5375,6 @@ third_party/angle/gni/angle.gni third_party/angle/include/CL/cl_platform.h third_party/angle/include/GLSLANG/ShaderLang.h third_party/angle/include/GLSLANG/ShaderVars.h -third_party/angle/include/platform/autogen/FeaturesVk_autogen.h -third_party/angle/include/platform/autogen/FrontendFeatures_autogen.h third_party/angle/include/platform/frontend_features.json third_party/angle/include/platform/vk_features.json third_party/angle/infra/specs/PRESUBMIT.py @@ -5683,155 +5507,6 @@ third_party/blink/common/page_state/page_state_serialization.cc third_party/blink/common/page_state/page_state_serialization_unittest.cc third_party/blink/common/permissions_policy/origin_with_possible_wildcards_unittest.cc third_party/blink/common/shared_storage/module_script_downloader.cc -third_party/blink/manual_tests/forms/color-suggestion-picker.html -third_party/blink/manual_tests/forms/list-picker.html -third_party/blink/manual_tests/media-elements/video-moved-from-iframe-to-main-page.html -third_party/blink/manual_tests/plugins/windowed.html -third_party/blink/manual_tests/plugins/windowless.html -third_party/blink/manual_tests/print-onload-with-image.html -third_party/blink/manual_tests/property-map-save-crash.html -third_party/blink/manual_tests/remove-input-file-onchange.html -third_party/blink/manual_tests/remove-on-drop-crash.html -third_party/blink/manual_tests/resources/testframe-link_text.html -third_party/blink/manual_tests/resources/testframeset.html -third_party/blink/manual_tests/scrolling-nestedframesets.html -third_party/blink/manual_tests/video-statistics.html -third_party/blink/manual_tests/webaudio/multichannel-mediastreamdestination.html -third_party/blink/manual_tests/webaudio/multichannel.html -third_party/blink/manual_tests/wordXML-selectall.xml -third_party/blink/perf_tests/bindings/resources/data/blink-dev.json -third_party/blink/perf_tests/css/resources/semantic.min.css -third_party/blink/perf_tests/owp_storage/resources/idb-load-docs-runner.html -third_party/blink/perf_tests/owp_storage/resources/idb-load-docs-shared.js -third_party/blink/perf_tests/parser/css-parser-yui.html -third_party/blink/perf_tests/parser/resources/html5.html -third_party/blink/perf_tests/speedometer20/resources/flightjs-example-app/app/data.js -third_party/blink/perf_tests/speedometer20/resources/flightjs-example-app/components/es5-shim/component.json -third_party/blink/perf_tests/speedometer20/resources/flightjs-example-app/components/es5-shim/es5-sham.js -third_party/blink/perf_tests/speedometer20/resources/flightjs-example-app/components/es5-shim/es5-shim.js -third_party/blink/perf_tests/speedometer20/resources/flightjs-example-app/components/es5-shim/package.json -third_party/blink/perf_tests/speedometer20/resources/flightjs-example-app/components/jquery/composer.json -third_party/blink/perf_tests/speedometer20/resources/flightjs-example-app/components/jquery/jquery.js -third_party/blink/perf_tests/speedometer20/resources/flightjs-example-app/components/requirejs/require.js -third_party/blink/perf_tests/speedometer20/resources/todomvc/architecture-examples/angular/dist/assets/css/todomvc-app.css -third_party/blink/perf_tests/speedometer20/resources/todomvc/architecture-examples/angular/src/assets/css/todomvc-app.css -third_party/blink/perf_tests/speedometer20/resources/todomvc/architecture-examples/angularjs/node_modules/angular-resource/angular-resource.js -third_party/blink/perf_tests/speedometer20/resources/todomvc/architecture-examples/angularjs/node_modules/angular/angular.js -third_party/blink/perf_tests/speedometer20/resources/todomvc/architecture-examples/angularjs/node_modules/todomvc-app-css/index.css -third_party/blink/perf_tests/speedometer20/resources/todomvc/architecture-examples/angularjs/node_modules/todomvc-app-css/package.json -third_party/blink/perf_tests/speedometer20/resources/todomvc/architecture-examples/angularjs/node_modules/todomvc-common/base.js -third_party/blink/perf_tests/speedometer20/resources/todomvc/architecture-examples/backbone/node_modules/backbone/backbone.js -third_party/blink/perf_tests/speedometer20/resources/todomvc/architecture-examples/backbone/node_modules/jquery/dist/jquery.js -third_party/blink/perf_tests/speedometer20/resources/todomvc/architecture-examples/backbone/node_modules/todomvc-app-css/index.css -third_party/blink/perf_tests/speedometer20/resources/todomvc/architecture-examples/backbone/node_modules/todomvc-common/base.js -third_party/blink/perf_tests/speedometer20/resources/todomvc/architecture-examples/backbone/node_modules/underscore/underscore.js -third_party/blink/perf_tests/speedometer20/resources/todomvc/architecture-examples/emberjs-debug/assets/vendor.css -third_party/blink/perf_tests/speedometer20/resources/todomvc/architecture-examples/emberjs-debug/assets/vendor.js -third_party/blink/perf_tests/speedometer20/resources/todomvc/architecture-examples/emberjs/vendor/index.css -third_party/blink/perf_tests/speedometer20/resources/todomvc/architecture-examples/inferno/node_modules/todomvc-app-css/index.css -third_party/blink/perf_tests/speedometer20/resources/todomvc/architecture-examples/inferno/node_modules/todomvc-app-css/package.json -third_party/blink/perf_tests/speedometer20/resources/todomvc/architecture-examples/inferno/node_modules/todomvc-common/base.js -third_party/blink/perf_tests/speedometer20/resources/todomvc/architecture-examples/jquery/node_modules/director/dist/director.js -third_party/blink/perf_tests/speedometer20/resources/todomvc/architecture-examples/jquery/node_modules/director/package.json -third_party/blink/perf_tests/speedometer20/resources/todomvc/architecture-examples/jquery/node_modules/jquery/dist/jquery.js -third_party/blink/perf_tests/speedometer20/resources/todomvc/architecture-examples/jquery/node_modules/todomvc-app-css/index.css -third_party/blink/perf_tests/speedometer20/resources/todomvc/architecture-examples/jquery/node_modules/todomvc-app-css/package.json -third_party/blink/perf_tests/speedometer20/resources/todomvc/architecture-examples/jquery/node_modules/todomvc-common/base.js -third_party/blink/perf_tests/speedometer20/resources/todomvc/architecture-examples/preact/dist/todomvc-common/base.js -third_party/blink/perf_tests/speedometer20/resources/todomvc/architecture-examples/preact/dist/todomvc.css -third_party/blink/perf_tests/speedometer20/resources/todomvc/architecture-examples/react/node_modules/todomvc-app-css/index.css -third_party/blink/perf_tests/speedometer20/resources/todomvc/architecture-examples/react/node_modules/todomvc-common/base.js -third_party/blink/perf_tests/speedometer20/resources/todomvc/architecture-examples/vuejs-cli/src/components/todo.css -third_party/blink/perf_tests/speedometer20/resources/todomvc/dependency-examples/flight/flight/node_modules/depot/package.json -third_party/blink/perf_tests/speedometer20/resources/todomvc/dependency-examples/flight/flight/node_modules/es5-shim/es5-sham.js -third_party/blink/perf_tests/speedometer20/resources/todomvc/dependency-examples/flight/flight/node_modules/es5-shim/es5-shim.js -third_party/blink/perf_tests/speedometer20/resources/todomvc/dependency-examples/flight/flight/node_modules/jquery/dist/jquery.js -third_party/blink/perf_tests/speedometer20/resources/todomvc/dependency-examples/flight/flight/node_modules/jquery/package.json -third_party/blink/perf_tests/speedometer20/resources/todomvc/dependency-examples/flight/flight/node_modules/requirejs-text/package.json -third_party/blink/perf_tests/speedometer20/resources/todomvc/dependency-examples/flight/flight/node_modules/requirejs-text/text.js -third_party/blink/perf_tests/speedometer20/resources/todomvc/dependency-examples/flight/flight/node_modules/requirejs/package.json -third_party/blink/perf_tests/speedometer20/resources/todomvc/dependency-examples/flight/flight/node_modules/requirejs/require.js -third_party/blink/perf_tests/speedometer20/resources/todomvc/dependency-examples/flight/flight/node_modules/todomvc-app-css/index.css -third_party/blink/perf_tests/speedometer20/resources/todomvc/dependency-examples/flight/flight/node_modules/todomvc-app-css/package.json -third_party/blink/perf_tests/speedometer20/resources/todomvc/dependency-examples/flight/flight/node_modules/todomvc-common/base.js -third_party/blink/perf_tests/speedometer20/resources/todomvc/functional-prog-examples/elm/node_modules/todomvc-app-css/index.css -third_party/blink/perf_tests/speedometer20/resources/todomvc/functional-prog-examples/elm/node_modules/todomvc-common/base.js -third_party/blink/perf_tests/speedometer20/resources/todomvc/labs/architecture-examples/react/bower_components/director/build/director.js -third_party/blink/perf_tests/speedometer20/resources/todomvc/labs/architecture-examples/react/bower_components/react/JSXTransformer.js -third_party/blink/perf_tests/speedometer20/resources/todomvc/labs/architecture-examples/react/bower_components/todomvc-common/base.js -third_party/blink/perf_tests/speedometer20/resources/todomvc/vanilla-examples/es2015-babel-webpack/src/helpers.js -third_party/blink/perf_tests/speedometer20/resources/todomvc/vanilla-examples/es2015/node_modules/todomvc-app-css/index.css -third_party/blink/perf_tests/speedometer20/resources/todomvc/vanilla-examples/es2015/node_modules/todomvc-app-css/package.json -third_party/blink/perf_tests/speedometer20/resources/todomvc/vanilla-examples/es2015/node_modules/todomvc-common/base.js -third_party/blink/perf_tests/speedometer20/resources/todomvc/vanilla-examples/es2015/src/helpers.js -third_party/blink/perf_tests/speedometer20/resources/todomvc/vanilla-examples/vanillajs/js/helpers.js -third_party/blink/perf_tests/speedometer20/resources/todomvc/vanilla-examples/vanillajs/node_modules/todomvc-app-css/index.css -third_party/blink/perf_tests/speedometer20/resources/todomvc/vanilla-examples/vanillajs/node_modules/todomvc-common/base.js -third_party/blink/perf_tests/speedometer21/resources/flightjs-example-app/app/data.js -third_party/blink/perf_tests/speedometer21/resources/flightjs-example-app/components/es5-shim/component.json -third_party/blink/perf_tests/speedometer21/resources/flightjs-example-app/components/es5-shim/es5-sham.js -third_party/blink/perf_tests/speedometer21/resources/flightjs-example-app/components/es5-shim/es5-shim.js -third_party/blink/perf_tests/speedometer21/resources/flightjs-example-app/components/es5-shim/package.json -third_party/blink/perf_tests/speedometer21/resources/flightjs-example-app/components/jquery/composer.json -third_party/blink/perf_tests/speedometer21/resources/flightjs-example-app/components/jquery/jquery.js -third_party/blink/perf_tests/speedometer21/resources/flightjs-example-app/components/requirejs/require.js -third_party/blink/perf_tests/speedometer21/resources/todomvc/architecture-examples/angular/dist/assets/css/todomvc-app.css -third_party/blink/perf_tests/speedometer21/resources/todomvc/architecture-examples/angular/src/assets/css/todomvc-app.css -third_party/blink/perf_tests/speedometer21/resources/todomvc/architecture-examples/angularjs/node_modules/angular-resource/angular-resource.js -third_party/blink/perf_tests/speedometer21/resources/todomvc/architecture-examples/angularjs/node_modules/angular/angular.js -third_party/blink/perf_tests/speedometer21/resources/todomvc/architecture-examples/angularjs/node_modules/todomvc-app-css/index.css -third_party/blink/perf_tests/speedometer21/resources/todomvc/architecture-examples/angularjs/node_modules/todomvc-app-css/package.json -third_party/blink/perf_tests/speedometer21/resources/todomvc/architecture-examples/angularjs/node_modules/todomvc-common/base.js -third_party/blink/perf_tests/speedometer21/resources/todomvc/architecture-examples/backbone/node_modules/backbone/backbone.js -third_party/blink/perf_tests/speedometer21/resources/todomvc/architecture-examples/backbone/node_modules/jquery/dist/jquery.js -third_party/blink/perf_tests/speedometer21/resources/todomvc/architecture-examples/backbone/node_modules/todomvc-app-css/index.css -third_party/blink/perf_tests/speedometer21/resources/todomvc/architecture-examples/backbone/node_modules/todomvc-common/base.js -third_party/blink/perf_tests/speedometer21/resources/todomvc/architecture-examples/backbone/node_modules/underscore/underscore.js -third_party/blink/perf_tests/speedometer21/resources/todomvc/architecture-examples/emberjs-debug/assets/vendor.css -third_party/blink/perf_tests/speedometer21/resources/todomvc/architecture-examples/emberjs-debug/assets/vendor.js -third_party/blink/perf_tests/speedometer21/resources/todomvc/architecture-examples/emberjs/vendor/index.css -third_party/blink/perf_tests/speedometer21/resources/todomvc/architecture-examples/inferno/node_modules/todomvc-app-css/index.css -third_party/blink/perf_tests/speedometer21/resources/todomvc/architecture-examples/inferno/node_modules/todomvc-app-css/package.json -third_party/blink/perf_tests/speedometer21/resources/todomvc/architecture-examples/inferno/node_modules/todomvc-common/base.js -third_party/blink/perf_tests/speedometer21/resources/todomvc/architecture-examples/jquery/node_modules/director/dist/director.js -third_party/blink/perf_tests/speedometer21/resources/todomvc/architecture-examples/jquery/node_modules/director/package.json -third_party/blink/perf_tests/speedometer21/resources/todomvc/architecture-examples/jquery/node_modules/jquery/dist/jquery.js -third_party/blink/perf_tests/speedometer21/resources/todomvc/architecture-examples/jquery/node_modules/todomvc-app-css/index.css -third_party/blink/perf_tests/speedometer21/resources/todomvc/architecture-examples/jquery/node_modules/todomvc-app-css/package.json -third_party/blink/perf_tests/speedometer21/resources/todomvc/architecture-examples/jquery/node_modules/todomvc-common/base.js -third_party/blink/perf_tests/speedometer21/resources/todomvc/architecture-examples/preact/dist/todomvc-common/base.js -third_party/blink/perf_tests/speedometer21/resources/todomvc/architecture-examples/preact/dist/todomvc.css -third_party/blink/perf_tests/speedometer21/resources/todomvc/architecture-examples/react/node_modules/todomvc-app-css/index.css -third_party/blink/perf_tests/speedometer21/resources/todomvc/architecture-examples/react/node_modules/todomvc-common/base.js -third_party/blink/perf_tests/speedometer21/resources/todomvc/architecture-examples/vuejs-cli/src/components/todo.css -third_party/blink/perf_tests/speedometer21/resources/todomvc/dependency-examples/flight/flight/node_modules/depot/package.json -third_party/blink/perf_tests/speedometer21/resources/todomvc/dependency-examples/flight/flight/node_modules/es5-shim/es5-sham.js -third_party/blink/perf_tests/speedometer21/resources/todomvc/dependency-examples/flight/flight/node_modules/es5-shim/es5-shim.js -third_party/blink/perf_tests/speedometer21/resources/todomvc/dependency-examples/flight/flight/node_modules/jquery/dist/jquery.js -third_party/blink/perf_tests/speedometer21/resources/todomvc/dependency-examples/flight/flight/node_modules/jquery/package.json -third_party/blink/perf_tests/speedometer21/resources/todomvc/dependency-examples/flight/flight/node_modules/requirejs-text/package.json -third_party/blink/perf_tests/speedometer21/resources/todomvc/dependency-examples/flight/flight/node_modules/requirejs-text/text.js -third_party/blink/perf_tests/speedometer21/resources/todomvc/dependency-examples/flight/flight/node_modules/requirejs/package.json -third_party/blink/perf_tests/speedometer21/resources/todomvc/dependency-examples/flight/flight/node_modules/requirejs/require.js -third_party/blink/perf_tests/speedometer21/resources/todomvc/dependency-examples/flight/flight/node_modules/todomvc-app-css/index.css -third_party/blink/perf_tests/speedometer21/resources/todomvc/dependency-examples/flight/flight/node_modules/todomvc-app-css/package.json -third_party/blink/perf_tests/speedometer21/resources/todomvc/dependency-examples/flight/flight/node_modules/todomvc-common/base.js -third_party/blink/perf_tests/speedometer21/resources/todomvc/functional-prog-examples/elm/node_modules/todomvc-app-css/index.css -third_party/blink/perf_tests/speedometer21/resources/todomvc/functional-prog-examples/elm/node_modules/todomvc-common/base.js -third_party/blink/perf_tests/speedometer21/resources/todomvc/labs/architecture-examples/react/bower_components/director/build/director.js -third_party/blink/perf_tests/speedometer21/resources/todomvc/labs/architecture-examples/react/bower_components/react/JSXTransformer.js -third_party/blink/perf_tests/speedometer21/resources/todomvc/labs/architecture-examples/react/bower_components/todomvc-common/base.js -third_party/blink/perf_tests/speedometer21/resources/todomvc/vanilla-examples/es2015-babel-webpack/src/helpers.js -third_party/blink/perf_tests/speedometer21/resources/todomvc/vanilla-examples/es2015/node_modules/todomvc-app-css/index.css -third_party/blink/perf_tests/speedometer21/resources/todomvc/vanilla-examples/es2015/node_modules/todomvc-app-css/package.json -third_party/blink/perf_tests/speedometer21/resources/todomvc/vanilla-examples/es2015/node_modules/todomvc-common/base.js -third_party/blink/perf_tests/speedometer21/resources/todomvc/vanilla-examples/es2015/src/helpers.js -third_party/blink/perf_tests/speedometer21/resources/todomvc/vanilla-examples/vanillajs/js/helpers.js -third_party/blink/perf_tests/speedometer21/resources/todomvc/vanilla-examples/vanillajs/node_modules/todomvc-app-css/index.css -third_party/blink/perf_tests/speedometer21/resources/todomvc/vanilla-examples/vanillajs/node_modules/todomvc-common/base.js -third_party/blink/perf_tests/sun_spider/tests/sunspider-0.9.1/string-base64.js -third_party/blink/perf_tests/sun_spider/tests/sunspider-0.9/string-base64.js -third_party/blink/perf_tests/sun_spider/tests/sunspider-1.0/string-base64.js third_party/blink/public/common/custom_handlers/protocol_handler_utils.h third_party/blink/public/common/frame/delegated_capability_request_token.h third_party/blink/public/common/frame/user_activation_state.h @@ -5885,6 +5560,7 @@ third_party/blink/renderer/core/css/invalidation/rule_invalidation_data_visitor. third_party/blink/renderer/core/css/invalidation/style_invalidator.h third_party/blink/renderer/core/css/parser/css_selector_parser.cc third_party/blink/renderer/core/css/parser/find_length_of_declaration_list-inl.h +third_party/blink/renderer/core/css/properties/computed_style_utils.cc third_party/blink/renderer/core/css/properties/longhands/longhands_custom.cc third_party/blink/renderer/core/css/remote_font_face_source.cc third_party/blink/renderer/core/css/resolver/style_adjuster.cc @@ -6031,6 +5707,7 @@ third_party/blink/renderer/core/html/html_collection.cc third_party/blink/renderer/core/html/html_collection.idl third_party/blink/renderer/core/html/html_document.cc third_party/blink/renderer/core/html/html_document.idl +third_party/blink/renderer/core/html/html_element.cc third_party/blink/renderer/core/html/html_element.idl third_party/blink/renderer/core/html/html_embed_element.idl third_party/blink/renderer/core/html/html_frame_element.idl @@ -6219,10 +5896,6 @@ third_party/blink/renderer/modules/encryptedmedia/encrypted_media_utils.h third_party/blink/renderer/modules/file_system_access/file_system_cloud_identifier.idl third_party/blink/renderer/modules/filesystem/dom_file_system_base_test.cc third_party/blink/renderer/modules/font_access/font_metadata.h -third_party/blink/renderer/modules/gamepad/gamepad_axis_event.idl -third_party/blink/renderer/modules/gamepad/gamepad_axis_event_init.idl -third_party/blink/renderer/modules/gamepad/gamepad_button_event.idl -third_party/blink/renderer/modules/gamepad/gamepad_button_event_init.idl third_party/blink/renderer/modules/geolocation/geolocation.cc third_party/blink/renderer/modules/geolocation/geolocation.h third_party/blink/renderer/modules/hid/hid.cc @@ -6388,6 +6061,7 @@ third_party/blink/renderer/platform/wtf/linked_hash_set.h third_party/blink/renderer/platform/wtf/stack_util.cc third_party/blink/renderer/platform/wtf/text/string_impl.h third_party/blink/renderer/platform/wtf/thread_specific.h +third_party/blink/renderer/platform/wtf/vector.h third_party/blink/renderer/platform/wtf/vector_test.cc third_party/boringssl/src/.bcr/metadata.template.json third_party/boringssl/src/CMakeLists.txt @@ -6395,7 +6069,7 @@ third_party/boringssl/src/crypto/cpu_aarch64_openbsd.c third_party/boringssl/src/crypto/dilithium/dilithium.c third_party/boringssl/src/crypto/fipsmodule/aes/internal.h third_party/boringssl/src/crypto/internal.h -third_party/boringssl/src/crypto/mldsa/mldsa.c +third_party/boringssl/src/crypto/mldsa/mldsa.cc third_party/boringssl/src/crypto/pkcs7/pkcs7_test.cc third_party/boringssl/src/crypto/pkcs8/pkcs8_x509.c third_party/boringssl/src/crypto/rand_extra/windows.c @@ -7726,6 +7400,7 @@ third_party/crossbench/crossbench/probes/performance_entries.py third_party/crossbench/crossbench/probes/profiling/browser_profiling.py third_party/crossbench/crossbench/probes/profiling/system_profiling.py third_party/crossbench/crossbench/probes/web_page_replay/recorder.py +third_party/crossbench/tests/crossbench/benchmarks/loading/config/test_login.py third_party/crossbench/tests/crossbench/benchmarks/loading/config/test_pages.py third_party/crossbench/tests/crossbench/benchmarks/loading/test_loading.py third_party/crossbench/tests/crossbench/probes/test_js.py @@ -7739,6 +7414,7 @@ third_party/dav1d/libdav1d/tools/input/parse.h third_party/dav1d/libdav1d/tools/input/section5.c third_party/dawn/.vscode/tasks.json third_party/dawn/CMakeLists.txt +third_party/dawn/generator/dawn_json_generator.py third_party/dawn/src/dawn/dawn.json third_party/dawn/src/dawn/native/CommandAllocator.cpp third_party/dawn/src/dawn/native/CopyTextureForBrowserHelper.cpp @@ -7792,6 +7468,7 @@ third_party/dawn/src/dawn/tests/white_box/SharedTextureMemoryTests_dmabuf.cpp third_party/dawn/src/dawn/tests/white_box/VulkanImageWrappingTests_DmaBuf.cpp third_party/dawn/src/dawn/utils/WindowsDebugLogger.cpp third_party/dawn/src/tint/lang/core/constant/eval_builtin_test.cc +third_party/dawn/src/tint/lang/hlsl/type/rasterizer_ordered_texture_2d.h third_party/dawn/src/tint/lang/hlsl/writer/ast_printer/ast_printer.cc third_party/dawn/src/tint/lang/hlsl/writer/printer/printer.cc third_party/dawn/src/tint/lang/spirv/reader/ast_parser/ast_parser.cc @@ -7998,11 +7675,13 @@ third_party/depot_tools/fetch_configs/skia_buildbot.py third_party/depot_tools/fetch_configs/syzygy.py third_party/depot_tools/fetch_configs/v8.py third_party/depot_tools/fetch_configs/web-workload.py +third_party/depot_tools/fetch_configs/webpagereplay.py third_party/depot_tools/fetch_configs/webrtc.py third_party/depot_tools/fetch_configs/website.py third_party/depot_tools/gclient.py third_party/depot_tools/gclient_scm.py third_party/depot_tools/gclient_utils.py +third_party/depot_tools/gerrit_client.py third_party/depot_tools/gerrit_util.py third_party/depot_tools/git_auth.py third_party/depot_tools/git_cache.py @@ -8292,23 +7971,29 @@ third_party/devtools-frontend/src/front_end/models/issues_manager/DeprecationIss third_party/devtools-frontend/src/front_end/models/issues_manager/GenericIssue.ts third_party/devtools-frontend/src/front_end/models/issues_manager/HeavyAdIssue.ts third_party/devtools-frontend/src/front_end/models/issues_manager/SharedArrayBufferIssue.ts +third_party/devtools-frontend/src/front_end/models/live-metrics/LiveMetrics.ts third_party/devtools-frontend/src/front_end/models/persistence/NetworkPersistenceManager.test.ts third_party/devtools-frontend/src/front_end/models/persistence/NetworkPersistenceManager.ts third_party/devtools-frontend/src/front_end/models/persistence/PersistenceImpl.test.ts third_party/devtools-frontend/src/front_end/models/trace/ModelImpl.test.ts +third_party/devtools-frontend/src/front_end/models/trace/extras/ThirdParties.test.ts +third_party/devtools-frontend/src/front_end/models/trace/extras/ThirdParties.ts third_party/devtools-frontend/src/front_end/models/trace/handlers/MetaHandler.test.ts third_party/devtools-frontend/src/front_end/models/trace/handlers/MetaHandler.ts third_party/devtools-frontend/src/front_end/models/trace/handlers/NetworkRequestsHandler.test.ts third_party/devtools-frontend/src/front_end/models/trace/handlers/UserInteractionsHandler.ts third_party/devtools-frontend/src/front_end/models/trace/handlers/UserTimingsHandler.ts third_party/devtools-frontend/src/front_end/models/trace/helpers/Trace.test.ts -third_party/devtools-frontend/src/front_end/models/trace/insights/CumulativeLayoutShift.ts +third_party/devtools-frontend/src/front_end/models/trace/insights/CLSCulprits.ts third_party/devtools-frontend/src/front_end/models/trace/insights/DocumentLatency.ts third_party/devtools-frontend/src/front_end/models/trace/insights/FontDisplay.test.ts +third_party/devtools-frontend/src/front_end/models/trace/insights/FontDisplay.ts third_party/devtools-frontend/src/front_end/models/trace/insights/InteractionToNextPaint.ts third_party/devtools-frontend/src/front_end/models/trace/insights/RenderBlocking.test.ts -third_party/devtools-frontend/src/front_end/models/trace/insights/ThirdPartyWeb.test.ts -third_party/devtools-frontend/src/front_end/models/trace/insights/ThirdPartyWeb.ts +third_party/devtools-frontend/src/front_end/models/trace/insights/SlowCSSSelector.ts +third_party/devtools-frontend/src/front_end/models/trace/insights/ThirdParties.test.ts +third_party/devtools-frontend/src/front_end/models/trace/insights/ThirdParties.ts +third_party/devtools-frontend/src/front_end/models/trace/insights/Viewport.ts third_party/devtools-frontend/src/front_end/models/trace/lantern/core/NetworkAnalyzer.test.ts third_party/devtools-frontend/src/front_end/models/trace/lantern/graph/NetworkNode.ts third_party/devtools-frontend/src/front_end/models/trace/lantern/graph/PageDependencyGraph.ts @@ -8338,7 +8023,6 @@ third_party/devtools-frontend/src/front_end/panels/application/preloading/compon third_party/devtools-frontend/src/front_end/panels/autofill/AutofillView.ts third_party/devtools-frontend/src/front_end/panels/console/ErrorStackParser.test.ts third_party/devtools-frontend/src/front_end/panels/css_overview/components/CSSOverviewStartView.ts -third_party/devtools-frontend/src/front_end/panels/elements/CSSRuleValidator.ts third_party/devtools-frontend/src/front_end/panels/elements/ElementStatePaneWidget.test.ts third_party/devtools-frontend/src/front_end/panels/elements/ElementStatePaneWidget.ts third_party/devtools-frontend/src/front_end/panels/elements/components/CSSPropertyDocsView.test.ts @@ -8346,8 +8030,10 @@ third_party/devtools-frontend/src/front_end/panels/emulation/DeviceModeToolbar.t third_party/devtools-frontend/src/front_end/panels/emulation/emulation-meta.ts third_party/devtools-frontend/src/front_end/panels/explain/components/ConsoleInsight.ts third_party/devtools-frontend/src/front_end/panels/freestyler/DrJonesFileAgent.ts +third_party/devtools-frontend/src/front_end/panels/freestyler/DrJonesPerformanceAgent.ts third_party/devtools-frontend/src/front_end/panels/freestyler/FreestylerPanel.ts -third_party/devtools-frontend/src/front_end/panels/freestyler/components/ProvideFeedback.ts +third_party/devtools-frontend/src/front_end/panels/freestyler/components/FreestylerChatUi.ts +third_party/devtools-frontend/src/front_end/panels/freestyler/components/UserActionRow.ts third_party/devtools-frontend/src/front_end/panels/freestyler/components/freestylerChatUi.css third_party/devtools-frontend/src/front_end/panels/issues/AffectedCookiesView.ts third_party/devtools-frontend/src/front_end/panels/issues/AffectedDirectivesView.ts @@ -8369,6 +8055,7 @@ third_party/devtools-frontend/src/front_end/panels/profiler/HeapSnapshotGridNode third_party/devtools-frontend/src/front_end/panels/recorder/RecorderController.ts third_party/devtools-frontend/src/front_end/panels/recorder/components/CreateRecordingView.ts third_party/devtools-frontend/src/front_end/panels/recorder/components/StartView.ts +third_party/devtools-frontend/src/front_end/panels/security/CookieReportView.ts third_party/devtools-frontend/src/front_end/panels/settings/AISettingsTab.ts third_party/devtools-frontend/src/front_end/panels/settings/FrameworkIgnoreListSettingsTab.ts third_party/devtools-frontend/src/front_end/panels/settings/KeybindsSettingsTab.ts @@ -8390,17 +8077,14 @@ third_party/devtools-frontend/src/front_end/panels/timeline/TimelineTreeView.tes third_party/devtools-frontend/src/front_end/panels/timeline/TimelineUIUtils.test.ts third_party/devtools-frontend/src/front_end/panels/timeline/TimingsTrackAppender.ts third_party/devtools-frontend/src/front_end/panels/timeline/components/DetailsView.ts -third_party/devtools-frontend/src/front_end/panels/timeline/components/EntryStyles.ts third_party/devtools-frontend/src/front_end/panels/timeline/components/FieldSettingsDialog.test.ts third_party/devtools-frontend/src/front_end/panels/timeline/components/FieldSettingsDialog.ts third_party/devtools-frontend/src/front_end/panels/timeline/components/LiveMetricsView.ts third_party/devtools-frontend/src/front_end/panels/timeline/components/SidebarInsightsTab.test.ts -third_party/devtools-frontend/src/front_end/panels/timeline/components/insights/FontDisplay.ts -third_party/devtools-frontend/src/front_end/panels/timeline/components/insights/SlowCSSSelector.ts -third_party/devtools-frontend/src/front_end/panels/timeline/components/insights/ThirdParties.ts -third_party/devtools-frontend/src/front_end/panels/timeline/components/insights/Viewport.ts third_party/devtools-frontend/src/front_end/panels/timeline/overlays/components/EntriesLinkOverlay.ts third_party/devtools-frontend/src/front_end/panels/timeline/track_appenders/ThreadAppender.test.ts +third_party/devtools-frontend/src/front_end/panels/timeline/utils/AICallTree.test.ts +third_party/devtools-frontend/src/front_end/panels/timeline/utils/EntryStyles.ts third_party/devtools-frontend/src/front_end/panels/timeline/utils/Helpers.test.ts third_party/devtools-frontend/src/front_end/panels/webauthn/WebauthnPane.ts third_party/devtools-frontend/src/front_end/services/tracing/PerformanceTracing.ts @@ -8632,6 +8316,7 @@ third_party/devtools-frontend/src/front_end/ui/legacy/SearchableView.ts third_party/devtools-frontend/src/front_end/ui/legacy/UIUtils.test.ts third_party/devtools-frontend/src/front_end/ui/legacy/UIUtils.ts third_party/devtools-frontend/src/front_end/ui/legacy/components/object_ui/CustomPreviewComponent.ts +third_party/devtools-frontend/src/front_end/ui/legacy/components/perf_ui/FlameChart.ts third_party/devtools-frontend/src/front_end/ui/legacy/components/utils/JSPresentationUtils.test.ts third_party/devtools-frontend/src/front_end/ui/legacy/components/utils/Linkifier.test.ts third_party/devtools-frontend/src/front_end/ui/legacy/themeColors.css @@ -8676,9 +8361,13 @@ third_party/devtools-frontend/src/node_modules/@puppeteer/browsers/src/browser-d third_party/devtools-frontend/src/node_modules/@puppeteer/browsers/src/browser-data/chromium.ts third_party/devtools-frontend/src/node_modules/@puppeteer/browsers/src/browser-data/firefox.ts third_party/devtools-frontend/src/node_modules/@puppeteer/browsers/src/install.ts -third_party/devtools-frontend/src/node_modules/@rollup/plugin-node-resolve/node_modules/@rollup/pluginutils/package.json third_party/devtools-frontend/src/node_modules/@rollup/plugin-node-resolve/package.json +third_party/devtools-frontend/src/node_modules/@rollup/plugin-terser/package.json third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/package.json +third_party/devtools-frontend/src/node_modules/@rollup/wasm-node/dist/es/shared/node-entry.js +third_party/devtools-frontend/src/node_modules/@rollup/wasm-node/dist/es/shared/watch.js +third_party/devtools-frontend/src/node_modules/@rollup/wasm-node/dist/shared/index.js +third_party/devtools-frontend/src/node_modules/@rollup/wasm-node/dist/shared/rollup.js third_party/devtools-frontend/src/node_modules/@sinonjs/commons/lib/prototypes/throws-on-proto.js third_party/devtools-frontend/src/node_modules/@sinonjs/commons/types/prototypes/throws-on-proto.d.ts third_party/devtools-frontend/src/node_modules/@sinonjs/samsam/lib/create-set.js @@ -8732,6 +8421,8 @@ third_party/devtools-frontend/src/node_modules/@types/node/wasi.d.ts third_party/devtools-frontend/src/node_modules/@types/node/worker_threads.d.ts third_party/devtools-frontend/src/node_modules/@vscode/web-custom-data/data/browsers.css-data.json third_party/devtools-frontend/src/node_modules/@vscode/web-custom-data/data/browsers.html-data.json +third_party/devtools-frontend/src/node_modules/@web/rollup-plugin-import-meta-assets/node_modules/globby/package.json +third_party/devtools-frontend/src/node_modules/@web/rollup-plugin-import-meta-assets/node_modules/slash/package.json third_party/devtools-frontend/src/node_modules/acorn/dist/acorn.js third_party/devtools-frontend/src/node_modules/acorn/package.json third_party/devtools-frontend/src/node_modules/ajv/dist/ajv.bundle.js @@ -8745,8 +8436,6 @@ third_party/devtools-frontend/src/node_modules/array.prototype.flat/package.json third_party/devtools-frontend/src/node_modules/arrify/package.json third_party/devtools-frontend/src/node_modules/asap/browser-raw.js third_party/devtools-frontend/src/node_modules/astral-regex/package.json -third_party/devtools-frontend/src/node_modules/atob/bower.json -third_party/devtools-frontend/src/node_modules/atob/package.json third_party/devtools-frontend/src/node_modules/axe-core/axe.js third_party/devtools-frontend/src/node_modules/axe-core/axe.min.js third_party/devtools-frontend/src/node_modules/axobject-query/package.json @@ -8779,6 +8468,8 @@ third_party/devtools-frontend/src/node_modules/chromium-bidi/lib/cjs/bidiMapper/ third_party/devtools-frontend/src/node_modules/chromium-bidi/lib/cjs/bidiMapper/modules/storage/StorageProcessor.js third_party/devtools-frontend/src/node_modules/chromium-bidi/lib/cjs/utils/uuid.js third_party/devtools-frontend/src/node_modules/chromium-bidi/lib/iife/mapperTab.js +third_party/devtools-frontend/src/node_modules/cliui/node_modules/ansi-regex/package.json +third_party/devtools-frontend/src/node_modules/cliui/node_modules/strip-ansi/package.json third_party/devtools-frontend/src/node_modules/clone-regexp/index.d.ts third_party/devtools-frontend/src/node_modules/clone-regexp/package.json third_party/devtools-frontend/src/node_modules/clone/package.json @@ -8822,7 +8513,7 @@ third_party/devtools-frontend/src/node_modules/debug/src/browser.js third_party/devtools-frontend/src/node_modules/decamelize-keys/node_modules/map-obj/package.json third_party/devtools-frontend/src/node_modules/decamelize-keys/package.json third_party/devtools-frontend/src/node_modules/decamelize/package.json -third_party/devtools-frontend/src/node_modules/decode-uri-component/package.json +third_party/devtools-frontend/src/node_modules/define-data-property/package.json third_party/devtools-frontend/src/node_modules/degenerator/node_modules/escodegen/bin/escodegen.js third_party/devtools-frontend/src/node_modules/degenerator/node_modules/escodegen/bin/esgenerate.js third_party/devtools-frontend/src/node_modules/degenerator/node_modules/escodegen/escodegen.js @@ -8859,6 +8550,8 @@ third_party/devtools-frontend/src/node_modules/engine.io/build/transports/webtra third_party/devtools-frontend/src/node_modules/engine.io/package.json third_party/devtools-frontend/src/node_modules/error-ex/package.json third_party/devtools-frontend/src/node_modules/es-abstract/package.json +third_party/devtools-frontend/src/node_modules/es-define-property/package.json +third_party/devtools-frontend/src/node_modules/es-errors/package.json third_party/devtools-frontend/src/node_modules/es-to-primitive/package.json third_party/devtools-frontend/src/node_modules/escalade/package.json third_party/devtools-frontend/src/node_modules/escape-string-regexp/package.json @@ -8947,6 +8640,7 @@ third_party/devtools-frontend/src/node_modules/esutils/lib/keyword.js third_party/devtools-frontend/src/node_modules/esutils/lib/utils.js third_party/devtools-frontend/src/node_modules/esutils/package.json third_party/devtools-frontend/src/node_modules/execall/package.json +third_party/devtools-frontend/src/node_modules/fast-glob/out/utils/path.js third_party/devtools-frontend/src/node_modules/fast-uri/package.json third_party/devtools-frontend/src/node_modules/fast-uri/test/uri-js.test.js third_party/devtools-frontend/src/node_modules/fd-slicer/package.json @@ -8970,12 +8664,16 @@ third_party/devtools-frontend/src/node_modules/glob-parent/package.json third_party/devtools-frontend/src/node_modules/globals/package.json third_party/devtools-frontend/src/node_modules/globby/node_modules/slash/package.json third_party/devtools-frontend/src/node_modules/globby/package.json +third_party/devtools-frontend/src/node_modules/gopd/package.json third_party/devtools-frontend/src/node_modules/hard-rejection/package.json third_party/devtools-frontend/src/node_modules/has-bigints/package.json third_party/devtools-frontend/src/node_modules/has-flag/package.json +third_party/devtools-frontend/src/node_modules/has-property-descriptors/package.json +third_party/devtools-frontend/src/node_modules/has-proto/package.json third_party/devtools-frontend/src/node_modules/has-symbols/package.json third_party/devtools-frontend/src/node_modules/has-tostringtag/package.json third_party/devtools-frontend/src/node_modules/has/package.json +third_party/devtools-frontend/src/node_modules/hasown/package.json third_party/devtools-frontend/src/node_modules/html-tags/package.json third_party/devtools-frontend/src/node_modules/http-proxy/package.json third_party/devtools-frontend/src/node_modules/iconv-lite/encodings/dbcs-data.js @@ -9008,8 +8706,6 @@ third_party/devtools-frontend/src/node_modules/is-weakref/package.json third_party/devtools-frontend/src/node_modules/isbinaryfile/package.json third_party/devtools-frontend/src/node_modules/istanbul-lib-report/node_modules/has-flag/package.json third_party/devtools-frontend/src/node_modules/istanbul-lib-report/node_modules/supports-color/package.json -third_party/devtools-frontend/src/node_modules/jest-worker/node_modules/has-flag/package.json -third_party/devtools-frontend/src/node_modules/jest-worker/node_modules/supports-color/package.json third_party/devtools-frontend/src/node_modules/js-yaml/package.json third_party/devtools-frontend/src/node_modules/json5/package.json third_party/devtools-frontend/src/node_modules/jsonfile/package.json @@ -9051,6 +8747,8 @@ third_party/devtools-frontend/src/node_modules/log-symbols/node_modules/has-flag third_party/devtools-frontend/src/node_modules/log-symbols/node_modules/supports-color/package.json third_party/devtools-frontend/src/node_modules/log-symbols/package.json third_party/devtools-frontend/src/node_modules/log4js/package.json +third_party/devtools-frontend/src/node_modules/magic-string/dist/magic-string.cjs.js +third_party/devtools-frontend/src/node_modules/magic-string/dist/magic-string.umd.js third_party/devtools-frontend/src/node_modules/make-dir/package.json third_party/devtools-frontend/src/node_modules/map-obj/package.json third_party/devtools-frontend/src/node_modules/mathml-tag-names/package.json @@ -9281,13 +8979,12 @@ third_party/devtools-frontend/src/node_modules/requireindex/package.json third_party/devtools-frontend/src/node_modules/requires-port/test.js third_party/devtools-frontend/src/node_modules/resolve-from/package.json third_party/devtools-frontend/src/node_modules/resolve/lib/caller.js -third_party/devtools-frontend/src/node_modules/rollup-plugin-sourcemaps/node_modules/@rollup/pluginutils/package.json -third_party/devtools-frontend/src/node_modules/rollup-plugin-sourcemaps/package.json -third_party/devtools-frontend/src/node_modules/rollup/dist/es/shared/rollup.js +third_party/devtools-frontend/src/node_modules/rollup/dist/es/shared/node-entry.js third_party/devtools-frontend/src/node_modules/rollup/dist/es/shared/watch.js third_party/devtools-frontend/src/node_modules/rollup/dist/shared/index.js third_party/devtools-frontend/src/node_modules/rollup/dist/shared/rollup.js third_party/devtools-frontend/src/node_modules/safer-buffer/package.json +third_party/devtools-frontend/src/node_modules/set-function-length/package.json third_party/devtools-frontend/src/node_modules/shebang-command/package.json third_party/devtools-frontend/src/node_modules/shebang-regex/package.json third_party/devtools-frontend/src/node_modules/side-channel/package.json @@ -9345,6 +9042,7 @@ third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ansi-regex third_party/devtools-frontend/src/node_modules/stylelint/node_modules/resolve-from/package.json third_party/devtools-frontend/src/node_modules/stylelint/node_modules/strip-ansi/package.json third_party/devtools-frontend/src/node_modules/supports-color/package.json +third_party/devtools-frontend/src/node_modules/supports-preserve-symlinks-flag/package.json third_party/devtools-frontend/src/node_modules/svg-tags/package.json third_party/devtools-frontend/src/node_modules/svgo/dist/svgo.browser.js third_party/devtools-frontend/src/node_modules/svgo/plugins/_collections.js @@ -9473,6 +9171,11 @@ third_party/devtools-frontend/src/node_modules/workerpool/dist/workerpool.js third_party/devtools-frontend/src/node_modules/workerpool/dist/workerpool.min.js.LICENSE.txt third_party/devtools-frontend/src/node_modules/workerpool/package.json third_party/devtools-frontend/src/node_modules/workerpool/src/header.js +third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/ansi-regex/package.json +third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/ansi-styles/package.json +third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/color-convert/package.json +third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/color-name/package.json +third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/strip-ansi/package.json third_party/devtools-frontend/src/node_modules/wrap-ansi/package.json third_party/devtools-frontend/src/node_modules/ws/package.json third_party/devtools-frontend/src/node_modules/y18n/package.json @@ -9493,6 +9196,7 @@ third_party/devtools-frontend/src/test/conductor/resultsdb.ts third_party/devtools-frontend/src/test/e2e/application/reporting-api_test.ts third_party/devtools-frontend/src/test/e2e/console/console-message-format_test.ts third_party/devtools-frontend/src/test/e2e/console/console-truncate-long-messages_test.ts +third_party/devtools-frontend/src/test/e2e/issues/heavy-ad-issues_test.ts third_party/devtools-frontend/src/test/e2e/lighthouse/devtools-settings_test.ts third_party/devtools-frontend/src/test/e2e/lighthouse/navigation_test.ts third_party/devtools-frontend/src/test/e2e/lighthouse/snapshot_test.ts @@ -10546,6 +10250,7 @@ third_party/ffmpeg/libavfilter/f_ebur128.c third_party/ffmpeg/libavfilter/gradfun.h third_party/ffmpeg/libavfilter/motion_estimation.c third_party/ffmpeg/libavfilter/motion_estimation.h +third_party/ffmpeg/libavfilter/psnr.c third_party/ffmpeg/libavfilter/psnr.h third_party/ffmpeg/libavfilter/ssim.h third_party/ffmpeg/libavfilter/vf_bwdif.c @@ -11236,9 +10941,6 @@ third_party/harfbuzz-ng/src/src/hb-style.h third_party/harfbuzz-ng/src/src/hb-subset-cff-common.hh third_party/harfbuzz-ng/src/src/hb-unicode.hh third_party/harfbuzz-ng/src/src/hb.hh -third_party/harfbuzz-ng/src/test/api/hb-test.h -third_party/harfbuzz-ng/src/test/api/test-draw.c -third_party/harfbuzz-ng/src/test/api/test-ot-tag.c third_party/highway/src/.bcr/metadata.template.json third_party/highway/src/hwy/stats.h third_party/hunspell/src/hunspell/affentry.cxx @@ -11692,6 +11394,7 @@ third_party/libyuv/tools_libyuv/autoroller/unittests/roll_deps_test.py third_party/libzip/src/lib/zip_crypto_win.c third_party/libzip/src/lib/zip_extra_field.c third_party/lit/v3_0/BUILD.gn +third_party/llvm-libc/src/src/__support/macros/properties/compiler.h third_party/lottie/lottie_worker.js third_party/mako/mako/test/templates/internationalization.html third_party/material_web_components/components-chromium/node_modules/@lit/reactive-element/decorators/event-options.d.ts @@ -11817,7 +11520,6 @@ third_party/nearby/src/sharing/android/example/app/src/main/res/xml/data_extract third_party/nearby/src/sharing/contacts/nearby_share_contact_manager_impl_test.cc third_party/nearby/src/sharing/contacts/nearby_share_contacts_sorter_test.cc third_party/nearby/src/sharing/local_device_data/nearby_share_local_device_data_manager_impl_test.cc -third_party/nearby/src/sharing/nearby_share_profile_info_provider_impl_test.cc third_party/nearby/src/sharing/nearby_sharing_service.h third_party/nearby/src/sharing/text_attachment_test.cc third_party/node/node_modules/@aashutoshrathi/word-wrap/package.json @@ -11898,6 +11600,7 @@ third_party/node/node_modules/esutils/lib/keyword.js third_party/node/node_modules/esutils/lib/utils.js third_party/node/node_modules/esutils/package.json third_party/node/node_modules/fast-glob/node_modules/glob-parent/package.json +third_party/node/node_modules/fast-glob/out/utils/path.js third_party/node/node_modules/find-up/package.json third_party/node/node_modules/glob-parent/package.json third_party/node/node_modules/html-minifier/package.json @@ -12060,7 +11763,6 @@ third_party/openscreen/src/discovery/mdns/impl/mdns_probe_unittest.cc third_party/openscreen/src/discovery/mdns/impl/mdns_responder.cc third_party/openscreen/src/discovery/mdns/public/mdns_reader.cc third_party/openscreen/src/discovery/public/dns_sd_service_watcher.h -third_party/openscreen/src/osp/impl/message_demuxer.cc third_party/openscreen/src/osp/impl/quic/certificates/quic_agent_certificate.cc third_party/openscreen/src/platform/impl/tls_connection_factory_posix.cc third_party/openscreen/src/platform/impl/tls_connection_posix.cc @@ -12599,6 +12301,7 @@ third_party/pefile_py3/pefile.py third_party/perfetto/gn/standalone/BUILD.gn third_party/perfetto/gn/standalone/toolchain/msvc.gni third_party/perfetto/include/perfetto/base/build_config.h +third_party/perfetto/include/perfetto/base/thread_annotations.h third_party/perfetto/include/perfetto/ext/base/unix_socket.h third_party/perfetto/include/perfetto/protozero/proto_utils.h third_party/perfetto/include/perfetto/public/te_category_macros.h @@ -12694,8 +12397,8 @@ third_party/perfetto/ui/src/common/recordingV2/target_factories/android_websocke third_party/perfetto/ui/src/common/recordingV2/targets/android_target.ts third_party/perfetto/ui/src/controller/adb.ts third_party/perfetto/ui/src/controller/chrome_proxy_record_controller.ts +third_party/perfetto/ui/src/core/analytics_impl.ts third_party/perfetto/ui/src/core_plugins/example_traces/index.ts -third_party/perfetto/ui/src/frontend/analytics.ts third_party/perfetto/ui/src/frontend/cookie_consent.ts third_party/perfetto/ui/src/frontend/css_constants.ts third_party/perfetto/ui/src/frontend/error_dialog.ts @@ -12708,9 +12411,9 @@ third_party/perfetto/ui/src/frontend/post_message_handler.ts third_party/perfetto/ui/src/frontend/post_message_handler_unittest.ts third_party/perfetto/ui/src/frontend/record_page.ts third_party/perfetto/ui/src/frontend/sidebar.ts -third_party/perfetto/ui/src/frontend/trace_info_page.ts third_party/perfetto/ui/src/frontend/trace_url_handler.ts third_party/perfetto/ui/src/open_perfetto_trace/index.html +third_party/perfetto/ui/src/plugins/dev.perfetto.TraceInfoPage/trace_info_page.ts third_party/perfetto/ui/src/trace_processor/engine.ts third_party/perfetto/ui/src/widgets/hotkey_context.ts third_party/polymer/v3_0/BUILD.gn @@ -13495,6 +13198,7 @@ third_party/rust/PRESUBMIT.py third_party/rust/adler2/v2/BUILD.gn third_party/rust/aho_corasick/v1/BUILD.gn third_party/rust/anyhow/v1/BUILD.gn +third_party/rust/bstr/v1/BUILD.gn third_party/rust/bytemuck/v1/BUILD.gn third_party/rust/bytemuck_derive/v1/BUILD.gn third_party/rust/byteorder/v1/BUILD.gn @@ -13508,8 +13212,8 @@ third_party/rust/lazy_static/v1/BUILD.gn third_party/rust/memchr/v2/BUILD.gn third_party/rust/miniz_oxide/v0_8/BUILD.gn third_party/rust/proc_macro2/v1/BUILD.gn -third_party/rust/prost/v0_12/BUILD.gn -third_party/rust/prost_derive/v0_12/BUILD.gn +third_party/rust/prost/v0_13/BUILD.gn +third_party/rust/prost_derive/v0_13/BUILD.gn third_party/rust/qr_code/v2/BUILD.gn third_party/rust/quote/v1/BUILD.gn third_party/rust/regex/v1/BUILD.gn @@ -13570,6 +13274,7 @@ third_party/skia/demos.skia.org/demos/web_worker/worker.js third_party/skia/demos.skia.org/demos/webgpu/index.html third_party/skia/example/external_client/src/ganesh_gl.cpp third_party/skia/example/external_client/src/gl_context_helper.mm +third_party/skia/experimental/rust_png/impl/SkPngRustCodec.cpp third_party/skia/experimental/tools/pdf-comparison.py third_party/skia/fuzz/FuzzPathop.cpp third_party/skia/gm/addarc.cpp @@ -13709,6 +13414,7 @@ third_party/skia/src/gpu/ganesh/gl/GrGLGpu.cpp third_party/skia/src/gpu/ganesh/vk/GrVkCaps.cpp third_party/skia/src/gpu/graphite/Device.cpp third_party/skia/src/gpu/graphite/dawn/DawnCommandBuffer.cpp +third_party/skia/src/gpu/graphite/dawn/DawnResourceProvider.cpp third_party/skia/src/gpu/graphite/render/AnalyticRRectRenderStep.cpp third_party/skia/src/gpu/graphite/render/PerEdgeAAQuadRenderStep.cpp third_party/skia/src/gpu/tessellate/Tessellation.cpp @@ -14233,6 +13939,7 @@ third_party/vulkan-tools/src/scripts/vulkan_tools_helper_file_generator.py third_party/vulkan-tools/src/windows-runtime-installer/VulkanRT-License.txt third_party/vulkan-utility-libraries/src/scripts/gn/gn.py third_party/vulkan-validation-layers/src/layers/external/xxhash.h +third_party/vulkan-validation-layers/src/layers/gpu/debug_printf/debug_printf.cpp third_party/vulkan-validation-layers/src/scripts/android.py third_party/vulkan-validation-layers/src/scripts/gn/gn.py third_party/wayland-protocols/gtk/.gitlab-ci/pages/fonts.css @@ -14288,295 +13995,6 @@ third_party/webdriver/pylib/test/selenium/webdriver/common/example2.py third_party/webdriver/pylib/test/selenium/webdriver/common/select_class_tests.py third_party/webdriver/pylib/test/selenium/webdriver/common/typing_tests.py third_party/webdriver/pylib/test/selenium/webdriver/common/webdriverwait_tests.py -third_party/webgl/src/conformance-suites/1.0.0/conformance/more/all_tests.html -third_party/webgl/src/conformance-suites/1.0.0/conformance/more/all_tests_linkonly.html -third_party/webgl/src/conformance-suites/1.0.0/conformance/more/all_tests_sequential.html -third_party/webgl/src/conformance-suites/1.0.0/conformance/more/conformance/badArgsArityLessThanArgc.html -third_party/webgl/src/conformance-suites/1.0.0/conformance/more/conformance/constants.html -third_party/webgl/src/conformance-suites/1.0.0/conformance/more/conformance/methods.html -third_party/webgl/src/conformance-suites/1.0.0/conformance/more/functions/bindBuffer.html -third_party/webgl/src/conformance-suites/1.0.0/conformance/more/functions/bindBufferBadArgs.html -third_party/webgl/src/conformance-suites/1.0.0/conformance/more/functions/copyTexImage2D.html -third_party/webgl/src/conformance-suites/1.0.0/conformance/more/functions/copyTexImage2DBadArgs.html -third_party/webgl/src/conformance-suites/1.0.0/conformance/more/functions/copyTexSubImage2D.html -third_party/webgl/src/conformance-suites/1.0.0/conformance/more/functions/copyTexSubImage2DBadArgs.html -third_party/webgl/src/conformance-suites/1.0.0/conformance/more/functions/drawArrays.html -third_party/webgl/src/conformance-suites/1.0.0/conformance/more/functions/drawArraysOutOfBounds.html -third_party/webgl/src/conformance-suites/1.0.0/conformance/more/functions/drawElements.html -third_party/webgl/src/conformance-suites/1.0.0/conformance/more/functions/drawElementsBadArgs.html -third_party/webgl/src/conformance-suites/1.0.0/conformance/more/functions/isTests.html -third_party/webgl/src/conformance-suites/1.0.0/conformance/more/functions/readPixels.html -third_party/webgl/src/conformance-suites/1.0.0/conformance/more/functions/readPixelsBadArgs.html -third_party/webgl/src/conformance-suites/1.0.0/conformance/more/functions/texImage2D.html -third_party/webgl/src/conformance-suites/1.0.0/conformance/more/functions/texImage2DBadArgs.html -third_party/webgl/src/conformance-suites/1.0.0/conformance/more/functions/texImage2DHTML.html -third_party/webgl/src/conformance-suites/1.0.0/conformance/more/functions/texSubImage2D.html -third_party/webgl/src/conformance-suites/1.0.0/conformance/more/functions/texSubImage2DBadArgs.html -third_party/webgl/src/conformance-suites/1.0.0/conformance/more/functions/texSubImage2DHTML.html -third_party/webgl/src/conformance-suites/1.0.0/conformance/more/functions/vertexAttrib.html -third_party/webgl/src/conformance-suites/1.0.0/conformance/more/functions/vertexAttribBadArgs.html -third_party/webgl/src/conformance-suites/1.0.0/conformance/more/functions/vertexAttribPointer.html -third_party/webgl/src/conformance-suites/1.0.0/conformance/more/functions/vertexAttribPointerBadArgs.html -third_party/webgl/src/conformance-suites/1.0.0/conformance/more/glsl/arrayOutOfBounds.html -third_party/webgl/src/conformance-suites/1.0.0/conformance/more/glsl/longLoops.html -third_party/webgl/src/conformance-suites/1.0.0/conformance/more/glsl/uniformOutOfBounds.html -third_party/webgl/src/conformance-suites/1.0.0/conformance/more/glsl/unusedAttribsUniforms.html -third_party/webgl/src/conformance-suites/1.0.0/conformance/more/index.html -third_party/webgl/src/conformance-suites/1.0.0/conformance/more/performance/CPUvsGPU.html -third_party/webgl/src/conformance-suites/1.0.0/conformance/more/performance/bandwidth.html -third_party/webgl/src/conformance-suites/1.0.0/conformance/more/unit.css -third_party/webgl/src/conformance-suites/1.0.0/conformance/more/unit.js -third_party/webgl/src/conformance-suites/1.0.0/conformance/more/util.js -third_party/webgl/src/conformance-suites/1.0.1/conformance/more/all_tests.html -third_party/webgl/src/conformance-suites/1.0.1/conformance/more/all_tests_linkonly.html -third_party/webgl/src/conformance-suites/1.0.1/conformance/more/all_tests_sequential.html -third_party/webgl/src/conformance-suites/1.0.1/conformance/more/conformance/badArgsArityLessThanArgc.html -third_party/webgl/src/conformance-suites/1.0.1/conformance/more/conformance/constants.html -third_party/webgl/src/conformance-suites/1.0.1/conformance/more/conformance/methods.html -third_party/webgl/src/conformance-suites/1.0.1/conformance/more/functions/bindBuffer.html -third_party/webgl/src/conformance-suites/1.0.1/conformance/more/functions/bindBufferBadArgs.html -third_party/webgl/src/conformance-suites/1.0.1/conformance/more/functions/copyTexImage2D.html -third_party/webgl/src/conformance-suites/1.0.1/conformance/more/functions/copyTexImage2DBadArgs.html -third_party/webgl/src/conformance-suites/1.0.1/conformance/more/functions/copyTexSubImage2D.html -third_party/webgl/src/conformance-suites/1.0.1/conformance/more/functions/copyTexSubImage2DBadArgs.html -third_party/webgl/src/conformance-suites/1.0.1/conformance/more/functions/drawArrays.html -third_party/webgl/src/conformance-suites/1.0.1/conformance/more/functions/drawArraysOutOfBounds.html -third_party/webgl/src/conformance-suites/1.0.1/conformance/more/functions/drawElements.html -third_party/webgl/src/conformance-suites/1.0.1/conformance/more/functions/drawElementsBadArgs.html -third_party/webgl/src/conformance-suites/1.0.1/conformance/more/functions/isTests.html -third_party/webgl/src/conformance-suites/1.0.1/conformance/more/functions/readPixels.html -third_party/webgl/src/conformance-suites/1.0.1/conformance/more/functions/readPixelsBadArgs.html -third_party/webgl/src/conformance-suites/1.0.1/conformance/more/functions/texImage2D.html -third_party/webgl/src/conformance-suites/1.0.1/conformance/more/functions/texImage2DBadArgs.html -third_party/webgl/src/conformance-suites/1.0.1/conformance/more/functions/texImage2DHTML.html -third_party/webgl/src/conformance-suites/1.0.1/conformance/more/functions/texSubImage2D.html -third_party/webgl/src/conformance-suites/1.0.1/conformance/more/functions/texSubImage2DBadArgs.html -third_party/webgl/src/conformance-suites/1.0.1/conformance/more/functions/texSubImage2DHTML.html -third_party/webgl/src/conformance-suites/1.0.1/conformance/more/functions/vertexAttrib.html -third_party/webgl/src/conformance-suites/1.0.1/conformance/more/functions/vertexAttribBadArgs.html -third_party/webgl/src/conformance-suites/1.0.1/conformance/more/functions/vertexAttribPointer.html -third_party/webgl/src/conformance-suites/1.0.1/conformance/more/functions/vertexAttribPointerBadArgs.html -third_party/webgl/src/conformance-suites/1.0.1/conformance/more/glsl/arrayOutOfBounds.html -third_party/webgl/src/conformance-suites/1.0.1/conformance/more/glsl/longLoops.html -third_party/webgl/src/conformance-suites/1.0.1/conformance/more/glsl/uniformOutOfBounds.html -third_party/webgl/src/conformance-suites/1.0.1/conformance/more/glsl/unusedAttribsUniforms.html -third_party/webgl/src/conformance-suites/1.0.1/conformance/more/index.html -third_party/webgl/src/conformance-suites/1.0.1/conformance/more/performance/CPUvsGPU.html -third_party/webgl/src/conformance-suites/1.0.1/conformance/more/performance/bandwidth.html -third_party/webgl/src/conformance-suites/1.0.1/conformance/more/unit.css -third_party/webgl/src/conformance-suites/1.0.1/conformance/more/unit.js -third_party/webgl/src/conformance-suites/1.0.1/conformance/more/util.js -third_party/webgl/src/conformance-suites/1.0.1/conformance/resources/webgl-test-utils.js -third_party/webgl/src/conformance-suites/1.0.1/resources/webgl-test-harness.js -third_party/webgl/src/conformance-suites/1.0.2/conformance/extensions/ext-texture-filter-anisotropic.html -third_party/webgl/src/conformance-suites/1.0.2/conformance/more/index.html -third_party/webgl/src/conformance-suites/1.0.2/conformance/more/unit.css -third_party/webgl/src/conformance-suites/1.0.2/conformance/resources/webgl-test-utils.js -third_party/webgl/src/conformance-suites/1.0.2/resources/webgl-test-harness.js -third_party/webgl/src/conformance-suites/1.0.3/conformance/extensions/angle-instanced-arrays.html -third_party/webgl/src/conformance-suites/1.0.3/conformance/extensions/ext-texture-filter-anisotropic.html -third_party/webgl/src/conformance-suites/1.0.3/conformance/glsl/bugs/conditional-discard-in-loop.html -third_party/webgl/src/conformance-suites/1.0.3/conformance/glsl/bugs/conditional-discard-optimization.html -third_party/webgl/src/conformance-suites/1.0.3/conformance/glsl/bugs/floored-division-accuracy.html -third_party/webgl/src/conformance-suites/1.0.3/conformance/glsl/bugs/modulo-arithmetic-accuracy.html -third_party/webgl/src/conformance-suites/1.0.3/conformance/glsl/bugs/multiplication-assignment.html -third_party/webgl/src/conformance-suites/1.0.3/conformance/more/index.html -third_party/webgl/src/conformance-suites/1.0.3/conformance/more/unit.css -third_party/webgl/src/conformance-suites/1.0.3/conformance/rendering/multisample-corruption.html -third_party/webgl/src/conformance-suites/1.0.3/conformance/resources/webgl-test-utils.js -third_party/webgl/src/conformance-suites/1.0.3/conformance/textures/texture-fakeblack.html -third_party/webgl/src/conformance-suites/1.0.3/resources/cookies.js -third_party/webgl/src/conformance-suites/1.0.3/resources/webgl-test-harness.js -third_party/webgl/src/conformance-suites/2.0.0/closure-library/README-Khronos.txt -third_party/webgl/src/conformance-suites/2.0.0/closure-library/closure/bin/build/closurebuilder.py -third_party/webgl/src/conformance-suites/2.0.0/closure-library/closure/bin/build/depstree.py -third_party/webgl/src/conformance-suites/2.0.0/closure-library/closure/bin/build/depswriter.py -third_party/webgl/src/conformance-suites/2.0.0/closure-library/closure/bin/build/jscompiler.py -third_party/webgl/src/conformance-suites/2.0.0/closure-library/closure/bin/build/source.py -third_party/webgl/src/conformance-suites/2.0.0/closure-library/closure/bin/build/treescan.py -third_party/webgl/src/conformance-suites/2.0.0/closure-library/closure/bin/scopify.py -third_party/webgl/src/conformance-suites/2.0.0/closure-library/closure/goog/base.js -third_party/webgl/src/conformance-suites/2.0.0/conformance/attribs/gl-bindAttribLocation-repeated.html -third_party/webgl/src/conformance-suites/2.0.0/conformance/extensions/angle-instanced-arrays.html -third_party/webgl/src/conformance-suites/2.0.0/conformance/extensions/ext-texture-filter-anisotropic.html -third_party/webgl/src/conformance-suites/2.0.0/conformance/glsl/bugs/conditional-discard-in-loop.html -third_party/webgl/src/conformance-suites/2.0.0/conformance/glsl/bugs/conditional-discard-optimization.html -third_party/webgl/src/conformance-suites/2.0.0/conformance/glsl/bugs/floor-div-cos-should-not-truncate.html -third_party/webgl/src/conformance-suites/2.0.0/conformance/glsl/bugs/floored-division-accuracy.html -third_party/webgl/src/conformance-suites/2.0.0/conformance/glsl/bugs/loop-if-loop-gradient.html -third_party/webgl/src/conformance-suites/2.0.0/conformance/glsl/bugs/modulo-arithmetic-accuracy.html -third_party/webgl/src/conformance-suites/2.0.0/conformance/glsl/bugs/multiplication-assignment.html -third_party/webgl/src/conformance-suites/2.0.0/conformance/glsl/bugs/qualcomm-crash.html -third_party/webgl/src/conformance-suites/2.0.0/conformance/glsl/bugs/qualcomm-loop-with-continue-crash.html -third_party/webgl/src/conformance-suites/2.0.0/conformance/glsl/bugs/sketchfab-lighting-shader-crash.html -third_party/webgl/src/conformance-suites/2.0.0/conformance/more/index.html -third_party/webgl/src/conformance-suites/2.0.0/conformance/more/unit.css -third_party/webgl/src/conformance-suites/2.0.0/conformance/rendering/multisample-corruption.html -third_party/webgl/src/conformance-suites/2.0.0/conformance/textures/misc/texture-cube-as-fbo-attachment.html -third_party/webgl/src/conformance-suites/2.0.0/conformance/textures/misc/texture-fakeblack.html -third_party/webgl/src/conformance-suites/2.0.0/conformance2/misc/getextension-while-pbo-bound-stability.html -third_party/webgl/src/conformance-suites/2.0.0/conformance2/rendering/canvas-resizing-with-pbo-bound.html -third_party/webgl/src/conformance-suites/2.0.0/conformance2/textures/misc/tex-image-with-bad-args.html -third_party/webgl/src/conformance-suites/2.0.0/deqp/framework/common/tcuSkipList.js -third_party/webgl/src/conformance-suites/2.0.0/deqp/temp_externs/chrome.js -third_party/webgl/src/conformance-suites/2.0.0/deqp/temp_externs/es3.js -third_party/webgl/src/conformance-suites/2.0.0/deqp/temp_externs/es5.js -third_party/webgl/src/conformance-suites/2.0.0/deqp/temp_externs/es6.js -third_party/webgl/src/conformance-suites/2.0.0/deqp/temp_externs/es6_collections.js -third_party/webgl/src/conformance-suites/2.0.0/deqp/temp_externs/fileapi.js -third_party/webgl/src/conformance-suites/2.0.0/deqp/temp_externs/gecko_css.js -third_party/webgl/src/conformance-suites/2.0.0/deqp/temp_externs/gecko_dom.js -third_party/webgl/src/conformance-suites/2.0.0/deqp/temp_externs/google.js -third_party/webgl/src/conformance-suites/2.0.0/deqp/temp_externs/html5.js -third_party/webgl/src/conformance-suites/2.0.0/deqp/temp_externs/ie_css.js -third_party/webgl/src/conformance-suites/2.0.0/deqp/temp_externs/ie_dom.js -third_party/webgl/src/conformance-suites/2.0.0/deqp/temp_externs/ie_event.js -third_party/webgl/src/conformance-suites/2.0.0/deqp/temp_externs/ie_vml.js -third_party/webgl/src/conformance-suites/2.0.0/deqp/temp_externs/iphone.js -third_party/webgl/src/conformance-suites/2.0.0/deqp/temp_externs/w3c_css.js -third_party/webgl/src/conformance-suites/2.0.0/deqp/temp_externs/w3c_css3d.js -third_party/webgl/src/conformance-suites/2.0.0/deqp/temp_externs/w3c_dom1.js -third_party/webgl/src/conformance-suites/2.0.0/deqp/temp_externs/w3c_dom2.js -third_party/webgl/src/conformance-suites/2.0.0/deqp/temp_externs/w3c_dom3.js -third_party/webgl/src/conformance-suites/2.0.0/deqp/temp_externs/w3c_elementtraversal.js -third_party/webgl/src/conformance-suites/2.0.0/deqp/temp_externs/w3c_range.js -third_party/webgl/src/conformance-suites/2.0.0/deqp/temp_externs/w3c_rtc.js -third_party/webgl/src/conformance-suites/2.0.0/deqp/temp_externs/w3c_selectors.js -third_party/webgl/src/conformance-suites/2.0.0/deqp/temp_externs/w3c_xml.js -third_party/webgl/src/conformance-suites/2.0.0/deqp/temp_externs/webkit_css.js -third_party/webgl/src/conformance-suites/2.0.0/deqp/temp_externs/webkit_dom.js -third_party/webgl/src/conformance-suites/2.0.0/deqp/temp_externs/window.js -third_party/webgl/src/conformance-suites/2.0.0/js/webgl-test-harness.js -third_party/webgl/src/conformance-suites/2.0.0/js/webgl-test-utils.js -third_party/webgl/src/extensions/EXT_blend_minmax/extension.xml -third_party/webgl/src/extensions/EXT_disjoint_timer_query/extension.xml -third_party/webgl/src/extensions/EXT_disjoint_timer_query_webgl2/extension.xml -third_party/webgl/src/extensions/EXT_frag_depth/extension.xml -third_party/webgl/src/extensions/EXT_sRGB/extension.xml -third_party/webgl/src/extensions/EXT_shader_texture_lod/extension.xml -third_party/webgl/src/extensions/EXT_texture_filter_anisotropic/extension.xml -third_party/webgl/src/extensions/KHR_parallel_shader_compile/extension.xml -third_party/webgl/src/extensions/OES_element_index_uint/extension.xml -third_party/webgl/src/extensions/OES_fbo_render_mipmap/extension.xml -third_party/webgl/src/extensions/WEBGL_clip_cull_distance/extension.xml -third_party/webgl/src/extensions/WEBGL_debug_renderer_info/extension.xml -third_party/webgl/src/extensions/WEBGL_debug_shaders/extension.xml -third_party/webgl/src/extensions/WEBGL_depth_texture/extension.xml -third_party/webgl/src/extensions/WEBGL_draw_instanced_base_vertex_base_instance/extension.xml -third_party/webgl/src/extensions/WEBGL_lose_context/extension.xml -third_party/webgl/src/extensions/WEBGL_multi_draw/extension.xml -third_party/webgl/src/extensions/WEBGL_multi_draw_instanced_base_vertex_base_instance/extension.xml -third_party/webgl/src/extensions/WEBGL_polygon_mode/extension.xml -third_party/webgl/src/extensions/WEBGL_provoking_vertex/extension.xml -third_party/webgl/src/extensions/WEBGL_shader_pixel_local_storage/extension.xml -third_party/webgl/src/extensions/WEBGL_stencil_texturing/extension.xml -third_party/webgl/src/extensions/proposals/WEBGL_webcodecs_video_frame/extension.xml -third_party/webgl/src/extensions/rejected/OES_depth24/extension.xml -third_party/webgl/src/extensions/rejected/WEBGL_security_sensitive_resources/extension.xml -third_party/webgl/src/extensions/rejected/WEBGL_texture_source_iframe/extension.xml -third_party/webgl/src/other/get.webgl.org/get-a-webgl-implementation/index.html -third_party/webgl/src/other/get.webgl.org/stage.html -third_party/webgl/src/other/get.webgl.org/troubleshooting/DoNotCopyOrLinkThisFileElseYouWillNotGetAutoUpdatedHelpForYourUsers.js -third_party/webgl/src/other/get.webgl.org/webgl2/troubleshooting/DoNotCopyOrLinkThisFileElseYouWillNotGetAutoUpdatedHelpForYourUsers.js -third_party/webgl/src/other/test-runner/android/PortForwarderService/proguard-project.txt -third_party/webgl/src/other/test-runner/package.json -third_party/webgl/src/resources/html5lib-1.1/src/html5lib/tests/test_parser2.py -third_party/webgl/src/resources/html5lib/src/html5lib/serializer/htmlserializer.py -third_party/webgl/src/resources/html5lib/src/html5lib/tests/test_parser2.py -third_party/webgl/src/sdk/demos/google/particles/index.html -third_party/webgl/src/sdk/demos/google/resources/o3djs/base.js -third_party/webgl/src/sdk/demos/google/resources/o3djs/event.js -third_party/webgl/src/sdk/demos/google/san-angeles/box/box.html -third_party/webgl/src/sdk/demos/google/shiny-teapot/index.html -third_party/webgl/src/sdk/demos/google/web-workers-typed-arrays/capabilities.js -third_party/webgl/src/sdk/demos/google/web-workers-typed-arrays/demo-multicore.js -third_party/webgl/src/sdk/demos/intel/ComputeBoids.html -third_party/webgl/src/sdk/tests/closure-library/README-Khronos.txt -third_party/webgl/src/sdk/tests/closure-library/closure/bin/build/closurebuilder.py -third_party/webgl/src/sdk/tests/closure-library/closure/bin/build/depstree.py -third_party/webgl/src/sdk/tests/closure-library/closure/bin/build/depswriter.py -third_party/webgl/src/sdk/tests/closure-library/closure/bin/build/jscompiler.py -third_party/webgl/src/sdk/tests/closure-library/closure/bin/build/source.py -third_party/webgl/src/sdk/tests/closure-library/closure/bin/build/treescan.py -third_party/webgl/src/sdk/tests/closure-library/closure/bin/scopify.py -third_party/webgl/src/sdk/tests/closure-library/closure/goog/base.js -third_party/webgl/src/sdk/tests/conformance/attribs/gl-bindAttribLocation-repeated.html -third_party/webgl/src/sdk/tests/conformance/buffers/buffer-data-and-buffer-sub-data.html -third_party/webgl/src/sdk/tests/conformance/extensions/angle-instanced-arrays.html -third_party/webgl/src/sdk/tests/conformance/glsl/bugs/conditional-discard-in-loop.html -third_party/webgl/src/sdk/tests/conformance/glsl/bugs/conditional-discard-optimization.html -third_party/webgl/src/sdk/tests/conformance/glsl/bugs/floor-div-cos-should-not-truncate.html -third_party/webgl/src/sdk/tests/conformance/glsl/bugs/floored-division-accuracy.html -third_party/webgl/src/sdk/tests/conformance/glsl/bugs/loop-if-loop-gradient.html -third_party/webgl/src/sdk/tests/conformance/glsl/bugs/modulo-arithmetic-accuracy.html -third_party/webgl/src/sdk/tests/conformance/glsl/bugs/multiplication-assignment.html -third_party/webgl/src/sdk/tests/conformance/glsl/bugs/qualcomm-crash.html -third_party/webgl/src/sdk/tests/conformance/glsl/bugs/qualcomm-loop-with-continue-crash.html -third_party/webgl/src/sdk/tests/conformance/glsl/bugs/sketchfab-lighting-shader-crash.html -third_party/webgl/src/sdk/tests/conformance/glsl/bugs/struct-with-single-member-constructor.html -third_party/webgl/src/sdk/tests/conformance/glsl/bugs/unary-minus-operator-float-bug.html -third_party/webgl/src/sdk/tests/conformance/glsl/misc/sampler-operand.html -third_party/webgl/src/sdk/tests/conformance/more/index.html -third_party/webgl/src/sdk/tests/conformance/more/unit.css -third_party/webgl/src/sdk/tests/conformance/rendering/multisample-corruption.html -third_party/webgl/src/sdk/tests/conformance/rendering/preservedrawingbuffer-leak.html -third_party/webgl/src/sdk/tests/conformance/rendering/scissor-rect-repeated-rendering.html -third_party/webgl/src/sdk/tests/conformance/state/fb-attach-implicit-target-assignment.html -third_party/webgl/src/sdk/tests/conformance/textures/misc/texture-cube-as-fbo-attachment.html -third_party/webgl/src/sdk/tests/conformance/textures/misc/texture-fakeblack.html -third_party/webgl/src/sdk/tests/conformance2/buffers/uniform-buffers.html -third_party/webgl/src/sdk/tests/conformance2/context/context-sharing-texture2darray-texture3d-data-bug.html -third_party/webgl/src/sdk/tests/conformance2/misc/getextension-while-pbo-bound-stability.html -third_party/webgl/src/sdk/tests/conformance2/query/query.html -third_party/webgl/src/sdk/tests/conformance2/renderbuffers/framebuffer-object-attachment.html -third_party/webgl/src/sdk/tests/conformance2/rendering/canvas-resizing-with-pbo-bound.html -third_party/webgl/src/sdk/tests/conformance2/rendering/framebuffer-render-to-layer-angle-issue.html -third_party/webgl/src/sdk/tests/conformance2/textures/misc/canvas-remains-unchanged-after-used-in-webgl-texture.html -third_party/webgl/src/sdk/tests/conformance2/textures/misc/copy-texture-cube-map-AMD-bug.html -third_party/webgl/src/sdk/tests/conformance2/textures/misc/copy-texture-cube-map-bug.html -third_party/webgl/src/sdk/tests/conformance2/textures/misc/copy-texture-image-same-texture.html -third_party/webgl/src/sdk/tests/conformance2/textures/misc/tex-image-with-bad-args.html -third_party/webgl/src/sdk/tests/conformance2/textures/misc/tex-subimage3d-canvas-bug.html -third_party/webgl/src/sdk/tests/conformance2/textures/misc/tex-subimage3d-pixel-buffer-bug.html -third_party/webgl/src/sdk/tests/conformance2/uniforms/dependent-buffer-change.html -third_party/webgl/src/sdk/tests/conformance2/uniforms/draw-with-uniform-blocks.html -third_party/webgl/src/sdk/tests/conformance2/uniforms/large-uniform-buffers.html -third_party/webgl/src/sdk/tests/conformance2/uniforms/simple-buffer-change.html -third_party/webgl/src/sdk/tests/deqp/framework/common/tcuSkipList.js -third_party/webgl/src/sdk/tests/deqp/temp_externs/chrome.js -third_party/webgl/src/sdk/tests/deqp/temp_externs/es3.js -third_party/webgl/src/sdk/tests/deqp/temp_externs/es5.js -third_party/webgl/src/sdk/tests/deqp/temp_externs/es6.js -third_party/webgl/src/sdk/tests/deqp/temp_externs/es6_collections.js -third_party/webgl/src/sdk/tests/deqp/temp_externs/fileapi.js -third_party/webgl/src/sdk/tests/deqp/temp_externs/gecko_css.js -third_party/webgl/src/sdk/tests/deqp/temp_externs/gecko_dom.js -third_party/webgl/src/sdk/tests/deqp/temp_externs/google.js -third_party/webgl/src/sdk/tests/deqp/temp_externs/html5.js -third_party/webgl/src/sdk/tests/deqp/temp_externs/ie_css.js -third_party/webgl/src/sdk/tests/deqp/temp_externs/ie_dom.js -third_party/webgl/src/sdk/tests/deqp/temp_externs/ie_event.js -third_party/webgl/src/sdk/tests/deqp/temp_externs/ie_vml.js -third_party/webgl/src/sdk/tests/deqp/temp_externs/iphone.js -third_party/webgl/src/sdk/tests/deqp/temp_externs/w3c_css.js -third_party/webgl/src/sdk/tests/deqp/temp_externs/w3c_css3d.js -third_party/webgl/src/sdk/tests/deqp/temp_externs/w3c_dom1.js -third_party/webgl/src/sdk/tests/deqp/temp_externs/w3c_dom2.js -third_party/webgl/src/sdk/tests/deqp/temp_externs/w3c_dom3.js -third_party/webgl/src/sdk/tests/deqp/temp_externs/w3c_elementtraversal.js -third_party/webgl/src/sdk/tests/deqp/temp_externs/w3c_range.js -third_party/webgl/src/sdk/tests/deqp/temp_externs/w3c_rtc.js -third_party/webgl/src/sdk/tests/deqp/temp_externs/w3c_selectors.js -third_party/webgl/src/sdk/tests/deqp/temp_externs/w3c_xml.js -third_party/webgl/src/sdk/tests/deqp/temp_externs/webkit_css.js -third_party/webgl/src/sdk/tests/deqp/temp_externs/webkit_dom.js -third_party/webgl/src/sdk/tests/deqp/temp_externs/window.js -third_party/webgl/src/sdk/tests/extra/workload-simulator.html -third_party/webgl/src/sdk/tests/js/webgl-test-harness.js -third_party/webgl/src/sdk/tests/js/webgl-test-utils.js -third_party/webgl/src/specs/2.0.0/index.html -third_party/webgl/src/specs/latest/1.0/index.html -third_party/webgl/src/specs/latest/2.0/index.html third_party/webgpu-cts/src/src/webgpu/api/operation/command_buffer/queries/occlusionQuery.spec.ts third_party/webgpu-cts/src/src/webgpu/api/operation/render_pipeline/sample_mask.spec.ts third_party/webgpu-cts/src/src/webgpu/api/operation/rendering/depth_bias.spec.ts @@ -14882,7 +14300,6 @@ tools/android/memtrack_helper/memtrack_helper.c tools/android/modularization/convenience/touch_resources.py tools/android/native_lib_memory/PRESUBMIT.py tools/android/python_utils/PRESUBMIT.py -tools/android/sdk_updater/update_sdk.py tools/android/test_health/PRESUBMIT.py tools/android/tracing/systrace-extract-startup.py tools/binary_size/PRESUBMIT.py @@ -15275,6 +14692,7 @@ tools/metrics/histograms/metadata/scanning/enums.xml tools/metrics/histograms/metadata/scanning/histograms.xml tools/metrics/histograms/metadata/scheduler/enums.xml tools/metrics/histograms/metadata/scheduler/histograms.xml +tools/metrics/histograms/metadata/search/enums.xml tools/metrics/histograms/metadata/search/histograms.xml tools/metrics/histograms/metadata/security/enums.xml tools/metrics/histograms/metadata/security/histograms.xml @@ -15291,7 +14709,6 @@ tools/metrics/histograms/metadata/sharing/enums.xml tools/metrics/histograms/metadata/sharing/histograms.xml tools/metrics/histograms/metadata/shortcuts/enums.xml tools/metrics/histograms/metadata/shortcuts/histograms.xml -tools/metrics/histograms/metadata/side_search/histograms.xml tools/metrics/histograms/metadata/signin/enums.xml tools/metrics/histograms/metadata/signin/histograms.xml tools/metrics/histograms/metadata/simple/histograms.xml @@ -15309,6 +14726,8 @@ tools/metrics/histograms/metadata/sync/histograms.xml tools/metrics/histograms/metadata/system/histograms.xml tools/metrics/histograms/metadata/tab/enums.xml tools/metrics/histograms/metadata/tab/histograms.xml +tools/metrics/histograms/metadata/task_manager/enums.xml +tools/metrics/histograms/metadata/task_manager/histograms.xml tools/metrics/histograms/metadata/toasts/enums.xml tools/metrics/histograms/metadata/toasts/histograms.xml tools/metrics/histograms/metadata/translate/enums.xml @@ -15343,6 +14762,7 @@ tools/metrics/histograms/metadata/webapps/enums.xml tools/metrics/histograms/metadata/webapps/histograms.xml tools/metrics/histograms/metadata/webauthn/enums.xml tools/metrics/histograms/metadata/webauthn/histograms.xml +tools/metrics/histograms/metadata/webnn/enums.xml tools/metrics/histograms/metadata/webnn/histograms.xml tools/metrics/histograms/metadata/windows/enums.xml tools/metrics/histograms/metadata/windows/histograms.xml @@ -15435,6 +14855,7 @@ tools/perf/core/services/pinpoint_service.py tools/perf/core/services/request.py tools/perf/core/shard_maps/timing_data/android-pixel-tangor-perf_timing.json tools/perf/core/shard_maps/timing_data/android-pixel4-perf_timing.json +tools/perf/core/shard_maps/timing_data/android-pixel4_webview-perf-pgo_timing.json tools/perf/core/shard_maps/timing_data/android-pixel4_webview-perf_timing.json tools/perf/core/shard_maps/timing_data/android-pixel6-perf_timing.json tools/perf/core/shard_maps/timing_data/android-pixel6-pro-perf_timing.json @@ -15506,114 +14927,6 @@ tools/perf/page_sets/tough_animation_cases/mix_blend_mode_propagating_isolation. tools/perf/page_sets/v8_top_25.py tools/perf/page_sets/webrtc_cases/codec_constraints.html tools/perf/process_perf_results.py -tools/perf/testdata/task_output_dir/0/blink_perf.image_decoder.reference/benchmark_log.txt -tools/perf/testdata/task_output_dir/0/blink_perf.image_decoder.reference/perf_results.json -tools/perf/testdata/task_output_dir/0/blink_perf.image_decoder.reference/test_results.json -tools/perf/testdata/task_output_dir/0/blink_perf.image_decoder/benchmark_log.txt -tools/perf/testdata/task_output_dir/0/blink_perf.image_decoder/perf_results.json -tools/perf/testdata/task_output_dir/0/blink_perf.image_decoder/test_results.json -tools/perf/testdata/task_output_dir/0/blink_perf.owp_storage.reference/benchmark_log.txt -tools/perf/testdata/task_output_dir/0/blink_perf.owp_storage.reference/perf_results.json -tools/perf/testdata/task_output_dir/0/blink_perf.owp_storage.reference/test_results.json -tools/perf/testdata/task_output_dir/0/blink_perf.owp_storage/benchmark_log.txt -tools/perf/testdata/task_output_dir/0/blink_perf.owp_storage/perf_results.json -tools/perf/testdata/task_output_dir/0/blink_perf.owp_storage/test_results.json -tools/perf/testdata/task_output_dir/0/memory.desktop.reference/benchmark_log.txt -tools/perf/testdata/task_output_dir/0/memory.desktop.reference/perf_results.json -tools/perf/testdata/task_output_dir/0/memory.desktop.reference/test_results.json -tools/perf/testdata/task_output_dir/0/memory.desktop/benchmark_log.txt -tools/perf/testdata/task_output_dir/0/memory.desktop/perf_results.json -tools/perf/testdata/task_output_dir/0/memory.desktop/test_results.json -tools/perf/testdata/task_output_dir/0/power.desktop.reference/benchmark_log.txt -tools/perf/testdata/task_output_dir/0/power.desktop.reference/perf_results.json -tools/perf/testdata/task_output_dir/0/power.desktop.reference/test_results.json -tools/perf/testdata/task_output_dir/0/power.desktop/benchmark_log.txt -tools/perf/testdata/task_output_dir/0/power.desktop/perf_results.json -tools/perf/testdata/task_output_dir/0/power.desktop/test_results.json -tools/perf/testdata/task_output_dir/0/speedometer-future.reference/benchmark_log.txt -tools/perf/testdata/task_output_dir/0/speedometer-future.reference/perf_results.json -tools/perf/testdata/task_output_dir/0/speedometer-future.reference/test_results.json -tools/perf/testdata/task_output_dir/0/speedometer-future/benchmark_log.txt -tools/perf/testdata/task_output_dir/0/speedometer-future/perf_results.json -tools/perf/testdata/task_output_dir/0/speedometer-future/test_results.json -tools/perf/testdata/task_output_dir/1/dummy_benchmark.histogram_benchmark_1.reference/benchmark_log.txt -tools/perf/testdata/task_output_dir/1/dummy_benchmark.histogram_benchmark_1.reference/perf_results.json -tools/perf/testdata/task_output_dir/1/dummy_benchmark.histogram_benchmark_1.reference/test_results.json -tools/perf/testdata/task_output_dir/1/dummy_benchmark.histogram_benchmark_1/benchmark_log.txt -tools/perf/testdata/task_output_dir/1/dummy_benchmark.histogram_benchmark_1/perf_results.json -tools/perf/testdata/task_output_dir/1/dummy_benchmark.histogram_benchmark_1/test_results.json -tools/perf/testdata/task_output_dir/1/memory.desktop.reference/benchmark_log.txt -tools/perf/testdata/task_output_dir/1/memory.desktop.reference/perf_results.json -tools/perf/testdata/task_output_dir/1/memory.desktop.reference/test_results.json -tools/perf/testdata/task_output_dir/1/memory.desktop/benchmark_log.txt -tools/perf/testdata/task_output_dir/1/memory.desktop/perf_results.json -tools/perf/testdata/task_output_dir/1/memory.desktop/test_results.json -tools/perf/testdata/task_output_dir/1/speedometer.reference/benchmark_log.txt -tools/perf/testdata/task_output_dir/1/speedometer.reference/perf_results.json -tools/perf/testdata/task_output_dir/1/speedometer.reference/test_results.json -tools/perf/testdata/task_output_dir/1/speedometer/benchmark_log.txt -tools/perf/testdata/task_output_dir/1/speedometer/perf_results.json -tools/perf/testdata/task_output_dir/1/speedometer/test_results.json -tools/perf/testdata/task_output_dir/1/wasm.reference/benchmark_log.txt -tools/perf/testdata/task_output_dir/1/wasm.reference/perf_results.json -tools/perf/testdata/task_output_dir/1/wasm.reference/test_results.json -tools/perf/testdata/task_output_dir/1/wasm/benchmark_log.txt -tools/perf/testdata/task_output_dir/1/wasm/perf_results.json -tools/perf/testdata/task_output_dir/1/wasm/test_results.json -tools/perf/testdata/task_output_dir/2/blink_perf.svg.reference/benchmark_log.txt -tools/perf/testdata/task_output_dir/2/blink_perf.svg.reference/perf_results.json -tools/perf/testdata/task_output_dir/2/blink_perf.svg.reference/test_results.json -tools/perf/testdata/task_output_dir/2/blink_perf.svg/benchmark_log.txt -tools/perf/testdata/task_output_dir/2/blink_perf.svg/perf_results.json -tools/perf/testdata/task_output_dir/2/blink_perf.svg/test_results.json -tools/perf/testdata/task_output_dir/2/dummy_benchmark.noisy_benchmark_1.reference/benchmark_log.txt -tools/perf/testdata/task_output_dir/2/dummy_benchmark.noisy_benchmark_1.reference/perf_results.json -tools/perf/testdata/task_output_dir/2/dummy_benchmark.noisy_benchmark_1.reference/test_results.json -tools/perf/testdata/task_output_dir/2/dummy_benchmark.noisy_benchmark_1/benchmark_log.txt -tools/perf/testdata/task_output_dir/2/dummy_benchmark.noisy_benchmark_1/perf_results.json -tools/perf/testdata/task_output_dir/2/dummy_benchmark.noisy_benchmark_1/test_results.json -tools/perf/testdata/task_output_dir/2/jetstream.reference/benchmark_log.txt -tools/perf/testdata/task_output_dir/2/jetstream.reference/perf_results.json -tools/perf/testdata/task_output_dir/2/jetstream.reference/test_results.json -tools/perf/testdata/task_output_dir/2/jetstream/benchmark_log.txt -tools/perf/testdata/task_output_dir/2/jetstream/perf_results.json -tools/perf/testdata/task_output_dir/2/jetstream/test_results.json -tools/perf/testdata/task_output_dir/2/memory.long_running_idle_gmail_tbmv2.reference/benchmark_log.txt -tools/perf/testdata/task_output_dir/2/memory.long_running_idle_gmail_tbmv2.reference/perf_results.json -tools/perf/testdata/task_output_dir/2/memory.long_running_idle_gmail_tbmv2.reference/test_results.json -tools/perf/testdata/task_output_dir/2/memory.long_running_idle_gmail_tbmv2/benchmark_log.txt -tools/perf/testdata/task_output_dir/2/memory.long_running_idle_gmail_tbmv2/perf_results.json -tools/perf/testdata/task_output_dir/2/memory.long_running_idle_gmail_tbmv2/test_results.json -tools/perf/testdata/task_output_dir/2/octane.reference/benchmark_log.txt -tools/perf/testdata/task_output_dir/2/octane.reference/perf_results.json -tools/perf/testdata/task_output_dir/2/octane.reference/test_results.json -tools/perf/testdata/task_output_dir/2/octane/benchmark_log.txt -tools/perf/testdata/task_output_dir/2/octane/perf_results.json -tools/perf/testdata/task_output_dir/2/octane/test_results.json -tools/perf/testdata/task_output_dir/2/power.idle_platform.reference/benchmark_log.txt -tools/perf/testdata/task_output_dir/2/power.idle_platform.reference/perf_results.json -tools/perf/testdata/task_output_dir/2/power.idle_platform.reference/test_results.json -tools/perf/testdata/task_output_dir/2/power.idle_platform/benchmark_log.txt -tools/perf/testdata/task_output_dir/2/power.idle_platform/perf_results.json -tools/perf/testdata/task_output_dir/2/power.idle_platform/test_results.json -tools/perf/testdata/task_output_dir/2/speedometer2-future.reference/benchmark_log.txt -tools/perf/testdata/task_output_dir/2/speedometer2-future.reference/perf_results.json -tools/perf/testdata/task_output_dir/2/speedometer2-future.reference/test_results.json -tools/perf/testdata/task_output_dir/2/speedometer2-future/benchmark_log.txt -tools/perf/testdata/task_output_dir/2/speedometer2-future/perf_results.json -tools/perf/testdata/task_output_dir/2/speedometer2-future/test_results.json -tools/perf/testdata/task_output_dir/2/v8.runtime_stats.top_25.reference/benchmark_log.txt -tools/perf/testdata/task_output_dir/2/v8.runtime_stats.top_25.reference/perf_results.json -tools/perf/testdata/task_output_dir/2/v8.runtime_stats.top_25.reference/test_results.json -tools/perf/testdata/task_output_dir/2/v8.runtime_stats.top_25/benchmark_log.txt -tools/perf/testdata/task_output_dir/2/v8.runtime_stats.top_25/perf_results.json -tools/perf/testdata/task_output_dir/2/v8.runtime_stats.top_25/test_results.json -tools/perf/testdata/task_output_dir/3/v8.runtime_stats.top_25.reference/benchmark_log.txt -tools/perf/testdata/task_output_dir/3/v8.runtime_stats.top_25.reference/perf_results.json -tools/perf/testdata/task_output_dir/3/v8.runtime_stats.top_25.reference/test_results.json -tools/perf/testdata/task_output_dir/3/v8.runtime_stats.top_25/benchmark_log.txt -tools/perf/testdata/task_output_dir/3/v8.runtime_stats.top_25/perf_results.json -tools/perf/testdata/task_output_dir/3/v8.runtime_stats.top_25/test_results.json tools/perfbot-analysis/builder.js tools/perfbot-analysis/bulk-download.js tools/pgo/generate_profile.py @@ -15716,8 +15029,6 @@ ui/base/clipboard/clipboard_win.h ui/base/clipboard/url_file_parser_unittest.cc ui/base/cocoa/tool_tip_base_view.mm ui/base/cursor/cursor.cc -ui/base/data_transfer_policy/data_transfer_endpoint_serializer.h -ui/base/data_transfer_policy/data_transfer_endpoint_serializer_unittest.cc ui/base/dragdrop/os_exchange_data_unittest.cc ui/base/dragdrop/os_exchange_data_win_unittest.cc ui/base/ime/PRESUBMIT.py @@ -15741,9 +15052,9 @@ ui/display/display_switches.cc ui/display/display_transform.cc ui/display/mac/cv_display_link_mac.mm ui/display/manager/tools/index.html +ui/display/win/screen_win.cc ui/display/win/test/virtual_display_util_win.cc ui/events/android/motion_event_android_unittest.cc -ui/events/ash/keyboard_capability_unittest.cc ui/events/blink/blink_event_util.cc ui/events/devices/input_device_observer_win.cc ui/events/gesture_detection/gesture_provider_unittest.cc @@ -15810,7 +15121,7 @@ ui/native_theme/native_theme_win.h ui/ozone/ozone.gni ui/ozone/platform/wayland/host/shell_popup_wrapper.cc ui/ozone/platform/wayland/host/wayland_clipboard.cc -ui/ozone/platform/wayland/host/wayland_exchange_data_provider_unittest.cc +ui/ozone/platform/wayland/host/wayland_data_drag_controller.cc ui/ozone/platform/wayland/host/wayland_output.h ui/ozone/platform/wayland/host/wayland_window.cc ui/ozone/platform/x11/test/os_exchange_data_provider_x11_unittest.cc @@ -15919,7 +15230,6 @@ v8/src/inspector/value-mirror.h v8/src/libplatform/default-thread-isolated-allocator.cc v8/src/libplatform/tracing/recorder-win.cc v8/src/libsampler/sampler.cc -v8/src/maglev/riscv/maglev-assembler-riscv.cc v8/src/objects/js-array-buffer.h v8/src/objects/js-number-format.cc v8/src/objects/map.h diff --git a/domain_substitution/prune_binaries.py b/domain_substitution/prune_binaries.py index 0580cd57..82e1d564 100644 --- a/domain_substitution/prune_binaries.py +++ b/domain_substitution/prune_binaries.py @@ -20,37 +20,41 @@ from _common import ENCODING, get_logger, add_common_params CONTINGENT_PATHS = ( # Overridable git sources 'third_party/angle/third_party/VK-GL-CTS/src/', - 'third_party/instrumented_libs/', # CIPD sources - 'buildtools/linux64/', - 'buildtools/reclient/', - 'third_party/apache-linux/', - 'third_party/checkstyle/', + 'third_party/dawn/third_party/ninja/', + 'third_party/dawn/tools/golang/', + 'third_party/devtools-frontend/src/third_party/esbuild/', 'third_party/google-java-format/', - 'third_party/libei/', - 'third_party/ninja/', - 'third_party/screen-ai/', - 'third_party/siso/', + 'third_party/openscreen/src/third_party/ninja/', 'third_party/updater/chrome_linux64/', 'third_party/updater/chromium_linux64/', - 'tools/luci-go/', - 'tools/resultdb/', - 'tools/skia_goldctl/linux/', # GCS sources - 'base/tracing/test/data', 'build/linux/debian_bullseye_amd64-sysroot/', 'build/linux/debian_bullseye_i386-sysroot/', - 'buildtools/linux64-format/', - 'third_party/blink/renderer/core/css/perftest_data/', 'third_party/js_code_coverage/', - 'third_party/llvm-build/Release+Asserts/', + 'third_party/openscreen/src/buildtools/linux64/format/', + # other + 'third_party/depot_tools/external_bin/', + # lite tarball paths: + # https://source.chromium.org/chromium/chromium/tools/build/+/main:recipes/recipes/publish_tarball.py + 'android_webview/', + 'buildtools/reclient/', + 'chromecast/', + 'native_client/', + 'native_client_sdk/', + 'third_party/android_platform/', + 'third_party/apache-linux/', + 'third_party/blink/manual_tests/', + 'third_party/blink/perf_tests/', + 'third_party/catapult/third_party/vinn/third_party/v8/', + 'third_party/instrumented_libs/', + 'third_party/llvm/', + 'third_party/llvm-build/', + 'third_party/llvm-build-tools/', 'third_party/node/linux/', - 'third_party/opus/tests/resources/', + 'third_party/rust-src/', 'third_party/rust-toolchain/', - 'third_party/subresource-filter-ruleset/data', - 'third_party/test_fonts/test_fonts', - 'third_party/tfhub_models/testdata/', - 'tools/perf/page_sets/maps_perf_test/dataset/', + 'third_party/webgl/', ) diff --git a/update_domain_substitution.sh b/update_domain_substitution.sh index a030115a..a85ac5d4 100755 --- a/update_domain_substitution.sh +++ b/update_domain_substitution.sh @@ -4,7 +4,7 @@ root_dir=$(dirname "$(readlink -f "$0")") cd $root_dir/domain_substitution -branch="131.0.6778.139-1" +branch="132.0.6834.83-1" if [ -d ungoogled-chromium ]; then cd ungoogled-chromium git fetch origin $branch -- GitLab From ab1308c7955d6c5556cd5f77e3f70a44d71e9570 Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Fri, 24 Jan 2025 13:52:27 +0530 Subject: [PATCH 04/10] Update e patches --- .../e_patches/Add-Mojeek-Search-engine.patch | 4 +- ...vider-to-share-default-search-engine.patch | 8 +- .../Browser-Change-adblock-url-to-ours.patch | 14 +-- ...ange-app-and-package-name-to-browser.patch | 4 +- .../Browser-Change-info-bar-icon.patch | 4 +- ...e-Android-native-autofill-by-default.patch | 4 +- ...rowser-Enable-custom-tabs-by-default.patch | 8 +- ...owser-Enable-do-not-track-by-default.patch | 4 +- ...wser-Enable-external-intent-requests.patch | 8 +- ...-Enable-search-suggestion-by-default.patch | 8 +- ...r-Enable-unified-autoplay-by-default.patch | 8 +- .../Browser-Enable-webRTC-by-default.patch | 12 +-- .../Browser-Enable-webgl-by-default.patch | 6 +- .../Browser-Fix-open-in-browser-text.patch | 4 +- ...ings-when-parental-control-is-active.patch | 20 ++-- ...rowser-Modify-default-search-engines.patch | 12 +-- ...r-Point-to-our-default-popular-sites.patch | 4 +- ...-Redirect-users-to-e-foundation-docs.patch | 4 +- ...ser-Remove-broken-link-about-entries.patch | 4 +- ...owser-Remove-logo-from-chromeversion.patch | 6 +- ...rowser-Remove-send-to-devices-option.patch | 12 +-- .../Browser-Rename-strings-to-browser.patch | 12 +-- .../Browser-Replace-default-tab-favicon.patch | 4 +- ...Browser-Spoof-as-Pixel-4a-by-default.patch | 4 +- ...ser-Use-adaptive-icon-for-recents-UI.patch | 8 +- .../Browser-Use-correct-switch-scale.patch | 4 +- ...wser-Use-our-custom-icon-for-browser.patch | 10 +- ...owser-disable-first-run-welcome-page.patch | 4 +- ...-price-shopping-commerce-integration.patch | 16 +-- ...Browser-disable-search-provider-logo.patch | 4 +- ...cent-and-switch-to-match-our-palette.patch | 20 ++-- build/e_patches/Disable-AGSA-by-default.patch | 68 +++++-------- ...t-avatar-on-new-tab-pages-by-default.patch | 12 +-- ...ble-support-for-RAR-files-inspection.patch | 6 +- ...-SPPI-for-devices-with-enough-memory.patch | 4 +- .../e_patches/Enable-sensors-by-default.patch | 4 +- .../Handle-web-search-action-in-browser.patch | 10 +- ...e-Sign-In-preference-when-disallowed.patch | 8 +- .../Multiple-fingerprinting-mitigations.patch | 98 +++++++++---------- .../e_patches/Reintroduce-kWebAuthCable.patch | 28 +++--- .../Remove-bromite-auto-updater-option.patch | 4 +- .../Remove-google-pref-from-main-menu.patch | 6 +- ...-mremap-from-seccomp-baseline-policy.patch | 8 +- .../Remove-some-privacy-UI-pref.patch | 8 +- .../Revert-TM-Add-themed-app-icons.patch | 10 +- build/e_patches/Update-app-icon.patch | 4 +- build/e_patches/Update-default-sites.patch | 4 +- .../e_patches/Update-i18n-zhCN-support.patch | 26 ++--- .../Use-thirdparty-autofill-by-default.patch | 4 +- .../add-trichrome-browser-apk-targets.patch | 10 +- ...e-browser-sign-in-feature-by-default.patch | 6 +- ...disable-contextual-search-by-default.patch | 8 +- .../disable-fetching-variations.patch | 4 +- ...vigation-error-correction-by-default.patch | 8 +- .../disable-seedbased-field-trials.patch | 10 +- .../fixup-Bromite-subresource-adblocker.patch | 10 +- ...Disable-fetching-of-all-field-trials.patch | 10 +- ...l-of-execution-context-address-space.patch | 4 +- .../netcert-increase-default-key-length.patch | 8 +- ...enH264-enable-ARMARM64-optimizations.patch | 8 +- .../ungoogledchromium-Disable-Gaia.patch | 4 +- 61 files changed, 316 insertions(+), 330 deletions(-) diff --git a/build/e_patches/Add-Mojeek-Search-engine.patch b/build/e_patches/Add-Mojeek-Search-engine.patch index 437ed5a1..0e004e6d 100644 --- a/build/e_patches/Add-Mojeek-Search-engine.patch +++ b/build/e_patches/Add-Mojeek-Search-engine.patch @@ -1,4 +1,4 @@ -From 999a54d8ca4a591df0d0cedfb4b7bc5f78157611 Mon Sep 17 00:00:00 2001 +From e6d957ecae604d43ffcc3d47a13baff64d9fde44 Mon Sep 17 00:00:00 2001 From: TheScarastic Date: Wed, 16 Nov 2022 11:14:01 +0000 Subject: Add Mojeek Search engine @@ -20,5 +20,5 @@ index 38964682da20f..ae5b4298d910e 100644 // Note, the below entries are sorted by country code, not the name in comment. -- -2.47.1 +2.48.1 diff --git a/build/e_patches/Browser-Add-provider-to-share-default-search-engine.patch b/build/e_patches/Browser-Add-provider-to-share-default-search-engine.patch index 9b85fd6e..a542d312 100644 --- a/build/e_patches/Browser-Add-provider-to-share-default-search-engine.patch +++ b/build/e_patches/Browser-Add-provider-to-share-default-search-engine.patch @@ -1,4 +1,4 @@ -From 2153c5dec892c6ce34fbe04cb9fe573263702536 Mon Sep 17 00:00:00 2001 +From b6d5df7b340ba478425265acf2cfb84492829257 Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Fri, 26 Nov 2021 08:03:13 +0000 Subject: Browser: Add provider to share default search engine @@ -12,10 +12,10 @@ Signed-off-by: Aayush Gupta create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/provider/SearchEngineProvider.java diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml -index 65808866ca8d5..a38c08abb8024 100644 +index c27be94f12955..bf8c03b935bd4 100644 --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml -@@ -1295,6 +1295,12 @@ by a child template that "extends" this file. +@@ -1287,6 +1287,12 @@ by a child template that "extends" this file. android:readPermission="android.permission.GLOBAL_SEARCH" /> @@ -123,5 +123,5 @@ index 8b061b9741a97..185f08c123009 100644 chrome_java_sources += userscripts_java_sources +chrome_java_sources += [ "java/src/org/chromium/chrome/browser/provider/SearchEngineProvider.java" ] -- -2.47.1 +2.48.1 diff --git a/build/e_patches/Browser-Change-adblock-url-to-ours.patch b/build/e_patches/Browser-Change-adblock-url-to-ours.patch index 472c3aec..45998d7b 100644 --- a/build/e_patches/Browser-Change-adblock-url-to-ours.patch +++ b/build/e_patches/Browser-Change-adblock-url-to-ours.patch @@ -1,4 +1,4 @@ -From ae032864beffec0ab7053634a69a074e5e8912b2 Mon Sep 17 00:00:00 2001 +From fa75635802c30286707d532511b2e708ccde9f13 Mon Sep 17 00:00:00 2001 From: althafvly Date: Tue, 10 Sep 2024 12:17:23 +0530 Subject: Browser: Change adblock url to ours @@ -43,10 +43,10 @@ index ef6d1652c97f0..24cd56084827d 100644 mAdBlockFiltersUrlEdit.setText(AdBlockNativeGateway.getAdBlockFiltersURL()); mAdBlockFiltersUrlEdit.addTextChangedListener(this); diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc -index aeacb35386f12..ff6a4e0be5533 100644 +index fb0e518a7e4a9..69cc40bca46d5 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc -@@ -1239,11 +1239,11 @@ BrowserProcessImpl::adblock_updater() { +@@ -1234,11 +1234,11 @@ BrowserProcessImpl::adblock_updater() { std::unique_ptr scheduler = std::make_unique(); @@ -63,7 +63,7 @@ index aeacb35386f12..ff6a4e0be5533 100644 } adblock_updater_ = std::make_unique( -@@ -1251,7 +1251,7 @@ BrowserProcessImpl::adblock_updater() { +@@ -1246,7 +1246,7 @@ BrowserProcessImpl::adblock_updater() { std::move(scheduler), g_browser_process->subresource_filter_ruleset_service(), local_state()->GetBoolean(prefs::kAdBlockEnabled), @@ -73,10 +73,10 @@ index aeacb35386f12..ff6a4e0be5533 100644 return adblock_updater_.get(); } diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc -index cfc3e3fd63558..2afa1e270bd43 100644 +index ec95c866fff39..d8806890e13ea 100644 --- a/chrome/browser/net/system_network_context_manager.cc +++ b/chrome/browser/net/system_network_context_manager.cc -@@ -642,7 +642,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) { +@@ -643,7 +643,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) { registry->RegisterBooleanPref(prefs::kAdBlockEnabled, false); registry->RegisterStringPref(prefs::kAdBlockFiltersURL, @@ -86,5 +86,5 @@ index cfc3e3fd63558..2afa1e270bd43 100644 // Static auth params registry->RegisterStringPref(prefs::kAuthSchemes, -- -2.47.1 +2.48.1 diff --git a/build/e_patches/Browser-Change-app-and-package-name-to-browser.patch b/build/e_patches/Browser-Change-app-and-package-name-to-browser.patch index 3e477d31..465352ba 100644 --- a/build/e_patches/Browser-Change-app-and-package-name-to-browser.patch +++ b/build/e_patches/Browser-Change-app-and-package-name-to-browser.patch @@ -1,4 +1,4 @@ -From 77dd135feedab18aafe90396155d41dcf5adf490 Mon Sep 17 00:00:00 2001 +From ac04f8686be3bb1ff89748e63d1117d9a3e12e47 Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Fri, 26 Nov 2021 05:39:25 +0000 Subject: Browser: Change app and package name to browser @@ -27,5 +27,5 @@ index cc1f2a30cb3c5..49863cede1033 100644 + Browser quick action search -- -2.47.1 +2.48.1 diff --git a/build/e_patches/Browser-Change-info-bar-icon.patch b/build/e_patches/Browser-Change-info-bar-icon.patch index a363baa8..ce0f76d9 100644 --- a/build/e_patches/Browser-Change-info-bar-icon.patch +++ b/build/e_patches/Browser-Change-info-bar-icon.patch @@ -1,4 +1,4 @@ -From e1033025e432452931661cc459f225e3021b51f4 Mon Sep 17 00:00:00 2001 +From 9f3e8573f386be8a33c772d172397e08de654486 Mon Sep 17 00:00:00 2001 From: althafvly Date: Wed, 14 Dec 2022 16:17:58 +0530 Subject: Browser: Change info bar icon @@ -496,5 +496,5 @@ zO+Z*7&Bk!eoH~L?=|dPuV(*)KA768Q5Fa%#552smrlzK*rlzK*rlw|+-vB>p(BZ;* R_znO7002ovPDHLkV1oYj%jf_A -- -2.47.1 +2.48.1 diff --git a/build/e_patches/Browser-Disable-Android-native-autofill-by-default.patch b/build/e_patches/Browser-Disable-Android-native-autofill-by-default.patch index bed01c3e..d3ce422b 100644 --- a/build/e_patches/Browser-Disable-Android-native-autofill-by-default.patch +++ b/build/e_patches/Browser-Disable-Android-native-autofill-by-default.patch @@ -1,4 +1,4 @@ -From d1fe9c2ee9c39c5e225940ff6c1e71bf830605cf Mon Sep 17 00:00:00 2001 +From d2d7657d3eec661aba60bc47bd5ef7d0df85ce47 Mon Sep 17 00:00:00 2001 From: althafvly Date: Tue, 22 Aug 2023 06:16:40 +0000 Subject: Browser: Disable Android native autofill by default @@ -21,5 +21,5 @@ index fe6d74befcec1..87b3685d4cb6b 100644 registry->RegisterIntegerPref(prefs::kAutocompleteLastVersionRetentionPolicy, 0); -- -2.47.1 +2.48.1 diff --git a/build/e_patches/Browser-Enable-custom-tabs-by-default.patch b/build/e_patches/Browser-Enable-custom-tabs-by-default.patch index 114791c5..cb691633 100644 --- a/build/e_patches/Browser-Enable-custom-tabs-by-default.patch +++ b/build/e_patches/Browser-Enable-custom-tabs-by-default.patch @@ -1,4 +1,4 @@ -From 34005afb0d960743c99d6e7dfc28221b54c0e89c Mon Sep 17 00:00:00 2001 +From c66f92b723920e08fd1d1155598096018e9bdf43 Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Mon, 29 Nov 2021 03:37:37 +0000 Subject: Browser: Enable custom tabs by default @@ -24,10 +24,10 @@ index 778020bb87f4c..91183f69c335e 100644 android:title="@string/uses_separate_storagepartition_for_cct_title" android:summary="@string/uses_separate_storagepartition_for_cct_summary" diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java -index a28ab51bf8e92..8dc21f944c9c7 100644 +index 4ecdbec3d4290..658e912dd4248 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java -@@ -260,7 +260,7 @@ public class LaunchIntentDispatcher { +@@ -282,7 +282,7 @@ public class LaunchIntentDispatcher { public static boolean isCustomTabIntent(Intent intent) { if (intent == null) return false; if (!ContextUtils.getAppSharedPreferences() @@ -37,5 +37,5 @@ index a28ab51bf8e92..8dc21f944c9c7 100644 Log.w( TAG, -- -2.47.1 +2.48.1 diff --git a/build/e_patches/Browser-Enable-do-not-track-by-default.patch b/build/e_patches/Browser-Enable-do-not-track-by-default.patch index 1c5c5465..e89a05a8 100644 --- a/build/e_patches/Browser-Enable-do-not-track-by-default.patch +++ b/build/e_patches/Browser-Enable-do-not-track-by-default.patch @@ -1,4 +1,4 @@ -From 2250af39dcdecefbe516c8f017de8c9b5434f199 Mon Sep 17 00:00:00 2001 +From 19930949182e01abe3775bc3535581589e755f47 Mon Sep 17 00:00:00 2001 From: althafvly Date: Fri, 26 Nov 2021 07:34:57 +0000 Subject: Browser: Enable do not track by default @@ -21,5 +21,5 @@ index fd95362628114..b6e6e86e0fa22 100644 registry->RegisterBooleanPref(prefs::kUserBypass3pcExceptionsMigrated, false); -- -2.47.1 +2.48.1 diff --git a/build/e_patches/Browser-Enable-external-intent-requests.patch b/build/e_patches/Browser-Enable-external-intent-requests.patch index e3e54a22..116d53d6 100644 --- a/build/e_patches/Browser-Enable-external-intent-requests.patch +++ b/build/e_patches/Browser-Enable-external-intent-requests.patch @@ -1,4 +1,4 @@ -From acc5f1c0e112a7e39bcd99512a75b747cedcd364 Mon Sep 17 00:00:00 2001 +From 671d22da5400d61bb7608a35eb02045f21e25c59 Mon Sep 17 00:00:00 2001 From: althafvly Date: Tue, 5 Nov 2024 10:08:21 +0530 Subject: Browser: Enable external intent requests @@ -61,10 +61,10 @@ index c7ad21ed8c9af..ec58d93767b52 100644 @Override diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java -index ff3e6935090a7..e36807f3ceb4e 100644 +index 073ec4c2dac3b..f369505f11f0d 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java -@@ -120,6 +120,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment +@@ -121,6 +121,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment private ChromeSwitchPreference allowCustomTabIntentsPref; private ChromeSwitchPreference openExternalLinksPref; @@ -171,5 +171,5 @@ index c4015ad7de119..0000000000000 - "AllowExternalIntentRequests", - base::FEATURE_DISABLED_BY_DEFAULT); -- -2.47.1 +2.48.1 diff --git a/build/e_patches/Browser-Enable-search-suggestion-by-default.patch b/build/e_patches/Browser-Enable-search-suggestion-by-default.patch index 787c64ba..919ede1b 100644 --- a/build/e_patches/Browser-Enable-search-suggestion-by-default.patch +++ b/build/e_patches/Browser-Enable-search-suggestion-by-default.patch @@ -1,4 +1,4 @@ -From aec24b056e69fb247a82775e9b3a6d1722cc53b6 Mon Sep 17 00:00:00 2001 +From 46196715cfa31b6e09bde920f1cf250b37f4cd9d Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Mon, 29 Nov 2021 03:39:21 +0000 Subject: Browser: Enable search suggestion by default @@ -9,10 +9,10 @@ Signed-off-by: Aayush Gupta 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc -index 946009e7ce63e..89254771117da 100644 +index 1708f7f994ddd..4385d5d90f9c8 100644 --- a/chrome/browser/profiles/profile.cc +++ b/chrome/browser/profiles/profile.cc -@@ -308,7 +308,7 @@ const char Profile::kProfileKey[] = "__PROFILE__"; +@@ -316,7 +316,7 @@ const char Profile::kProfileKey[] = "__PROFILE__"; void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( prefs::kSearchSuggestEnabled, @@ -22,5 +22,5 @@ index 946009e7ce63e..89254771117da 100644 #if BUILDFLAG(IS_ANDROID) registry->RegisterStringPref( -- -2.47.1 +2.48.1 diff --git a/build/e_patches/Browser-Enable-unified-autoplay-by-default.patch b/build/e_patches/Browser-Enable-unified-autoplay-by-default.patch index 68060d7c..92f96a29 100644 --- a/build/e_patches/Browser-Enable-unified-autoplay-by-default.patch +++ b/build/e_patches/Browser-Enable-unified-autoplay-by-default.patch @@ -1,4 +1,4 @@ -From b1460ee71e79257e0ef044a2abba7fd409c24391 Mon Sep 17 00:00:00 2001 +From 1564cd63a3a4f5dc7c8b72eaffb8532fe0509dbf Mon Sep 17 00:00:00 2001 From: althafvly Date: Fri, 29 Sep 2023 16:30:17 +0530 Subject: Browser: Enable unified autoplay by default @@ -22,10 +22,10 @@ index c7d5377ac6564..1b169f33a75d8 100644 /*valid_settings=*/{CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK}, WebsiteSettingsInfo::TOP_ORIGIN_ONLY_SCOPE, diff --git a/third_party/blink/renderer/core/html/media/autoplay_policy.cc b/third_party/blink/renderer/core/html/media/autoplay_policy.cc -index c5d166fe82e67..80955678d1d1e 100644 +index 34fb2b20ba46e..cc3b118ed79f4 100644 --- a/third_party/blink/renderer/core/html/media/autoplay_policy.cc +++ b/third_party/blink/renderer/core/html/media/autoplay_policy.cc -@@ -459,7 +459,7 @@ bool AutoplayPolicy::IsAutoplayAllowedPerSettings() const { +@@ -458,7 +458,7 @@ bool AutoplayPolicy::IsAutoplayAllowedPerSettings() const { return false; if (auto* settings_client = frame->GetContentSettingsClient()) { return settings_client->AllowContentSetting( @@ -35,5 +35,5 @@ index c5d166fe82e67..80955678d1d1e 100644 return true; } -- -2.47.1 +2.48.1 diff --git a/build/e_patches/Browser-Enable-webRTC-by-default.patch b/build/e_patches/Browser-Enable-webRTC-by-default.patch index 30c49ad2..8c292353 100644 --- a/build/e_patches/Browser-Enable-webRTC-by-default.patch +++ b/build/e_patches/Browser-Enable-webRTC-by-default.patch @@ -1,4 +1,4 @@ -From 2a6941e430d2560e2ef8f691e296ad7ee3b4b2be Mon Sep 17 00:00:00 2001 +From bc5f0b16c88c80bb6af4be967dd67e5f74453b37 Mon Sep 17 00:00:00 2001 From: althafvly Date: Fri, 20 Oct 2023 18:49:36 +0530 Subject: Browser: Enable webRTC by default @@ -21,10 +21,10 @@ index 69b2de0ff52fa..c4ce181e6c88c 100644 /*allowlisted_schemes=*/{}, /*valid_settings=*/{CONTENT_SETTING_ALLOW, diff --git a/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc b/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc -index 331a4a09acfb6..23d0ed48c5eae 100644 +index a89cacfbb3056..1fc4cc0c8ee31 100644 --- a/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc +++ b/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc -@@ -883,7 +883,7 @@ PeerConnectionDependencyFactory::CreatePortAllocator( +@@ -881,7 +881,7 @@ PeerConnectionDependencyFactory::CreatePortAllocator( WebRTCIPHandlingPolicy policy = GetWebRTCIPHandlingPolicy(webrtc_ip_handling_policy); blink::WebContentSettingsClient* settings = web_frame->GetContentSettingsClient(); @@ -47,10 +47,10 @@ index 0b8d9b03c92ba..3ad714a7a2d60 100644 } diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc b/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc -index 82e209c1e66eb..22b997470e972 100644 +index 4683910a5d539..175c74fc50664 100644 --- a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc +++ b/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc -@@ -1037,7 +1037,7 @@ RTCRtpCapabilities* RTCRtpSender::getCapabilities(ScriptState* state, +@@ -1036,7 +1036,7 @@ RTCRtpCapabilities* RTCRtpSender::getCapabilities(ScriptState* state, auto* web_frame = static_cast(WebFrame::FromCoreFrame(window->GetFrame())); blink::WebContentSettingsClient* settings = web_frame->GetContentSettingsClient(); @@ -60,5 +60,5 @@ index 82e209c1e66eb..22b997470e972 100644 } -- -2.47.1 +2.48.1 diff --git a/build/e_patches/Browser-Enable-webgl-by-default.patch b/build/e_patches/Browser-Enable-webgl-by-default.patch index 5b29ea35..9d12b25b 100644 --- a/build/e_patches/Browser-Enable-webgl-by-default.patch +++ b/build/e_patches/Browser-Enable-webgl-by-default.patch @@ -1,4 +1,4 @@ -From d5104876b6dcdeed2cf504cf93e43142a080d69d Mon Sep 17 00:00:00 2001 +From 3ecaab44c45d4222e87cbb60470b01f2593c49a3 Mon Sep 17 00:00:00 2001 From: althafvly Date: Tue, 24 Oct 2023 14:39:06 +0530 Subject: Browser: Enable webgl by default @@ -19,7 +19,7 @@ index 3ff01832baef4..dd88ffeab7bbb 100644 /*allowlisted_schemes=*/{}, /*valid_settings=*/{CONTENT_SETTING_ALLOW, diff --git a/third_party/blink/renderer/core/execution_context/execution_context.cc b/third_party/blink/renderer/core/execution_context/execution_context.cc -index 1a7909cd62f6f..95810a19c8a3f 100644 +index f50aef8b6f219..b703bdbf33bee 100644 --- a/third_party/blink/renderer/core/execution_context/execution_context.cc +++ b/third_party/blink/renderer/core/execution_context/execution_context.cc @@ -88,8 +88,8 @@ blink::WebContentSettingsClient* GetContentSettingsClientFor( @@ -34,5 +34,5 @@ index 1a7909cd62f6f..95810a19c8a3f 100644 ExecutionContext::ExecutionContext(v8::Isolate* isolate, -- -2.47.1 +2.48.1 diff --git a/build/e_patches/Browser-Fix-open-in-browser-text.patch b/build/e_patches/Browser-Fix-open-in-browser-text.patch index 713c2a14..c3ca3959 100644 --- a/build/e_patches/Browser-Fix-open-in-browser-text.patch +++ b/build/e_patches/Browser-Fix-open-in-browser-text.patch @@ -1,4 +1,4 @@ -From 4cfbb3e6bfaeb7d1f591707799a0ebeb77b1364e Mon Sep 17 00:00:00 2001 +From 646d06cf8b913ff407adeafe9974aef10fbaded8 Mon Sep 17 00:00:00 2001 From: althafvly Date: Wed, 2 Oct 2024 11:41:48 +0530 Subject: Browser: Fix open in browser text @@ -29,5 +29,5 @@ index f1fe2d0695070..512fdbdd2fd6d 100644 /** -- -2.47.1 +2.48.1 diff --git a/build/e_patches/Browser-Hide-settings-when-parental-control-is-active.patch b/build/e_patches/Browser-Hide-settings-when-parental-control-is-active.patch index 9b3439d4..194d569c 100644 --- a/build/e_patches/Browser-Hide-settings-when-parental-control-is-active.patch +++ b/build/e_patches/Browser-Hide-settings-when-parental-control-is-active.patch @@ -1,4 +1,4 @@ -From d3d1c72953e88c35951ecc4aa6b0617220f31101 Mon Sep 17 00:00:00 2001 +From 8d9920de4878d81e87489631bcac8c5981783355 Mon Sep 17 00:00:00 2001 From: althafvly Date: Thu, 11 Jul 2024 11:11:15 +0530 Subject: Browser: Hide settings when parental control is active @@ -11,10 +11,10 @@ Subject: Browser: Hide settings when parental control is active 4 files changed, 39 insertions(+), 1 deletion(-) 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 -index b086beeb3151c..76a9018135f69 100644 +index e9220cb9947d8..655865bba50a5 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java -@@ -2506,7 +2506,7 @@ public abstract class ChromeActivity +@@ -2433,7 +2433,7 @@ public abstract class ChromeActivity @BrowserProfileType int type = Profile.getBrowserProfileTypeFromProfile(getCurrentTabModel().getProfile()); @@ -24,7 +24,7 @@ index b086beeb3151c..76a9018135f69 100644 SettingsNavigationFactory.createSettingsNavigation(); settingsNavigation.startSettings(this); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java -index 951be38ed8768..76877ebd6dcb1 100644 +index de19ad9e9efa7..251a965a90fcb 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java @@ -37,6 +37,7 @@ import org.chromium.base.supplier.OneshotSupplier; @@ -35,7 +35,7 @@ index 951be38ed8768..76877ebd6dcb1 100644 import org.chromium.chrome.browser.ActivityTabProvider; import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor; import org.chromium.chrome.browser.profiles.ProfileManager; -@@ -649,6 +650,10 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -658,6 +659,10 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate item.setEnabled(isIncognitoEnabled() && !isIncognitoReauthShowing); } @@ -47,12 +47,12 @@ index 951be38ed8768..76877ebd6dcb1 100644 item.setEnabled(false); } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java b/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java -index e9a067e1ae512..d456f964da5c7 100644 +index a707b811668ee..7af5803b5e01e 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java -@@ -53,6 +53,7 @@ import org.chromium.components.cached_flags.CachedFlagsSafeMode; +@@ -53,6 +53,7 @@ import org.chromium.components.cached_flags.CachedFlagUtils; + import org.chromium.components.cached_flags.CachedFlagsSafeMode; import org.chromium.components.omnibox.OmniboxFeatures; - import org.chromium.components.signin.SigninFeatureMap; +import java.lang.reflect.Method; import java.util.ArrayList; @@ -92,7 +92,7 @@ index e9a067e1ae512..d456f964da5c7 100644 + } } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java -index 70e27fd6ba2e5..713df584feb62 100644 +index 078e310afdc6c..67c254deb18e0 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java @@ -25,6 +25,7 @@ import org.chromium.base.supplier.ObservableSupplierImpl; @@ -114,5 +114,5 @@ index 70e27fd6ba2e5..713df584feb62 100644 SyncService syncService = SyncServiceFactory.getForProfile(getProfile()); if (syncService != null) { -- -2.47.1 +2.48.1 diff --git a/build/e_patches/Browser-Modify-default-search-engines.patch b/build/e_patches/Browser-Modify-default-search-engines.patch index 5bfd02e6..40280f4b 100644 --- a/build/e_patches/Browser-Modify-default-search-engines.patch +++ b/build/e_patches/Browser-Modify-default-search-engines.patch @@ -1,4 +1,4 @@ -From 6eacc6a7917334673baf22643857124285aef2de Mon Sep 17 00:00:00 2001 +From 3fe8fa1587fd308081b466e2b57a2388f8a8b744 Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Thu, 18 Mar 2021 13:42:44 +0100 Subject: Browser: Modify default search engines @@ -102,17 +102,17 @@ index c63dc8bd3eab2..b9c9db2d6d08d 100644 LocaleTemplateUrlLoader(const LocaleTemplateUrlLoader&) = delete; LocaleTemplateUrlLoader& operator=(const LocaleTemplateUrlLoader&) = delete; diff --git a/chrome/browser/locale/java/src/org/chromium/chrome/browser/locale/LocaleManagerDelegate.java b/chrome/browser/locale/java/src/org/chromium/chrome/browser/locale/LocaleManagerDelegate.java -index 145b3c997fab6..9d1195d973403 100644 +index 22f8ec082c49a..5d44feaf4a8f9 100644 --- a/chrome/browser/locale/java/src/org/chromium/chrome/browser/locale/LocaleManagerDelegate.java +++ b/chrome/browser/locale/java/src/org/chromium/chrome/browser/locale/LocaleManagerDelegate.java -@@ -141,7 +141,6 @@ public class LocaleManagerDelegate { +@@ -153,7 +153,6 @@ public class LocaleManagerDelegate { */ private void revertDefaultSearchEngineOverride() { if (!isSearchEngineAutoSwitchEnabled() || isSpecialLocaleEnabled()) return; - getLocaleTemplateUrlLoader().setGoogleAsDefaultSearch(); - showSnackbar(ContextUtils.getApplicationContext().getString(R.string.using_google)); + showSnackbarForSpecialLocale( + ContextUtils.getApplicationContext().getString(R.string.using_google)); } - diff --git a/chrome/browser/locale/java/src/org/chromium/chrome/browser/locale/LocaleTemplateUrlLoader.java b/chrome/browser/locale/java/src/org/chromium/chrome/browser/locale/LocaleTemplateUrlLoader.java index b672ac77cd523..819cf19ce7a53 100644 --- a/chrome/browser/locale/java/src/org/chromium/chrome/browser/locale/LocaleTemplateUrlLoader.java @@ -245,5 +245,5 @@ index 2882651b9a923..835f994a74dbb 100644 } -- -2.47.1 +2.48.1 diff --git a/build/e_patches/Browser-Point-to-our-default-popular-sites.patch b/build/e_patches/Browser-Point-to-our-default-popular-sites.patch index 40a3d4d4..a606d997 100644 --- a/build/e_patches/Browser-Point-to-our-default-popular-sites.patch +++ b/build/e_patches/Browser-Point-to-our-default-popular-sites.patch @@ -1,4 +1,4 @@ -From 9ce62c91c47eb3e3f107a51b7af611ce632a5dd6 Mon Sep 17 00:00:00 2001 +From 33e94d6b715498bb3e9bde2581d0a863d9c109e6 Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Fri, 26 Nov 2021 07:29:59 +0000 Subject: Browser: Point to our default popular sites @@ -47,5 +47,5 @@ index 3403a2c029399..259160cce7edf 100644 -- -2.47.1 +2.48.1 diff --git a/build/e_patches/Browser-Redirect-users-to-e-foundation-docs.patch b/build/e_patches/Browser-Redirect-users-to-e-foundation-docs.patch index a0fa3209..e237ad03 100644 --- a/build/e_patches/Browser-Redirect-users-to-e-foundation-docs.patch +++ b/build/e_patches/Browser-Redirect-users-to-e-foundation-docs.patch @@ -1,4 +1,4 @@ -From 4265ca51621a0ef999c122de13808926d3dca323 Mon Sep 17 00:00:00 2001 +From bd8517c324ddccb286553b1b742e41a043026410 Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Tue, 11 May 2021 14:22:00 +0200 Subject: Browser: Redirect users to e foundation docs @@ -36,5 +36,5 @@ index b4410a1abd95f..1f99d13ab8b86 100644 /** * Starts an activity showing a help page for the specified context ID. -- -2.47.1 +2.48.1 diff --git a/build/e_patches/Browser-Remove-broken-link-about-entries.patch b/build/e_patches/Browser-Remove-broken-link-about-entries.patch index 58a16109..d61435c9 100644 --- a/build/e_patches/Browser-Remove-broken-link-about-entries.patch +++ b/build/e_patches/Browser-Remove-broken-link-about-entries.patch @@ -1,4 +1,4 @@ -From fea25a530e1a3fd8ca6520abefa92fb70ab89f4f Mon Sep 17 00:00:00 2001 +From 56a2a499059cbfe769debd53d8062387a179512c Mon Sep 17 00:00:00 2001 From: althafvly Date: Mon, 20 Feb 2023 07:39:35 +0000 Subject: Browser: Remove broken link about entries @@ -29,5 +29,5 @@ index 32067c19d4f7a..8998689617e27 100644 - app:url="@string/google_privacy_policy_url" /> -- -2.47.1 +2.48.1 diff --git a/build/e_patches/Browser-Remove-logo-from-chromeversion.patch b/build/e_patches/Browser-Remove-logo-from-chromeversion.patch index 9f980b2f..15ee2264 100644 --- a/build/e_patches/Browser-Remove-logo-from-chromeversion.patch +++ b/build/e_patches/Browser-Remove-logo-from-chromeversion.patch @@ -1,4 +1,4 @@ -From b10656ef4abde12acf8bb6ea22dce93594db06e1 Mon Sep 17 00:00:00 2001 +From 06793e3151ab857999d7bd60ab9790075ed4f98e Mon Sep 17 00:00:00 2001 From: A Mak Date: Sat, 25 Jul 2020 17:56:47 -0700 Subject: Browser: Remove logo from chrome://version @@ -8,7 +8,7 @@ Subject: Browser: Remove logo from chrome://version 1 file changed, 7 deletions(-) diff --git a/components/version_ui/resources/about_version.html b/components/version_ui/resources/about_version.html -index 508c4ecfd790f..e0045fb361640 100644 +index c04197bd7b397..9cffeee25842b 100644 --- a/components/version_ui/resources/about_version.html +++ b/components/version_ui/resources/about_version.html @@ -53,13 +53,6 @@ about:version template page @@ -26,5 +26,5 @@ index 508c4ecfd790f..e0045fb361640 100644
$i18n{company}
-- -2.47.1 +2.48.1 diff --git a/build/e_patches/Browser-Remove-send-to-devices-option.patch b/build/e_patches/Browser-Remove-send-to-devices-option.patch index 30e8afb7..8b0d646f 100644 --- a/build/e_patches/Browser-Remove-send-to-devices-option.patch +++ b/build/e_patches/Browser-Remove-send-to-devices-option.patch @@ -1,4 +1,4 @@ -From 2c6bdceaa5e51a6bebb673789498506630f3bf7e Mon Sep 17 00:00:00 2001 +From 519a705cb0f32bedf93cac1b07764e79717af4b7 Mon Sep 17 00:00:00 2001 From: althafvly Date: Fri, 20 Oct 2023 18:23:09 +0530 Subject: Browser: Remove send to devices option @@ -8,10 +8,10 @@ Subject: Browser: Remove send to devices option 1 file changed, 34 deletions(-) diff --git a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/ChromeProvidedSharingOptionsProviderBase.java b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/ChromeProvidedSharingOptionsProviderBase.java -index d28f469d49760..99621a3ce2e5d 100644 +index 782a73d49ca2a..5bbe442181520 100644 --- a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/ChromeProvidedSharingOptionsProviderBase.java +++ b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/ChromeProvidedSharingOptionsProviderBase.java -@@ -270,7 +270,6 @@ public abstract class ChromeProvidedSharingOptionsProviderBase { +@@ -271,7 +271,6 @@ public abstract class ChromeProvidedSharingOptionsProviderBase { maybeAddLongScreenshotFirstPartyOption(); maybeAddPrintFirstPartyOption(); } @@ -19,7 +19,7 @@ index d28f469d49760..99621a3ce2e5d 100644 maybeAddQrCodeFirstPartyOption(); } -@@ -281,14 +280,6 @@ public abstract class ChromeProvidedSharingOptionsProviderBase { +@@ -282,14 +281,6 @@ public abstract class ChromeProvidedSharingOptionsProviderBase { } } @@ -34,7 +34,7 @@ index d28f469d49760..99621a3ce2e5d 100644 private void maybeAddQrCodeFirstPartyOption() { } -@@ -395,31 +386,6 @@ public abstract class ChromeProvidedSharingOptionsProviderBase { +@@ -399,31 +390,6 @@ public abstract class ChromeProvidedSharingOptionsProviderBase { .build(); } @@ -67,5 +67,5 @@ index d28f469d49760..99621a3ce2e5d 100644 return new FirstPartyOptionBuilder(ContentType.LINK_PAGE_VISIBLE) .setIcon(R.drawable.sharing_print, R.string.print_share_activity_title) -- -2.47.1 +2.48.1 diff --git a/build/e_patches/Browser-Rename-strings-to-browser.patch b/build/e_patches/Browser-Rename-strings-to-browser.patch index c1d6277d..d66f28cd 100644 --- a/build/e_patches/Browser-Rename-strings-to-browser.patch +++ b/build/e_patches/Browser-Rename-strings-to-browser.patch @@ -1,4 +1,4 @@ -From 13982dd46bac0ded8fff87a412369222f44972e6 Mon Sep 17 00:00:00 2001 +From ee98890fecff2b255e9be50fc678982b0d88d2d4 Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Fri, 26 Nov 2021 07:12:30 +0000 Subject: Browser: Rename strings to browser @@ -27,7 +27,7 @@ index fb1dfed23052b..d5092508ce452 100644 android:key="application_version" android:title="@string/application_version_title" /> diff --git a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java -index 5556ff632b02b..f3454d344e207 100644 +index 45645bf509f4d..c42374eac7404 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java @@ -31,7 +31,7 @@ public class AboutChromeSettings extends PreferenceFragmentCompat @@ -38,8 +38,8 @@ index 5556ff632b02b..f3454d344e207 100644 + private static final String PREF_E_BROWSER_INFORMATION = "e_browser_information"; // Non-translated strings: - private static final String MSG_DEVELOPER_ENABLE_COUNTDOWN = -@@ -58,9 +58,9 @@ public class AboutChromeSettings extends PreferenceFragmentCompat + @SuppressWarnings("InlineFormatString") +@@ -60,9 +60,9 @@ public class AboutChromeSettings extends PreferenceFragmentCompat p.setOnPreferenceClickListener(this); p = findPreference(PREF_OS_VERSION); p.setSummary(AboutSettingsBridge.getOSVersion()); @@ -53,7 +53,7 @@ index 5556ff632b02b..f3454d344e207 100644 @Override diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd -index 1258473ad284e..49454e94b81cf 100644 +index 7e17b609cb97c..61b32ddd37fe2 100644 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd @@ -202,6 +202,8 @@ CHAR_LIMIT guidelines: @@ -82,5 +82,5 @@ index 0000000000000..49da40abd38e7 + + -- -2.47.1 +2.48.1 diff --git a/build/e_patches/Browser-Replace-default-tab-favicon.patch b/build/e_patches/Browser-Replace-default-tab-favicon.patch index 08a6a1b8..0c246d2f 100644 --- a/build/e_patches/Browser-Replace-default-tab-favicon.patch +++ b/build/e_patches/Browser-Replace-default-tab-favicon.patch @@ -1,4 +1,4 @@ -From ac01f916c5d33e04ae1557b2053848004e4da33b Mon Sep 17 00:00:00 2001 +From 1b4e49799d9175c9996e5da887700813701b5274 Mon Sep 17 00:00:00 2001 From: althafvly Date: Mon, 2 Jan 2023 15:12:41 +0530 Subject: Browser: Replace default tab favicon @@ -274,5 +274,5 @@ zgHvtB1wLAMW7fpK0Dkn>u|T_ZEk;p!1?**bE*en_KaCliE Date: Thu, 19 Jan 2023 05:41:58 +0000 Subject: Browser: Spoof as Pixel 4a by default @@ -71,5 +71,5 @@ index 0c758175d87b2..98d89019ad500 100644 std::string SysInfo::GetAndroidHardwareEGL() { -- -2.47.1 +2.48.1 diff --git a/build/e_patches/Browser-Use-adaptive-icon-for-recents-UI.patch b/build/e_patches/Browser-Use-adaptive-icon-for-recents-UI.patch index 262a8618..0ac9dd0c 100644 --- a/build/e_patches/Browser-Use-adaptive-icon-for-recents-UI.patch +++ b/build/e_patches/Browser-Use-adaptive-icon-for-recents-UI.patch @@ -1,4 +1,4 @@ -From bdd51468d91d23613ff8bbcfde08ddfb25780066 Mon Sep 17 00:00:00 2001 +From 5ea107080381f4dd136f0a15d2936e8a8a004c95 Mon Sep 17 00:00:00 2001 From: althafvly Date: Wed, 14 Dec 2022 12:18:50 +0530 Subject: Browser: Use adaptive icon for recents UI @@ -8,7 +8,7 @@ Subject: Browser: Use adaptive icon for recents UI 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java -index 13897ae316e50..77e29331480f5 100644 +index 54f24effe5c22..2989881ef969e 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java @@ -12,6 +12,8 @@ import android.app.ActivityManager.TaskDescription; @@ -20,7 +20,7 @@ index 13897ae316e50..77e29331480f5 100644 import android.os.Build; import android.os.Build.VERSION_CODES; import android.os.Bundle; -@@ -355,11 +357,15 @@ public class ChromeBaseAppCompatActivity extends AppCompatActivity +@@ -384,11 +386,15 @@ public class ChromeBaseAppCompatActivity extends AppCompatActivity /** Sets the default task description that will appear in the recents UI. */ protected void setDefaultTaskDescription() { @@ -38,5 +38,5 @@ index 13897ae316e50..77e29331480f5 100644 @Override public void onNightModeStateChanged() { -- -2.47.1 +2.48.1 diff --git a/build/e_patches/Browser-Use-correct-switch-scale.patch b/build/e_patches/Browser-Use-correct-switch-scale.patch index 25f1f5a3..4cc4b5d7 100644 --- a/build/e_patches/Browser-Use-correct-switch-scale.patch +++ b/build/e_patches/Browser-Use-correct-switch-scale.patch @@ -1,4 +1,4 @@ -From 55ad8340650c0b85b35fdb0e159bab319dd10a22 Mon Sep 17 00:00:00 2001 +From 7568f72bcafd508bbc55c7dc83f680ad2e5c6f19 Mon Sep 17 00:00:00 2001 From: althafvly Date: Wed, 7 Aug 2024 14:05:16 +0530 Subject: Browser: Use correct switch scale @@ -21,5 +21,5 @@ index 675a27c7ee75e..6fb89c1891296 100644 60dp @dimen/min_touch_target_size -- -2.47.1 +2.48.1 diff --git a/build/e_patches/Browser-Use-our-custom-icon-for-browser.patch b/build/e_patches/Browser-Use-our-custom-icon-for-browser.patch index 321f2b81..b28105d4 100644 --- a/build/e_patches/Browser-Use-our-custom-icon-for-browser.patch +++ b/build/e_patches/Browser-Use-our-custom-icon-for-browser.patch @@ -1,4 +1,4 @@ -From 80b6fd7c03b7a3af9a6a9b12d42f72041a8a82fe Mon Sep 17 00:00:00 2001 +From 399a9af7a8be597e4b559bfd26621ea944537d0f Mon Sep 17 00:00:00 2001 From: althafvly Date: Fri, 18 Nov 2022 10:07:39 +0000 Subject: Browser: Use our custom icon for browser @@ -60,10 +60,10 @@ Subject: Browser: Use our custom icon for browser delete mode 100644 chrome/android/java/res_chromium_base/mipmap-xxxhdpi/layered_app_icon_background.png diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn -index 0fa9e5b84d615..a37c7208b26b6 100644 +index 5f97034b6992d..54f6a94fd5607 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -177,22 +177,24 @@ if (current_toolchain == default_toolchain) { +@@ -178,22 +178,24 @@ if (current_toolchain == default_toolchain) { "java/res_base/values/ic_launcher_round_alias.xml", "java/res_base/values/values.xml", "java/res_base/xml/network_security_config.xml", @@ -98,7 +98,7 @@ index 0fa9e5b84d615..a37c7208b26b6 100644 "java/res_chromium_base/values/channel_constants.xml", ] } -@@ -2267,22 +2269,24 @@ if (current_toolchain == default_toolchain) { +@@ -2298,22 +2300,24 @@ if (current_toolchain == default_toolchain) { android_resources("chrome_public_apk_base_module_resources") { resource_overlay = true sources = [ @@ -4325,5 +4325,5 @@ index 41072a348f244..ef0766c75cd67 100644 + -- -2.47.1 +2.48.1 diff --git a/build/e_patches/Browser-disable-first-run-welcome-page.patch b/build/e_patches/Browser-disable-first-run-welcome-page.patch index b3431785..efa18958 100644 --- a/build/e_patches/Browser-disable-first-run-welcome-page.patch +++ b/build/e_patches/Browser-disable-first-run-welcome-page.patch @@ -1,4 +1,4 @@ -From 684fb9cde59de24607783269a705778b30408778 Mon Sep 17 00:00:00 2001 +From 5dc73a7213dd28c20ca6f2f22dc51d30aa53dc9b Mon Sep 17 00:00:00 2001 From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Sun, 26 Nov 2017 22:51:43 +0100 Subject: Browser: disable first run welcome page @@ -47,5 +47,5 @@ index 4aedb8a0f1d95..d10c15f0fad1c 100644 /** -- -2.47.1 +2.48.1 diff --git a/build/e_patches/Browser-disable-price-shopping-commerce-integration.patch b/build/e_patches/Browser-disable-price-shopping-commerce-integration.patch index 1b04c1a9..08777214 100644 --- a/build/e_patches/Browser-disable-price-shopping-commerce-integration.patch +++ b/build/e_patches/Browser-disable-price-shopping-commerce-integration.patch @@ -1,4 +1,4 @@ -From 96eecf1029f5efd4766d4711d97971f2fd65ff4a Mon Sep 17 00:00:00 2001 +From ab248374ba00b357ac69018ee832025cb7dc50a8 Mon Sep 17 00:00:00 2001 From: althafvly Date: Wed, 4 Oct 2023 19:36:24 +0530 Subject: Browser: disable price shopping commerce integration @@ -9,10 +9,10 @@ Subject: Browser: disable price shopping commerce integration 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java -index a40db3645e945..951be38ed8768 100644 +index 7abab8da36653..de19ad9e9efa7 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java -@@ -1225,7 +1225,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -1234,7 +1234,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate } Profile profile = currentTab.getProfile(); @@ -21,7 +21,7 @@ index a40db3645e945..951be38ed8768 100644 ShoppingService.ProductInfo info = null; if (service != null) { info = service.getAvailableProductInfoForUrl(currentTab.getUrl()); -@@ -1258,7 +1258,9 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -1267,7 +1267,9 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate } else { startPriceTrackingMenuItem.setVisible(true); stopPriceTrackingMenuItem.setVisible(false); @@ -33,10 +33,10 @@ index a40db3645e945..951be38ed8768 100644 /** diff --git a/components/commerce/core/commerce_feature_list.cc b/components/commerce/core/commerce_feature_list.cc -index a67213fe34673..e1073e128ab13 100644 +index 875b7e93d69b6..cdc7912b56905 100644 --- a/components/commerce/core/commerce_feature_list.cc +++ b/components/commerce/core/commerce_feature_list.cc -@@ -123,7 +123,7 @@ BASE_FEATURE(kCommerceAllowLocalImages, +@@ -124,7 +124,7 @@ BASE_FEATURE(kCommerceAllowLocalImages, BASE_FEATURE(kCommerceAllowOnDemandBookmarkUpdates, "CommerceAllowOnDemandBookmarkUpdates", @@ -45,7 +45,7 @@ index a67213fe34673..e1073e128ab13 100644 BASE_FEATURE(kCommerceAllowOnDemandBookmarkBatchUpdates, "CommerceAllowOnDemandBookmarkBatchUpdates", -@@ -337,7 +337,7 @@ BASE_FEATURE(kShoppingPageTypesRegionLaunched, +@@ -355,7 +355,7 @@ BASE_FEATURE(kShoppingPageTypesRegionLaunched, "ShoppingPageTypesRegionLaunched", base::FEATURE_ENABLED_BY_DEFAULT); @@ -55,5 +55,5 @@ index a67213fe34673..e1073e128ab13 100644 BASE_FEATURE(kCommerceDeveloper, "CommerceDeveloper", -- -2.47.1 +2.48.1 diff --git a/build/e_patches/Browser-disable-search-provider-logo.patch b/build/e_patches/Browser-disable-search-provider-logo.patch index 3a3e77af..f7dda881 100644 --- a/build/e_patches/Browser-disable-search-provider-logo.patch +++ b/build/e_patches/Browser-disable-search-provider-logo.patch @@ -1,4 +1,4 @@ -From d0a0f204d955f4ee0552c211b1ad6c1fb2d74f00 Mon Sep 17 00:00:00 2001 +From 0031aa947f9bf5dd214771f5cb708b8695ebb0b5 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Mon, 17 Jun 2019 12:03:52 -0400 Subject: Browser: disable search provider logo @@ -42,5 +42,5 @@ index 3602bfc20e4d0..437b868e4ed9a 100644 jboolean TemplateUrlServiceAndroid::IsDefaultSearchEngineGoogle( -- -2.47.1 +2.48.1 diff --git a/build/e_patches/Change-accent-and-switch-to-match-our-palette.patch b/build/e_patches/Change-accent-and-switch-to-match-our-palette.patch index 9e2a051e..91b5898c 100644 --- a/build/e_patches/Change-accent-and-switch-to-match-our-palette.patch +++ b/build/e_patches/Change-accent-and-switch-to-match-our-palette.patch @@ -1,4 +1,4 @@ -From 244100d49dcffbd230e2844eb67ef3deb7e1a3f7 Mon Sep 17 00:00:00 2001 +From f8ff8da7b75bc386007723e3f88b5dbbfc8f7949 Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Tue, 20 Feb 2024 20:35:25 +0530 Subject: Change accent and switch to match our palette @@ -185,10 +185,10 @@ index ecc6bc6b9b150..175082479e551 100644 - app:drawableTint="?attr/colorPrimary" /> + app:drawableTint="@color/default_control_color_active_baseline" /> diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBarViewBinder.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBarViewBinder.java -index 750f4aa6e25f2..6a63f0842de0d 100644 +index 8d17efe86438c..d2574f63c9f52 100644 --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBarViewBinder.java +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBarViewBinder.java -@@ -144,7 +144,7 @@ class UrlBarViewBinder { +@@ -142,7 +142,7 @@ class UrlBarViewBinder { final int color = useIncognitoColors ? view.getContext().getColor(R.color.default_control_color_active_dark) @@ -198,7 +198,7 @@ index 750f4aa6e25f2..6a63f0842de0d 100644 textSelectHandle.mutate().setTint(color); textSelectHandleLeft.mutate().setTint(color); diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/styles/OmniboxResourceProvider.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/styles/OmniboxResourceProvider.java -index 1075f1f27999d..270b7a0cece6f 100644 +index acddf13fb2e56..aa8bd91b64951 100644 --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/styles/OmniboxResourceProvider.java +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/styles/OmniboxResourceProvider.java @@ -352,7 +352,7 @@ public class OmniboxResourceProvider { @@ -221,7 +221,7 @@ index 56a1aac203baa..40a9798da1323 100644 - app:drawableTint="?attr/colorPrimary" /> + app:drawableTint="@color/default_control_color_active_baseline" /> diff --git a/components/browser_ui/styles/android/BUILD.gn b/components/browser_ui/styles/android/BUILD.gn -index d5ddd2b72ef0f..730829dbf399e 100644 +index b51a6ed01af82..efde759481a26 100644 --- a/components/browser_ui/styles/android/BUILD.gn +++ b/components/browser_ui/styles/android/BUILD.gn @@ -57,6 +57,8 @@ android_resources("java_resources") { @@ -233,7 +233,7 @@ index d5ddd2b72ef0f..730829dbf399e 100644 "java/res/drawable-hdpi/btn_star_filled.png", "java/res/drawable-hdpi/ic_delete_white_24dp.png", "java/res/drawable-hdpi/ic_edit_24dp.png", -@@ -238,6 +240,8 @@ android_resources("java_resources") { +@@ -232,6 +234,8 @@ android_resources("java_resources") { "java/res/drawable/smartphone_black_24dp.xml", "java/res/drawable/star_outline_24dp.xml", "java/res/drawable/toolbar_hairline.xml", @@ -364,7 +364,7 @@ index 0fc8e8e6559ff..fcea0bb5b51d1 100644 diff --git a/components/browser_ui/theme/android/java/res/values/themes.xml b/components/browser_ui/theme/android/java/res/values/themes.xml -index 218d193e15c00..74e7358784b33 100644 +index 9c41e95bf8513..5e19ca1aab026 100644 --- a/components/browser_ui/theme/android/java/res/values/themes.xml +++ b/components/browser_ui/theme/android/java/res/values/themes.xml @@ -46,7 +46,7 @@ found in the LICENSE file. @@ -439,7 +439,7 @@ index 209d2a1568df5..c615ca94ceffa 100644 android:layout_width="wrap_content" android:layout_height="wrap_content" /> diff --git a/ui/android/java/res/values/color_palette.xml b/ui/android/java/res/values/color_palette.xml -index 5b94afa783490..7ee627019145a 100644 +index b02232ec720c1..0527074586dfd 100644 --- a/ui/android/java/res/values/color_palette.xml +++ b/ui/android/java/res/values/color_palette.xml @@ -11,13 +11,13 @@ found in the LICENSE file. @@ -458,7 +458,7 @@ index 5b94afa783490..7ee627019145a 100644 #0F0B57D0 #190B57D0 #1F0B57D0 -@@ -150,4 +150,9 @@ found in the LICENSE file. +@@ -151,4 +151,9 @@ found in the LICENSE file. @color/baseline_primary_40 @color/baseline_primary_20 @color/baseline_primary_10 @@ -469,5 +469,5 @@ index 5b94afa783490..7ee627019145a 100644 + #C8CED0 -- -2.47.1 +2.48.1 diff --git a/build/e_patches/Disable-AGSA-by-default.patch b/build/e_patches/Disable-AGSA-by-default.patch index 306c6d9c..5aea19f5 100644 --- a/build/e_patches/Disable-AGSA-by-default.patch +++ b/build/e_patches/Disable-AGSA-by-default.patch @@ -1,4 +1,4 @@ -From 5f897ea94782398a98eef13ddc9d22ee98522808 Mon Sep 17 00:00:00 2001 +From 6261088b79a41a75a2b954b094ae561436fe8e94 Mon Sep 17 00:00:00 2001 From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Sun, 26 Sep 2021 11:17:53 +0200 Subject: Disable AGSA by default @@ -13,14 +13,13 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../chrome/browser/share/LensUtils.java | 17 ++--------------- .../chrome/browser/ui/RootUiCoordinator.java | 17 ----------------- .../flags/android/chrome_feature_list.cc | 4 ++-- - .../chrome/browser/flags/ChromeFeatureList.java | 2 +- - 9 files changed, 9 insertions(+), 66 deletions(-) + 8 files changed, 8 insertions(+), 65 deletions(-) diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn -index a37c7208b26b6..e60106c464dae 100644 +index 54f6a94fd5607..e8994f95a6332 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -393,7 +393,6 @@ if (current_toolchain == default_toolchain) { +@@ -400,7 +400,6 @@ if (current_toolchain == default_toolchain) { "//chrome/browser/flags:java", "//chrome/browser/fullscreen/android:java", "//chrome/browser/gesturenav/android:java", @@ -28,7 +27,7 @@ index a37c7208b26b6..e60106c464dae 100644 "//chrome/browser/history:java", "//chrome/browser/history_clusters:java", "//chrome/browser/hub:factory_java", -@@ -1056,7 +1055,6 @@ if (current_toolchain == default_toolchain) { +@@ -1078,7 +1077,6 @@ if (current_toolchain == default_toolchain) { "//chrome/browser/flags:flags_junit_tests", "//chrome/browser/flags:java", "//chrome/browser/fullscreen/android:java", @@ -37,10 +36,10 @@ index a37c7208b26b6..e60106c464dae 100644 "//chrome/browser/history_clusters:java", "//chrome/browser/hub:factory_java", diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java -index 6c70d2587c79b..e6e0f77f4ee00 100644 +index 129dbd66a53d0..15aa23054972d 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java -@@ -41,7 +41,6 @@ import org.chromium.chrome.browser.document.ChromeLauncherActivity; +@@ -44,7 +44,6 @@ import org.chromium.chrome.browser.document.ChromeLauncherActivity; import org.chromium.chrome.browser.externalnav.IntentWithRequestMetadataHandler; import org.chromium.chrome.browser.externalnav.IntentWithRequestMetadataHandler.RequestMetadata; import org.chromium.chrome.browser.flags.ChromeFeatureList; @@ -48,9 +47,9 @@ index 6c70d2587c79b..e6e0f77f4ee00 100644 import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteCoordinator; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.profiles.ProfileManager; -@@ -256,9 +255,6 @@ public class IntentHandler { - public static final String EXTRA_APP_SPECIFIC_HISTORY = - "org.chromium.chrome.browser.app_specific_history"; +@@ -262,9 +261,6 @@ public class IntentHandler { + public static final String EXTRA_SKIP_PRECONNECT = + "org.chromium.chrome.browser.skip_preconnect"; - /** The package name for the Google Search App. */ - public static final String PACKAGE_GSA = GSAUtils.GSA_PACKAGE_NAME; @@ -58,7 +57,7 @@ index 6c70d2587c79b..e6e0f77f4ee00 100644 private static Pair sPendingReferrer; private static int sReferrerId; private static String sPendingIncognitoUrl; -@@ -301,7 +297,6 @@ public class IntentHandler { +@@ -307,7 +303,6 @@ public class IntentHandler { ExternalAppId.NEWS, ExternalAppId.LINE, ExternalAppId.WHATSAPP, @@ -66,7 +65,7 @@ index 6c70d2587c79b..e6e0f77f4ee00 100644 ExternalAppId.WEBAPK, ExternalAppId.YAHOO_MAIL, ExternalAppId.VIBER, -@@ -322,7 +317,6 @@ public class IntentHandler { +@@ -328,7 +323,6 @@ public class IntentHandler { int NEWS = 8; int LINE = 9; int WHATSAPP = 10; @@ -74,7 +73,7 @@ index 6c70d2587c79b..e6e0f77f4ee00 100644 int WEBAPK = 12; int YAHOO_MAIL = 13; int VIBER = 14; -@@ -524,8 +518,6 @@ public class IntentHandler { +@@ -526,8 +520,6 @@ public class IntentHandler { return ExternalAppId.LINE; } else if (packageName.equals(PACKAGE_WHATSAPP)) { return ExternalAppId.WHATSAPP; @@ -84,7 +83,7 @@ index 6c70d2587c79b..e6e0f77f4ee00 100644 return ExternalAppId.CHROME; } else if (packageName.startsWith(WEBAPK_PACKAGE_PREFIX)) { diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java -index 041878206c5f7..247c537cd49d4 100644 +index b050fae7d92d6..5d3b338ec46dd 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java @@ -38,7 +38,6 @@ import org.chromium.chrome.browser.ephemeraltab.EphemeralTabCoordinator; @@ -95,7 +94,7 @@ index 041878206c5f7..247c537cd49d4 100644 import org.chromium.chrome.browser.lens.LensController; import org.chromium.chrome.browser.lens.LensEntryPoint; import org.chromium.chrome.browser.lens.LensIntentParams; -@@ -899,12 +898,6 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { +@@ -895,12 +894,6 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { LensMetrics.LensSupportStatus.ACTIVITY_NOT_ACCESSIBLE); return false; } @@ -109,7 +108,7 @@ index 041878206c5f7..247c537cd49d4 100644 if (LensUtils.isDeviceOsBelowMinimum()) { LensMetrics.recordLensSupportStatus( diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityClientConnectionKeeper.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityClientConnectionKeeper.java -index 2fb7883c1b505..a606f4d157b08 100644 +index 4085fa8702363..fbe56a942e30c 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityClientConnectionKeeper.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityClientConnectionKeeper.java @@ -11,7 +11,6 @@ import org.chromium.base.metrics.RecordHistogram; @@ -155,7 +154,7 @@ index f4dba3e61fe61..d7bd7d6b2c21f 100644 return "webapk"; case ExternalAppId.YAHOO_MAIL: diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils.java -index 979faa3252842..a205e3277ba3c 100644 +index d28f7ade3313c..8ff94a355de29 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils.java @@ -10,7 +10,6 @@ import android.os.Build; @@ -183,24 +182,24 @@ index 979faa3252842..a205e3277ba3c 100644 } } -@@ -93,11 +84,7 @@ public class LensUtils { +@@ -92,11 +83,7 @@ public class LensUtils { * @return Whether the package is valid. */ - public static boolean isValidAgsaPackage(final ExternalAuthUtils externalAuthUtils) { + public static boolean isValidAgsaPackage() { - if (sFakePassableLensEnvironmentForTesting) { - return true; - } - -- return externalAuthUtils.isGoogleSigned(IntentHandler.PACKAGE_GSA); +- return ExternalAuthUtils.getInstance().isGoogleSigned(IntentHandler.PACKAGE_GSA); + return false; } public static boolean isGoogleLensFeatureEnabled(boolean isIncognito) { diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java -index fd1a3c30c08f9..cf1b701e698e7 100644 +index 038bd5d5532cd..dd5b125ce69ba 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java -@@ -923,23 +923,6 @@ public class RootUiCoordinator +@@ -926,23 +926,6 @@ public class RootUiCoordinator mLayoutStateProviderOneShotSupplier, mFullscreenManager); mReadAloudControllerSupplier.set(controller); @@ -222,13 +221,13 @@ index fd1a3c30c08f9..cf1b701e698e7 100644 - contextualSearchManager.addObserver(mReadAloudContextualSearchObserver); - } } - } - + if (BuildInfo.getInstance().isAutomotive + && ChromeFeatureList.isEnabled( diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc -index f41e3cba7d913..d24fc6a85105c 100644 +index ec02789bd6104..19c098bd76ceb 100644 --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -756,8 +756,8 @@ BASE_FEATURE(kEdgeToEdgeWebOptIn, +@@ -759,8 +759,8 @@ BASE_FEATURE(kEdgeToEdgeWebOptIn, base::FEATURE_DISABLED_BY_DEFAULT); BASE_FEATURE(kExperimentsForAgsa, @@ -239,19 +238,6 @@ index f41e3cba7d913..d24fc6a85105c 100644 BASE_FEATURE(kForceBrowserControlsUponExitingFullscreen, "ForceBrowserControlsUponExitingFullscreen", -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 -index f99a07f8c041c..e97fa0014371a 100644 ---- 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 -@@ -689,7 +689,7 @@ public abstract class ChromeFeatureList { - newCachedFlag(EDUCATIONAL_TIP_MODULE, false); - public static final CachedFlag sEnableDiscountInfoApi = - newCachedFlag(ENABLE_DISCOUNT_INFO_API, false); -- public static final CachedFlag sExperimentsForAgsa = newCachedFlag(EXPERIMENTS_FOR_AGSA, true); -+ public static final CachedFlag sExperimentsForAgsa = newCachedFlag(EXPERIMENTS_FOR_AGSA, false); - public static final CachedFlag sForceListTabSwitcher = - newCachedFlag(FORCE_LIST_TAB_SWITCHER, false); - public static final CachedFlag sForceTranslucentNotificationTrampoline = -- -2.47.1 +2.48.1 diff --git a/build/e_patches/Disable-adding-a-signed-out-avatar-on-new-tab-pages-by-default.patch b/build/e_patches/Disable-adding-a-signed-out-avatar-on-new-tab-pages-by-default.patch index 6ff9b7db..c951a728 100644 --- a/build/e_patches/Disable-adding-a-signed-out-avatar-on-new-tab-pages-by-default.patch +++ b/build/e_patches/Disable-adding-a-signed-out-avatar-on-new-tab-pages-by-default.patch @@ -1,4 +1,4 @@ -From 448ae151b8e65fa8be7cc0a2a834a385543fb7f0 Mon Sep 17 00:00:00 2001 +From 2f7a44e646d8e504d261e21359133c6af428597e Mon Sep 17 00:00:00 2001 From: fgei Date: Tue, 8 Aug 2023 09:10:36 +0000 Subject: Disable adding a signed out avatar on new tab pages by default @@ -8,10 +8,10 @@ Subject: Disable adding a signed out avatar on new tab pages by default 1 file changed, 12 insertions(+) diff --git a/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/IdentityDiscController.java b/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/IdentityDiscController.java -index 03930c7f90a96..9036ec2250e40 100644 +index 004f2b3d6960b..ef8e8232352c0 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/IdentityDiscController.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/IdentityDiscController.java -@@ -60,6 +60,9 @@ public class IdentityDiscController +@@ -62,6 +62,9 @@ public class IdentityDiscController ProfileDataCache.Observer, IdentityManager.Observer, ButtonDataProvider { @@ -21,7 +21,7 @@ index 03930c7f90a96..9036ec2250e40 100644 // Context is used for fetching resources and launching preferences page. private final Context mContext; private ActivityLifecycleDispatcher mActivityLifecycleDispatcher; -@@ -148,6 +151,11 @@ public class IdentityDiscController +@@ -150,6 +153,11 @@ public class IdentityDiscController return; } @@ -33,7 +33,7 @@ index 03930c7f90a96..9036ec2250e40 100644 String email = CoreAccountInfo.getEmailFrom(getSignedInAccountInfo()); ensureProfileDataCache(); -@@ -323,6 +331,10 @@ public class IdentityDiscController +@@ -325,6 +333,10 @@ public class IdentityDiscController } private String getContentDescription(@Nullable String email) { @@ -45,5 +45,5 @@ index 03930c7f90a96..9036ec2250e40 100644 if (SigninUtils.shouldShowNewSigninFlow()) { return mContext.getString( -- -2.47.1 +2.48.1 diff --git a/build/e_patches/Disable-support-for-RAR-files-inspection.patch b/build/e_patches/Disable-support-for-RAR-files-inspection.patch index f5010fed..a095248e 100644 --- a/build/e_patches/Disable-support-for-RAR-files-inspection.patch +++ b/build/e_patches/Disable-support-for-RAR-files-inspection.patch @@ -1,4 +1,4 @@ -From a89e41151a2dfa121de9624d6dba40f551ac5e2a Mon Sep 17 00:00:00 2001 +From 5e852bac12f91a79dd2564d66739763c4bd5bf1f Mon Sep 17 00:00:00 2001 From: Michael Gilbert Date: Wed, 21 Nov 2018 02:37:35 +0000 Subject: Disable support for RAR files inspection @@ -26,7 +26,7 @@ index e6973f9bdeca3..158262ac1f7ab 100644 } else if (inspection_type == DownloadFileType::DMG) { StartExtractDmgFeatures(); diff --git a/chrome/services/file_util/safe_archive_analyzer.cc b/chrome/services/file_util/safe_archive_analyzer.cc -index 847e66468b5e3..2a4b1363bca89 100644 +index f5a860c8b1943..5473bfb95f599 100644 --- a/chrome/services/file_util/safe_archive_analyzer.cc +++ b/chrome/services/file_util/safe_archive_analyzer.cc @@ -78,19 +78,8 @@ void SafeArchiveAnalyzer::AnalyzeRarFile( @@ -65,5 +65,5 @@ index b1302b7928484..5410eab6c164f 100644 #endif -- -2.47.1 +2.48.1 diff --git a/build/e_patches/Enable-SPPI-for-devices-with-enough-memory.patch b/build/e_patches/Enable-SPPI-for-devices-with-enough-memory.patch index 47c9f538..111818fd 100644 --- a/build/e_patches/Enable-SPPI-for-devices-with-enough-memory.patch +++ b/build/e_patches/Enable-SPPI-for-devices-with-enough-memory.patch @@ -1,4 +1,4 @@ -From a022ba35f6dca2a91acc39623511ae6f38ddfde2 Mon Sep 17 00:00:00 2001 +From 65b523b7b526fb96cc2b78a0f5467dd66b026755 Mon Sep 17 00:00:00 2001 From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Sun, 17 Mar 2019 19:09:00 +0100 Subject: Enable SPPI for devices with enough memory @@ -24,5 +24,5 @@ index b45a6e9f43d84..ef677a54c9e7b 100644 "strict_site_isolation_threshold_mb"; const char kPartialSiteIsolationMemoryThresholdParamName[] = -- -2.47.1 +2.48.1 diff --git a/build/e_patches/Enable-sensors-by-default.patch b/build/e_patches/Enable-sensors-by-default.patch index 723b49db..c8ef4021 100644 --- a/build/e_patches/Enable-sensors-by-default.patch +++ b/build/e_patches/Enable-sensors-by-default.patch @@ -1,4 +1,4 @@ -From fe1fe2857fbe4bdb3ccfa2efe88b0fa3d9b5f2cd Mon Sep 17 00:00:00 2001 +From 80c5f39d9ec16415970b647cade1b4536b761c31 Mon Sep 17 00:00:00 2001 From: althafvly Date: Mon, 12 Feb 2024 15:07:39 +0530 Subject: Enable sensors by default @@ -21,5 +21,5 @@ index 1b169f33a75d8..046c6ea060e72 100644 /*valid_settings=*/{CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK}, WebsiteSettingsInfo::TOP_ORIGIN_ONLY_SCOPE, -- -2.47.1 +2.48.1 diff --git a/build/e_patches/Handle-web-search-action-in-browser.patch b/build/e_patches/Handle-web-search-action-in-browser.patch index b6dc0274..a44fa6a1 100644 --- a/build/e_patches/Handle-web-search-action-in-browser.patch +++ b/build/e_patches/Handle-web-search-action-in-browser.patch @@ -1,4 +1,4 @@ -From 374f6b1bee2e79d19688a8687964c358db5099c0 Mon Sep 17 00:00:00 2001 +From ac5c15bb4b202d3ad45bf224e502604322679967 Mon Sep 17 00:00:00 2001 From: fgei Date: Wed, 28 Sep 2022 05:37:00 +0200 Subject: Handle web search action in browser @@ -31,7 +31,7 @@ index a467d72ad54c7..ee8af3392bf15 100644 public static boolean hasSystemFeature(String feature) { PackageManager pm = ContextUtils.getApplicationContext().getPackageManager(); diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml -index a38c08abb8024..ade730e601eba 100644 +index bf8c03b935bd4..8335d4d775bd7 100644 --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml @@ -343,6 +343,10 @@ by a child template that "extends" this file. @@ -46,10 +46,10 @@ index a38c08abb8024..ade730e601eba 100644 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java -index 8dc21f944c9c7..c59b30d133f5c 100644 +index 658e912dd4248..d1e797184703b 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java -@@ -228,7 +228,7 @@ public class LaunchIntentDispatcher { +@@ -250,7 +250,7 @@ public class LaunchIntentDispatcher { Intent searchIntent = new Intent(Intent.ACTION_WEB_SEARCH); searchIntent.putExtra(SearchManager.QUERY, query); @@ -59,5 +59,5 @@ index 8dc21f944c9c7..c59b30d133f5c 100644 mActivity.startActivity(searchIntent); } else { -- -2.47.1 +2.48.1 diff --git a/build/e_patches/Hide-Sign-In-preference-when-disallowed.patch b/build/e_patches/Hide-Sign-In-preference-when-disallowed.patch index a5b196b9..94d203e7 100644 --- a/build/e_patches/Hide-Sign-In-preference-when-disallowed.patch +++ b/build/e_patches/Hide-Sign-In-preference-when-disallowed.patch @@ -1,4 +1,4 @@ -From f4a06dcba941cf145d8d1685fcad2b511cadcadc Mon Sep 17 00:00:00 2001 +From dfe1d85699230325392d05217be932ef0b1bc6d0 Mon Sep 17 00:00:00 2001 From: fgei Date: Sun, 29 Aug 2021 19:31:00 +0000 Subject: Hide Sign In preference when disallowed @@ -8,10 +8,10 @@ Subject: Hide Sign In preference when disallowed 1 file changed, 1 insertion(+) diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SignInPreference.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SignInPreference.java -index 8700f56766d54..2539553be8534 100644 +index 3f4ba5dc31b4c..7de643237fca7 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SignInPreference.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SignInPreference.java -@@ -176,6 +176,7 @@ public class SignInPreference extends Preference +@@ -179,6 +179,7 @@ public class SignInPreference extends Preference } private void setupSigninDisallowed() { @@ -20,5 +20,5 @@ index 8700f56766d54..2539553be8534 100644 } -- -2.47.1 +2.48.1 diff --git a/build/e_patches/Multiple-fingerprinting-mitigations.patch b/build/e_patches/Multiple-fingerprinting-mitigations.patch index 1c32953e..0502e287 100644 --- a/build/e_patches/Multiple-fingerprinting-mitigations.patch +++ b/build/e_patches/Multiple-fingerprinting-mitigations.patch @@ -1,4 +1,4 @@ -From f9e1d9a80beb8858ac9932aab96f9a84b0da68b0 Mon Sep 17 00:00:00 2001 +From 9a4bfd123e36b074e3761365ee8c4d404e15996b Mon Sep 17 00:00:00 2001 From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Fri, 30 Mar 2018 10:09:03 +0200 Subject: Multiple fingerprinting mitigations @@ -61,10 +61,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html create mode 100644 third_party/ungoogled/ungoogled_switches.h diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index 2a80e4d2c9526..690cef5606f87 100644 +index 96b9485a3e528..ee706132e1de0 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2447,6 +2447,7 @@ static_library("browser") { +@@ -2442,6 +2442,7 @@ static_library("browser") { "//services/device/public/cpp:device_features", "//services/device/public/cpp/geolocation", "//services/device/public/cpp/usb", @@ -73,10 +73,10 @@ index 2a80e4d2c9526..690cef5606f87 100644 "//services/device/public/mojom:usb", "//services/image_annotation:service", diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc -index 1e97d70a134c6..ea3fb6c62a7ea 100644 +index caf9a26f4c867..31c0516427d91 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -249,6 +249,8 @@ +@@ -252,6 +252,8 @@ #include "ui/ui_features.h" #include "url/url_features.h" @@ -86,10 +86,10 @@ index 1e97d70a134c6..ea3fb6c62a7ea 100644 #include "base/allocator/buildflags.h" #endif diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn -index 9fe4f5cf47fe8..9bddc834f75a7 100644 +index 6f0eb1326294a..cbcb85c0f3691 100644 --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn -@@ -276,6 +276,7 @@ source_set("browser") { +@@ -280,6 +280,7 @@ source_set("browser") { "//third_party/re2", "//third_party/snappy", "//third_party/sqlite", @@ -98,7 +98,7 @@ index 9fe4f5cf47fe8..9bddc834f75a7 100644 "//third_party/zlib", "//tools/v8_context_snapshot:buildflags", diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc -index 4fa5e441515f8..6ee16e49f80c3 100644 +index ecf19d244374c..a665e261ab8d4 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -213,6 +213,7 @@ @@ -109,7 +109,7 @@ index 4fa5e441515f8..6ee16e49f80c3 100644 #if BUILDFLAG(IS_ANDROID) #include "base/android/child_process_binding_types.h" #include "content/browser/font_unique_name_lookup/font_unique_name_lookup_service.h" -@@ -3312,6 +3313,9 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( +@@ -3310,6 +3311,9 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( switches::kDisableBreakpad, switches::kDisableDatabases, switches::kDisableFileSystem, @@ -120,10 +120,10 @@ index 4fa5e441515f8..6ee16e49f80c3 100644 switches::kDisableGpuMemoryBufferVideoFrames, switches::kDisableHistogramCustomizer, diff --git a/content/child/BUILD.gn b/content/child/BUILD.gn -index e40717e1ed42d..a109cd094f740 100644 +index bdf9ad21ddf0c..cccb47651a5fa 100644 --- a/content/child/BUILD.gn +++ b/content/child/BUILD.gn -@@ -105,6 +105,7 @@ target(link_target_type, "child") { +@@ -106,6 +106,7 @@ target(link_target_type, "child") { "//third_party/blink/public/common:buildflags", "//third_party/blink/public/strings", "//third_party/ced", @@ -132,19 +132,19 @@ index e40717e1ed42d..a109cd094f740 100644 "//ui/base", "//ui/events/blink", diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc -index d4861d00d382f..b13dfcb55eee9 100644 +index d48d6d1359170..4984ef5d705c6 100644 --- a/content/child/runtime_features.cc +++ b/content/child/runtime_features.cc -@@ -47,6 +47,8 @@ - #include "ui/gl/gl_switches.h" +@@ -48,6 +48,8 @@ #include "ui/native_theme/native_theme_features.h" + #include "ui/native_theme/native_theme_utils.h" +#include "third_party/ungoogled/ungoogled_switches.h" + #if BUILDFLAG(IS_ANDROID) #include "base/android/build_info.h" #endif -@@ -536,6 +538,12 @@ void SetRuntimeFeaturesFromCommandLine(const base::CommandLine& command_line) { +@@ -532,6 +534,12 @@ void SetRuntimeFeaturesFromCommandLine(const base::CommandLine& command_line) { // as a last resort. void SetCustomizedRuntimeFeaturesFromCombinedArgs( const base::CommandLine& command_line) { @@ -194,7 +194,7 @@ index d7d110b9f8f30..136b67c51f120 100644 static void EnableFluentOverlayScrollbars(bool); static void EnableVibration(bool); diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc -index a5e7e0575ffd3..232bc08db98f6 100644 +index c241c3d78d041..8c51548cadd6c 100644 --- a/third_party/blink/renderer/core/dom/document.cc +++ b/third_party/blink/renderer/core/dom/document.cc @@ -38,6 +38,7 @@ @@ -205,7 +205,7 @@ index a5e7e0575ffd3..232bc08db98f6 100644 #include "base/metrics/histogram_functions.h" #include "base/not_fatal_until.h" #include "base/notreached.h" -@@ -849,6 +850,17 @@ Document::Document(const DocumentInit& initializer, +@@ -853,6 +854,17 @@ Document::Document(const DocumentInit& initializer, TRACE_EVENT_WITH_FLOW0("blink", "Document::Document", TRACE_ID_LOCAL(this), TRACE_EVENT_FLAG_FLOW_OUT); DCHECK(agent_); @@ -223,7 +223,7 @@ index a5e7e0575ffd3..232bc08db98f6 100644 if (base::FeatureList::IsEnabled(features::kDelayAsyncScriptExecution) && features::kDelayAsyncScriptExecutionDelayByDefaultParam.Get()) { script_runner_delayer_->Activate(); -@@ -2438,6 +2450,14 @@ void Document::UpdateStyleAndLayoutTreeForThisDocument() { +@@ -2451,6 +2463,14 @@ void Document::UpdateStyleAndLayoutTreeForThisDocument() { #endif } @@ -239,21 +239,21 @@ index a5e7e0575ffd3..232bc08db98f6 100644 DCHECK(IsActive()); DCHECK(IsMainThread()); diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/renderer/core/dom/document.h -index b096343f02cb9..5d99c7fe37d29 100644 +index 951beb14f4e9d..ec39daa63218c 100644 --- a/third_party/blink/renderer/core/dom/document.h +++ b/third_party/blink/renderer/core/dom/document.h -@@ -547,6 +547,10 @@ class CORE_EXPORT Document : public ContainerNode, - has_xml_declaration_ = has_xml_declaration ? 1 : 0; +@@ -541,6 +541,10 @@ class CORE_EXPORT Document : public ContainerNode, + return static_cast(xml_standalone_); } - + bool HasXMLDeclaration() const { return has_xml_declaration_; } + // Values for get*ClientRect fingerprint deception + double GetNoiseFactorX(); + double GetNoiseFactorY(); + - AtomicString visibilityState() const; - bool IsPageVisible() const; - bool hidden() const; -@@ -2554,6 +2558,9 @@ class CORE_EXPORT Document : public ContainerNode, + + void SetXMLEncoding(const String& encoding) { + xml_encoding_ = encoding; +@@ -2608,6 +2612,9 @@ class CORE_EXPORT Document : public ContainerNode, base::ElapsedTimer start_time_; @@ -264,10 +264,10 @@ index b096343f02cb9..5d99c7fe37d29 100644 Member script_runner_delayer_; diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/renderer/core/dom/element.cc -index b2ecbd1c2ebf8..ed545e855a0f0 100644 +index ba5e0ab36ec94..a2ed9299bde65 100644 --- a/third_party/blink/renderer/core/dom/element.cc +++ b/third_party/blink/renderer/core/dom/element.cc -@@ -2502,6 +2502,7 @@ void Element::ClientQuads(Vector& quads) const { +@@ -2503,6 +2503,7 @@ void Element::ClientQuads(Vector& quads) const { quads.push_back(element_layout_object->LocalToAbsoluteQuad( gfx::QuadF(element_layout_object->ObjectBoundingBox()))); } @@ -275,7 +275,7 @@ index b2ecbd1c2ebf8..ed545e855a0f0 100644 return; } -@@ -2510,6 +2511,10 @@ void Element::ClientQuads(Vector& quads) const { +@@ -2511,6 +2512,10 @@ void Element::ClientQuads(Vector& quads) const { element_layout_object->IsBR()) { element_layout_object->AbsoluteQuads(quads); } @@ -286,7 +286,7 @@ index b2ecbd1c2ebf8..ed545e855a0f0 100644 } DOMRectList* Element::getClientRects() { -@@ -2555,6 +2560,9 @@ gfx::RectF Element::GetBoundingClientRectNoLifecycleUpdate() const { +@@ -2556,6 +2561,9 @@ gfx::RectF Element::GetBoundingClientRectNoLifecycleUpdate() const { DCHECK(element_layout_object); GetDocument().AdjustRectForScrollAndAbsoluteZoom(result, *element_layout_object); @@ -297,10 +297,10 @@ index b2ecbd1c2ebf8..ed545e855a0f0 100644 } diff --git a/third_party/blink/renderer/core/dom/range.cc b/third_party/blink/renderer/core/dom/range.cc -index 1243ebf3e7212..516e718eb0290 100644 +index 9dc9e209ddc3f..e0f8b65b493bb 100644 --- a/third_party/blink/renderer/core/dom/range.cc +++ b/third_party/blink/renderer/core/dom/range.cc -@@ -1649,6 +1649,12 @@ DOMRectList* Range::getClientRects() const { +@@ -1620,6 +1620,12 @@ DOMRectList* Range::getClientRects() const { Vector quads; GetBorderAndTextQuads(quads); @@ -313,7 +313,7 @@ index 1243ebf3e7212..516e718eb0290 100644 return MakeGarbageCollected(quads); } -@@ -1787,7 +1793,11 @@ gfx::RectF Range::BoundingRect() const { +@@ -1758,7 +1764,11 @@ gfx::RectF Range::BoundingRect() const { // If all rects are empty, return the first rect. if (result.IsEmpty() && !quads.empty()) @@ -349,10 +349,10 @@ index 9b8e14d12ba98..e3804ed2ff45a 100644 } diff --git a/third_party/blink/renderer/core/html/canvas/text_metrics.cc b/third_party/blink/renderer/core/html/canvas/text_metrics.cc -index ae58364017184..5cd0a943664ad 100644 +index b8f5f0c46e26a..5f57fe70a5eca 100644 --- a/third_party/blink/renderer/core/html/canvas/text_metrics.cc +++ b/third_party/blink/renderer/core/html/canvas/text_metrics.cc -@@ -103,6 +103,24 @@ const ShapeResult* ShapeWord(const TextRun& word_run, const Font& font) { +@@ -102,6 +102,24 @@ const ShapeResult* ShapeWord(const TextRun& word_run, const Font& font) { } } // namespace @@ -378,10 +378,10 @@ index ae58364017184..5cd0a943664ad 100644 const TextDirection& direction, const TextBaseline& baseline, diff --git a/third_party/blink/renderer/core/html/canvas/text_metrics.h b/third_party/blink/renderer/core/html/canvas/text_metrics.h -index ffedb2f7a2c95..7bcf5ba5e0326 100644 +index 6b26b61d74a58..f4a21618a5c49 100644 --- a/third_party/blink/renderer/core/html/canvas/text_metrics.h +++ b/third_party/blink/renderer/core/html/canvas/text_metrics.h -@@ -101,6 +101,8 @@ class CORE_EXPORT TextMetrics final : public ScriptWrappable { +@@ -103,6 +103,8 @@ class CORE_EXPORT TextMetrics final : public ScriptWrappable { float x_position_; }; @@ -404,7 +404,7 @@ index ed8e6f5b855bf..a97783e63bc16 100644 UseCounter::Count(GetDocument(), WebFeature::kGetBBoxForText); } diff --git a/third_party/blink/renderer/core/svg/svg_text_content_element.cc b/third_party/blink/renderer/core/svg/svg_text_content_element.cc -index 27ad64ac9dccb..baa7a459209e6 100644 +index d7b23df22b372..3cc190f7e9239 100644 --- a/third_party/blink/renderer/core/svg/svg_text_content_element.cc +++ b/third_party/blink/renderer/core/svg/svg_text_content_element.cc @@ -111,11 +111,16 @@ float SVGTextContentElement::getComputedTextLength() { @@ -484,10 +484,10 @@ index 27ad64ac9dccb..baa7a459209e6 100644 return -1; } diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc -index d97b5f83a189b..3fa8f8c526db7 100644 +index 620c099407c0b..a67b62046f6e5 100644 --- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc +++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc -@@ -193,6 +193,11 @@ +@@ -194,6 +194,11 @@ #include "ui/gfx/geometry/size.h" #include "ui/gfx/geometry/size_f.h" #include "ui/gfx/geometry/skia_conversions.h" @@ -499,7 +499,7 @@ index d97b5f83a189b..3fa8f8c526db7 100644 #include "ui/gfx/geometry/vector2d.h" #include "ui/gfx/geometry/vector2d_f.h" #include "v8/include/v8-local-handle.h" -@@ -2918,6 +2923,10 @@ ImageData* BaseRenderingContext2D::getImageDataInternal( +@@ -2914,6 +2919,10 @@ ImageData* BaseRenderingContext2D::getImageDataInternal( snapshot->PaintImageForCurrentFrame().GetSkImageInfo().bounds(); DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh))); } @@ -510,7 +510,7 @@ index d97b5f83a189b..3fa8f8c526db7 100644 } return image_data; -@@ -3608,8 +3617,22 @@ TextMetrics* BaseRenderingContext2D::measureText(const String& text) { +@@ -3638,8 +3647,22 @@ TextMetrics* BaseRenderingContext2D::measureText(const String& text) { const CanvasRenderingContext2DState& state = GetState(); TextDirection direction = ToTextDirection(state.GetDirection(), canvas); @@ -535,10 +535,10 @@ index d97b5f83a189b..3fa8f8c526db7 100644 void BaseRenderingContext2D::SnapshotStateForFilter() { diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn -index b80735ad3f7e2..1c87474cf0502 100644 +index ffb2cc23eb74d..66dc9167b10fc 100644 --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -1711,7 +1711,9 @@ component("platform") { +@@ -1714,7 +1714,9 @@ component("platform") { "//third_party/blink/renderer:non_test_config", ] @@ -549,7 +549,7 @@ index b80735ad3f7e2..1c87474cf0502 100644 allow_circular_includes_from = [ "//third_party/blink/renderer/platform/blob", -@@ -1793,6 +1795,7 @@ component("platform") { +@@ -1796,6 +1798,7 @@ component("platform") { "//third_party/blink/public/strings", "//third_party/blink/renderer/platform/wtf", "//third_party/ced", @@ -785,7 +785,7 @@ index 0a575fd624b4b..9d39aca95278e 100644 + } // namespace blink diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h b/third_party/blink/renderer/platform/graphics/static_bitmap_image.h -index 240024f308848..2beaf21054473 100644 +index 34bea30e2cecb..aa2dce4587e54 100644 --- a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h +++ b/third_party/blink/renderer/platform/graphics/static_bitmap_image.h @@ -39,6 +39,8 @@ class PLATFORM_EXPORT StaticBitmapImage : public Image { @@ -798,10 +798,10 @@ index 240024f308848..2beaf21054473 100644 // Methods overridden by all sub-classes diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -index 386dea99648e2..fbaf2738cf108 100644 +index 0ed58c0784ef1..e11c85f255af3 100644 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -2953,6 +2953,15 @@ +@@ -2960,6 +2960,15 @@ status: {"Mac": "test", "default": "stable"}, base_feature: "none", }, @@ -882,5 +882,5 @@ index 0000000000000..28d542c0e999b + +#endif // THIRD_PARTY_UNGOOGLED_FINGERPRINTING_SWITCHES_H_ -- -2.47.1 +2.48.1 diff --git a/build/e_patches/Reintroduce-kWebAuthCable.patch b/build/e_patches/Reintroduce-kWebAuthCable.patch index f6667ebc..98e1f364 100644 --- a/build/e_patches/Reintroduce-kWebAuthCable.patch +++ b/build/e_patches/Reintroduce-kWebAuthCable.patch @@ -1,4 +1,4 @@ -From 666219654f70ed3bfba5cb3090512bab2933aadd Mon Sep 17 00:00:00 2001 +From 01d209f149a00af926b60ef6370dc0643f3df0db Mon Sep 17 00:00:00 2001 From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Sun, 4 Sep 2022 18:47:58 +0200 Subject: Re-introduce kWebAuthCable @@ -43,10 +43,10 @@ index 5a9201d66664c..dad05a3f9cbd5 100644 }; diff --git a/chrome/browser/ui/webauthn/authenticator_dialog_browsertest.cc b/chrome/browser/ui/webauthn/authenticator_dialog_browsertest.cc -index f34b10bd89a1b..c9f3aad771345 100644 +index d405894c8f597..116aef77d10b0 100644 --- a/chrome/browser/ui/webauthn/authenticator_dialog_browsertest.cc +++ b/chrome/browser/ui/webauthn/authenticator_dialog_browsertest.cc -@@ -71,6 +71,12 @@ class AuthenticatorDialogTest : public DialogBrowserTest { +@@ -70,6 +70,12 @@ class AuthenticatorDialogTest : public DialogBrowserTest { "user@example.com", signin::ConsentLevel::kSync); } @@ -59,7 +59,7 @@ index f34b10bd89a1b..c9f3aad771345 100644 // DialogBrowserTest: void ShowUi(const std::string& name) override { // Web modal dialogs' bounds may exceed the display's work area. -@@ -379,6 +385,7 @@ class AuthenticatorDialogTest : public DialogBrowserTest { +@@ -377,6 +383,7 @@ class AuthenticatorDialogTest : public DialogBrowserTest { std::unique_ptr controller_; base::RepeatingTimer timer_; int bio_samples_remaining_ = 5; @@ -68,10 +68,10 @@ index f34b10bd89a1b..c9f3aad771345 100644 IN_PROC_BROWSER_TEST_F(AuthenticatorDialogTest, InvokeUi_default) { diff --git a/chrome/browser/webauthn/chrome_webauthn_browsertest.cc b/chrome/browser/webauthn/chrome_webauthn_browsertest.cc -index aaacebaaf508f..d6d199fa4bddd 100644 +index 7937a6604eef2..5bdc0b10976db 100644 --- a/chrome/browser/webauthn/chrome_webauthn_browsertest.cc +++ b/chrome/browser/webauthn/chrome_webauthn_browsertest.cc -@@ -1143,6 +1143,7 @@ IN_PROC_BROWSER_TEST_F(WebAuthnCableExtension, ServerLink) { +@@ -1159,6 +1159,7 @@ IN_PROC_BROWSER_TEST_F(WebAuthnCableExtension, ServerLink) { class WebAuthnCableSecondFactor : public WebAuthnBrowserTest { public: WebAuthnCableSecondFactor() { @@ -79,7 +79,7 @@ index aaacebaaf508f..d6d199fa4bddd 100644 // This makes it a little easier to compare against. trace_ << std::endl; } -@@ -1391,6 +1392,7 @@ class WebAuthnCableSecondFactor : public WebAuthnBrowserTest { +@@ -1407,6 +1408,7 @@ class WebAuthnCableSecondFactor : public WebAuthnBrowserTest { }; protected: @@ -88,10 +88,10 @@ index aaacebaaf508f..d6d199fa4bddd 100644 raw_ptr controller_ = nullptr; diff --git a/content/browser/webauth/authenticator_impl_unittest.cc b/content/browser/webauth/authenticator_impl_unittest.cc -index e11a03e0f2a58..6b2aa7c11a94f 100644 +index 5969983925537..21012952a7b83 100644 --- a/content/browser/webauth/authenticator_impl_unittest.cc +++ b/content/browser/webauth/authenticator_impl_unittest.cc -@@ -1523,7 +1523,12 @@ TEST_F(AuthenticatorImplTest, OversizedCredentialId) { +@@ -1513,7 +1513,12 @@ TEST_F(AuthenticatorImplTest, OversizedCredentialId) { } } @@ -106,10 +106,10 @@ index e11a03e0f2a58..6b2aa7c11a94f 100644 NavigateAndCommit(GURL(kTestOrigin1)); diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc -index 1988f92171f59..54dca98aaa6f8 100644 +index 8e57f40a3fac0..c90323a7421d2 100644 --- a/content/public/common/content_features.cc +++ b/content/public/common/content_features.cc -@@ -1228,6 +1228,13 @@ BASE_FEATURE(kWebAssemblyTrapHandler, +@@ -1288,6 +1288,13 @@ BASE_FEATURE(kWebAssemblyTrapHandler, #endif ); @@ -124,10 +124,10 @@ index 1988f92171f59..54dca98aaa6f8 100644 // https://webbluetoothcg.github.io/web-bluetooth/ BASE_FEATURE(kWebBluetooth, "WebBluetooth", base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/content/public/common/content_features.h b/content/public/common/content_features.h -index 1c895ca9857eb..490b1cf8817c8 100644 +index 9ca7bca370de0..0f29ae9b73913 100644 --- a/content/public/common/content_features.h +++ b/content/public/common/content_features.h -@@ -274,6 +274,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebBluetoothNewPermissionsBackend); +@@ -285,6 +285,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebBluetoothNewPermissionsBackend); CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebOtpBackendAuto); CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebPayments); CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebUICodeCache); @@ -136,5 +136,5 @@ index 1c895ca9857eb..490b1cf8817c8 100644 CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebXr); CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebPermissionsApi); -- -2.47.1 +2.48.1 diff --git a/build/e_patches/Remove-bromite-auto-updater-option.patch b/build/e_patches/Remove-bromite-auto-updater-option.patch index ddeb36cf..6dfdf988 100644 --- a/build/e_patches/Remove-bromite-auto-updater-option.patch +++ b/build/e_patches/Remove-bromite-auto-updater-option.patch @@ -1,4 +1,4 @@ -From 6fce67f4721f0d58da76d0d83a74b6ce182f79c2 Mon Sep 17 00:00:00 2001 +From 408133862f46645d6cd31c731b3f369f4e519c47 Mon Sep 17 00:00:00 2001 From: althafvly Date: Wed, 20 Sep 2023 09:59:55 +0530 Subject: Remove bromite auto updater option @@ -122,5 +122,5 @@ index 8194988c68715..afbe972a84643 100644 allowedToUpdate ? UpdateState.UPDATE_AVAILABLE : UpdateState.NONE; -- -2.47.1 +2.48.1 diff --git a/build/e_patches/Remove-google-pref-from-main-menu.patch b/build/e_patches/Remove-google-pref-from-main-menu.patch index b21d505b..4ae315e5 100644 --- a/build/e_patches/Remove-google-pref-from-main-menu.patch +++ b/build/e_patches/Remove-google-pref-from-main-menu.patch @@ -1,4 +1,4 @@ -From 7c1eb060d1802aaeabb6db49687af363d7658b51 Mon Sep 17 00:00:00 2001 +From 2c5083038a80d65e8d345fe6e8ed8bf6b2c5d21d Mon Sep 17 00:00:00 2001 From: althafvly Date: Mon, 12 Feb 2024 13:41:11 +0530 Subject: Remove google pref from main menu @@ -8,7 +8,7 @@ Subject: Remove google pref from main menu 1 file changed, 3 insertions(+) diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java -index fbfeacbdf33bb..70e27fd6ba2e5 100644 +index 24348e18e4dee..078e310afdc6c 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java @@ -297,6 +297,9 @@ public class MainSettings extends ChromeBaseSettingsFragment @@ -22,5 +22,5 @@ index fbfeacbdf33bb..70e27fd6ba2e5 100644 templateUrlService.registerLoadListener(this); templateUrlService.load(); -- -2.47.1 +2.48.1 diff --git a/build/e_patches/Remove-mremap-from-seccomp-baseline-policy.patch b/build/e_patches/Remove-mremap-from-seccomp-baseline-policy.patch index 5206853d..9b27b2e1 100644 --- a/build/e_patches/Remove-mremap-from-seccomp-baseline-policy.patch +++ b/build/e_patches/Remove-mremap-from-seccomp-baseline-policy.patch @@ -1,4 +1,4 @@ -From 932ca92be25ae9bc3401ea566cca697cc2b23689 Mon Sep 17 00:00:00 2001 +From 8c551ae3c407c59fbf6b7885caffc19749a1e7f1 Mon Sep 17 00:00:00 2001 From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Sat, 16 Apr 2022 10:14:28 +0200 Subject: Remove mremap from seccomp baseline policy @@ -13,10 +13,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 1 file changed, 1 deletion(-) diff --git a/sandbox/linux/seccomp-bpf-helpers/baseline_policy_android.cc b/sandbox/linux/seccomp-bpf-helpers/baseline_policy_android.cc -index 560b4c67cb1fc..536f61d321ae0 100644 +index 34be26bb5448e..aef55c75f436c 100644 --- a/sandbox/linux/seccomp-bpf-helpers/baseline_policy_android.cc +++ b/sandbox/linux/seccomp-bpf-helpers/baseline_policy_android.cc -@@ -178,7 +178,6 @@ bool IsBaselinePolicyAllowed(int sysno) { +@@ -179,7 +179,6 @@ bool IsBaselinePolicyAllowed(int sysno) { // Used on pre-N to initialize threads in ART. case __NR_modify_ldt: #endif @@ -25,5 +25,5 @@ index 560b4c67cb1fc..536f61d321ae0 100644 // File system access cannot be restricted with seccomp-bpf on Android, // since the JVM classloader and other Framework features require file -- -2.47.1 +2.48.1 diff --git a/build/e_patches/Remove-some-privacy-UI-pref.patch b/build/e_patches/Remove-some-privacy-UI-pref.patch index 3af6ac96..ae476bb8 100644 --- a/build/e_patches/Remove-some-privacy-UI-pref.patch +++ b/build/e_patches/Remove-some-privacy-UI-pref.patch @@ -1,4 +1,4 @@ -From cac2a0f8b7c2dfcaf41751c50f9a23b383b112e8 Mon Sep 17 00:00:00 2001 +From a85fbf645985685baaaf7576675b11654ef66f64 Mon Sep 17 00:00:00 2001 From: althafvly Date: Mon, 12 Feb 2024 14:21:50 +0530 Subject: Remove some privacy UI pref @@ -8,10 +8,10 @@ Subject: Remove some privacy UI pref 1 file changed, 5 insertions(+) diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java -index 29a393bdc8407..ff3e6935090a7 100644 +index 85fa817e94425..073ec4c2dac3b 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java -@@ -213,6 +213,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment +@@ -214,6 +214,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment mContextualSearch.setSummary( isContextualSearchEnabled ? R.string.text_on : R.string.text_off); @@ -31,5 +31,5 @@ index 29a393bdc8407..ff3e6935090a7 100644 List options = new ArrayList<>(); options.add(new TimeFrequencySpinnerOption(0, -- -2.47.1 +2.48.1 diff --git a/build/e_patches/Revert-TM-Add-themed-app-icons.patch b/build/e_patches/Revert-TM-Add-themed-app-icons.patch index 716bc402..718c688e 100644 --- a/build/e_patches/Revert-TM-Add-themed-app-icons.patch +++ b/build/e_patches/Revert-TM-Add-themed-app-icons.patch @@ -1,4 +1,4 @@ -From dc3b326c74db3bec2117f29a1a60f86c1551af25 Mon Sep 17 00:00:00 2001 +From 3bf6f19fe1ec9dca04623da0bc036fdba001a716 Mon Sep 17 00:00:00 2001 From: althafvly Date: Fri, 18 Nov 2022 09:48:02 +0000 Subject: Revert "[TM] Add themed app icons" @@ -13,10 +13,10 @@ This reverts commit 9faa242a0c09838268d7c969acdf493f29ef3db5. delete mode 100644 chrome/android/java/res_chromium_base/drawable/themed_app_icon.xml diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn -index 47f7d43e64677..0fa9e5b84d615 100644 +index 2f1ea11f18a50..5f97034b6992d 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -177,7 +177,6 @@ if (current_toolchain == default_toolchain) { +@@ -178,7 +178,6 @@ if (current_toolchain == default_toolchain) { "java/res_base/values/ic_launcher_round_alias.xml", "java/res_base/values/values.xml", "java/res_base/xml/network_security_config.xml", @@ -24,7 +24,7 @@ index 47f7d43e64677..0fa9e5b84d615 100644 "java/res_chromium_base/mipmap-hdpi/app_icon.png", "java/res_chromium_base/mipmap-hdpi/layered_app_icon.png", "java/res_chromium_base/mipmap-hdpi/layered_app_icon_background.png", -@@ -2268,7 +2267,6 @@ if (current_toolchain == default_toolchain) { +@@ -2299,7 +2298,6 @@ if (current_toolchain == default_toolchain) { android_resources("chrome_public_apk_base_module_resources") { resource_overlay = true sources = [ @@ -88,5 +88,5 @@ index 32a95bc6ee4d5..0000000000000 - - -- -2.47.1 +2.48.1 diff --git a/build/e_patches/Update-app-icon.patch b/build/e_patches/Update-app-icon.patch index 012ba406..595bd20a 100644 --- a/build/e_patches/Update-app-icon.patch +++ b/build/e_patches/Update-app-icon.patch @@ -1,4 +1,4 @@ -From c799e4350ba8a1111fb93c47391886137744e121 Mon Sep 17 00:00:00 2001 +From 2de8410985520ed2f41c4cafaa9072b645111a86 Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Wed, 14 Feb 2024 15:09:43 +0530 Subject: Update app icon @@ -229,5 +229,5 @@ index 49fbe9525bc1a..7330ae6b34976 100644 + -- -2.47.1 +2.48.1 diff --git a/build/e_patches/Update-default-sites.patch b/build/e_patches/Update-default-sites.patch index 06390716..5dcfa30d 100644 --- a/build/e_patches/Update-default-sites.patch +++ b/build/e_patches/Update-default-sites.patch @@ -1,4 +1,4 @@ -From ae6417c1b40d8fc795b8d0ff5ef3c868f407e84b Mon Sep 17 00:00:00 2001 +From 9f0ca5bbd4ae4fddf87b12c748d908132991cceb Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Thu, 11 Apr 2024 20:54:43 +0530 Subject: Update default sites @@ -40,5 +40,5 @@ index 3c58051b91f8c..91b66bbdeb455 100644 } ] -- -2.47.1 +2.48.1 diff --git a/build/e_patches/Update-i18n-zhCN-support.patch b/build/e_patches/Update-i18n-zhCN-support.patch index 41c263f0..205551d7 100644 --- a/build/e_patches/Update-i18n-zhCN-support.patch +++ b/build/e_patches/Update-i18n-zhCN-support.patch @@ -1,4 +1,4 @@ -From 15b9c96c269879a69ad82c617dda2d30529d1264 Mon Sep 17 00:00:00 2001 +From 08c77291e145507ef87ad74479c0b55928fc01fb Mon Sep 17 00:00:00 2001 From: mars Date: Sun, 2 Aug 2020 00:37:49 +0800 Subject: Update i18n zh_CN support @@ -14,12 +14,12 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 6 files changed, 133 insertions(+), 6 deletions(-) diff --git a/chrome/app/resources/generated_resources_zh-CN.xtb b/chrome/app/resources/generated_resources_zh-CN.xtb -index a6233632ee363..ee93c47e65323 100644 +index f831480c72ba5..1c246bfbedf47 100644 --- a/chrome/app/resources/generated_resources_zh-CN.xtb +++ b/chrome/app/resources/generated_resources_zh-CN.xtb -@@ -11560,4 +11560,6 @@ - 网站会在您访问时自动采用此设置。网站通常会发送通知，以便您知悉重大新闻或聊天消息。 +@@ -11697,4 +11697,6 @@ 您需要开启 Chrome 同步才能使用 Wi-Fi 同步功能。了解详情 + 同步标签页分组 检查(&N) - \ No newline at end of file @@ -27,10 +27,10 @@ index a6233632ee363..ee93c47e65323 100644 +配置广告拦截和过滤规则地址 + diff --git a/chrome/app/resources/google_chrome_strings_zh-CN.xtb b/chrome/app/resources/google_chrome_strings_zh-CN.xtb -index b364501b9de27..72c629fc286f4 100644 +index 8e6b305b9cfc2..d3889682a9d46 100644 --- a/chrome/app/resources/google_chrome_strings_zh-CN.xtb +++ b/chrome/app/resources/google_chrome_strings_zh-CN.xtb -@@ -673,4 +673,5 @@ +@@ -678,4 +678,5 @@ 更新服务器没有应用的任何哈希数据，因此安装失败。 Google Chrome 是您的默认浏览器 可用于切换 Chrome 个人资料 @@ -39,10 +39,10 @@ index b364501b9de27..72c629fc286f4 100644 +关于 Bromite + diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb -index 6db8452f34fbd..d732a0e577de9 100644 +index 2d06dd96d65f1..04f8081d6c161 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb -@@ -1845,4 +1845,74 @@ +@@ -1822,4 +1822,74 @@ 若要删除您设备中的无痕浏览记录，请关闭所有无痕式标签页。 个标签页 动态卡片上的菜单已关闭 @@ -120,10 +120,10 @@ index 6db8452f34fbd..d732a0e577de9 100644 +全选 + diff --git a/components/browser_ui/strings/android/translations/browser_ui_strings_zh-CN.xtb b/components/browser_ui/strings/android/translations/browser_ui_strings_zh-CN.xtb -index 7e6d81ef2230c..7d05adf25df44 100644 +index c0d22ec9e6bb0..b18f26b131b57 100644 --- a/components/browser_ui/strings/android/translations/browser_ui_strings_zh-CN.xtb +++ b/components/browser_ui/strings/android/translations/browser_ui_strings_zh-CN.xtb -@@ -547,4 +547,28 @@ +@@ -554,4 +554,28 @@ 您访问的网站可以验证您是真人而非机器人 让各项内容井井有条 已存储的数据 @@ -155,10 +155,10 @@ index 7e6d81ef2230c..7d05adf25df44 100644 +WebRTC + diff --git a/components/strings/components_strings_zh-CN.xtb b/components/strings/components_strings_zh-CN.xtb -index b3132b09c0366..a719c3fc60ed0 100644 +index d95e9c823d831..2cbb6c1ecdc58 100644 --- a/components/strings/components_strings_zh-CN.xtb +++ b/components/strings/components_strings_zh-CN.xtb -@@ -4595,4 +4595,33 @@ +@@ -4604,4 +4604,33 @@ 添加 IBAN YouTube 来自 Google Pay @@ -207,5 +207,5 @@ index a7a5bb8d41c6e..eb88a676d443b 100644 +无法保存到所选文件 + -- -2.47.1 +2.48.1 diff --git a/build/e_patches/Use-thirdparty-autofill-by-default.patch b/build/e_patches/Use-thirdparty-autofill-by-default.patch index 717cbfb7..31a4d4ef 100644 --- a/build/e_patches/Use-thirdparty-autofill-by-default.patch +++ b/build/e_patches/Use-thirdparty-autofill-by-default.patch @@ -1,4 +1,4 @@ -From f271b7193125d3fa4b300ca608b2764d3094e0f4 Mon Sep 17 00:00:00 2001 +From 23666c9430192f5aa989394906aca654ff227e5b Mon Sep 17 00:00:00 2001 From: althafvly Date: Mon, 12 Feb 2024 13:54:08 +0530 Subject: Use thirdparty autofill by default @@ -42,5 +42,5 @@ index de3ecfcd88c59..74a79a70e3e37 100644 public RadioButtonGroupThirdPartyPreference(Context context, AttributeSet attrs) { super(context, attrs); -- -2.47.1 +2.48.1 diff --git a/build/e_patches/add-trichrome-browser-apk-targets.patch b/build/e_patches/add-trichrome-browser-apk-targets.patch index d901df8d..1d52c51d 100644 --- a/build/e_patches/add-trichrome-browser-apk-targets.patch +++ b/build/e_patches/add-trichrome-browser-apk-targets.patch @@ -1,4 +1,4 @@ -From 0477f24edf5f007e02d3d11a7d427073c7dfe818 Mon Sep 17 00:00:00 2001 +From d9f20c34b3fdae75ffe9164628519a1e541f4273 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Thu, 27 May 2021 07:30:02 -0400 Subject: add trichrome browser apk targets @@ -9,10 +9,10 @@ Subject: add trichrome browser apk targets 2 files changed, 37 insertions(+) diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn -index 33a6a6b96db4a..47f7d43e64677 100644 +index 87ad585b96191..2f1ea11f18a50 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -2526,6 +2526,10 @@ if (current_toolchain == default_toolchain) { +@@ -2557,6 +2557,10 @@ if (current_toolchain == default_toolchain) { is_trichrome = true is_bundle_module = true } @@ -23,7 +23,7 @@ index 33a6a6b96db4a..47f7d43e64677 100644 # Exists separately from chrome_public_base_module_java_for_test to allow # downstream to depend on test support packages without needing to depend on -@@ -2890,6 +2894,37 @@ if (current_toolchain == default_toolchain) { +@@ -2922,6 +2926,37 @@ if (current_toolchain == default_toolchain) { } } } @@ -75,5 +75,5 @@ index ff00662732c1b..640d564c5dca5 100644 assert(!_is_trichrome) asset_deps += [ "//chrome/android:chrome_apk_pak_assets" ] -- -2.47.1 +2.48.1 diff --git a/build/e_patches/disable-browser-sign-in-feature-by-default.patch b/build/e_patches/disable-browser-sign-in-feature-by-default.patch index 9c58f8d3..aa0867d8 100644 --- a/build/e_patches/disable-browser-sign-in-feature-by-default.patch +++ b/build/e_patches/disable-browser-sign-in-feature-by-default.patch @@ -1,4 +1,4 @@ -From b4b86f7e831fde81a21e2b5211e3b630f0c3c6c2 Mon Sep 17 00:00:00 2001 +From 1cdde79f2c95f24d96d45249241c63bf3ce6cc07 Mon Sep 17 00:00:00 2001 From: althafvly Date: Mon, 12 Feb 2024 13:26:25 +0530 Subject: disable browser sign in feature by default @@ -8,7 +8,7 @@ Subject: disable browser sign in feature by default 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/browser/signin/account_consistency_mode_manager.cc b/chrome/browser/signin/account_consistency_mode_manager.cc -index 948a8e31ba7ed..143358e48091e 100644 +index c8c3d849d0510..0a284c80461d8 100644 --- a/chrome/browser/signin/account_consistency_mode_manager.cc +++ b/chrome/browser/signin/account_consistency_mode_manager.cc @@ -117,7 +117,7 @@ AccountConsistencyModeManager::~AccountConsistencyModeManager() {} @@ -21,5 +21,5 @@ index 948a8e31ba7ed..143358e48091e 100644 // static -- -2.47.1 +2.48.1 diff --git a/build/e_patches/disable-contextual-search-by-default.patch b/build/e_patches/disable-contextual-search-by-default.patch index cd78aa90..ec4f3253 100644 --- a/build/e_patches/disable-contextual-search-by-default.patch +++ b/build/e_patches/disable-contextual-search-by-default.patch @@ -1,4 +1,4 @@ -From 0e18a35c423322dc2481bb25443c5c8555375b9d Mon Sep 17 00:00:00 2001 +From 90900f3d1c1ba4d0cfe3824b17cda9d86de5a3c2 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Wed, 23 Nov 2016 09:26:51 -0500 Subject: disable contextual search by default @@ -22,10 +22,10 @@ index 46146a968f9df..3eea0b291ed27 100644 /** diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc -index 89254771117da..acb71c43ad09c 100644 +index 4385d5d90f9c8..e1345ab756877 100644 --- a/chrome/browser/profiles/profile.cc +++ b/chrome/browser/profiles/profile.cc -@@ -313,7 +313,7 @@ void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { +@@ -321,7 +321,7 @@ void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { #if BUILDFLAG(IS_ANDROID) registry->RegisterStringPref( prefs::kContextualSearchEnabled, @@ -35,5 +35,5 @@ index 89254771117da..acb71c43ad09c 100644 registry->RegisterBooleanPref( prefs::kContextualSearchWasFullyPrivacyEnabled, false, -- -2.47.1 +2.48.1 diff --git a/build/e_patches/disable-fetching-variations.patch b/build/e_patches/disable-fetching-variations.patch index 6d972385..9cc4ea5e 100644 --- a/build/e_patches/disable-fetching-variations.patch +++ b/build/e_patches/disable-fetching-variations.patch @@ -1,4 +1,4 @@ -From d67015503c63317ce9b966b4c1dbdc193d54b918 Mon Sep 17 00:00:00 2001 +From 107828739f3201e2a2359988044bcabd909a8ae0 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Wed, 18 Nov 2020 19:08:58 -0500 Subject: disable fetching variations @@ -21,5 +21,5 @@ index 14b47a9d148f5..4601ee31cf50b 100644 @VisibleForTesting -- -2.47.1 +2.48.1 diff --git a/build/e_patches/disable-navigation-error-correction-by-default.patch b/build/e_patches/disable-navigation-error-correction-by-default.patch index 4efe5608..d747e855 100644 --- a/build/e_patches/disable-navigation-error-correction-by-default.patch +++ b/build/e_patches/disable-navigation-error-correction-by-default.patch @@ -1,4 +1,4 @@ -From dd56b9d6e156489a37ab954eb15941dc450125a4 Mon Sep 17 00:00:00 2001 +From 9c0e1d6b2cc1fc43a852cd8f3449a4dbdb1f6680 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Wed, 23 Nov 2016 08:29:58 -0500 Subject: disable navigation error correction by default @@ -8,10 +8,10 @@ Subject: disable navigation error correction by default 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/browser/net/profile_network_context_service.cc b/chrome/browser/net/profile_network_context_service.cc -index 7ec28fd3b3ce3..dfe56e6e2c269 100644 +index e1f26abe03490..7430be22c09b8 100644 --- a/chrome/browser/net/profile_network_context_service.cc +++ b/chrome/browser/net/profile_network_context_service.cc -@@ -475,7 +475,7 @@ void ProfileNetworkContextService::ConfigureNetworkContextParams( +@@ -501,7 +501,7 @@ void ProfileNetworkContextService::ConfigureNetworkContextParams( void ProfileNetworkContextService::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref(embedder_support::kAlternateErrorPagesEnabled, @@ -21,5 +21,5 @@ index 7ec28fd3b3ce3..dfe56e6e2c269 100644 registry->RegisterBooleanPref(prefs::kGloballyScopeHTTPAuthCacheEnabled, false); -- -2.47.1 +2.48.1 diff --git a/build/e_patches/disable-seedbased-field-trials.patch b/build/e_patches/disable-seedbased-field-trials.patch index 4470ec64..b6096696 100644 --- a/build/e_patches/disable-seedbased-field-trials.patch +++ b/build/e_patches/disable-seedbased-field-trials.patch @@ -1,4 +1,4 @@ -From f6f5b7f1000da27f02f026e51467b7b8ceab479e Mon Sep 17 00:00:00 2001 +From 75ea6d91e9ce07c2e88089222bd608a93f903934 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Tue, 25 Dec 2018 16:19:51 -0500 Subject: disable seed-based field trials @@ -8,21 +8,21 @@ Subject: disable seed-based field trials 1 file changed, 2 insertions(+) diff --git a/components/variations/service/variations_field_trial_creator_base.cc b/components/variations/service/variations_field_trial_creator_base.cc -index b381f1682b38f..dac624d844470 100644 +index 01bb36ceff98e..618173b4c5521 100644 --- a/components/variations/service/variations_field_trial_creator_base.cc +++ b/components/variations/service/variations_field_trial_creator_base.cc -@@ -327,9 +327,11 @@ bool VariationsFieldTrialCreatorBase::SetUpFieldTrials( +@@ -323,9 +323,11 @@ bool VariationsFieldTrialCreatorBase::SetUpFieldTrials( bool used_seed = false; if (!used_testing_config) { +#if defined(FIELDTRIAL_SEED_ENABLED) used_seed = - CreateTrialsFromSeed(*entropy_providers, feature_list.get(), + CreateTrialsFromSeed(entropy_providers, feature_list.get(), safe_seed_manager, synthetic_trial_registry); +#endif } platform_field_trials->RegisterFeatureOverrides(feature_list.get()); -- -2.47.1 +2.48.1 diff --git a/build/e_patches/fixup-Bromite-subresource-adblocker.patch b/build/e_patches/fixup-Bromite-subresource-adblocker.patch index bf93c5ec..078c3f52 100644 --- a/build/e_patches/fixup-Bromite-subresource-adblocker.patch +++ b/build/e_patches/fixup-Bromite-subresource-adblocker.patch @@ -1,4 +1,4 @@ -From 129f898b53215e3f90976dccc3f30f1b5f528995 Mon Sep 17 00:00:00 2001 +From 58910479f8f2df05e5bc0cc180fa8c9693581268 Mon Sep 17 00:00:00 2001 From: althafvly Date: Thu, 11 Apr 2024 19:45:52 +0530 Subject: fixup Bromite subresource adblocker @@ -8,11 +8,11 @@ Subject: fixup Bromite subresource adblocker 1 file changed, 1 deletion(-) diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn -index b7a3001cef41e..33a6a6b96db4a 100644 +index 581c8fd02fefc..87ad585b96191 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -331,7 +331,6 @@ if (current_toolchain == default_toolchain) { - "//chrome/android/modules/cablev2_authenticator/public:java", +@@ -336,7 +336,6 @@ if (current_toolchain == default_toolchain) { + "//chrome/android/features/tab_ui/public:ui_java_resources", "//chrome/android/modules/stack_unwinder/provider:java", "//chrome/android/webapk/libs/client:client_java", - "//chrome/browser/endpoint_fetcher:java", @@ -20,5 +20,5 @@ index b7a3001cef41e..33a6a6b96db4a 100644 "//chrome/android/webapk/libs/common:splash_java", "//chrome/android/webapk/libs/runtime_library:webapk_service_aidl_java", -- -2.47.1 +2.48.1 diff --git a/build/e_patches/fixup-Disable-fetching-of-all-field-trials.patch b/build/e_patches/fixup-Disable-fetching-of-all-field-trials.patch index 55be2cea..89ac6b7e 100644 --- a/build/e_patches/fixup-Disable-fetching-of-all-field-trials.patch +++ b/build/e_patches/fixup-Disable-fetching-of-all-field-trials.patch @@ -1,4 +1,4 @@ -From aa185b0a9da20d93322d9d12a2fef59a8a311f4d Mon Sep 17 00:00:00 2001 +From 2273da76375fb8100e06f9240bd07757902d8a1b Mon Sep 17 00:00:00 2001 From: althafvly Date: Wed, 20 Sep 2023 09:48:52 +0530 Subject: fixup Disable fetching of all field trials @@ -29,7 +29,7 @@ index ad626ddfe4ef8..d6b55d4be62e4 100644 @Override diff --git a/build/android/gyp/proguard.py b/build/android/gyp/proguard.py -index 840d49ed76ef2..024b37a940545 100755 +index 0f567aca5c04f..b62d2aabfdf17 100755 --- a/build/android/gyp/proguard.py +++ b/build/android/gyp/proguard.py @@ -54,6 +54,8 @@ _IGNORE_WARNINGS = ( @@ -42,10 +42,10 @@ index 840d49ed76ef2..024b37a940545 100755 # TODO(agrieve): Remove once we update to U SDK. r'OnBackAnimationCallback', diff --git a/components/variations/service/variations_field_trial_creator_base.cc b/components/variations/service/variations_field_trial_creator_base.cc -index 4b14887853b01..b381f1682b38f 100644 +index 48d914feedd6c..01bb36ceff98e 100644 --- a/components/variations/service/variations_field_trial_creator_base.cc +++ b/components/variations/service/variations_field_trial_creator_base.cc -@@ -334,6 +334,8 @@ bool VariationsFieldTrialCreatorBase::SetUpFieldTrials( +@@ -330,6 +330,8 @@ bool VariationsFieldTrialCreatorBase::SetUpFieldTrials( platform_field_trials->RegisterFeatureOverrides(feature_list.get()); @@ -55,5 +55,5 @@ index 4b14887853b01..b381f1682b38f 100644 // For testing Variations Safe Mode, maybe crash here. -- -2.47.1 +2.48.1 diff --git a/build/e_patches/fixup-Revert-removal-of-execution-context-address-space.patch b/build/e_patches/fixup-Revert-removal-of-execution-context-address-space.patch index 01396e12..48dc8a9f 100644 --- a/build/e_patches/fixup-Revert-removal-of-execution-context-address-space.patch +++ b/build/e_patches/fixup-Revert-removal-of-execution-context-address-space.patch @@ -1,4 +1,4 @@ -From c4d0eff6285aad64f01c89f9d959744cd1386111 Mon Sep 17 00:00:00 2001 +From 92637190e825cebf3c0d4832dbe75ff4dc93670f Mon Sep 17 00:00:00 2001 From: althafvly Date: Wed, 4 Oct 2023 13:51:29 +0530 Subject: fixup Revert removal of execution context address space @@ -24,5 +24,5 @@ index 2a978cb476740..fe67745d54ccd 100644 ContentSecurityPolicyResponseHeaders -- -2.47.1 +2.48.1 diff --git a/build/e_patches/netcert-increase-default-key-length.patch b/build/e_patches/netcert-increase-default-key-length.patch index 2521dc3a..a9af1a4e 100644 --- a/build/e_patches/netcert-increase-default-key-length.patch +++ b/build/e_patches/netcert-increase-default-key-length.patch @@ -1,4 +1,4 @@ -From 75fbc2c5793c6edc3cddcbcd59b1cf9d71db67f4 Mon Sep 17 00:00:00 2001 +From 502f25c208129eb7cd6956e8afcfa26afcfb9e8e Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 15 Sep 2014 10:52:32 +0200 Subject: net/cert: increase default key length @@ -12,10 +12,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/cert/x509_util.cc b/net/cert/x509_util.cc -index 03b3e350d8734..e8e34cab664dc 100644 +index cefc02d7c46e1..48dc25536a33c 100644 --- a/net/cert/x509_util.cc +++ b/net/cert/x509_util.cc -@@ -281,7 +281,7 @@ bool GetTLSServerEndPointChannelBinding(const X509Certificate& certificate, +@@ -280,7 +280,7 @@ bool GetTLSServerEndPointChannelBinding(const X509Certificate& certificate, } // RSA keys created by CreateKeyAndSelfSignedCert will be of this length. @@ -25,5 +25,5 @@ index 03b3e350d8734..e8e34cab664dc 100644 // Certificates made by CreateKeyAndSelfSignedCert will be signed using this // digest algorithm. -- -2.47.1 +2.48.1 diff --git a/build/e_patches/openH264-enable-ARMARM64-optimizations.patch b/build/e_patches/openH264-enable-ARMARM64-optimizations.patch index c9d60c38..f41bf5e0 100644 --- a/build/e_patches/openH264-enable-ARMARM64-optimizations.patch +++ b/build/e_patches/openH264-enable-ARMARM64-optimizations.patch @@ -1,4 +1,4 @@ -From da815b0973c9cb4b8f67511ab35301629c849f28 Mon Sep 17 00:00:00 2001 +From fced42ce6325314eb38461f44bab09aa20a3b201 Mon Sep 17 00:00:00 2001 From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Sat, 20 Jan 2018 21:17:27 +0100 Subject: openH264: enable ARM/ARM64 optimizations @@ -13,10 +13,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/third_party/blink/renderer/modules/mediarecorder/h264_encoder.cc b/third_party/blink/renderer/modules/mediarecorder/h264_encoder.cc -index bd24e7ccdfa02..7f3989e2dcacd 100644 +index c0dead691024d..bd363bd4a3671 100644 --- a/third_party/blink/renderer/modules/mediarecorder/h264_encoder.cc +++ b/third_party/blink/renderer/modules/mediarecorder/h264_encoder.cc -@@ -236,11 +236,11 @@ bool H264Encoder::ConfigureEncoder(const gfx::Size& size) { +@@ -235,11 +235,11 @@ bool H264Encoder::ConfigureEncoder(const gfx::Size& size) { init_params.iRCMode = RC_OFF_MODE; } @@ -81,5 +81,5 @@ index 99340a7369dd7..7666a1cfc8fb2 100644 include_dirs = openh264_encoder_include_dirs -- -2.47.1 +2.48.1 diff --git a/build/e_patches/ungoogledchromium-Disable-Gaia.patch b/build/e_patches/ungoogledchromium-Disable-Gaia.patch index dc156c52..059ddeca 100644 --- a/build/e_patches/ungoogledchromium-Disable-Gaia.patch +++ b/build/e_patches/ungoogledchromium-Disable-Gaia.patch @@ -1,4 +1,4 @@ -From 586eab72c26dea638ab632db8ff1ee3ec2da33b7 Mon Sep 17 00:00:00 2001 +From 960185fbe2130ce72f2a5ac8ad257e40a4bff433 Mon Sep 17 00:00:00 2001 From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Mon, 12 Feb 2018 21:37:52 +0100 Subject: ungoogled-chromium: Disable Gaia @@ -43,5 +43,5 @@ index 9ba4e97c83076..724b73d9ab6c5 100644 // static -- -2.47.1 +2.48.1 -- GitLab From b65f60584eeb8ef7b2faba571fc15b0829ca6487 Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Fri, 24 Jan 2025 13:52:50 +0530 Subject: [PATCH 05/10] Remove unneeded build args --- build/browser.gn_args | 1 - 1 file changed, 1 deletion(-) diff --git a/build/browser.gn_args b/build/browser.gn_args index feab1ff6..750096b9 100644 --- a/build/browser.gn_args +++ b/build/browser.gn_args @@ -14,7 +14,6 @@ enable_cardboard=false enable_dav1d_decoder=true enable_hangout_services_extension=false enable_iterator_debugging=false -enable_log_error_not_reached=true enable_mdns=false enable_mse_mpeg2ts_stream_parser=true enable_nacl=false -- GitLab From ae5c389d6d58d5e60873b89d9e213930eba3eb1f Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Fri, 24 Jan 2025 13:55:20 +0530 Subject: [PATCH 06/10] Drop the patch which was removed by cromite in v132.0.6834.83 --- ...-lock-icon-in-address-bar-by-default.patch | 24 ------------------- build/cromite_patches_list.txt | 1 - 2 files changed, 25 deletions(-) delete mode 100644 build/cromite_patches/Disable-lock-icon-in-address-bar-by-default.patch diff --git a/build/cromite_patches/Disable-lock-icon-in-address-bar-by-default.patch b/build/cromite_patches/Disable-lock-icon-in-address-bar-by-default.patch deleted file mode 100644 index 88c2f190..00000000 --- a/build/cromite_patches/Disable-lock-icon-in-address-bar-by-default.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: csagan5 <32685696+csagan5@users.noreply.github.com> -Date: Fri, 8 Oct 2021 00:30:26 +0200 -Subject: Disable lock icon in address bar by default - -License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html ---- - components/omnibox/common/omnibox_features.cc | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/components/omnibox/common/omnibox_features.cc b/components/omnibox/common/omnibox_features.cc ---- a/components/omnibox/common/omnibox_features.cc -+++ b/components/omnibox/common/omnibox_features.cc -@@ -250,8 +250,8 @@ BASE_FEATURE(kOmniboxAssistantVoiceSearch, - // used, on non-Android platforms this is controlled through the - // ChromeRefresh2023 flag. - BASE_FEATURE(kUpdatedConnectionSecurityIndicators, -- "OmniboxUpdatedConnectionSecurityIndicators", -- ENABLED); -+ "OmniboxUpdatedConnectionSecurityIndicators", // enabled by default -+ ENABLED); // in Bromite - - // Feature used to default typed navigations to use HTTPS instead of HTTP. - // This only applies to navigations that don't have a scheme such as --- diff --git a/build/cromite_patches_list.txt b/build/cromite_patches_list.txt index 654b873c..5b11da95 100644 --- a/build/cromite_patches_list.txt +++ b/build/cromite_patches_list.txt @@ -120,7 +120,6 @@ Add-flag-to-disable-vibration.patch mime_util-force-text-x-suse-ymp-to-be-downloaded.patch Client-hints-overrides.patch Allow-building-without-enable_reporting.patch -Disable-lock-icon-in-address-bar-by-default.patch Experimental-user-scripts-support.patch Keep-empty-tabs-between-sessions.patch Disable-third-party-origin-trials.patch -- GitLab From 2857e5a9a9d3914107fcc6557809f5c06b1606bb Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Fri, 24 Jan 2025 13:57:31 +0530 Subject: [PATCH 07/10] Update parental control patch for v132 --- ...tings-when-parental-control-is-active.patch | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/build/e_patches/Browser-Hide-settings-when-parental-control-is-active.patch b/build/e_patches/Browser-Hide-settings-when-parental-control-is-active.patch index 194d569c..7fe2a5c9 100644 --- a/build/e_patches/Browser-Hide-settings-when-parental-control-is-active.patch +++ b/build/e_patches/Browser-Hide-settings-when-parental-control-is-active.patch @@ -1,20 +1,28 @@ -From 8d9920de4878d81e87489631bcac8c5981783355 Mon Sep 17 00:00:00 2001 +From 415ca6262686f9255ed3b7ef7835fb004ac86d22 Mon Sep 17 00:00:00 2001 From: althafvly Date: Thu, 11 Jul 2024 11:11:15 +0530 Subject: Browser: Hide settings when parental control is active --- - .../chrome/browser/app/ChromeActivity.java | 2 +- + .../chrome/browser/app/ChromeActivity.java | 3 +- .../AppMenuPropertiesDelegateImpl.java | 5 ++++ .../browser/app/flags/ChromeCachedFlags.java | 29 +++++++++++++++++++ .../chrome/browser/settings/MainSettings.java | 4 +++ - 4 files changed, 39 insertions(+), 1 deletion(-) + 4 files changed, 40 insertions(+), 1 deletion(-) 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 -index e9220cb9947d8..655865bba50a5 100644 +index e9220cb9947d8..3b67f537da328 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java -@@ -2433,7 +2433,7 @@ public abstract class ChromeActivity +@@ -71,6 +71,7 @@ import org.chromium.chrome.browser.PlayServicesVersionInfo; + import org.chromium.chrome.browser.WarmupManager; + import org.chromium.chrome.browser.app.appmenu.AppMenuPropertiesDelegateImpl; + import org.chromium.chrome.browser.app.download.DownloadMessageUiDelegate; ++import org.chromium.chrome.browser.app.flags.ChromeCachedFlags; + import org.chromium.chrome.browser.app.metrics.LaunchCauseMetrics; + import org.chromium.chrome.browser.app.tab_activity_glue.ReparentingDelegateFactory; + import org.chromium.chrome.browser.app.tab_activity_glue.TabReparentingController; +@@ -2433,7 +2434,7 @@ public abstract class ChromeActivity @BrowserProfileType int type = Profile.getBrowserProfileTypeFromProfile(getCurrentTabModel().getProfile()); -- GitLab From 74bfc0107832f75c2493dea9783d53c6c8e93c45 Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Fri, 24 Jan 2025 14:10:49 +0530 Subject: [PATCH 08/10] fix password getting deleted when using browser's password manager --- ...BASEASBACKEND-before-removing-the-db.patch | 55 +++++++++++++++++++ build/e_patches_list.txt | 1 + 2 files changed, 56 insertions(+) create mode 100644 build/e_patches/Check-USELOGINDATABASEASBACKEND-before-removing-the-db.patch diff --git a/build/e_patches/Check-USELOGINDATABASEASBACKEND-before-removing-the-db.patch b/build/e_patches/Check-USELOGINDATABASEASBACKEND-before-removing-the-db.patch new file mode 100644 index 00000000..5244254e --- /dev/null +++ b/build/e_patches/Check-USELOGINDATABASEASBACKEND-before-removing-the-db.patch @@ -0,0 +1,55 @@ +From 40b628d878533c97427cc70e65f5eb43aa77fad1 Mon Sep 17 00:00:00 2001 +From: Ioana Pandele +Date: Thu, 9 Jan 2025 02:29:04 -0800 +Subject: Check USE_LOGIN_DATABASE_AS_BACKEND before removing the db + +Bug: 388451842 +Change-Id: Ic2f8e4f7d35b1c849480aae0a9327d8e08994d6b +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6157381 +Reviewed-by: Vasilii Sukhanov +Commit-Queue: Ioana Pandele +Cr-Commit-Position: refs/heads/main@{#1404059} +--- + .../android/password_manager_android_util.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/chrome/browser/password_manager/android/password_manager_android_util.cc b/chrome/browser/password_manager/android/password_manager_android_util.cc +index 1ef8939bfc79a..e590a13bd38fb 100644 +--- a/chrome/browser/password_manager/android/password_manager_android_util.cc ++++ b/chrome/browser/password_manager/android/password_manager_android_util.cc +@@ -247,6 +247,7 @@ void MaybeActivateSplitStoresAndLocalUpm( + } + } + ++#if !BUILDFLAG(USE_LOGIN_DATABASE_AS_BACKEND) + // Called on startup from `MaybeDeactivateSplitStoresAndLocalUpm` to delete the + // login data files for users migrated to UPM. Must only be called if the value + // of the state pref `PasswordsUseUPMLocalAndSeparateStores` is `On` and there +@@ -286,6 +287,7 @@ void MaybeDeleteLoginDataFiles(PrefService* prefs, + } + base::DeleteFile(account_db_journal_path); + } ++#endif // !BUILDFLAG(USE_LOGIN_DATABASE_AS_BACKEND) + + // Must only be called if the state pref is kOn or kOffAndMigrationPending, to + // set it to kOff if the user downgraded GmsCore. Any passwords saved to GmsCore +@@ -318,13 +320,15 @@ void MaybeDeactivateSplitStoresAndLocalUpm( + HasMinGmsVersion() ? ActivationError::kNone + : ActivationError::kOutdatedGmsCore); + if (HasMinGmsVersion()) { +- // GmsCore was not downgraded, no need to deactivate. ++#if !BUILDFLAG(USE_LOGIN_DATABASE_AS_BACKEND) + if (GetSplitStoresAndLocalUpmPrefValue(pref_service) == kOn && + base::FeatureList::IsEnabled( + password_manager::features:: + kClearLoginDatabaseForAllMigratedUPMUsers)) { + MaybeDeleteLoginDataFiles(pref_service, login_db_directory); + } ++#endif // !BUILDFLAG(USE_LOGIN_DATABASE_AS_BACKEND) ++ // GmsCore was not downgraded, no need to deactivate. + return; + } + +-- +2.48.1 + diff --git a/build/e_patches_list.txt b/build/e_patches_list.txt index aa0a54a3..2c6771cc 100644 --- a/build/e_patches_list.txt +++ b/build/e_patches_list.txt @@ -59,3 +59,4 @@ ungoogledchromium-Disable-Gaia.patch Disable-support-for-RAR-files-inspection.patch Browser-Fix-open-in-browser-text.patch Browser-Enable-external-intent-requests.patch +Check-USELOGINDATABASEASBACKEND-before-removing-the-db.patch -- GitLab From 08db001239ba992585c3a2b169ca1b1c497d9e86 Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Fri, 24 Jan 2025 14:16:36 +0530 Subject: [PATCH 09/10] Browser: Fix eyeo patch issue --- ...g-Solution-Chrome-Integration-Module.patch | 23 +++++++++++++++++++ build/e_patches_list.txt | 1 + 2 files changed, 24 insertions(+) create mode 100644 build/e_patches/fixup-eyeo-Browser-Ad-filtering-Solution-Chrome-Integration-Module.patch diff --git a/build/e_patches/fixup-eyeo-Browser-Ad-filtering-Solution-Chrome-Integration-Module.patch b/build/e_patches/fixup-eyeo-Browser-Ad-filtering-Solution-Chrome-Integration-Module.patch new file mode 100644 index 00000000..52a217e4 --- /dev/null +++ b/build/e_patches/fixup-eyeo-Browser-Ad-filtering-Solution-Chrome-Integration-Module.patch @@ -0,0 +1,23 @@ +From 460342d9dde2d8c4a3092e945316c484fdf0a4ef Mon Sep 17 00:00:00 2001 +From: Nishith Khanna +Date: Fri, 24 Jan 2025 14:13:51 +0530 +Subject: fixup: eyeo Browser Ad filtering Solution: Chrome Integration Module + +--- + chrome/browser/ui/webui/chrome_web_ui_configs.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chrome/browser/ui/webui/chrome_web_ui_configs.cc b/chrome/browser/ui/webui/chrome_web_ui_configs.cc +index 209497a950cfc..2fff6c059532f 100644 +--- a/chrome/browser/ui/webui/chrome_web_ui_configs.cc ++++ b/chrome/browser/ui/webui/chrome_web_ui_configs.cc +@@ -423,5 +423,5 @@ void RegisterChromeWebUIConfigs() { + #if BUILDFLAG(IS_ANDROID) + map.AddWebUIConfig(std::make_unique()); + #endif +-} + map.AddWebUIConfig(std::make_unique()); ++} +-- +2.34.1 + diff --git a/build/e_patches_list.txt b/build/e_patches_list.txt index 2c6771cc..a80f8fa7 100644 --- a/build/e_patches_list.txt +++ b/build/e_patches_list.txt @@ -1,3 +1,4 @@ +fixup-eyeo-Browser-Ad-filtering-Solution-Chrome-Integration-Module.patch fixup-Revert-removal-of-execution-context-address-space.patch fixup-Bromite-subresource-adblocker.patch fixup-Disable-fetching-of-all-field-trials.patch -- GitLab From 398a133efb87a3d1b75e29545db5b72a72bd9f44 Mon Sep 17 00:00:00 2001 From: althafvly Date: Mon, 27 Jan 2025 10:32:22 +0530 Subject: [PATCH 10/10] Browser: e_patches: Ignore last line too --- update_e_patches.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/update_e_patches.sh b/update_e_patches.sh index 62be4dab..b0eb5aad 100755 --- a/update_e_patches.sh +++ b/update_e_patches.sh @@ -50,10 +50,14 @@ for commit in $(git rev-list --reverse "$chromium_commit_hash"..HEAD); do temp_patch_file=$(mktemp) git format-patch -1 --stdout "$commit" --subject-prefix="" > "$temp_patch_file" - # Check if the patch differs from any existing one, ignoring the first line + # Check if the patch differs from any existing one, ignoring the first line and the last non-empty line if [ -f "$patch_path" ]; then - # Compare content ignoring the first line - if diff -q <(tail -n +2 "$temp_patch_file") <(tail -n +2 "$patch_path") > /dev/null; then + # Remove trailing empty lines and skip the first and last non-empty line + temp_content=$(sed '/./!d' "$temp_patch_file" | tail -n +2 | head -n -1) + existing_content=$(sed '/./!d' "$patch_path" | tail -n +2 | head -n -1) + + # Compare processed content + if diff -q <(echo "$temp_content") <(echo "$existing_content") > /dev/null; then echo "Patch already up-to-date: $patch_filename" rm "$temp_patch_file" echo "$patch_filename" >> "$output_patch_file" -- GitLab