diff --git a/build/RELEASE b/build/RELEASE index 8a68fbe7..724fe3ca 100644 --- a/build/RELEASE +++ b/build/RELEASE @@ -1 +1 @@ -134.0.6998.108 \ No newline at end of file +135.0.7049.41 \ No newline at end of file diff --git a/build/cromite_patches_list.txt b/build/cromite_patches_list.txt index 9bb1ff57..fb0197e6 100644 --- a/build/cromite_patches_list.txt +++ b/build/cromite_patches_list.txt @@ -294,6 +294,7 @@ Enable-ProcessBoundStringEncryption-by-default.patch Prevent-mouse-wheel-fingerprinting-on-Windows.patch Enable-component-updater.patch Android-fonts-fingerprinting-mitigation.patch +Disable-Android-Tab-Declutter.patch # temporary or wip patches Temp-PerformanceNavigationTiming-privacy-fix.patch diff --git a/build/patches/AImageReader-CFI-crash-mitigations.patch b/build/patches/AImageReader-CFI-crash-mitigations.patch index d5cd9d4f..438fb642 100644 --- a/build/patches/AImageReader-CFI-crash-mitigations.patch +++ b/build/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 -@@ -3224,6 +3224,10 @@ +@@ -3268,6 +3268,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 -@@ -59,6 +59,11 @@ BASE_FEATURE(kAggressiveShaderCacheLimits, +@@ -58,6 +58,11 @@ BASE_FEATURE(kAggressiveShaderCacheLimits, base::FEATURE_DISABLED_BY_DEFAULT); #if BUILDFLAG(IS_ANDROID) @@ -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; -@@ -375,6 +378,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info, +@@ -348,6 +351,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) -@@ -715,6 +716,13 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line, +@@ -692,6 +693,13 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line, } #endif // BUILDFLAG(IS_WIN) diff --git a/build/patches/Add-AllowUserCertificates-flag.patch b/build/patches/Add-AllowUserCertificates-flag.patch index 255e9b51..ca19f5ea 100644 --- a/build/patches/Add-AllowUserCertificates-flag.patch +++ b/build/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 -@@ -225,6 +225,7 @@ import org.chromium.content_public.browser.LoadUrlParams; +@@ -227,6 +227,7 @@ import org.chromium.content_public.browser.LoadUrlParams; import org.chromium.content_public.browser.SelectionPopupController; import org.chromium.content_public.browser.WebContents; import org.chromium.content_public.common.ContentSwitches; @@ -28,7 +28,7 @@ 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; -@@ -968,6 +969,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity +@@ -969,6 +970,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity super.onStartWithNative(); ChromeActivitySessionTracker.getInstance().onStartWithNative(getProfileProviderSupplier()); @@ -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 -@@ -164,6 +164,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -160,6 +160,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &feed::kFeedPerformanceStudy, &feed::kFeedShowSignInCommand, &feed::kFeedSignedOutViewDemotion, @@ -59,16 +59,16 @@ 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 = -@@ -624,6 +625,8 @@ public abstract class ChromeFeatureList { - public static final CachedFlag sAndroidTabDeclutterDedupeTabIdsKillSwitch = - newCachedFlag(ANDROID_TAB_DECLUTTER_DEDUPE_TAB_IDS_KILL_SWITCH, true); +@@ -642,6 +643,8 @@ public abstract class ChromeFeatureList { + public static final CachedFlag sAndroidMinimalUiLargeScreen = + newCachedFlag(ANDROID_MINIMAL_UI_LARGE_SCREEN, false); public static final CachedFlag sAppSpecificHistory = newCachedFlag(APP_SPECIFIC_HISTORY, true); + public static final CachedFlag sAllowUserCertificates = + newCachedFlag(ALLOW_USER_CERTIFICATES, false); public static final CachedFlag sAsyncNotificationManager = newCachedFlag(ASYNC_NOTIFICATION_MANAGER, false, true); - public static final CachedFlag sBlockIntentsWhileLocked = -@@ -845,6 +848,7 @@ public abstract class ChromeFeatureList { + public static final CachedFlag sAsyncNotificationManagerForDownload = +@@ -877,6 +880,7 @@ public abstract class ChromeFeatureList { public static final List sFlagsCachedFullBrowserChromium = List.of( sAndroidAppIntegration, diff --git a/build/patches/Add-IsCleartextPermitted-flag.patch b/build/patches/Add-IsCleartextPermitted-flag.patch index 08929780..177c9ea7 100644 --- a/build/patches/Add-IsCleartextPermitted-flag.patch +++ b/build/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 -@@ -372,6 +372,11 @@ std::unique_ptr URLRequestHttpJob::Create(URLRequest* request) { +@@ -387,6 +387,11 @@ std::unique_ptr URLRequestHttpJob::Create(URLRequest* request) { } } diff --git a/build/patches/Add-PartialLowEndModeOnMidRangeDevices-flag.patch b/build/patches/Add-PartialLowEndModeOnMidRangeDevices-flag.patch index cb5af53f..930853b7 100644 --- a/build/patches/Add-PartialLowEndModeOnMidRangeDevices-flag.patch +++ b/build/patches/Add-PartialLowEndModeOnMidRangeDevices-flag.patch @@ -15,7 +15,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/base/features.cc b/base/features.cc --- a/base/features.cc +++ b/base/features.cc -@@ -123,6 +123,10 @@ BASE_FEATURE(kPostGetMyMemoryStateToBackground, +@@ -120,6 +120,10 @@ BASE_FEATURE(kPostGetMyMemoryStateToBackground, FEATURE_ENABLED_BY_DEFAULT); #endif // BUILDFLAG(IS_ANDROID) @@ -25,7 +25,7 @@ diff --git a/base/features.cc b/base/features.cc + void Init(EmitThreadControllerProfilerMetadata emit_thread_controller_profiler_metadata) { - InitializeCpuReductionExperiment(); + sequence_manager::internal::SequenceManagerImpl::InitializeFeatures(); 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 diff --git a/build/patches/Add-a-flag-to-disable-GamePad-API.patch b/build/patches/Add-a-flag-to-disable-GamePad-API.patch index 1ddb573f..37396a59 100644 --- a/build/patches/Add-a-flag-to-disable-GamePad-API.patch +++ b/build/patches/Add-a-flag-to-disable-GamePad-API.patch @@ -17,7 +17,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json --- a/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json -@@ -7665,9 +7665,9 @@ +@@ -7693,9 +7693,9 @@ "expiry_milestone": 140 }, { diff --git a/build/patches/Add-a-proxy-configuration-page.patch b/build/patches/Add-a-proxy-configuration-page.patch index b248d175..e4e40be5 100644 --- a/build/patches/Add-a-proxy-configuration-page.patch +++ b/build/patches/Add-a-proxy-configuration-page.patch @@ -29,7 +29,7 @@ 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 + - .../browser/ui/webui/chrome_web_ui_configs.cc | 4 + + .../browser/ui/webui/chrome_web_ui_configs.cc | 5 +- chrome/browser/ui/webui/proxy_config_ui.cc | 389 ++++++++++++++++++ chrome/browser/ui/webui/proxy_config_ui.h | 41 ++ chrome/common/webui_url_constants.cc | 2 + @@ -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, 984 insertions(+), 17 deletions(-) + 25 files changed, 984 insertions(+), 18 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 @@ -106,7 +106,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 @@ -196,16 +196,16 @@ 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 -@@ -200,6 +200,8 @@ +@@ -196,6 +196,8 @@ #include "printing/buildflags/buildflags.h" #include "rlz/buildflags/buildflags.h" +#include "chrome/browser/net/proxy_service_factory.h" + #if BUILDFLAG(ENABLE_BACKGROUND_MODE) - #include "chrome/browser/background/background_mode_manager.h" + #include "chrome/browser/background/extensions/background_mode_manager.h" #endif -@@ -1644,6 +1646,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -1561,6 +1563,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { component_updater::RegisterPrefs(registry); domain_reliability::RegisterPrefs(registry); embedder_support::OriginTrialPrefs::RegisterPrefs(registry); @@ -217,7 +217,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse diff --git a/chrome/browser/prefs/chrome_command_line_pref_store.cc b/chrome/browser/prefs/chrome_command_line_pref_store.cc --- a/chrome/browser/prefs/chrome_command_line_pref_store.cc +++ b/chrome/browser/prefs/chrome_command_line_pref_store.cc -@@ -157,7 +157,7 @@ void ChromeCommandLinePrefStore::ApplyProxyMode() { +@@ -156,7 +156,7 @@ void ChromeCommandLinePrefStore::ApplyProxyMode() { command_line()->GetSwitchValueASCII(switches::kProxyBypassList); SetValue(proxy_config::prefs::kProxy, base::Value(ProxyConfigDictionary::CreateFixedServers( @@ -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 -@@ -222,6 +222,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", @@ -672,7 +672,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn 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 -@@ -55,6 +55,9 @@ +@@ -54,6 +54,9 @@ #include "extensions/buildflags/buildflags.h" #include "printing/buildflags/buildflags.h" @@ -682,12 +682,15 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_configs.cc b/chrome/browser/u #if BUILDFLAG(ENABLE_NACL) #include "chrome/browser/ui/webui/nacl_ui.h" #endif -@@ -388,4 +391,5 @@ void RegisterChromeWebUIConfigs() { - #if BUILDFLAG(ENABLE_GLIC) +@@ -391,7 +394,7 @@ void RegisterChromeWebUIConfigs() { map.AddWebUIConfig(std::make_unique()); + map.AddWebUIConfig(std::make_unique()); #endif +- + map.AddWebUIConfig(std::make_unique()); - } + #if BUILDFLAG(SAFE_BROWSING_AVAILABLE) + 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 @@ -1150,7 +1153,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons diff --git a/chrome/common/webui_url_constants.h b/chrome/common/webui_url_constants.h --- a/chrome/common/webui_url_constants.h +++ b/chrome/common/webui_url_constants.h -@@ -160,6 +160,8 @@ inline constexpr char kChromeUINetExportHost[] = "net-export"; +@@ -161,6 +161,8 @@ inline constexpr char kChromeUINetExportHost[] = "net-export"; inline constexpr char kChromeUINetInternalsHost[] = "net-internals"; inline constexpr char kChromeUINetInternalsURL[] = "chrome://net-internals/"; inline constexpr char kChromeUINewTabHost[] = "newtab"; diff --git a/build/patches/Add-an-always-incognito-mode.patch b/build/patches/Add-an-always-incognito-mode.patch index 86764e77..b45e714c 100644 --- a/build/patches/Add-an-always-incognito-mode.patch +++ b/build/patches/Add-an-always-incognito-mode.patch @@ -98,7 +98,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 -@@ -636,6 +636,7 @@ chrome_java_resources = [ +@@ -643,6 +643,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", @@ -117,7 +117,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_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", -@@ -946,6 +947,7 @@ chrome_java_sources = [ +@@ -879,6 +880,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", @@ -255,7 +255,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; -@@ -715,14 +719,19 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn +@@ -727,14 +731,19 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn Profile profile = mTabModelSelector.getCurrentModel().getProfile(); // For saving non-incognito tab closures for Recent Tabs. @@ -282,7 +282,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct // Defer creation of this helper so it triggers after TabGroupModelFilter observers. mUndoRefocusHelper = new UndoRefocusHelper( -@@ -2571,8 +2580,9 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn +@@ -2614,8 +2623,9 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn // We determine the model as soon as possible so every systems get initialized coherently. boolean startIncognito = @@ -297,7 +297,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct 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 -@@ -92,6 +92,7 @@ import org.chromium.chrome.browser.compositor.layouts.SceneChangeObserver; +@@ -94,6 +94,7 @@ import org.chromium.chrome.browser.compositor.layouts.SceneChangeObserver; import org.chromium.chrome.browser.compositor.layouts.content.TabContentManagerHandler; import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager; import org.chromium.chrome.browser.device.DeviceClassManager; @@ -305,7 +305,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv import org.chromium.chrome.browser.dom_distiller.DomDistillerUiUtils; import org.chromium.chrome.browser.download.DownloadManagerService; import org.chromium.chrome.browser.download.DownloadUtils; -@@ -1952,6 +1953,9 @@ public abstract class ChromeActivity extends AsyncInitializationActivity +@@ -1953,6 +1954,9 @@ public abstract class ChromeActivity extends AsyncInitializationActivity throw new IllegalStateException( "Attempting to access TabCreator before initialization"); } @@ -327,7 +327,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; -@@ -101,6 +103,10 @@ import java.util.ArrayList; +@@ -102,6 +104,10 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -338,7 +338,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. -@@ -599,6 +605,13 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -609,6 +615,13 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate } private void prepareCommonMenuItems(Menu menu, @MenuGroup int menuGroup, boolean isIncognito) { @@ -352,7 +352,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; -@@ -662,7 +675,15 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -672,7 +685,15 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate } if (item.getItemId() == R.id.recent_tabs_menu_id) { @@ -369,7 +369,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); -@@ -867,8 +888,9 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -877,8 +898,9 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate && !isNativePage && !isFileScheme && !isContentScheme @@ -384,15 +384,15 @@ 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/contextmenu/ChromeContextMenuPopulator.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java -@@ -30,6 +30,7 @@ import org.chromium.base.metrics.RecordHistogram; +@@ -29,6 +29,7 @@ import org.chromium.base.ContextUtils; import org.chromium.base.shared_preferences.SharedPreferencesManager; import org.chromium.base.supplier.Supplier; import org.chromium.chrome.R; +import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor; + import org.chromium.chrome.browser.bookmarks.BookmarkUtils; import org.chromium.chrome.browser.contextmenu.ChromeContextMenuItem.Item; import org.chromium.chrome.browser.contextmenu.ContextMenuCoordinator.ListItemType; - import org.chromium.chrome.browser.download.DownloadUtils; -@@ -339,6 +340,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { +@@ -277,6 +278,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { public List> buildContextMenu() { mShowEphemeralTabNewLabel = null; @@ -402,7 +402,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr List> groupedItems = new ArrayList<>(); if (mParams.isAnchor()) { -@@ -349,6 +353,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { +@@ -287,6 +291,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)); @@ -410,7 +410,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)); } -@@ -379,7 +384,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { +@@ -317,7 +322,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { } } if (FirstRunStatus.getFirstRunFlowComplete()) { @@ -502,7 +502,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; -@@ -1180,6 +1183,13 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid +@@ -1183,6 +1186,13 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid return getInitialActivityWidth() > 0; } @@ -538,7 +538,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"; -@@ -299,7 +304,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. @@ -559,7 +559,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/Downlo diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryContentManager.java b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryContentManager.java --- a/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryContentManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryContentManager.java -@@ -277,7 +277,9 @@ public class HistoryContentManager implements SignInStateObserver, PrefObserver +@@ -300,7 +300,9 @@ public class HistoryContentManager implements SignInStateObserver, PrefObserver mHistoryAdapter.generateFooterItems(); // Listen to changes in sign in state. @@ -570,7 +570,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History // Create PrefChangeRegistrar to receive notifications on preference changes. mPrefChangeRegistrar = PrefServiceUtil.createFor(profile); -@@ -353,7 +355,8 @@ public class HistoryContentManager implements SignInStateObserver, PrefObserver +@@ -376,7 +378,8 @@ public class HistoryContentManager implements SignInStateObserver, PrefObserver mHistoryAdapter.onDestroyed(); mLargeIconBridge.destroy(); mLargeIconBridge = null; @@ -578,8 +578,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History + if (IdentityServicesProvider.get().getSigninManager(mProfile) != null) + IdentityServicesProvider.get().getSigninManager(mProfile).removeSignInStateObserver(this); mPrefChangeRegistrar.destroy(); - } - + if (mHistorySyncPromoCoordinator != null) { + mHistorySyncPromoCoordinator.destroy(); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java --- a/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java @@ -684,7 +684,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; -@@ -319,7 +320,8 @@ public class NativePageFactory { +@@ -326,7 +327,8 @@ public class NativePageFactory { String url, NativePage candidatePage, Tab tab, boolean isIncognito, PdfInfo pdfInfo) { NativePage page; @@ -1043,7 +1043,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 -@@ -180,6 +180,8 @@ import org.chromium.ui.InsetObserver; +@@ -191,6 +191,8 @@ import org.chromium.ui.InsetObserver; import org.chromium.ui.UiUtils; import org.chromium.ui.base.ActivityWindowAndroid; import org.chromium.ui.base.DeviceFormFactor; @@ -1052,7 +1052,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; -@@ -1078,7 +1080,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -1148,7 +1150,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { () -> { mTabCreatorManagerSupplier .get() @@ -1075,7 +1075,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome /** This class creates various kinds of new tabs and adds them to the right {@link TabModel}. */ public class ChromeTabCreator extends TabCreator { private final Activity mActivity; -@@ -500,7 +504,6 @@ public class ChromeTabCreator extends TabCreator { +@@ -502,7 +506,6 @@ public class ChromeTabCreator extends TabCreator { // TODO(crbug.com/40691614): Clean up the launches from SearchActivity/Chrome. public Tab launchUrlFromExternalApp( LoadUrlParams loadUrlParams, String appId, boolean forceNewTab, Intent intent) { @@ -1115,7 +1115,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPer import java.io.BufferedInputStream; import java.io.BufferedOutputStream; import java.io.ByteArrayInputStream; -@@ -821,6 +823,13 @@ public class TabPersistentStore { +@@ -832,6 +834,13 @@ public class TabPersistentStore { } } } @@ -1140,7 +1140,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; -@@ -752,7 +753,7 @@ public class ToolbarManager +@@ -748,7 +749,7 @@ public class ToolbarManager TraceEvent.end("isOfflinePage"); return ret; } @@ -1351,10 +1351,10 @@ 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" -@@ -103,9 +104,25 @@ scoped_refptr - if (profile->IsOffTheRecord() && !profile->IsGuestSession()) +@@ -105,9 +106,25 @@ scoped_refptr GetForProfile(original_profile); + bool should_record_metrics = profiles::IsRegularUserProfile(profile); + bool always_incognito_enabled = false; + bool force_save_site_settings = false; + @@ -1376,9 +1376,9 @@ diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.c + !force_save_site_settings && (profile->IsOffTheRecord() || profile->IsGuestSession()), + force_save_site_settings, /*store_last_modified=*/true, profile->ShouldRestoreOldSessionCookies(), - profiles::IsRegularUserProfile(profile))); + should_record_metrics)); -@@ -114,6 +131,9 @@ scoped_refptr +@@ -116,6 +133,9 @@ scoped_refptr settings_map->RegisterProvider(ProviderType::kWebuiAllowlistProvider, std::move(allowlist_provider)); @@ -1401,7 +1401,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" -@@ -492,6 +495,13 @@ void HistoryTabHelper::TitleWasSet(NavigationEntry* entry) { +@@ -511,6 +514,13 @@ void HistoryTabHelper::TitleWasSet(NavigationEntry* entry) { history::HistoryService* HistoryTabHelper::GetHistoryService() { Profile* profile = Profile::FromBrowserContext(web_contents()->GetBrowserContext()); @@ -1415,7 +1415,7 @@ diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/histo if (profile->IsOffTheRecord()) return nullptr; -@@ -499,6 +509,16 @@ history::HistoryService* HistoryTabHelper::GetHistoryService() { +@@ -518,6 +528,16 @@ history::HistoryService* HistoryTabHelper::GetHistoryService() { profile, ServiceAccessType::IMPLICIT_ACCESS); } @@ -1764,7 +1764,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 -@@ -250,6 +250,7 @@ +@@ -245,6 +245,7 @@ #if BUILDFLAG(IS_ANDROID) #include "chrome/browser/accessibility/accessibility_prefs/android/accessibility_prefs_controller.h" @@ -1772,7 +1772,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse #include "chrome/browser/android/ntp/recent_tabs_page_prefs.h" #include "chrome/browser/android/oom_intervention/oom_intervention_decider.h" #include "chrome/browser/android/preferences/browser_prefs_android.h" -@@ -2105,6 +2106,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -2010,6 +2011,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, usage_stats::UsageStatsBridge::RegisterProfilePrefs(registry); variations::VariationsService::RegisterProfilePrefs(registry); webapps::InstallPromptPrefs::RegisterProfilePrefs(registry); @@ -1933,7 +1933,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 -@@ -6460,6 +6460,31 @@ To change this setting, BEGIN_LINKdelete the Chrome d +@@ -6528,6 +6528,31 @@ To change this setting, BEGIN_LINKdelete the Chrome d Cookies, cache, and other site data @@ -1990,7 +1990,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/messages/android/BUILD.gn b/chrome/browser/ui/messages/android/BUILD.gn --- a/chrome/browser/ui/messages/android/BUILD.gn +++ b/chrome/browser/ui/messages/android/BUILD.gn -@@ -27,6 +27,7 @@ android_library("java") { +@@ -28,6 +28,7 @@ android_library("java") { srcjar_deps = [ ":jni_headers" ] sources = [ "java/src/org/chromium/chrome/browser/ui/messages/infobar/SimpleConfirmInfoBarBuilder.java", @@ -2034,7 +2034,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 -@@ -4149,6 +4149,12 @@ inline constexpr char kOutOfProcessSystemDnsResolutionEnabled[] = +@@ -4071,6 +4071,12 @@ inline constexpr char kOutOfProcessSystemDnsResolutionEnabled[] = "net.out_of_process_system_dns_resolution_enabled"; #endif // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) @@ -2100,7 +2100,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 -@@ -264,6 +264,7 @@ struct ContentSettingEntry { +@@ -247,6 +247,7 @@ struct ContentSettingEntry { HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs, bool is_off_the_record, @@ -2108,7 +2108,7 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map. bool store_last_modified, bool restore_session, bool should_record_metrics) -@@ -273,6 +274,7 @@ HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs, +@@ -256,6 +257,7 @@ HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs, #endif prefs_(prefs), is_off_the_record_(is_off_the_record), @@ -2116,7 +2116,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()) { -@@ -286,7 +288,7 @@ HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs, +@@ -269,7 +271,7 @@ HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs, policy_provider->AddObserver(this); auto pref_provider_ptr = std::make_unique( @@ -2136,7 +2136,7 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map. bool store_last_modified, bool restore_session, bool should_record_metrics); -@@ -502,6 +503,8 @@ class HostContentSettingsMap : public content_settings::Observer, +@@ -505,6 +506,8 @@ class HostContentSettingsMap : public content_settings::Observer, // Whether this settings map is for an incognito or guest session. bool is_off_the_record_; diff --git a/build/patches/Add-autoplay-site-setting.patch b/build/patches/Add-autoplay-site-setting.patch index 5893c42f..98418797 100644 --- a/build/patches/Add-autoplay-site-setting.patch +++ b/build/patches/Add-autoplay-site-setting.patch @@ -292,8 +292,8 @@ diff --git a/third_party/blink/renderer/core/html/media/autoplay_policy.cc b/thi --- a/third_party/blink/renderer/core/html/media/autoplay_policy.cc +++ b/third_party/blink/renderer/core/html/media/autoplay_policy.cc @@ -9,6 +9,7 @@ + #include "third_party/blink/public/mojom/autoplay/autoplay.mojom-blink.h" #include "third_party/blink/public/mojom/frame/lifecycle.mojom-blink.h" - #include "third_party/blink/public/mojom/permissions_policy/permissions_policy.mojom-blink.h" #include "third_party/blink/public/mojom/webpreferences/web_preferences.mojom-blink.h" +#include "third_party/blink/public/platform/web_content_settings_client.h" #include "third_party/blink/public/platform/web_media_player.h" diff --git a/build/patches/Add-bookmark-import-export-actions.patch b/build/patches/Add-bookmark-import-export-actions.patch index 118bc8f4..a31211c3 100644 --- a/build/patches/Add-bookmark-import-export-actions.patch +++ b/build/patches/Add-bookmark-import-export-actions.patch @@ -14,20 +14,20 @@ 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 ++ - .../browser/bookmarks/BookmarkBridge.java | 285 ++++++++++++++++++ + .../app/bookmarks/BookmarkActivity.java | 31 ++ + .../native_page/NativePageFactory.java | 9 +- + chrome/browser/BUILD.gn | 11 +- + .../bookmarks/android/bookmark_bridge.cc | 267 +++++++++++++++++ + .../bookmarks/android/bookmark_bridge.h | 30 +- + .../browser/bookmarks/BookmarkBridge.java | 39 +++ .../browser/bookmarks/BookmarkDelegate.java | 10 + .../bookmarks/BookmarkManagerCoordinator.java | 9 + - .../bookmarks/BookmarkManagerMediator.java | 23 ++ - .../browser/bookmarks/BookmarkPage.java | 8 +- - .../browser/bookmarks/BookmarkToolbar.java | 28 ++ + .../bookmarks/BookmarkManagerMediator.java | 283 ++++++++++++++++++ + .../browser/bookmarks/BookmarkPage.java | 9 +- + .../browser/bookmarks/BookmarkToolbar.java | 27 ++ .../bookmarks/BookmarkToolbarMediator.java | 4 + .../bookmarks/BookmarkToolbarProperties.java | 8 +- .../bookmarks/BookmarkToolbarViewBinder.java | 6 + - .../native_page/NativePageFactory.java | 11 +- - chrome/browser/BUILD.gn | 11 +- - .../bookmarks/android/bookmark_bridge.cc | 267 ++++++++++++++++ - .../bookmarks/android/bookmark_bridge.h | 30 +- .../dialogs/DownloadLocationCustomView.java | 8 +- .../DownloadLocationDialogCoordinator.java | 10 +- .../flags/android/chrome_feature_list.cc | 1 + @@ -52,7 +52,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 + - 41 files changed, 888 insertions(+), 30 deletions(-) + 41 files changed, 900 insertions(+), 29 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 @@ -103,7 +103,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; -@@ -54,7 +55,7 @@ import org.chromium.ui.modaldialog.ModalDialogManager; +@@ -55,7 +56,7 @@ import org.chromium.ui.modaldialog.ModalDialogManager; * {@link ChromeTabbedActivity}. */ public class TabbedModeTabDelegateFactory implements TabDelegateFactory { @@ -112,7 +112,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; -@@ -83,7 +84,7 @@ public class TabbedModeTabDelegateFactory implements TabDelegateFactory { +@@ -85,7 +86,7 @@ public class TabbedModeTabDelegateFactory implements TabDelegateFactory { private NativePageFactory mNativePageFactory; public TabbedModeTabDelegateFactory( @@ -124,7 +124,15 @@ 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 -@@ -25,6 +25,9 @@ import org.chromium.components.embedder_support.util.UrlConstants; +@@ -7,6 +7,7 @@ package org.chromium.chrome.browser.app.bookmarks; + import android.content.ComponentName; + import android.content.Intent; + import android.text.TextUtils; ++import android.os.Bundle; + + import org.chromium.base.IntentUtils; + import org.chromium.build.annotations.Nullable; +@@ -28,6 +29,9 @@ import org.chromium.components.embedder_support.util.UrlConstants; import org.chromium.ui.modaldialog.ModalDialogManager; import org.chromium.ui.modaldialog.ModalDialogManager.ModalDialogType; @@ -134,17 +142,17 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/B /** * The activity that displays the bookmark UI on the phone. It keeps a {@link * 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"; +@@ -41,6 +45,9 @@ public class BookmarkActivity extends SnackbarActivity { + private @Nullable BookmarkManagerCoordinator mBookmarkManagerCoordinator; + private @Nullable BookmarkOpener mBookmarkOpener; + private ActivityWindowAndroid mWindowAndroid; + private IntentRequestTracker mIntentRequestTracker; + @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); -@@ -62,8 +68,25 @@ public class BookmarkActivity extends SnackbarActivity { + protected void onProfileAvailable(Profile profile) { + super.onProfileAvailable(profile); +@@ -70,6 +77,14 @@ public class BookmarkActivity extends SnackbarActivity { getOnBackPressedDispatcher(), mBookmarkManagerCoordinator, SecondaryActivity.BOOKMARK); @@ -154,23 +162,12 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/B + mWindowAndroid = new ActivityWindowAndroid(this, listenToActivityState, + mIntentRequestTracker, /*InsetObserver*/ null, + /* trackOcclusion= */ true); -+ mWindowAndroid.getIntentRequestTracker().restoreInstanceState(savedInstanceState); + mBookmarkManagerCoordinator.setWindow(mWindowAndroid, -+ new ModalDialogManager( -+ new AppModalPresenter(this), ModalDialogManager.ModalDialogType.APP)); ++ getModalDialogManagerSupplier().get()); } -+ @Override -+ protected void onSaveInstanceState(Bundle outState) { -+ super.onSaveInstanceState(outState); -+ -+ mWindowAndroid.getIntentRequestTracker().saveInstanceState(outState); -+ } -+ @Override - protected void onDestroy() { - super.onDestroy(); -@@ -73,6 +96,7 @@ public class BookmarkActivity extends SnackbarActivity { +@@ -89,6 +104,7 @@ public class BookmarkActivity extends SnackbarActivity { @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); @@ -178,10 +175,17 @@ 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( -@@ -86,6 +110,14 @@ public class BookmarkActivity extends SnackbarActivity { - return new ModalDialogManager(new AppModalPresenter(this), ModalDialogType.APP); +@@ -97,6 +113,21 @@ public class BookmarkActivity extends SnackbarActivity { + } } ++ @Override ++ protected void onSaveInstanceState(Bundle outState) { ++ super.onSaveInstanceState(outState); ++ ++ mWindowAndroid.getIntentRequestTracker().saveInstanceState(outState); ++ } ++ + @Override + public void onRequestPermissionsResult( + int requestCode, String[] permissions, int[] grantResults) { @@ -189,564 +193,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/B + return; + super.onRequestPermissionsResult(requestCode, permissions, grantResults); + } -+ - /** - * @return The {@link BookmarkManagerCoordinator} for testing purposes. - */ -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java -@@ -34,6 +34,48 @@ import org.chromium.url.GURL; - import java.util.ArrayList; - import java.util.List; - -+import android.app.Activity; -+import android.content.Intent; -+import android.content.Context; -+import android.content.pm.PackageManager; -+import android.content.DialogInterface; -+import android.content.res.Resources; -+import android.content.ContentResolver; -+import android.net.Uri; -+import android.provider.Browser; -+import android.provider.DocumentsContract; -+import android.Manifest.permission; -+import android.view.View; -+import android.view.LayoutInflater; -+ -+import androidx.appcompat.app.AlertDialog; -+import android.os.Build; -+ -+import java.io.File; -+ -+import org.chromium.base.ContentUriUtils; -+import org.chromium.base.shared_preferences.SharedPreferencesManager; -+import org.chromium.base.task.AsyncTask; -+import org.chromium.chrome.R; -+import org.chromium.chrome.browser.document.ChromeLauncherActivity; -+import org.chromium.chrome.browser.IntentHandler; -+import org.chromium.chrome.browser.preferences.ChromePreferenceKeys; -+import org.chromium.chrome.browser.download.DownloadLocationDialogType; -+import org.chromium.chrome.browser.download.settings.DownloadLocationHelperImpl; -+import org.chromium.chrome.browser.download.dialogs.DownloadLocationDialogController; -+import org.chromium.chrome.browser.download.dialogs.DownloadLocationDialogCoordinator; -+import org.chromium.chrome.browser.download.dialogs.DownloadLocationCustomView; -+import org.chromium.chrome.browser.download.DirectoryOption; -+import org.chromium.chrome.browser.profiles.ProfileManager; -+import org.chromium.chrome.browser.preferences.ChromeSharedPreferences; -+import org.chromium.chrome.browser.flags.ChromeFeatureList; -+import org.chromium.ui.base.PageTransition; -+import org.chromium.ui.base.WindowAndroid; -+import org.chromium.ui.modelutil.PropertyModel; -+import org.chromium.ui.modaldialog.ModalDialogManager; -+import org.chromium.ui.modaldialog.ModalDialogProperties; -+import org.chromium.ui.modaldialog.DialogDismissalCause; -+ - /** - * Provides the communication channel for Android to fetch and manipulate the bookmark model stored - * in native. -@@ -490,6 +532,245 @@ class BookmarkBridge { - .getTotalBookmarkCount(mNativeBookmarkBridge, id.getId(), id.getType()); - } - -+ @CalledByNative -+ public void bookmarksExported(WindowAndroid window, String bookmarksPath, boolean success) { -+ Uri uri = Uri.parse(bookmarksPath); -+ -+ if (success == false) { -+ ((Activity)window.getContext().get()).runOnUiThread(new Runnable() { -+ public void run() { -+ window.showError(R.string.saving_file_error); -+ } -+ }); -+ } else { -+ SharedPreferencesManager sharedPrefs = ChromeSharedPreferences.getInstance(); -+ sharedPrefs.writeString(ChromePreferenceKeys.BOOKMARKS_LAST_EXPORT_URI, bookmarksPath); -+ -+ Context context = ContextUtils.getApplicationContext(); -+ -+ Intent intent = new Intent(Intent.ACTION_VIEW, -+ ContentUriUtils.isContentUri(bookmarksPath) ? -+ Uri.parse(bookmarksPath) : Uri.parse("file://" + bookmarksPath)); -+ intent.putExtra(Browser.EXTRA_APPLICATION_ID, -+ context.getPackageName()); -+ intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); -+ intent.putExtra(IntentHandler.EXTRA_PAGE_TRANSITION_TYPE, PageTransition.AUTO_BOOKMARK); -+ -+ // If the bookmark manager is shown in a tab on a phone (rather than in a separate -+ // activity) the component name may be null. Send the intent through -+ // ChromeLauncherActivity instead to avoid crashing. See crbug.com/615012. -+ intent.setClass(context, ChromeLauncherActivity.class); -+ -+ IntentHandler.startActivityForTrustedIntent(intent); -+ } -+ } -+ -+ /** -+ * Import bookmarks from a selected file. -+ * @param window The current window of the bookmarks activity or page. -+ */ -+ public void importBookmarks(WindowAndroid window) { -+ assert mIsNativeBookmarkModelLoaded; -+ BookmarkBridgeJni.get().importBookmarks(mNativeBookmarkBridge, BookmarkBridge.this, window); -+ } -+ -+ /** -+ * Export bookmarks to a path selected by the user. -+ * @param window The current window of the bookmarks activity or page. -+ */ -+ public void exportBookmarks(WindowAndroid window, ModalDialogManager modalDialogManager) { -+ assert mIsNativeBookmarkModelLoaded; -+ if (ChromeFeatureList.isEnabled(ChromeFeatureList.BOOKMARKS_EXPORT_USESAF) || -+ Build.VERSION.SDK_INT > Build.VERSION_CODES.Q) -+ exportBookmarksImplUseSaf(window); -+ else -+ exportBookmarksImplUseFile(window, modalDialogManager); -+ } -+ -+ private void exportBookmarksImplUseSaf(WindowAndroid window) { -+ Context context = window.getContext().get(); -+ -+ // standard name for boorkmark file -+ final String standardBoorkmarkName = "bookmarks.html"; -+ -+ // use the fileSelector and saf asking user for the file -+ Intent fileSelector = new Intent(Intent.ACTION_CREATE_DOCUMENT); -+ fileSelector.addCategory(Intent.CATEGORY_OPENABLE); -+ fileSelector.setType("text/html"); -+ fileSelector.putExtra(Intent.EXTRA_TITLE, standardBoorkmarkName); -+ fileSelector.setFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION | -+ Intent.FLAG_GRANT_READ_URI_PERMISSION | -+ Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION); -+ -+ // get last exported uri path, if any -+ SharedPreferencesManager sharedPrefs = ChromeSharedPreferences.getInstance(); -+ String bookmarksPath = sharedPrefs.readString(ChromePreferenceKeys.BOOKMARKS_LAST_EXPORT_URI, standardBoorkmarkName); -+ Uri lastSelectedUri = Uri.parse(bookmarksPath); -+ -+ // prepare delegate for file selector -+ DialogInterface.OnClickListener onClickListener = new DialogInterface.OnClickListener() { -+ @Override -+ public void onClick(DialogInterface dialog, int button) { -+ if (button == AlertDialog.BUTTON_NEGATIVE) { -+ window.showIntent(fileSelector, -+ new WindowAndroid.IntentCallback() { -+ @Override -+ public void onIntentCompleted(int resultCode, Intent data) { -+ if (data == null) return; -+ Uri filePath = data.getData(); -+ doExportBookmarksImpl(window, filePath); -+ } -+ }, -+ null); -+ } else { -+ if (dialog!=null) dialog.dismiss(); -+ doExportBookmarksImpl(window, lastSelectedUri); -+ } -+ } -+ }; -+ -+ // as a workaround for https://issuetracker.google.com/issues/37136466 -+ // ask to overwrite if is a valid uri and the file is present -+ if (DocumentsContract.isDocumentUri(context, lastSelectedUri)) { -+ AsyncTask checkUriTask = new AsyncTask() { -+ boolean uriExists = false; -+ String actualFilePath = null; -+ -+ @Override -+ protected Void doInBackground() { -+ uriExists = ContentUriUtils.contentUriExists(lastSelectedUri.toString()); -+ if (uriExists) { -+ actualFilePath = ContentUriUtils.getFilePathFromContentUri(lastSelectedUri); -+ // get real actual file name on disk -+ if (actualFilePath==null) actualFilePath = lastSelectedUri.toString(); -+ // set file name to last exported file name -+ fileSelector.putExtra(Intent.EXTRA_TITLE, -+ ContentUriUtils.getDisplayName(lastSelectedUri, context, -+ DocumentsContract.Document.COLUMN_DISPLAY_NAME)); -+ } -+ return null; -+ } -+ -+ @Override -+ protected void onPostExecute(Void result) { -+ // check for permissions -+ if (uriExists) { -+ AlertDialog.Builder alert = -+ new AlertDialog.Builder(context, R.style.ThemeOverlay_BrowserUI_AlertDialog); -+ AlertDialog alertDialog = -+ alert.setTitle(R.string.export_bookmarks_alert_title) -+ .setMessage(context.getString(R.string.export_bookmarks_alert_message, actualFilePath)) -+ .setPositiveButton( -+ R.string.export_bookmarks_alert_message_yes, onClickListener) -+ .setNegativeButton(R.string.export_bookmarks_alert_message_no, onClickListener) -+ .create(); -+ alertDialog.getDelegate().setHandleNativeActionModesEnabled(false); -+ -+ // show dialog asking for overwrite -+ alertDialog.show(); -+ return; -+ } else { -+ onClickListener.onClick(null, AlertDialog.BUTTON_NEGATIVE); -+ } -+ } -+ }; -+ checkUriTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); -+ return; -+ } -+ -+ // actually open the file selector -+ onClickListener.onClick(null, AlertDialog.BUTTON_NEGATIVE); -+ } -+ -+ private void doExportBookmarksImpl(WindowAndroid window, Uri filePath) { -+ ContentResolver resolver = ContextUtils.getApplicationContext().getContentResolver(); -+ // since we want to persist the uri in settings, ask for persistable permissions -+ resolver.takePersistableUriPermission(filePath, Intent.FLAG_GRANT_WRITE_URI_PERMISSION | -+ Intent.FLAG_GRANT_READ_URI_PERMISSION); -+ -+ BookmarkBridgeJni.get().exportBookmarks(mNativeBookmarkBridge, BookmarkBridge.this, -+ window, filePath.toString()); -+ } -+ -+ private void exportBookmarksImplUseFile(WindowAndroid window, ModalDialogManager modalDialogManager) { -+ Context context = window.getContext().get(); -+ -+ // standard name for boorkmark file -+ final String standardBoorkmarkName = "bookmarks.html"; -+ -+ // use the download ui and standard file saving -+ DownloadLocationDialogController controller = new DownloadLocationDialogController() { -+ @Override -+ public void onDownloadLocationDialogComplete(String returnedPath) {} -+ -+ @Override -+ public void onDownloadLocationDialogCanceled() {} -+ }; -+ -+ DownloadLocationDialogCoordinator dialog = new DownloadLocationDialogCoordinator() { -+ @Override -+ protected void onDirectoryOptionsRetrieved(ArrayList dirs) { -+ if (mDialogModel != null) return; -+ -+ // Actually show the dialog. -+ mCustomView = (DownloadLocationCustomView) LayoutInflater.from(context).inflate( -+ R.layout.download_location_dialog, null); -+ mCustomView.initialize(DownloadLocationDialogType.DEFAULT, /*totalBytes*/ 0, -+ (isChecked) -> {}, -+ new DownloadLocationHelperImpl(mProfile)); -+ mCustomView.setTitle(context.getString(R.string.export_bookmarks_alert_title)); -+ mCustomView.setFileName(standardBoorkmarkName); -+ mCustomView.mDontShowAgain.setVisibility(View.GONE); -+ -+ Resources resources = context.getResources(); -+ mDialogModel = new PropertyModel.Builder(ModalDialogProperties.ALL_KEYS) -+ .with(ModalDialogProperties.CONTROLLER, this) -+ .with(ModalDialogProperties.CUSTOM_VIEW, mCustomView) -+ .with(ModalDialogProperties.POSITIVE_BUTTON_TEXT, resources, -+ R.string.export_bookmarks) -+ .with(ModalDialogProperties.NEGATIVE_BUTTON_TEXT, resources, -+ R.string.cancel) -+ .build(); -+ -+ mModalDialogManager.showDialog(mDialogModel, ModalDialogManager.ModalDialogType.APP); -+ } -+ -+ @Override -+ public void onDismiss(PropertyModel model, int dismissalCause) { -+ switch (dismissalCause) { -+ case DialogDismissalCause.POSITIVE_BUTTON_CLICKED: -+ { -+ String fileName = mCustomView.getFileName(); -+ String directory = mCustomView.getDirectoryOption().location; -+ if (fileName != null && directory != null) { -+ File file = new File(directory, fileName); -+ -+ if (window.hasPermission(permission.WRITE_EXTERNAL_STORAGE)) { -+ BookmarkBridgeJni.get().exportBookmarks(mNativeBookmarkBridge, -+ BookmarkBridge.this, window, file.getPath()); -+ } else { -+ String[] requestPermissions = new String[] {permission.WRITE_EXTERNAL_STORAGE}; -+ window.requestPermissions(requestPermissions, (permissions, grantResults) -> { -+ if (grantResults.length >= 1 && grantResults[0] == PackageManager.PERMISSION_GRANTED) { -+ BookmarkBridgeJni.get().exportBookmarks(mNativeBookmarkBridge, -+ BookmarkBridge.this, window, file.getPath()); -+ } -+ }); -+ }; -+ } -+ } -+ break; -+ } -+ mDialogModel = null; -+ mCustomView = null; -+ } -+ }; -+ dialog.initialize(controller); -+ dialog.showDialog(context, modalDialogManager, /*totalBytes*/ 0, -+ DownloadLocationDialogType.DEFAULT, /*suggestedPath*/ "", -+ ProfileManager.getLastUsedRegularProfile()); -+ } -+ - /** - * Synchronously gets a list of bookmarks that match the specified search query. - * -@@ -1108,6 +1389,10 @@ class BookmarkBridge { - void getChildIds( - long nativeBookmarkBridge, long id, int type, List bookmarksList); - -+ void importBookmarks(long nativeBookmarkBridge, BookmarkBridge caller, WindowAndroid window); -+ void exportBookmarks(long nativeBookmarkBridge, BookmarkBridge caller, WindowAndroid window, -+ String export_path); -+ - BookmarkId getChildAt(long nativeBookmarkBridge, long id, int type, int index); - - int getTotalBookmarkCount(long nativeBookmarkBridge, long id, int type); -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDelegate.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDelegate.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDelegate.java -@@ -65,6 +65,16 @@ public interface BookmarkDelegate { - /** Shows the search UI. */ - void openSearchUi(); - -+ /** -+ * Imports bookmarks from user-selected file. -+ */ -+ void importBookmarks(); -+ -+ /** -+ * Exports bookmarks to downloads directory. -+ */ -+ void exportBookmarks(); -+ - /** Add an observer to bookmark UI changes. */ - void addUiObserver(BookmarkUiObserver observer); - -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerCoordinator.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerCoordinator.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerCoordinator.java -@@ -54,6 +54,8 @@ import org.chromium.components.image_fetcher.ImageFetcher; - import org.chromium.components.image_fetcher.ImageFetcherConfig; - import org.chromium.components.image_fetcher.ImageFetcherFactory; - import org.chromium.ui.KeyboardVisibilityDelegate; -+import org.chromium.ui.base.ActivityWindowAndroid; -+import org.chromium.ui.modaldialog.ModalDialogManager; - import org.chromium.ui.modaldialog.ModalDialogManager; - import org.chromium.ui.modaldialog.ModalDialogManager.ModalDialogType; - import org.chromium.ui.modelutil.MVCListAdapter.ModelList; -@@ -326,6 +328,13 @@ public class BookmarkManagerCoordinator - - // Public API implementation. - -+ /** -+ * Sets the Android window that is used by further intents created by the bookmark activity. -+ */ -+ public void setWindow(ActivityWindowAndroid window, ModalDialogManager modalDialogManager) { -+ mMediator.setWindow(window, modalDialogManager); -+ } -+ - /** Destroys and cleans up itself. This must be called after done using this class. */ - public void onDestroyed() { - RecordUserAction.record("MobileBookmarkManagerClose"); -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 -@@ -58,6 +58,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; -+import org.chromium.ui.base.ActivityWindowAndroid; -+import org.chromium.ui.modaldialog.ModalDialogManager; - import org.chromium.ui.accessibility.AccessibilityState; - import org.chromium.ui.listmenu.ListMenu; - import org.chromium.ui.listmenu.ListMenuItemProperties; -@@ -85,6 +87,9 @@ class BookmarkManagerMediator - - private static boolean sPreventLoadingForTesting; - -+ private ActivityWindowAndroid mWindowAndroid; -+ private ModalDialogManager mModalDialogManager; -+ - /** Keeps track of whether drag is enabled / active for bookmark lists. */ - private class BookmarkDragStateDelegate implements DragStateDelegate { - private BookmarkDelegate mBookmarkDelegate; -@@ -574,6 +579,14 @@ class BookmarkManagerMediator - mNativePage = nativePage; - } - -+ /** -+ * Sets the Android window that is used by further intents created by the bookmark activity. -+ */ -+ public void setWindow(ActivityWindowAndroid window, ModalDialogManager modalDialogManager) { -+ mWindowAndroid = window; -+ mModalDialogManager = modalDialogManager; -+ } -+ - /** See BookmarkManager(Coordinator)#updateForUrl */ - void updateForUrl(String url) { - // Bookmark model is null if the manager has been destroyed. -@@ -766,6 +779,16 @@ class BookmarkManagerMediator - } - } - -+ @Override -+ public void importBookmarks() { -+ mBookmarkModel.importBookmarks(mWindowAndroid); -+ } -+ -+ @Override -+ public void exportBookmarks() { -+ mBookmarkModel.exportBookmarks(mWindowAndroid, mModalDialogManager); -+ } + @Override - public void openSearchUi() { - onSearchTextChangeCallback(""); -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java -@@ -13,6 +13,9 @@ import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager; - import org.chromium.chrome.browser.ui.native_page.BasicNativePage; - import org.chromium.chrome.browser.ui.native_page.NativePageHost; - import org.chromium.components.embedder_support.util.UrlConstants; -+import org.chromium.chrome.browser.app.ChromeActivity; -+import org.chromium.ui.modaldialog.ModalDialogManager; -+import org.chromium.components.browser_ui.modaldialog.AppModalPresenter; - - /** A native page holding a {@link BookmarkManagerCoordinator} on _tablet_. */ - public class BookmarkPage extends BasicNativePage { -@@ -31,7 +34,7 @@ public class BookmarkPage extends BasicNativePage { - ComponentName componentName, - SnackbarManager snackbarManager, - Profile profile, -- NativePageHost host) { -+ NativePageHost host, ChromeActivity activity) { - super(host); - - mBookmarkManagerCoordinator = -@@ -44,6 +47,9 @@ public class BookmarkPage extends BasicNativePage { - new BookmarkUiPrefs(ChromeSharedPreferences.getInstance()), - /* bookmarkOpenedCallback= */ null); - mBookmarkManagerCoordinator.setBasicNativePage(this); -+ mBookmarkManagerCoordinator.setWindow(activity.getWindowAndroid(), -+ new ModalDialogManager( -+ new AppModalPresenter(activity), ModalDialogManager.ModalDialogType.APP)); - 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 ---- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java -@@ -98,6 +98,17 @@ public class BookmarkToolbar extends SelectableListToolbar - setOnMenuItemClickListener(dragEnabled ? null : this); - } - -+ private Runnable mImportBookmarkRunnable; -+ private Runnable mExportBookmarkRunnable; -+ -+ void setImportBookmarkRunnable(Runnable runnable) { -+ mImportBookmarkRunnable = runnable; -+ } -+ -+ void setExportBookmarkRunnable(Runnable runnable) { -+ mExportBookmarkRunnable = runnable; -+ } -+ - void setEditButtonVisible(boolean visible) { - mEditButtonVisible = visible; - getMenu().findItem(R.id.edit_menu_id).setVisible(visible); -@@ -174,6 +185,13 @@ public class BookmarkToolbar extends SelectableListToolbar - - void setCurrentFolder(BookmarkId folder) { - mCurrentFolder = mBookmarkModel.getBookmarkById(folder); -+ enableImportExportMenu(); -+ } -+ -+ void enableImportExportMenu() { -+ getMenu().findItem(R.id.import_menu_id).setVisible(true); -+ getMenu().findItem(R.id.export_menu_id).setVisible(true); -+ } - } - - void setNavigateBackRunnable(Runnable navigateBackRunnable) { -@@ -193,6 +211,13 @@ public class BookmarkToolbar extends SelectableListToolbar - @Override - public boolean onMenuItemClick(MenuItem menuItem) { - hideOverflowMenu(); -+ if (menuItem.getItemId() == R.id.import_menu_id) { -+ mImportBookmarkRunnable.run(); -+ return true; -+ } else if (menuItem.getItemId() == R.id.export_menu_id) { -+ mExportBookmarkRunnable.run(); -+ return true; -+ } - return mMenuIdClickedFunction.apply(menuItem.getItemId()); - } - -@@ -208,6 +233,9 @@ public class BookmarkToolbar extends SelectableListToolbar - protected void showNormalView() { - super.showNormalView(); - -+ getMenu().findItem(R.id.import_menu_id).setVisible(mCurrentFolder != null); -+ getMenu().findItem(R.id.export_menu_id).setVisible(mCurrentFolder != null); -+ - // SelectableListToolbar will show/hide the entire group. - setEditButtonVisible(mEditButtonVisible); - setNewFolderButtonVisible(mNewFolderButtonVisible); -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarMediator.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarMediator.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarMediator.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarMediator.java -@@ -132,6 +132,10 @@ class BookmarkToolbarMediator - mBookmarkDelegate = bookmarkDelegate; - mModel.set( - BookmarkToolbarProperties.NAVIGATE_BACK_RUNNABLE, this::onNavigateBack); -+ mModel.set( -+ BookmarkToolbarProperties.IMPORT_BOOKMARK_RUNNABLE, mBookmarkDelegate::importBookmarks); -+ mModel.set( -+ BookmarkToolbarProperties.EXPORT_BOOKMARK_RUNNABLE, mBookmarkDelegate::exportBookmarks); - mBookmarkDelegate.addUiObserver(this); - mBookmarkDelegate.notifyStateChange(this); - }); -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarProperties.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarProperties.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarProperties.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarProperties.java -@@ -78,6 +78,10 @@ class BookmarkToolbarProperties { - - static final WritableObjectPropertyKey NAVIGATE_BACK_RUNNABLE = - new WritableObjectPropertyKey<>(); -+ static final WritableObjectPropertyKey IMPORT_BOOKMARK_RUNNABLE = -+ new WritableObjectPropertyKey<>(); -+ static final WritableObjectPropertyKey EXPORT_BOOKMARK_RUNNABLE = -+ new WritableObjectPropertyKey<>(); - - static final PropertyKey[] ALL_KEYS = { - SELECTION_DELEGATE, -@@ -105,6 +109,8 @@ class BookmarkToolbarProperties { - SELECTION_MODE_SHOW_OPEN_IN_INCOGNITO, - SELECTION_MODE_SHOW_MOVE, - SELECTION_MODE_SHOW_MARK_READ, -- SELECTION_MODE_SHOW_MARK_UNREAD -+ SELECTION_MODE_SHOW_MARK_UNREAD, -+ IMPORT_BOOKMARK_RUNNABLE, -+ EXPORT_BOOKMARK_RUNNABLE - }; - } -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarViewBinder.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarViewBinder.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarViewBinder.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarViewBinder.java -@@ -54,6 +54,12 @@ class BookmarkToolbarViewBinder { - model.get(BookmarkToolbarProperties.CHECKED_VIEW_MENU_ID)); - } else if (key == BookmarkToolbarProperties.CURRENT_FOLDER) { - bookmarkToolbar.setCurrentFolder(model.get(BookmarkToolbarProperties.CURRENT_FOLDER)); -+ } else if (key == BookmarkToolbarProperties.IMPORT_BOOKMARK_RUNNABLE) { -+ bookmarkToolbar.setImportBookmarkRunnable( -+ model.get(BookmarkToolbarProperties.IMPORT_BOOKMARK_RUNNABLE)); -+ } else if (key == BookmarkToolbarProperties.EXPORT_BOOKMARK_RUNNABLE) { -+ bookmarkToolbar.setExportBookmarkRunnable( -+ model.get(BookmarkToolbarProperties.EXPORT_BOOKMARK_RUNNABLE)); - } else if (key == BookmarkToolbarProperties.NAVIGATE_BACK_RUNNABLE) { - bookmarkToolbar.setNavigateBackRunnable( - model.get(BookmarkToolbarProperties.NAVIGATE_BACK_RUNNABLE)); + protected ModalDialogManager createModalDialogManager() { + return new ModalDialogManager(new AppModalPresenter(this), ModalDialogType.APP); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java --- a/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java @@ -758,7 +208,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat import org.chromium.chrome.browser.app.download.home.DownloadPage; import org.chromium.chrome.browser.bookmarks.BookmarkPage; import org.chromium.chrome.browser.browser_controls.BrowserControlsMarginSupplier; -@@ -58,7 +59,7 @@ import org.chromium.ui.util.ColorUtils; +@@ -59,7 +60,7 @@ import org.chromium.ui.util.ColorUtils; * Creates NativePage objects to show chrome-native:// URLs using the native Android view system. */ public class NativePageFactory { @@ -767,7 +217,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat private final BottomSheetController mBottomSheetController; private final BrowserControlsManager mBrowserControlsManager; private final Supplier mCurrentTabSupplier; -@@ -80,7 +81,7 @@ public class NativePageFactory { +@@ -82,7 +83,7 @@ public class NativePageFactory { private static NativePage sTestPage; public NativePageFactory( @@ -776,7 +226,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat @NonNull BottomSheetController sheetController, @NonNull BrowserControlsManager browserControlsManager, @NonNull Supplier currentTabSupplier, -@@ -149,7 +150,7 @@ public class NativePageFactory { +@@ -154,7 +155,7 @@ public class NativePageFactory { @VisibleForTesting static class NativePageBuilder { @@ -785,28 +235,19 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat private final BottomSheetController mBottomSheetController; private final Supplier mUma; private final BrowserControlsManager mBrowserControlsManager; -@@ -168,7 +169,7 @@ public class NativePageFactory { - private final ObservableSupplier mEdgeToEdgeControllerSupplier; - - public NativePageBuilder( -- Activity activity, -+ ChromeActivity activity, - Supplier uma, - BottomSheetController sheetController, - BrowserControlsManager browserControlsManager, -@@ -242,7 +243,7 @@ public class NativePageFactory { - mActivity.getComponentName(), +@@ -251,7 +252,7 @@ public class NativePageFactory { mSnackbarManagerSupplier.get(), tab.getProfile(), -- new TabShim(tab, mBrowserControlsManager, mTabModelSelector)); -+ new TabShim(tab, mBrowserControlsManager, mTabModelSelector), mActivity); + new TabShim(tab, mBrowserControlsManager, mTabModelSelector), +- mActivity.getComponentName()); ++ mActivity.getComponentName(), mActivity); } protected NativePage buildDownloadsPage(Tab tab) { diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -218,6 +218,8 @@ static_library("browser") { +@@ -221,6 +221,8 @@ static_library("browser") { "bluetooth/chrome_bluetooth_delegate_impl_client.h", "bookmarks/bookmark_model_factory.cc", "bookmarks/bookmark_model_factory.h", @@ -815,7 +256,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "bookmarks/chrome_bookmark_client.cc", "bookmarks/chrome_bookmark_client.h", "bookmarks/managed_bookmark_service_factory.cc", -@@ -1698,6 +1700,13 @@ static_library("browser") { +@@ -1713,6 +1715,13 @@ static_library("browser") { ] } @@ -829,15 +270,15 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn configs += [ "//build/config/compiler:wexit_time_destructors", "//build/config:precompiled_headers", -@@ -3507,8 +3516,6 @@ static_library("browser") { +@@ -3535,8 +3544,6 @@ static_library("browser") { "bookmarks/bookmark_expanded_state_tracker.h", "bookmarks/bookmark_expanded_state_tracker_factory.cc", "bookmarks/bookmark_expanded_state_tracker_factory.h", - "bookmarks/bookmark_html_writer.cc", - "bookmarks/bookmark_html_writer.h", + "bookmarks/bookmark_merged_surface_ordering_storage.cc", + "bookmarks/bookmark_merged_surface_ordering_storage.h", "bookmarks/bookmark_merged_surface_service.cc", - "bookmarks/bookmark_merged_surface_service.h", - "bookmarks/bookmark_merged_surface_service_factory.cc", diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browser/bookmarks/android/bookmark_bridge.cc --- a/chrome/browser/bookmarks/android/bookmark_bridge.cc +++ b/chrome/browser/bookmarks/android/bookmark_bridge.cc @@ -868,7 +309,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse +#include "ui/shell_dialogs/select_file_dialog.h" + // Must come after all headers that specialize FromJniType() / ToJniType(). - #include "chrome/android/chrome_jni_headers/BookmarkBridge_jni.h" + #include "chrome/browser/bookmarks/android/jni_headers/BookmarkBridge_jni.h" @@ -84,6 +106,57 @@ using bookmarks::android::JavaBookmarkIdGetType; using content::BrowserThread; @@ -1225,6 +666,588 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser // Weak pointers for creating callbacks that won't call into a destroyed // object. base::WeakPtrFactory weak_ptr_factory_; +diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java +--- a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java ++++ b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java +@@ -36,6 +36,9 @@ import org.chromium.url.GURL; + import java.util.ArrayList; + import java.util.List; + ++import org.chromium.ui.base.WindowAndroid; ++import java.util.function.BiConsumer; ++ + /** + * Provides the communication channel for Android to fetch and manipulate the bookmark model stored + * in native. +@@ -52,6 +55,9 @@ class BookmarkBridge { + private boolean mIsNativeBookmarkModelLoaded; + private boolean mInitializedPartnerBookmarks; + ++ private static final BiConsumer NOOP = (success, bookmarksPath) -> {}; ++ private BiConsumer mOnExportedFunction = NOOP; ++ + // Lazily set pseudo-constants. These should never change at runtime. Used to avoid crossing + // JNI to fetch information. + private @Nullable BookmarkId mRootFolderId; +@@ -498,6 +504,35 @@ class BookmarkBridge { + .getTotalBookmarkCount(mNativeBookmarkBridge, id.getId(), id.getType()); + } + ++ /** ++ * Import bookmarks from a selected file. ++ * @param window The current window of the bookmarks activity or page. ++ */ ++ public void importBookmarks(WindowAndroid window) { ++ assert mIsNativeBookmarkModelLoaded; ++ BookmarkBridgeJni.get().importBookmarks(mNativeBookmarkBridge, ++ BookmarkBridge.this, window); ++ } ++ ++ /** ++ * Export bookmarks to a path selected by the user. ++ * @param window The current window of the bookmarks activity or page. ++ */ ++ public void exportBookmarks(WindowAndroid window, String exportPath, ++ BiConsumer onExportedFunction) { ++ assert mIsNativeBookmarkModelLoaded; ++ mOnExportedFunction = onExportedFunction; ++ BookmarkBridgeJni.get().exportBookmarks(mNativeBookmarkBridge, ++ BookmarkBridge.this, window, exportPath); ++ } ++ ++ @CalledByNative ++ public void bookmarksExported(WindowAndroid window, String bookmarksPath, boolean success) { ++ BiConsumer action = mOnExportedFunction ++ .andThen((x, y) -> mOnExportedFunction = NOOP); ++ action.accept(success, bookmarksPath); ++ } ++ + /** + * Synchronously gets a list of bookmarks that match the specified search query. + * +@@ -1120,6 +1155,10 @@ class BookmarkBridge { + void getChildIds( + long nativeBookmarkBridge, long id, int type, List bookmarksList); + ++ void importBookmarks(long nativeBookmarkBridge, BookmarkBridge caller, WindowAndroid window); ++ void exportBookmarks(long nativeBookmarkBridge, BookmarkBridge caller, WindowAndroid window, ++ String export_path); ++ + BookmarkId getChildAt(long nativeBookmarkBridge, long id, int type, int index); + + int getTotalBookmarkCount(long nativeBookmarkBridge, long id, int type); +diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDelegate.java b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDelegate.java +--- a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDelegate.java ++++ b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDelegate.java +@@ -65,6 +65,16 @@ public interface BookmarkDelegate { + /** Shows the search UI. */ + void openSearchUi(); + ++ /** ++ * Imports bookmarks from user-selected file. ++ */ ++ void importBookmarks(); ++ ++ /** ++ * Exports bookmarks to downloads directory. ++ */ ++ void exportBookmarks(); ++ + /** Add an observer to bookmark UI changes. */ + void addUiObserver(BookmarkUiObserver observer); + +diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerCoordinator.java b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerCoordinator.java +--- a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerCoordinator.java ++++ b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerCoordinator.java +@@ -54,6 +54,8 @@ import org.chromium.components.image_fetcher.ImageFetcher; + import org.chromium.components.image_fetcher.ImageFetcherConfig; + import org.chromium.components.image_fetcher.ImageFetcherFactory; + import org.chromium.ui.KeyboardVisibilityDelegate; ++import org.chromium.ui.base.ActivityWindowAndroid; ++import org.chromium.ui.modaldialog.ModalDialogManager; + import org.chromium.ui.modaldialog.ModalDialogManager; + import org.chromium.ui.modaldialog.ModalDialogManager.ModalDialogType; + import org.chromium.ui.modelutil.MVCListAdapter.ListItem; +@@ -328,6 +330,13 @@ public class BookmarkManagerCoordinator + + // Public API implementation. + ++ /** ++ * Sets the Android window that is used by further intents created by the bookmark activity. ++ */ ++ public void setWindow(ActivityWindowAndroid window, ModalDialogManager modalDialogManager) { ++ mMediator.setWindow(window, modalDialogManager); ++ } ++ + /** Destroys and cleans up itself. This must be called after done using this class. */ + public void onDestroyed() { + RecordUserAction.record("MobileBookmarkManagerClose"); +diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java +--- a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java ++++ b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java +@@ -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; ++import org.chromium.ui.base.ActivityWindowAndroid; ++import org.chromium.ui.modaldialog.ModalDialogManager; + import org.chromium.ui.accessibility.AccessibilityState; + import org.chromium.ui.listmenu.ListMenu; + import org.chromium.ui.listmenu.ListMenuItemProperties; +@@ -75,6 +77,47 @@ import java.util.function.BooleanSupplier; + import java.util.function.Consumer; + import java.util.function.Predicate; + ++import android.content.Intent; ++import android.content.pm.PackageManager; ++import android.content.DialogInterface; ++import android.content.res.Resources; ++import android.content.ContentResolver; ++import android.net.Uri; ++import android.provider.Browser; ++import android.provider.DocumentsContract; ++import android.Manifest.permission; ++import android.view.View; ++import android.view.LayoutInflater; ++ ++import androidx.appcompat.app.AlertDialog; ++import android.os.Build; ++ ++import java.io.File; ++ ++import org.chromium.base.ContextUtils; ++import org.chromium.base.ContentUriUtils; ++import org.chromium.base.shared_preferences.SharedPreferencesManager; ++import org.chromium.base.task.AsyncTask; ++import org.chromium.chrome.R; ++import org.chromium.chrome.browser.document.ChromeLauncherActivity; ++import org.chromium.chrome.browser.IntentHandler; ++import org.chromium.chrome.browser.preferences.ChromePreferenceKeys; ++import org.chromium.chrome.browser.download.DownloadLocationDialogType; ++import org.chromium.chrome.browser.download.settings.DownloadLocationHelperImpl; ++import org.chromium.chrome.browser.download.dialogs.DownloadLocationDialogController; ++import org.chromium.chrome.browser.download.dialogs.DownloadLocationDialogCoordinator; ++import org.chromium.chrome.browser.download.dialogs.DownloadLocationCustomView; ++import org.chromium.chrome.browser.download.DirectoryOption; ++import org.chromium.chrome.browser.profiles.ProfileManager; ++import org.chromium.chrome.browser.preferences.ChromeSharedPreferences; ++import org.chromium.chrome.browser.flags.ChromeFeatureList; ++import org.chromium.ui.base.PageTransition; ++import org.chromium.ui.base.WindowAndroid; ++import org.chromium.ui.modelutil.PropertyModel; ++import org.chromium.ui.modaldialog.ModalDialogManager; ++import org.chromium.ui.modaldialog.ModalDialogProperties; ++import org.chromium.ui.modaldialog.DialogDismissalCause; ++ + /** Responsible for BookmarkManager business logic. */ + // TODO(crbug.com/40256938): Remove BookmarkDelegate if possible. + class BookmarkManagerMediator +@@ -84,6 +127,9 @@ class BookmarkManagerMediator + + private static boolean sPreventLoadingForTesting; + ++ private ActivityWindowAndroid mWindowAndroid; ++ private ModalDialogManager mModalDialogManager; ++ + /** Keeps track of whether drag is enabled / active for bookmark lists. */ + private class BookmarkDragStateDelegate implements DragStateDelegate { + private BookmarkDelegate mBookmarkDelegate; +@@ -573,6 +619,14 @@ class BookmarkManagerMediator + mNativePage = nativePage; + } + ++ /** ++ * Sets the Android window that is used by further intents created by the bookmark activity. ++ */ ++ public void setWindow(ActivityWindowAndroid window, ModalDialogManager modalDialogManager) { ++ mWindowAndroid = window; ++ mModalDialogManager = modalDialogManager; ++ } ++ + /** See BookmarkManager(Coordinator)#updateForUrl */ + void updateForUrl(String url) { + // Bookmark model is null if the manager has been destroyed. +@@ -748,6 +802,235 @@ class BookmarkManagerMediator + } + } + ++ @Override ++ public void importBookmarks() { ++ mBookmarkModel.importBookmarks(mWindowAndroid); ++ } ++ ++ @Override ++ public void exportBookmarks() { ++ if (ChromeFeatureList.isEnabled(ChromeFeatureList.BOOKMARKS_EXPORT_USESAF) || ++ Build.VERSION.SDK_INT > Build.VERSION_CODES.Q) { ++ exportBookmarksImplUseSaf(); ++ } else { ++ exportBookmarksImplUseFile(); ++ } ++ } ++ ++ private void exportBookmarksImplUseSaf() { ++ Context context = mWindowAndroid.getContext().get(); ++ ++ // standard name for boorkmark file ++ final String standardBoorkmarkName = "bookmarks.html"; ++ ++ // use the fileSelector and saf asking user for the file ++ Intent fileSelector = new Intent(Intent.ACTION_CREATE_DOCUMENT); ++ fileSelector.addCategory(Intent.CATEGORY_OPENABLE); ++ fileSelector.setType("text/html"); ++ fileSelector.putExtra(Intent.EXTRA_TITLE, standardBoorkmarkName); ++ fileSelector.setFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION | ++ Intent.FLAG_GRANT_READ_URI_PERMISSION | ++ Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION); ++ ++ // get last exported uri path, if any ++ SharedPreferencesManager sharedPrefs = ChromeSharedPreferences.getInstance(); ++ String bookmarksPath = sharedPrefs.readString(ChromePreferenceKeys.BOOKMARKS_LAST_EXPORT_URI, standardBoorkmarkName); ++ Uri lastSelectedUri = Uri.parse(bookmarksPath); ++ ++ // prepare delegate for file selector ++ DialogInterface.OnClickListener onClickListener = new DialogInterface.OnClickListener() { ++ @Override ++ public void onClick(DialogInterface dialog, int button) { ++ if (button == AlertDialog.BUTTON_NEGATIVE) { ++ mWindowAndroid.showIntent(fileSelector, ++ new WindowAndroid.IntentCallback() { ++ @Override ++ public void onIntentCompleted(int resultCode, Intent data) { ++ if (data == null) return; ++ Uri filePath = data.getData(); ++ doExportBookmarksImpl(filePath); ++ } ++ }, ++ null); ++ } else { ++ if (dialog!=null) dialog.dismiss(); ++ doExportBookmarksImpl(lastSelectedUri); ++ } ++ } ++ }; ++ ++ // as a workaround for https://issuetracker.google.com/issues/37136466 ++ // ask to overwrite if is a valid uri and the file is present ++ if (DocumentsContract.isDocumentUri(context, lastSelectedUri)) { ++ AsyncTask checkUriTask = new AsyncTask() { ++ boolean uriExists = false; ++ String actualFilePath = null; ++ ++ @Override ++ protected Void doInBackground() { ++ uriExists = ContentUriUtils.contentUriExists(lastSelectedUri.toString()); ++ if (uriExists) { ++ actualFilePath = ContentUriUtils.getFilePathFromContentUri(lastSelectedUri); ++ // get real actual file name on disk ++ if (actualFilePath==null) actualFilePath = lastSelectedUri.toString(); ++ // set file name to last exported file name ++ fileSelector.putExtra(Intent.EXTRA_TITLE, ++ ContentUriUtils.getDisplayName(lastSelectedUri, context, ++ DocumentsContract.Document.COLUMN_DISPLAY_NAME)); ++ } ++ return null; ++ } ++ ++ @Override ++ protected void onPostExecute(Void result) { ++ // check for permissions ++ if (uriExists) { ++ AlertDialog.Builder alert = ++ new AlertDialog.Builder(context, R.style.ThemeOverlay_BrowserUI_AlertDialog); ++ AlertDialog alertDialog = ++ alert.setTitle(R.string.export_bookmarks_alert_title) ++ .setMessage(context.getString(R.string.export_bookmarks_alert_message, actualFilePath)) ++ .setPositiveButton( ++ R.string.export_bookmarks_alert_message_yes, onClickListener) ++ .setNegativeButton(R.string.export_bookmarks_alert_message_no, onClickListener) ++ .create(); ++ alertDialog.getDelegate().setHandleNativeActionModesEnabled(false); ++ ++ // show dialog asking for overwrite ++ alertDialog.show(); ++ return; ++ } else { ++ onClickListener.onClick(null, AlertDialog.BUTTON_NEGATIVE); ++ } ++ } ++ }; ++ checkUriTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); ++ return; ++ } ++ ++ // actually open the file selector ++ onClickListener.onClick(null, AlertDialog.BUTTON_NEGATIVE); ++ } ++ ++ private void exportBookmarksImplUseFile() { ++ Context context = mWindowAndroid.getContext().get(); ++ ++ // standard name for boorkmark file ++ final String standardBoorkmarkName = "bookmarks.html"; ++ ++ // use the download ui and standard file saving ++ DownloadLocationDialogController controller = new DownloadLocationDialogController() { ++ @Override ++ public void onDownloadLocationDialogComplete(String returnedPath) {} ++ ++ @Override ++ public void onDownloadLocationDialogCanceled() {} ++ }; ++ ++ DownloadLocationDialogCoordinator dialog = new DownloadLocationDialogCoordinator() { ++ @Override ++ protected void onDirectoryOptionsRetrieved(ArrayList dirs) { ++ if (mDialogModel != null) return; ++ ++ // Actually show the dialog. ++ mCustomView = (DownloadLocationCustomView) LayoutInflater.from(context).inflate( ++ R.layout.download_location_dialog, null); ++ mCustomView.initialize(DownloadLocationDialogType.DEFAULT, /*totalBytes*/ 0, ++ (isChecked) -> {}, ++ new DownloadLocationHelperImpl(mProfile)); ++ mCustomView.setTitle(context.getString(R.string.export_bookmarks_alert_title)); ++ mCustomView.setFileName(standardBoorkmarkName); ++ mCustomView.mDontShowAgain.setVisibility(View.GONE); ++ ++ Resources resources = context.getResources(); ++ mDialogModel = new PropertyModel.Builder(ModalDialogProperties.ALL_KEYS) ++ .with(ModalDialogProperties.CONTROLLER, this) ++ .with(ModalDialogProperties.CUSTOM_VIEW, mCustomView) ++ .with(ModalDialogProperties.POSITIVE_BUTTON_TEXT, resources, ++ R.string.export_bookmarks) ++ .with(ModalDialogProperties.NEGATIVE_BUTTON_TEXT, resources, ++ R.string.cancel) ++ .build(); ++ ++ mModalDialogManager.showDialog(mDialogModel, ModalDialogManager.ModalDialogType.APP); ++ } ++ ++ @Override ++ public void onDismiss(PropertyModel model, int dismissalCause) { ++ switch (dismissalCause) { ++ case DialogDismissalCause.POSITIVE_BUTTON_CLICKED: ++ { ++ String fileName = mCustomView.getFileName(); ++ String directory = mCustomView.getDirectoryOption().location; ++ if (fileName != null && directory != null) { ++ File file = new File(directory, fileName); ++ ++ if (mWindowAndroid.hasPermission(permission.WRITE_EXTERNAL_STORAGE)) { ++ doExportBookmarksImpl(file.getPath()); ++ } else { ++ String[] requestPermissions = new String[] {permission.WRITE_EXTERNAL_STORAGE}; ++ mWindowAndroid.requestPermissions(requestPermissions, (permissions, grantResults) -> { ++ if (grantResults.length >= 1 && grantResults[0] == PackageManager.PERMISSION_GRANTED) { ++ doExportBookmarksImpl(file.getPath()); ++ } ++ }); ++ }; ++ } ++ } ++ break; ++ } ++ mDialogModel = null; ++ mCustomView = null; ++ } ++ }; ++ dialog.initialize(controller); ++ dialog.showDialog(context, mModalDialogManager, /*totalBytes*/ 0, ++ DownloadLocationDialogType.DEFAULT, /*suggestedPath*/ "", ++ ProfileManager.getLastUsedRegularProfile()); ++ } ++ ++ private void doExportBookmarksImpl(Uri filePath) { ++ ContentResolver resolver = ContextUtils.getApplicationContext().getContentResolver(); ++ // since we want to persist the uri in settings, ask for persistable permissions ++ resolver.takePersistableUriPermission(filePath, Intent.FLAG_GRANT_WRITE_URI_PERMISSION | ++ Intent.FLAG_GRANT_READ_URI_PERMISSION); ++ ++ doExportBookmarksImpl(filePath.toString()); ++ } ++ ++ private void doExportBookmarksImpl(String filePath) { ++ mBookmarkModel.exportBookmarks(mWindowAndroid, filePath, ++ (success, bookmarksPath) -> { ++ if (!success) { ++ ((Activity)mWindowAndroid.getContext().get()).runOnUiThread(new Runnable() { ++ public void run() { ++ mWindowAndroid.showError(R.string.saving_file_error); ++ } ++ }); ++ } else { ++ SharedPreferencesManager sharedPrefs = ChromeSharedPreferences.getInstance(); ++ sharedPrefs.writeString(ChromePreferenceKeys.BOOKMARKS_LAST_EXPORT_URI, bookmarksPath); ++ ++ Context context = ContextUtils.getApplicationContext(); ++ ++ Intent intent = new Intent(Intent.ACTION_VIEW, ++ ContentUriUtils.isContentUri(bookmarksPath) ? ++ Uri.parse(bookmarksPath) : Uri.parse("file://" + bookmarksPath)); ++ intent.putExtra(Browser.EXTRA_APPLICATION_ID, ++ context.getPackageName()); ++ intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); ++ intent.putExtra(IntentHandler.EXTRA_PAGE_TRANSITION_TYPE, PageTransition.AUTO_BOOKMARK); ++ ++ // If the bookmark manager is shown in a tab on a phone (rather than in a separate ++ // activity) the component name may be null. Send the intent through ++ // ChromeLauncherActivity instead to avoid crashing. See crbug.com/615012. ++ intent.setClass(context, ChromeLauncherActivity.class); ++ ++ IntentHandler.startActivityForTrustedIntent(intent); ++ } ++ }); ++ } ++ + @Override + public void openSearchUi() { + onSearchTextChangeCallback(""); +diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java +--- a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java ++++ b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java +@@ -15,6 +15,9 @@ import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager; + import org.chromium.chrome.browser.ui.native_page.BasicNativePage; + import org.chromium.chrome.browser.ui.native_page.NativePageHost; + import org.chromium.components.embedder_support.util.UrlConstants; ++import org.chromium.chrome.browser.app.ChromeActivity; ++import org.chromium.ui.modaldialog.ModalDialogManager; ++import org.chromium.components.browser_ui.modaldialog.AppModalPresenter; + + /** A native page holding a {@link BookmarkManagerCoordinator} on _tablet_. */ + public class BookmarkPage extends BasicNativePage { +@@ -34,7 +37,8 @@ public class BookmarkPage extends BasicNativePage { + @NonNull SnackbarManager snackbarManager, + @NonNull Profile profile, + @NonNull NativePageHost host, +- @Nullable ComponentName componentName) { ++ @Nullable ComponentName componentName, ++ ChromeActivity activity) { + super(host); + mTitle = host.getContext().getString(R.string.bookmarks); + +@@ -53,6 +57,9 @@ public class BookmarkPage extends BasicNativePage { + mBookmarkOpener, + componentName); + mBookmarkManagerCoordinator.setBasicNativePage(this); ++ mBookmarkManagerCoordinator.setWindow(activity.getWindowAndroid(), ++ new ModalDialogManager( ++ new AppModalPresenter(activity), ModalDialogManager.ModalDialogType.APP)); + initWithView(mBookmarkManagerCoordinator.getView()); + } + +diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java +--- a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java ++++ b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java +@@ -96,6 +96,17 @@ public class BookmarkToolbar extends SelectableListToolbar + setOnMenuItemClickListener(dragEnabled ? null : this); + } + ++ private Runnable mImportBookmarkRunnable; ++ private Runnable mExportBookmarkRunnable; ++ ++ void setImportBookmarkRunnable(Runnable runnable) { ++ mImportBookmarkRunnable = runnable; ++ } ++ ++ void setExportBookmarkRunnable(Runnable runnable) { ++ mExportBookmarkRunnable = runnable; ++ } ++ + void setEditButtonVisible(boolean visible) { + mEditButtonVisible = visible; + getMenu().findItem(R.id.edit_menu_id).setVisible(visible); +@@ -172,6 +183,12 @@ public class BookmarkToolbar extends SelectableListToolbar + + void setCurrentFolder(BookmarkId folder) { + mCurrentFolder = mBookmarkModel.getBookmarkById(folder); ++ enableImportExportMenu(); ++ } ++ ++ void enableImportExportMenu() { ++ getMenu().findItem(R.id.import_menu_id).setVisible(true); ++ getMenu().findItem(R.id.export_menu_id).setVisible(true); + } + + void setNavigateBackRunnable(Runnable navigateBackRunnable) { +@@ -191,6 +208,13 @@ public class BookmarkToolbar extends SelectableListToolbar + @Override + public boolean onMenuItemClick(MenuItem menuItem) { + hideOverflowMenu(); ++ if (menuItem.getItemId() == R.id.import_menu_id) { ++ mImportBookmarkRunnable.run(); ++ return true; ++ } else if (menuItem.getItemId() == R.id.export_menu_id) { ++ mExportBookmarkRunnable.run(); ++ return true; ++ } + return mMenuIdClickedFunction.apply(menuItem.getItemId()); + } + +@@ -206,6 +230,9 @@ public class BookmarkToolbar extends SelectableListToolbar + protected void showNormalView() { + super.showNormalView(); + ++ getMenu().findItem(R.id.import_menu_id).setVisible(mCurrentFolder != null); ++ getMenu().findItem(R.id.export_menu_id).setVisible(mCurrentFolder != null); ++ + // SelectableListToolbar will show/hide the entire group. + setEditButtonVisible(mEditButtonVisible); + setNewFolderButtonVisible(mNewFolderButtonVisible); +diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarMediator.java b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarMediator.java +--- a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarMediator.java ++++ b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarMediator.java +@@ -135,6 +135,10 @@ class BookmarkToolbarMediator + mBookmarkDelegate = bookmarkDelegate; + mModel.set( + BookmarkToolbarProperties.NAVIGATE_BACK_RUNNABLE, this::onNavigateBack); ++ mModel.set( ++ BookmarkToolbarProperties.IMPORT_BOOKMARK_RUNNABLE, mBookmarkDelegate::importBookmarks); ++ mModel.set( ++ BookmarkToolbarProperties.EXPORT_BOOKMARK_RUNNABLE, mBookmarkDelegate::exportBookmarks); + mBookmarkDelegate.addUiObserver(this); + mBookmarkDelegate.notifyStateChange(this); + }); +diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarProperties.java b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarProperties.java +--- a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarProperties.java ++++ b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarProperties.java +@@ -79,6 +79,10 @@ class BookmarkToolbarProperties { + + static final WritableObjectPropertyKey NAVIGATE_BACK_RUNNABLE = + new WritableObjectPropertyKey<>(); ++ static final WritableObjectPropertyKey IMPORT_BOOKMARK_RUNNABLE = ++ new WritableObjectPropertyKey<>(); ++ static final WritableObjectPropertyKey EXPORT_BOOKMARK_RUNNABLE = ++ new WritableObjectPropertyKey<>(); + + static final PropertyKey[] ALL_KEYS = { + SELECTION_DELEGATE, +@@ -106,6 +110,8 @@ class BookmarkToolbarProperties { + SELECTION_MODE_SHOW_OPEN_IN_INCOGNITO, + SELECTION_MODE_SHOW_MOVE, + SELECTION_MODE_SHOW_MARK_READ, +- SELECTION_MODE_SHOW_MARK_UNREAD ++ SELECTION_MODE_SHOW_MARK_UNREAD, ++ IMPORT_BOOKMARK_RUNNABLE, ++ EXPORT_BOOKMARK_RUNNABLE + }; + } +diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarViewBinder.java b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarViewBinder.java +--- a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarViewBinder.java ++++ b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarViewBinder.java +@@ -54,6 +54,12 @@ class BookmarkToolbarViewBinder { + model.get(BookmarkToolbarProperties.CHECKED_VIEW_MENU_ID)); + } else if (key == BookmarkToolbarProperties.CURRENT_FOLDER) { + bookmarkToolbar.setCurrentFolder(model.get(BookmarkToolbarProperties.CURRENT_FOLDER)); ++ } else if (key == BookmarkToolbarProperties.IMPORT_BOOKMARK_RUNNABLE) { ++ bookmarkToolbar.setImportBookmarkRunnable( ++ model.get(BookmarkToolbarProperties.IMPORT_BOOKMARK_RUNNABLE)); ++ } else if (key == BookmarkToolbarProperties.EXPORT_BOOKMARK_RUNNABLE) { ++ bookmarkToolbar.setExportBookmarkRunnable( ++ model.get(BookmarkToolbarProperties.EXPORT_BOOKMARK_RUNNABLE)); + } else if (key == BookmarkToolbarProperties.NAVIGATE_BACK_RUNNABLE) { + bookmarkToolbar.setNavigateBackRunnable( + model.get(BookmarkToolbarProperties.NAVIGATE_BACK_RUNNABLE)); diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationCustomView.java b/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationCustomView.java --- a/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationCustomView.java +++ b/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationCustomView.java @@ -1302,18 +1325,18 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse 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 -@@ -214,6 +214,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -213,6 +213,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kCCTAuthTab, &kCCTAuthTabDisableAllExternalIntents, &kCCTAuthTabEnableHttpsRedirects, + &kBookmarksExportUseSaf, &kCCTBeforeUnload, + &kCCTBlockTouchesDuringEnterAnimation, &kCCTClientDataHeader, - &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 -@@ -585,6 +585,7 @@ public abstract class ChromeFeatureList { +@@ -598,6 +598,7 @@ public abstract class ChromeFeatureList { public static final String USE_LIBUNWINDSTACK_NATIVE_UNWINDER_ANDROID = "UseLibunwindstackNativeUnwinderAndroid"; public static final String VISITED_URL_RANKING_SERVICE = "VisitedURLRankingService"; @@ -1367,7 +1390,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 -@@ -121,6 +121,8 @@ public final class ChromePreferenceKeys { +@@ -127,6 +127,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"; @@ -1376,8 +1399,8 @@ 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"; -@@ -938,6 +940,7 @@ public final class ChromePreferenceKeys { - AUXILIARY_SEARCH_IS_SCHEMA_SET, +@@ -957,6 +959,7 @@ public final class ChromePreferenceKeys { + AUXILIARY_SEARCH_IS_SCHEMA_V2_SET, APP_LAUNCH_LAST_KNOWN_ACTIVE_TAB_STATE, APP_LAUNCH_SEARCH_ENGINE_HAD_LOGO, + BOOKMARKS_LAST_EXPORT_URI, @@ -1415,7 +1438,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn --- a/chrome/common/BUILD.gn +++ b/chrome/common/BUILD.gn -@@ -356,6 +356,9 @@ static_library("common_lib") { +@@ -350,6 +350,9 @@ static_library("common_lib") { sources += [ "media/chrome_media_drm_bridge_client.cc", "media/chrome_media_drm_bridge_client.h", diff --git a/build/patches/Add-cromite-flags-support.patch b/build/patches/Add-cromite-flags-support.patch index 6541dfe5..8f0e6471 100644 --- a/build/patches/Add-cromite-flags-support.patch +++ b/build/patches/Add-cromite-flags-support.patch @@ -51,20 +51,20 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html components/components_strings.grd | 1 + .../content_settings/core/common/features.cc | 1 + .../placeholder.txt | 1 + - components/flags_ui/flags_state.cc | 59 ++++++ - components/flags_ui/resources/app.css | 24 +++ - components/flags_ui/resources/app.html.ts | 28 +++ - components/flags_ui/resources/app.ts | 23 +++ - components/flags_ui/resources/experiment.css | 9 +- - .../flags_ui/resources/experiment.html.ts | 7 +- - components/flags_ui/resources/experiment.ts | 14 +- - .../flags_ui/resources/flags_browser_proxy.ts | 5 + .../core/offline_page_feature.cc | 1 + .../offline_pages/core/offline_page_feature.h | 1 + .../browser/features/password_features.cc | 1 + - components/permissions/features.cc | 1 + + components/permissions/features.cc | 2 + ...nthetic_trials_active_group_id_provider.cc | 4 +- ...ynthetic_trials_active_group_id_provider.h | 4 +- + components/webui/flags/flags_state.cc | 59 ++++++ + components/webui/flags/resources/app.css | 24 +++ + components/webui/flags/resources/app.html.ts | 28 +++ + components/webui/flags/resources/app.ts | 24 +++ + .../webui/flags/resources/experiment.css | 9 +- + .../webui/flags/resources/experiment.html.ts | 7 +- + .../webui/flags/resources/experiment.ts | 12 +- + .../flags/resources/flags_browser_proxy.ts | 5 + .../webui/version/version_handler_helper.cc | 4 +- content/common/features.cc | 1 + content/public/common/content_features.cc | 1 + @@ -106,7 +106,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 + - 93 files changed, 811 insertions(+), 30 deletions(-) + 93 files changed, 812 insertions(+), 29 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 @@ -143,7 +143,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 -@@ -165,6 +165,8 @@ use_epoll = is_linux || is_chromeos || is_android +@@ -164,6 +164,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") { @@ -152,7 +152,7 @@ diff --git a/base/BUILD.gn b/base/BUILD.gn sources = [ "allocator/allocator_check.cc", "allocator/allocator_check.h", -@@ -1016,7 +1018,7 @@ component("base") { +@@ -1019,7 +1021,7 @@ component("base") { "//build/config/compiler:wglobal_constructors", ] @@ -191,7 +191,7 @@ diff --git a/base/android/java/src/org/chromium/base/cached_flags/ValuesReturned diff --git a/base/feature_list.cc b/base/feature_list.cc --- a/base/feature_list.cc +++ b/base/feature_list.cc -@@ -42,6 +42,31 @@ +@@ -41,6 +41,31 @@ namespace base { @@ -223,7 +223,7 @@ diff --git a/base/feature_list.cc b/base/feature_list.cc namespace { // Pointer to the FeatureList instance singleton that was set via -@@ -473,6 +498,46 @@ bool FeatureList::IsEnabled(const Feature& feature) { +@@ -472,6 +497,46 @@ bool FeatureList::IsEnabled(const Feature& feature) { return g_feature_list_instance->IsFeatureEnabled(feature); } @@ -270,7 +270,7 @@ diff --git a/base/feature_list.cc b/base/feature_list.cc // static bool FeatureList::IsValidFeatureOrFieldTrialName(std::string_view name) { return IsStringASCII(name) && name.find_first_of(",<*") == std::string::npos; -@@ -743,6 +808,17 @@ void FeatureList::VisitFeaturesAndParams(FeatureVisitor& visitor, +@@ -742,6 +807,17 @@ void FeatureList::VisitFeaturesAndParams(FeatureVisitor& visitor, void FeatureList::FinalizeInitialization() { DCHECK(!initialized_); @@ -291,7 +291,7 @@ diff --git a/base/feature_list.cc b/base/feature_list.cc diff --git a/base/feature_list.h b/base/feature_list.h --- a/base/feature_list.h +++ b/base/feature_list.h -@@ -170,8 +170,10 @@ enum class FeatureMacroHandshake { kSecret }; +@@ -167,8 +167,10 @@ enum class FeatureMacroHandshake { kSecret }; struct BASE_EXPORT LOGICALLY_CONST Feature { constexpr Feature(const char* name, FeatureState default_state, @@ -304,7 +304,7 @@ diff --git a/base/feature_list.h b/base/feature_list.h #if BUILDFLAG(ENABLE_BANNED_BASE_FEATURE_PREFIX) if (std::string_view(name).find(BUILDFLAG(BANNED_BASE_FEATURE_PREFIX)) == 0) { -@@ -198,6 +200,9 @@ struct BASE_EXPORT LOGICALLY_CONST Feature { +@@ -195,6 +197,9 @@ struct BASE_EXPORT LOGICALLY_CONST Feature { // command line switch. const FeatureState default_state; @@ -314,7 +314,7 @@ diff --git a/base/feature_list.h b/base/feature_list.h private: friend class FeatureList; -@@ -477,6 +482,11 @@ class BASE_EXPORT FeatureList { +@@ -474,6 +479,11 @@ class BASE_EXPORT FeatureList { // instance, which is checked in builds with DCHECKs enabled. static bool IsEnabled(const Feature& feature); @@ -326,7 +326,7 @@ diff --git a/base/feature_list.h b/base/feature_list.h // Some characters are not allowed to appear in feature names or the // associated field trial names, as they are used as special characters for // command-line serialization. This function checks that the strings are ASCII -@@ -746,4 +756,62 @@ class BASE_EXPORT FeatureList { +@@ -743,4 +753,62 @@ class BASE_EXPORT FeatureList { } // namespace base @@ -632,7 +632,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tracing/setting 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 -@@ -394,6 +394,10 @@ using flags_ui::kOsLinux; +@@ -396,6 +396,10 @@ using flags_ui::kOsLinux; using flags_ui::kOsMac; using flags_ui::kOsWin; @@ -643,9 +643,9 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc namespace about_flags { namespace { -@@ -4383,6 +4387,10 @@ const FeatureEntry::FeatureVariation kTabSwitcherColorBlendAnimateVariations[] = - std::size(kTabSwitcherColorBlendAnimateVariation3), nullptr}}; - #endif // BUILDFLAG(IS_ANDROID) +@@ -4428,6 +4432,10 @@ const FeatureEntry::FeatureVariation + std::size(kStandardBoundSessionCredentialsEnabledOriginTrialToken), + nullptr}}; +#define FEATURE_PARAM_SECTION +#include "cromite_flags/chrome_browser_about_flags_cc.inc" @@ -654,7 +654,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. -@@ -4409,6 +4417,9 @@ const FeatureEntry::FeatureVariation kTabSwitcherColorBlendAnimateVariations[] = +@@ -4454,6 +4462,9 @@ const FeatureEntry::FeatureVariation const FeatureEntry kFeatureEntries[] = { // Include generated flags for flag unexpiry; see //docs/flag_expiry.md and // //tools/flags/generate_unexpire_flags.py. @@ -667,7 +667,7 @@ 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 -@@ -367,4 +367,5 @@ BASE_FEATURE(kRemovalOfIWAsFromTabCapture, +@@ -357,4 +357,5 @@ BASE_FEATURE(kRemovalOfIWAsFromTabCapture, "RemovalOfIWAsFromTabCapture", base::FEATURE_ENABLED_BY_DEFAULT); @@ -676,7 +676,7 @@ diff --git a/chrome/browser/browser_features.cc b/chrome/browser/browser_feature 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 -@@ -136,6 +136,7 @@ BASE_DECLARE_FEATURE(kRemovalOfIWAsFromTabCapture); +@@ -134,6 +134,7 @@ BASE_DECLARE_FEATURE(kRemovalOfIWAsFromTabCapture); // module, e.g. // //chrome/browser//features.h // @@ -726,7 +726,7 @@ 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 -@@ -1182,5 +1182,6 @@ BASE_FEATURE(kWebOtpCrossDeviceSimpleString, +@@ -1202,5 +1202,6 @@ BASE_FEATURE(kWebOtpCrossDeviceSimpleString, "WebOtpCrossDeviceSimpleString", base::FEATURE_DISABLED_BY_DEFAULT); @@ -736,7 +736,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 -@@ -236,6 +236,7 @@ constexpr base::FeatureParam kQuickDeleteAndroidSurveyTriggerId( +@@ -240,6 +240,7 @@ constexpr base::FeatureParam kQuickDeleteAndroidSurveyTriggerId( "trigger_id", /*default_value=*/""); @@ -758,7 +758,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f import java.util.List; import java.util.Map; -@@ -830,7 +834,7 @@ public abstract class ChromeFeatureList { +@@ -862,7 +866,7 @@ public abstract class ChromeFeatureList { public static final CachedFlag sWebApkMinShellApkVersion = newCachedFlag(WEB_APK_MIN_SHELL_APK_VERSION, true); @@ -767,7 +767,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f List.of( sAndroidAppIntegration, sAndroidAppIntegrationModule, -@@ -933,6 +937,13 @@ public abstract class ChromeFeatureList { +@@ -967,6 +971,13 @@ public abstract class ChromeFeatureList { sUseLibunwindstackNativeUnwinderAndroid, sWebApkMinShellApkVersion); @@ -778,9 +778,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(); + public static final List sFlagsCachedInMinimalBrowser = + List.of(sAsyncNotificationManagerForDownload); - 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 @@ -853,10 +853,10 @@ diff --git a/chrome/browser/settings/BUILD.gn b/chrome/browser/settings/BUILD.gn diff --git a/chrome/browser/settings/android/java/src/org/chromium/chrome/browser/settings/ChromeBaseSettingsFragment.java b/chrome/browser/settings/android/java/src/org/chromium/chrome/browser/settings/ChromeBaseSettingsFragment.java --- a/chrome/browser/settings/android/java/src/org/chromium/chrome/browser/settings/ChromeBaseSettingsFragment.java +++ b/chrome/browser/settings/android/java/src/org/chromium/chrome/browser/settings/ChromeBaseSettingsFragment.java -@@ -7,12 +7,19 @@ package org.chromium.chrome.browser.settings; - import androidx.annotation.NonNull; - import androidx.preference.PreferenceFragmentCompat; +@@ -8,12 +8,19 @@ import androidx.preference.PreferenceFragmentCompat; + import org.chromium.build.annotations.NullMarked; + import org.chromium.build.annotations.Nullable; +import org.chromium.base.supplier.Supplier; import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncher; import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncherFactory; @@ -873,9 +873,9 @@ diff --git a/chrome/browser/settings/android/java/src/org/chromium/chrome/browse /** * Base class for settings in Chrome. * -@@ -26,6 +33,49 @@ public abstract class ChromeBaseSettingsFragment extends PreferenceFragmentCompa - private Profile mProfile; - private SettingsCustomTabLauncher mCustomTabLauncher; +@@ -28,6 +35,49 @@ public abstract class ChromeBaseSettingsFragment extends PreferenceFragmentCompa + private @Nullable Profile mProfile; + private @Nullable SettingsCustomTabLauncher mCustomTabLauncher; + private Supplier mRequireRestartDelegateSupplier; + @@ -957,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 -@@ -416,4 +416,5 @@ BASE_FEATURE(kFedCmContinueWithoutName, - "FedCmContinueWithoutName", - base::FEATURE_ENABLED_BY_DEFAULT); +@@ -371,4 +371,5 @@ BASE_FEATURE(kByDateHistoryInSidePanel, + "ByDateHistoryInSidePanel", + base::FEATURE_DISABLED_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 -@@ -1569,4 +1569,5 @@ BASE_FEATURE(kDisableShortcutsEnableDiy, +@@ -1591,4 +1591,5 @@ BASE_FEATURE(kDisableShortcutsEnableDiy, "DisableShortcutsEnableDiy", base::FEATURE_ENABLED_BY_DEFAULT); @@ -1129,10 +1129,93 @@ new file mode 100644 +++ b/components/cromite_components_strings_grd/placeholder.txt @@ -0,0 +1 @@ +this file is intentionally empty -diff --git a/components/flags_ui/flags_state.cc b/components/flags_ui/flags_state.cc ---- a/components/flags_ui/flags_state.cc -+++ b/components/flags_ui/flags_state.cc -@@ -373,6 +373,21 @@ void FlagsState::GetSwitchesAndFeaturesFromFlags( +diff --git a/components/offline_pages/core/offline_page_feature.cc b/components/offline_pages/core/offline_page_feature.cc +--- a/components/offline_pages/core/offline_page_feature.cc ++++ b/components/offline_pages/core/offline_page_feature.cc +@@ -48,4 +48,5 @@ bool IsOfflinePagesNetworkStateLikelyUnknown() { + return base::FeatureList::IsEnabled(kOfflinePagesNetworkStateLikelyUnknown); + } + ++#include "cromite_flags/components_offline_pages_core_offline_page_feature_cc.inc" + } // namespace offline_pages +diff --git a/components/offline_pages/core/offline_page_feature.h b/components/offline_pages/core/offline_page_feature.h +--- a/components/offline_pages/core/offline_page_feature.h ++++ b/components/offline_pages/core/offline_page_feature.h +@@ -42,6 +42,7 @@ bool IsOnTheFlyMhtmlHashComputationEnabled(); + // offline pages to avoid showing them even when the device is online. + bool IsOfflinePagesNetworkStateLikelyUnknown(); + ++#include "cromite_flags/components_offline_pages_core_offline_page_feature_h.inc" + } // namespace offline_pages + + #endif // COMPONENTS_OFFLINE_PAGES_CORE_OFFLINE_PAGE_FEATURE_H_ +diff --git a/components/password_manager/core/browser/features/password_features.cc b/components/password_manager/core/browser/features/password_features.cc +--- a/components/password_manager/core/browser/features/password_features.cc ++++ b/components/password_manager/core/browser/features/password_features.cc +@@ -187,4 +187,5 @@ BASE_FEATURE(kImprovedPasswordChangeService, + "ImprovedPasswordChangeService", + base::FEATURE_DISABLED_BY_DEFAULT); + ++#include "cromite_flags/components_password_manager_core_browser_features_password_features_cc.inc" + } // namespace password_manager::features +diff --git a/components/permissions/features.cc b/components/permissions/features.cc +--- a/components/permissions/features.cc ++++ b/components/permissions/features.cc +@@ -137,6 +137,8 @@ BASE_FEATURE(kOsAdditionalSecurityPermissionKillSwitch, + "OsAdditionalSecurityPermissionKillSwitch", + base::FEATURE_DISABLED_BY_DEFAULT); + #endif ++ ++#include "cromite_flags/components_permissions_features_cc.inc" + } // namespace features + namespace feature_params { + +diff --git a/components/variations/synthetic_trials_active_group_id_provider.cc b/components/variations/synthetic_trials_active_group_id_provider.cc +--- a/components/variations/synthetic_trials_active_group_id_provider.cc ++++ b/components/variations/synthetic_trials_active_group_id_provider.cc +@@ -27,7 +27,7 @@ SyntheticTrialsActiveGroupIdProvider::GetActiveGroupIds() { + return group_ids_; + } + +-#if !defined(NDEBUG) ++#if true + std::vector + SyntheticTrialsActiveGroupIdProvider::GetGroups() { + base::AutoLock scoped_lock(lock_); +@@ -53,7 +53,7 @@ void SyntheticTrialsActiveGroupIdProvider::OnSyntheticTrialsChanged( + for (const auto& group : groups) { + group_ids_.push_back(group.id()); + } +-#if !defined(NDEBUG) ++#if true + groups_ = groups; + #endif // !defined(NDEBUG) + } +diff --git a/components/variations/synthetic_trials_active_group_id_provider.h b/components/variations/synthetic_trials_active_group_id_provider.h +--- a/components/variations/synthetic_trials_active_group_id_provider.h ++++ b/components/variations/synthetic_trials_active_group_id_provider.h +@@ -36,7 +36,7 @@ class COMPONENT_EXPORT(VARIATIONS) SyntheticTrialsActiveGroupIdProvider + // Returns currently active synthetic trial group IDs. + std::vector GetActiveGroupIds(); + +-#if !defined(NDEBUG) ++#if true + // In debug mode, not only the group IDs are tracked but also the full group + // info, to display the names unhashed in chrome://version. + std::vector GetGroups(); +@@ -60,7 +60,7 @@ class COMPONENT_EXPORT(VARIATIONS) SyntheticTrialsActiveGroupIdProvider + + base::Lock lock_; + std::vector group_ids_; // GUARDED_BY(lock_); +-#if !defined(NDEBUG) ++#if true + // In debug builds, keep the full group information to be able to display it + // in chrome://version. + std::vector groups_; // GUARDED_BY(lock_); +diff --git a/components/webui/flags/flags_state.cc b/components/webui/flags/flags_state.cc +--- a/components/webui/flags/flags_state.cc ++++ b/components/webui/flags/flags_state.cc +@@ -377,6 +377,21 @@ void FlagsState::GetSwitchesAndFeaturesFromFlags( for (const std::string& entry_name : enabled_entries) { const auto& entry_it = name_to_switch_map.find(entry_name); @@ -1154,7 +1237,7 @@ diff --git a/components/flags_ui/flags_state.cc b/components/flags_ui/flags_stat CHECK(entry_it != name_to_switch_map.end(), base::NotFatalUntil::M130); const SwitchEntry& entry = entry_it->second; -@@ -690,6 +705,27 @@ void FlagsState::GetFlagFeatureEntries( +@@ -705,6 +720,27 @@ void FlagsState::GetFlagFeatureEntries( data.Set("links", std::move(links)); } @@ -1182,7 +1265,7 @@ diff --git a/components/flags_ui/flags_state.cc b/components/flags_ui/flags_stat switch (entry.type) { case FeatureEntry::SINGLE_VALUE: case FeatureEntry::SINGLE_DISABLE_VALUE: -@@ -816,6 +852,16 @@ void FlagsState::AddSwitchesToCommandLine( +@@ -832,6 +868,16 @@ void FlagsState::AddSwitchesToCommandLine( for (const std::string& entry_name : enabled_entries) { const auto& entry_it = name_to_switch_map.find(entry_name); if (entry_it == name_to_switch_map.end()) { @@ -1199,7 +1282,7 @@ diff --git a/components/flags_ui/flags_state.cc b/components/flags_ui/flags_stat NOTREACHED(); } -@@ -1067,6 +1113,14 @@ const FeatureEntry* FlagsState::FindFeatureEntryByName( +@@ -1088,6 +1134,14 @@ const FeatureEntry* FlagsState::FindFeatureEntryByName( bool FlagsState::IsSupportedFeature(const FlagsStorage* storage, const std::string& name, int platform_mask) const { @@ -1213,8 +1296,8 @@ diff --git a/components/flags_ui/flags_state.cc b/components/flags_ui/flags_stat + } for (const auto& entry : feature_entries_) { DCHECK(entry.IsValid()); - if (!(entry.supported_platforms & platform_mask)) -@@ -1098,6 +1152,11 @@ void FlagsState::SetFlags(FlagsStorage* flags_storage, + if (!(entry.supported_platforms & platform_mask)) { +@@ -1122,6 +1176,11 @@ void FlagsState::SetFlags(FlagsStorage* flags_storage, std::string feature_internal_name = flag.substr(0, at_index); const flags_ui::FeatureEntry* entry = FindFeatureEntryByName(feature_internal_name); @@ -1226,9 +1309,9 @@ diff --git a/components/flags_ui/flags_state.cc b/components/flags_ui/flags_stat CHECK(entry); if (entry->type == FeatureEntry::FEATURE_VALUE || -diff --git a/components/flags_ui/resources/app.css b/components/flags_ui/resources/app.css ---- a/components/flags_ui/resources/app.css -+++ b/components/flags_ui/resources/app.css +diff --git a/components/webui/flags/resources/app.css b/components/webui/flags/resources/app.css +--- a/components/webui/flags/resources/app.css ++++ b/components/webui/flags/resources/app.css @@ -383,3 +383,27 @@ cr-tabs { padding-top: 1.5rem; } @@ -1257,9 +1340,9 @@ diff --git a/components/flags_ui/resources/app.css b/components/flags_ui/resourc +.cromite .section-header-title { + display: none; +} -diff --git a/components/flags_ui/resources/app.html.ts b/components/flags_ui/resources/app.html.ts ---- a/components/flags_ui/resources/app.html.ts -+++ b/components/flags_ui/resources/app.html.ts +diff --git a/components/webui/flags/resources/app.html.ts b/components/webui/flags/resources/app.html.ts +--- a/components/webui/flags/resources/app.html.ts ++++ b/components/webui/flags/resources/app.html.ts @@ -9,6 +9,7 @@ import type {AppElement} from './app.js'; export function getHtml(this: AppElement) { // clang-format off @@ -1309,9 +1392,9 @@ diff --git a/components/flags_ui/resources/app.html.ts b/components/flags_ui/res `; // clang-format on } -diff --git a/components/flags_ui/resources/app.ts b/components/flags_ui/resources/app.ts ---- a/components/flags_ui/resources/app.ts -+++ b/components/flags_ui/resources/app.ts +diff --git a/components/webui/flags/resources/app.ts b/components/webui/flags/resources/app.ts +--- a/components/webui/flags/resources/app.ts ++++ b/components/webui/flags/resources/app.ts @@ -132,6 +132,7 @@ export class FlagsAppElement extends CrLitElement { // loadTimeData.getString('unavailable'), @@ -1333,13 +1416,13 @@ diff --git a/components/flags_ui/resources/app.ts b/components/flags_ui/resource private announceStatusDelayMs: number = 100; private featuresResolver: PromiseResolver = new PromiseResolver(); private flagSearch: FlagSearch|null = null; -@@ -186,10 +190,24 @@ export class FlagsAppElement extends CrLitElement { +@@ -186,10 +190,25 @@ export class FlagsAppElement extends CrLitElement { if (changedPrivateProperties.has('data')) { const defaultFeatures: Feature[] = []; const nonDefaultFeatures: Feature[] = []; + const defaultCromiteFeatures: Feature[] = []; + const nonDefaultCromiteFeatures: Feature[] = []; - ++ + if (this.onlyCromiteFlags) { + this.data.supportedFeatures = + this.data.supportedFeatures.filter(item => item.is_new); @@ -1350,6 +1433,7 @@ diff --git a/components/flags_ui/resources/app.ts b/components/flags_ui/resource + : undefined)); + this.data.supportedFeatures.sort( + (a,b) => (a.internal_name.localeCompare(b.internal_name))); + this.data.supportedFeatures.forEach( f => (f.is_default ? defaultFeatures : nonDefaultFeatures).push(f)); @@ -1358,7 +1442,7 @@ diff --git a/components/flags_ui/resources/app.ts b/components/flags_ui/resource this.defaultFeatures = defaultFeatures; this.nonDefaultFeatures = nonDefaultFeatures; -@@ -233,6 +251,11 @@ export class FlagsAppElement extends CrLitElement { +@@ -233,6 +252,11 @@ export class FlagsAppElement extends CrLitElement { override connectedCallback() { super.connectedCallback(); @@ -1370,9 +1454,9 @@ diff --git a/components/flags_ui/resources/app.ts b/components/flags_ui/resource // const pathname = new URL(window.location.href).pathname; this.isFlagsDeprecatedUrl_ = -diff --git a/components/flags_ui/resources/experiment.css b/components/flags_ui/resources/experiment.css ---- a/components/flags_ui/resources/experiment.css -+++ b/components/flags_ui/resources/experiment.css +diff --git a/components/webui/flags/resources/experiment.css b/components/webui/flags/resources/experiment.css +--- a/components/webui/flags/resources/experiment.css ++++ b/components/webui/flags/resources/experiment.css @@ -12,6 +12,7 @@ } @@ -1417,9 +1501,9 @@ diff --git a/components/flags_ui/resources/experiment.css b/components/flags_ui/ width: 100%; } -diff --git a/components/flags_ui/resources/experiment.html.ts b/components/flags_ui/resources/experiment.html.ts ---- a/components/flags_ui/resources/experiment.html.ts -+++ b/components/flags_ui/resources/experiment.html.ts +diff --git a/components/webui/flags/resources/experiment.html.ts b/components/webui/flags/resources/experiment.html.ts +--- a/components/webui/flags/resources/experiment.html.ts ++++ b/components/webui/flags/resources/experiment.html.ts @@ -10,7 +10,8 @@ export function getHtml(this: ExperimentElement) { // clang-format off return html` @@ -1441,9 +1525,9 @@ diff --git a/components/flags_ui/resources/experiment.html.ts b/components/flags `)} -diff --git a/components/flags_ui/resources/experiment.ts b/components/flags_ui/resources/experiment.ts ---- a/components/flags_ui/resources/experiment.ts -+++ b/components/flags_ui/resources/experiment.ts +diff --git a/components/webui/flags/resources/experiment.ts b/components/webui/flags/resources/experiment.ts +--- a/components/webui/flags/resources/experiment.ts ++++ b/components/webui/flags/resources/experiment.ts @@ -81,6 +81,11 @@ export class ExperimentElement extends CrLitElement { enabled: false, is_default: false, @@ -1456,7 +1540,7 @@ diff --git a/components/flags_ui/resources/experiment.ts b/components/flags_ui/r }; // Whether the controls to change the experiment state should be hidden. -@@ -127,12 +132,15 @@ export class ExperimentElement extends CrLitElement { +@@ -127,9 +132,12 @@ export class ExperimentElement extends CrLitElement { } protected getExperimentTitle_(): string { @@ -1470,14 +1554,10 @@ diff --git a/components/flags_ui/resources/experiment.ts b/components/flags_ui/r + loadTimeData.getString('experiment-enabled')) + suffix; } -- return ''; -+ return suffix; - } - - protected getPlatforms_(): string { -diff --git a/components/flags_ui/resources/flags_browser_proxy.ts b/components/flags_ui/resources/flags_browser_proxy.ts ---- a/components/flags_ui/resources/flags_browser_proxy.ts -+++ b/components/flags_ui/resources/flags_browser_proxy.ts + return ''; +diff --git a/components/webui/flags/resources/flags_browser_proxy.ts b/components/webui/flags/resources/flags_browser_proxy.ts +--- a/components/webui/flags/resources/flags_browser_proxy.ts ++++ b/components/webui/flags/resources/flags_browser_proxy.ts @@ -16,6 +16,11 @@ export interface Feature { description: string; enabled: boolean; @@ -1490,88 +1570,6 @@ diff --git a/components/flags_ui/resources/flags_browser_proxy.ts b/components/f supported_platforms: string[]; origin_list_value?: string; string_value?: string; -diff --git a/components/offline_pages/core/offline_page_feature.cc b/components/offline_pages/core/offline_page_feature.cc ---- a/components/offline_pages/core/offline_page_feature.cc -+++ b/components/offline_pages/core/offline_page_feature.cc -@@ -48,4 +48,5 @@ bool IsOfflinePagesNetworkStateLikelyUnknown() { - return base::FeatureList::IsEnabled(kOfflinePagesNetworkStateLikelyUnknown); - } - -+#include "cromite_flags/components_offline_pages_core_offline_page_feature_cc.inc" - } // namespace offline_pages -diff --git a/components/offline_pages/core/offline_page_feature.h b/components/offline_pages/core/offline_page_feature.h ---- a/components/offline_pages/core/offline_page_feature.h -+++ b/components/offline_pages/core/offline_page_feature.h -@@ -42,6 +42,7 @@ bool IsOnTheFlyMhtmlHashComputationEnabled(); - // offline pages to avoid showing them even when the device is online. - bool IsOfflinePagesNetworkStateLikelyUnknown(); - -+#include "cromite_flags/components_offline_pages_core_offline_page_feature_h.inc" - } // namespace offline_pages - - #endif // COMPONENTS_OFFLINE_PAGES_CORE_OFFLINE_PAGE_FEATURE_H_ -diff --git a/components/password_manager/core/browser/features/password_features.cc b/components/password_manager/core/browser/features/password_features.cc ---- a/components/password_manager/core/browser/features/password_features.cc -+++ b/components/password_manager/core/browser/features/password_features.cc -@@ -182,4 +182,5 @@ BASE_FEATURE(kImprovedPasswordChangeService, - "ImprovedPasswordChangeService", - base::FEATURE_DISABLED_BY_DEFAULT); - -+#include "cromite_flags/components_password_manager_core_browser_features_password_features_cc.inc" - } // namespace password_manager::features -diff --git a/components/permissions/features.cc b/components/permissions/features.cc ---- a/components/permissions/features.cc -+++ b/components/permissions/features.cc -@@ -120,6 +120,7 @@ BASE_FEATURE(kCpssQuietChipTextUpdate, - BASE_FEATURE(kCpssUseTfliteSignatureRunner, - "CpssUseTfliteSignatureRunner", - base::FEATURE_DISABLED_BY_DEFAULT); -+#include "cromite_flags/components_permissions_features_cc.inc" - } // namespace features - namespace feature_params { - -diff --git a/components/variations/synthetic_trials_active_group_id_provider.cc b/components/variations/synthetic_trials_active_group_id_provider.cc ---- a/components/variations/synthetic_trials_active_group_id_provider.cc -+++ b/components/variations/synthetic_trials_active_group_id_provider.cc -@@ -27,7 +27,7 @@ SyntheticTrialsActiveGroupIdProvider::GetActiveGroupIds() { - return group_ids_; - } - --#if !defined(NDEBUG) -+#if true - std::vector - SyntheticTrialsActiveGroupIdProvider::GetGroups() { - base::AutoLock scoped_lock(lock_); -@@ -53,7 +53,7 @@ void SyntheticTrialsActiveGroupIdProvider::OnSyntheticTrialsChanged( - for (const auto& group : groups) { - group_ids_.push_back(group.id()); - } --#if !defined(NDEBUG) -+#if true - groups_ = groups; - #endif // !defined(NDEBUG) - } -diff --git a/components/variations/synthetic_trials_active_group_id_provider.h b/components/variations/synthetic_trials_active_group_id_provider.h ---- a/components/variations/synthetic_trials_active_group_id_provider.h -+++ b/components/variations/synthetic_trials_active_group_id_provider.h -@@ -36,7 +36,7 @@ class COMPONENT_EXPORT(VARIATIONS) SyntheticTrialsActiveGroupIdProvider - // Returns currently active synthetic trial group IDs. - std::vector GetActiveGroupIds(); - --#if !defined(NDEBUG) -+#if true - // In debug mode, not only the group IDs are tracked but also the full group - // info, to display the names unhashed in chrome://version. - std::vector GetGroups(); -@@ -60,7 +60,7 @@ class COMPONENT_EXPORT(VARIATIONS) SyntheticTrialsActiveGroupIdProvider - - base::Lock lock_; - std::vector group_ids_; // GUARDED_BY(lock_); --#if !defined(NDEBUG) -+#if true - // In debug builds, keep the full group information to be able to display it - // in chrome://version. - std::vector groups_; // GUARDED_BY(lock_); diff --git a/components/webui/version/version_handler_helper.cc b/components/webui/version/version_handler_helper.cc --- a/components/webui/version/version_handler_helper.cc +++ b/components/webui/version/version_handler_helper.cc @@ -1596,7 +1594,7 @@ diff --git a/components/webui/version/version_handler_helper.cc b/components/web diff --git a/content/common/features.cc b/content/common/features.cc --- a/content/common/features.cc +++ b/content/common/features.cc -@@ -490,4 +490,5 @@ BASE_FEATURE(kLimitCrossOriginNonActivatedPaintHolding, +@@ -509,4 +509,5 @@ BASE_FEATURE(kLimitCrossOriginNonActivatedPaintHolding, // Please keep features in alphabetical order. @@ -1605,7 +1603,7 @@ diff --git a/content/common/features.cc b/content/common/features.cc diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc --- a/content/public/common/content_features.cc +++ b/content/public/common/content_features.cc -@@ -1425,4 +1425,5 @@ bool IsVideoCaptureServiceEnabledForBrowserProcess() { +@@ -1485,4 +1485,5 @@ bool IsVideoCaptureServiceEnabledForBrowserProcess() { VideoCaptureServiceConfiguration::kEnabledForBrowserProcess; } @@ -1614,7 +1612,7 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c diff --git a/content/public/common/content_features.h b/content/public/common/content_features.h --- a/content/public/common/content_features.h +++ b/content/public/common/content_features.h -@@ -339,6 +339,7 @@ CONTENT_EXPORT extern const base::FeatureParam +@@ -350,6 +350,7 @@ CONTENT_EXPORT extern const base::FeatureParam CONTENT_EXPORT bool IsVideoCaptureServiceEnabledForOutOfProcess(); CONTENT_EXPORT bool IsVideoCaptureServiceEnabledForBrowserProcess(); @@ -1960,7 +1958,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 -@@ -1799,5 +1799,5 @@ uint32_t GetPassthroughAudioFormats() { +@@ -1807,5 +1807,5 @@ uint32_t GetPassthroughAudioFormats() { return 0; #endif // BUILDFLAG(ENABLE_PASSTHROUGH_AUDIO_CODECS) } @@ -1970,7 +1968,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 -@@ -568,5 +568,5 @@ MEDIA_EXPORT OOPVDMode GetOutOfProcessVideoDecodingMode(); +@@ -571,5 +571,5 @@ MEDIA_EXPORT OOPVDMode GetOutOfProcessVideoDecodingMode(); MEDIA_EXPORT uint32_t GetPassthroughAudioFormats(); } // namespace media @@ -1980,18 +1978,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 -@@ -701,4 +701,5 @@ BASE_FEATURE(kUseCertTransparencyAwareApiForOsCertVerify, - base::FEATURE_ENABLED_BY_DEFAULT); - #endif // BUILDFLAG(IS_ANDROID) +@@ -709,4 +709,5 @@ BASE_FEATURE(kSelfSignedLocalNetworkInterstitial, + "SelfSignedLocalNetworkInterstitial", + base::FEATURE_DISABLED_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 -@@ -719,6 +719,7 @@ NET_EXPORT BASE_DECLARE_FEATURE(kReportingApiCorsOriginHeader); - NET_EXPORT BASE_DECLARE_FEATURE(kUseCertTransparencyAwareApiForOsCertVerify); - #endif // BUILDFLAG(IS_ANDROID) +@@ -721,6 +721,7 @@ NET_EXPORT BASE_DECLARE_FEATURE(kUseCertTransparencyAwareApiForOsCertVerify); + // URLs. + NET_EXPORT BASE_DECLARE_FEATURE(kSelfSignedLocalNetworkInterstitial); +#include "cromite_flags/net_base_features_h.inc" } // namespace net::features @@ -2000,18 +1998,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 -@@ -351,4 +351,5 @@ BASE_FEATURE(kAdAuctionEventRegistration, - "AdAuctionEventRegistration", - base::FEATURE_DISABLED_BY_DEFAULT); +@@ -544,4 +544,5 @@ BASE_FEATURE_PARAM(int, + "max_ops_before_maintenance", + 1000); +#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 -@@ -150,6 +150,7 @@ COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kCreateURLLoaderPipeAsync); - // requests be processed? - COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kAdAuctionEventRegistration); +@@ -261,6 +261,7 @@ BASE_DECLARE_FEATURE_PARAM(int, kInterestGroupStorageMaxNegativeGroupsPerOwner); + COMPONENT_EXPORT(NETWORK_CPP) + BASE_DECLARE_FEATURE_PARAM(int, kInterestGroupStorageMaxOpsBeforeMaintenance); +#include "cromite_flags/services_network_public_cpp_features_h.inc" } // namespace network::features @@ -2020,7 +2018,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 -@@ -2899,4 +2899,5 @@ bool IsLinkPreviewTriggerTypeEnabled(LinkPreviewTriggerType type) { +@@ -2744,4 +2744,5 @@ bool IsLinkPreviewTriggerTypeEnabled(LinkPreviewTriggerType type) { // // DO NOT ADD NEW FEATURES HERE. @@ -2029,7 +2027,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 -@@ -1889,6 +1889,7 @@ BLINK_COMMON_EXPORT bool IsUpdateComplexSafaAreaConstraintsEnabled(); +@@ -1793,6 +1793,7 @@ BLINK_COMMON_EXPORT bool IsUpdateComplexSafaAreaConstraintsEnabled(); // // DO NOT ADD NEW FEATURES HERE. @@ -2040,7 +2038,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 -@@ -451,4 +451,5 @@ BASE_FEATURE(kAsyncFullscreenWindowState, +@@ -456,4 +456,5 @@ BASE_FEATURE(kAsyncFullscreenWindowState, "AsyncFullscreenWindowState", base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/build/patches/Add-custom-tab-intents-privacy-option.patch b/build/patches/Add-custom-tab-intents-privacy-option.patch index f66bd056..3a8458ec 100644 --- a/build/patches/Add-custom-tab-intents-privacy-option.patch +++ b/build/patches/Add-custom-tab-intents-privacy-option.patch @@ -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 -@@ -1187,7 +1187,9 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid +@@ -1190,7 +1190,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 -@@ -980,6 +980,7 @@ public class CustomTabsConnection { +@@ -981,6 +981,7 @@ public class CustomTabsConnection { PostTask.postTask( TaskTraits.UI_DEFAULT, () -> { @@ -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 -@@ -730,6 +730,8 @@ public abstract class ChromeFeatureList { +@@ -766,6 +766,8 @@ public abstract class ChromeFeatureList { public static final CachedFlag sMagicStackAndroid = newCachedFlag(MAGIC_STACK_ANDROID, true); public static final CachedFlag sMostVisitedTilesCustomization = newCachedFlag(MOST_VISITED_TILES_CUSTOMIZATION, false); @@ -275,7 +275,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 = -@@ -897,6 +899,7 @@ public abstract class ChromeFeatureList { +@@ -932,6 +934,7 @@ public abstract class ChromeFeatureList { sNotificationTrampoline, sMagicStackAndroid, sMostVisitedTilesCustomization, diff --git a/build/patches/Add-exit-menu-item.patch b/build/patches/Add-exit-menu-item.patch index 784dbf48..0bcee128 100644 --- a/build/patches/Add-exit-menu-item.patch +++ b/build/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 -@@ -166,6 +166,9 @@ found in the LICENSE file. +@@ -175,6 +175,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 -@@ -195,6 +198,9 @@ found in the LICENSE file. +@@ -204,6 +207,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 -@@ -293,6 +293,8 @@ import java.util.Set; +@@ -297,6 +297,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. -@@ -3021,6 +3023,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn +@@ -3070,6 +3072,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn .closeTabs( TabClosureParams.closeTab(currentTab).build(), /* allowDialog= */ true); RecordUserAction.record("MobileTabClosed"); @@ -60,15 +60,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct 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 -@@ -60,6 +60,7 @@ import org.chromium.chrome.R; +@@ -59,6 +59,7 @@ import org.chromium.base.supplier.UnownedUserDataSupplier; + import org.chromium.chrome.R; import org.chromium.chrome.browser.ActivityTabProvider; import org.chromium.chrome.browser.ActivityUtils; - import org.chromium.chrome.browser.AppHooks; +import org.chromium.chrome.browser.lifetime.ApplicationLifetime; import org.chromium.chrome.browser.ChromeActivitySessionTracker; import org.chromium.chrome.browser.ChromeApplicationImpl; import org.chromium.chrome.browser.ChromeKeyboardVisibilityDelegate; -@@ -2374,6 +2375,11 @@ public abstract class ChromeActivity extends AsyncInitializationActivity +@@ -2375,6 +2376,11 @@ public abstract class ChromeActivity extends AsyncInitializationActivity 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 -@@ -4345,6 +4345,9 @@ To change this setting, BEGIN_LINKdelete the Chrome d +@@ -4382,6 +4382,9 @@ To change this setting, BEGIN_LINKdelete the Chrome d Dark theme diff --git a/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch b/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch index 9ef86be5..4dd75b57 100644 --- a/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch +++ b/build/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" -@@ -540,6 +541,15 @@ AutocompleteController::AutocompleteController( +@@ -536,6 +537,15 @@ AutocompleteController::AutocompleteController( provider_client_->GetOmniboxTriggeredFeatureService()), steady_state_omnibox_position_( metrics::OmniboxEventProto::UNKNOWN_POSITION) { diff --git a/build/patches/Add-flag-to-configure-maximum-connections-per-host.patch b/build/patches/Add-flag-to-configure-maximum-connections-per-host.patch index f43672e0..346c8e40 100644 --- a/build/patches/Add-flag-to-configure-maximum-connections-per-host.patch +++ b/build/patches/Add-flag-to-configure-maximum-connections-per-host.patch @@ -103,7 +103,7 @@ diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket #include "net/ssl/ssl_config.h" #include "url/gurl.h" #include "url/scheme_host_port.h" -@@ -161,6 +165,19 @@ void ClientSocketPoolManager::set_max_sockets_per_pool( +@@ -164,6 +168,19 @@ void ClientSocketPoolManager::set_max_sockets_per_pool( int ClientSocketPoolManager::max_sockets_per_group( HttpNetworkSession::SocketPoolType pool_type) { DCHECK_LT(pool_type, HttpNetworkSession::NUM_SOCKET_POOL_TYPES); diff --git a/build/patches/Add-flag-to-disable-IPv6-probes.patch b/build/patches/Add-flag-to-disable-IPv6-probes.patch index 6883cd5d..433eccf7 100644 --- a/build/patches/Add-flag-to-disable-IPv6-probes.patch +++ b/build/patches/Add-flag-to-disable-IPv6-probes.patch @@ -45,8 +45,8 @@ new file mode 100644 diff --git a/net/BUILD.gn b/net/BUILD.gn --- a/net/BUILD.gn +++ b/net/BUILD.gn -@@ -1118,6 +1118,7 @@ component("net") { - "//build:chromeos_buildflags", +@@ -1119,6 +1119,7 @@ component("net") { + ":net_deps", "//components/miracle_parameter/common", "//components/network_time/time_tracker", + "//components/network_session_configurator/common", @@ -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" -@@ -1425,6 +1426,13 @@ int HostResolverManager::StartIPv6ReachabilityCheck( +@@ -1477,6 +1478,13 @@ int HostResolverManager::StartIPv6ReachabilityCheck( return OK; } diff --git a/build/patches/Add-flag-to-disable-external-intent-requests.patch b/build/patches/Add-flag-to-disable-external-intent-requests.patch index b8e7af24..dbe32a8a 100644 --- a/build/patches/Add-flag-to-disable-external-intent-requests.patch +++ b/build/patches/Add-flag-to-disable-external-intent-requests.patch @@ -57,7 +57,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust import org.chromium.chrome.browser.fullscreen.BrowserControlsManager; import org.chromium.chrome.browser.fullscreen.FullscreenManager; import org.chromium.chrome.browser.init.ChromeActivityNativeDelegate; -@@ -133,6 +134,7 @@ public class CustomTabDelegateFactory implements TabDelegateFactory { +@@ -127,6 +128,7 @@ public class CustomTabDelegateFactory implements TabDelegateFactory { @Override public boolean shouldDisableAllExternalIntents() { @@ -144,13 +144,13 @@ diff --git a/components/external_intents/android/external_intents_features.cc b/ @@ -27,7 +27,6 @@ namespace { const base::Feature* const kFeaturesExposedToJava[] = { &kExternalNavigationDebugLogs, &kBlockFrameRenavigations, - &kBlockIntentsToSelf, &kTrustedClientGestureBypass}; + &kBlockIntentsToSelf}; - } // namespace // Alphabetical: -@@ -48,7 +47,13 @@ BASE_FEATURE(kTrustedClientGestureBypass, - "TrustedClientGestureBypass", +@@ -44,7 +43,13 @@ BASE_FEATURE(kBlockIntentsToSelf, + "BlockIntentsToSelf", base::FEATURE_ENABLED_BY_DEFAULT); +CROMITE_FEATURE(kIntentBlockExternalFormRedirectsNoGesture, @@ -177,9 +177,9 @@ diff --git a/components/external_intents/android/external_intents_features.h b/c diff --git a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalIntentsFeatures.java b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalIntentsFeatures.java --- a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalIntentsFeatures.java +++ b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalIntentsFeatures.java -@@ -18,6 +18,12 @@ import org.chromium.base.Features; - */ +@@ -20,6 +20,12 @@ import org.chromium.build.annotations.NullMarked; @JNINamespace("external_intents") + @NullMarked public class ExternalIntentsFeatures extends Features { + public static final String INTENT_BLOCK_EXTERNAL_FORM_REDIRECT_NO_GESTURE_NAME = + "IntentBlockExternalFormRedirectsNoGesture"; diff --git a/build/patches/Add-flag-to-disable-vibration.patch b/build/patches/Add-flag-to-disable-vibration.patch index 5d3f0e58..35567bca 100644 --- a/build/patches/Add-flag-to-disable-vibration.patch +++ b/build/patches/Add-flag-to-disable-vibration.patch @@ -104,9 +104,9 @@ 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 -@@ -855,6 +855,10 @@ - status: {"Android": "stable"}, - base_feature: "none", +@@ -869,6 +869,10 @@ + { + name: "CompositingDecisionAtAnimationPhaseBoundaries" }, + { + name: "Vibration", diff --git a/build/patches/Add-kill-switch-for-unsupported-clangd-flags.patch b/build/patches/Add-kill-switch-for-unsupported-clangd-flags.patch index 775acfea..2c8780c1 100644 --- a/build/patches/Add-kill-switch-for-unsupported-clangd-flags.patch +++ b/build/patches/Add-kill-switch-for-unsupported-clangd-flags.patch @@ -14,17 +14,17 @@ 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 -@@ -1974,7 +1974,6 @@ config("default_warnings") { - # TODO(crbug.com/40284799): Fix and re-enable. - "-Wno-thread-safety-reference-return", +@@ -1978,7 +1978,6 @@ config("default_warnings") { + # TODO(crbug.com/376641662): Fix and re-enable. + "-Wno-nontrivial-memcall", ] - cflags_cc += [ # TODO(crbug.com/328490295): Fix and re-enable for C flags. "-Wenum-compare-conditional", -@@ -1992,6 +1991,16 @@ config("default_warnings") { - # TODO(crbug.com/376641662): Fix and re-enable. - cflags += [ "-Wno-nontrivial-memcall" ] +@@ -1993,6 +1992,16 @@ config("default_warnings") { + # TODO(crbug.com/344680447): Fix and re-enable. + cflags_cc += [ "-Wno-missing-template-arg-list-after-template-kw" ] } + if (skip_clangd_unsupported_options) { + cflags -= [ diff --git a/build/patches/Add-lifetime-options-for-permissions.patch b/build/patches/Add-lifetime-options-for-permissions.patch index 0baeefa9..d34bde28 100644 --- a/build/patches/Add-lifetime-options-for-permissions.patch +++ b/build/patches/Add-lifetime-options-for-permissions.patch @@ -232,7 +232,7 @@ diff --git a/chrome/browser/permissions/one_time_permissions_tracker_factory.cc diff --git a/chrome/browser/ui/views/permissions/chip/chip_controller.cc b/chrome/browser/ui/views/permissions/chip/chip_controller.cc --- a/chrome/browser/ui/views/permissions/chip/chip_controller.cc +++ b/chrome/browser/ui/views/permissions/chip/chip_controller.cc -@@ -235,7 +235,7 @@ void ChipController::OnWidgetDestroyed(views::Widget* widget) { +@@ -224,7 +224,7 @@ void ChipController::OnWidgetDestroyed(views::Widget* widget) { active_chip_permission_request_manager_.value()->Accept(); break; case permissions::PermissionAction::GRANTED_ONCE: @@ -279,10 +279,10 @@ 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 -@@ -591,6 +591,11 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment - } +@@ -603,6 +603,11 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment } + @RequiresNonNull({"mSite"}) + private boolean isSessionPermission(@ContentSettingsType.EnumType int type) { + return mSite.getPermissionInfo(type) != null && + mSite.getPermissionInfo(type).getSessionModel() == SessionModel.USER_SESSION; @@ -290,8 +290,8 @@ 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(); -@@ -1156,6 +1161,10 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment + assumeNonNull(preference); +@@ -1195,6 +1200,10 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment AppCompatResources.getColorStateList(getContext(), mHighlightColor) .getDefaultColor()); } @@ -305,7 +305,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c 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 -@@ -200,7 +200,7 @@ void GetOrigins(JNIEnv* env, +@@ -208,7 +208,7 @@ void GetOrigins(JNIEnv* env, seen_origins.push_back(origin); insertionFunc(env, static_cast(content_type), list, ConvertOriginToJavaString(env, origin), jembedder, @@ -532,7 +532,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 -@@ -1206,6 +1206,8 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info, +@@ -1197,6 +1197,8 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info, permission_info.is_one_time = (info.metadata.session_model() == content_settings::mojom::SessionModel::ONE_TIME); @@ -555,15 +555,15 @@ diff --git a/components/page_info/page_info.h b/components/page_info/page_info.h diff --git a/components/permissions/android/java/src/org/chromium/components/permissions/PermissionDialogDelegate.java b/components/permissions/android/java/src/org/chromium/components/permissions/PermissionDialogDelegate.java --- a/components/permissions/android/java/src/org/chromium/components/permissions/PermissionDialogDelegate.java +++ b/components/permissions/android/java/src/org/chromium/components/permissions/PermissionDialogDelegate.java -@@ -13,6 +13,7 @@ import org.jni_zero.JNINamespace; - import org.jni_zero.NativeMethods; - +@@ -15,6 +15,7 @@ import org.jni_zero.NativeMethods; + import org.chromium.build.annotations.NullMarked; + import org.chromium.build.annotations.Nullable; import org.chromium.ui.base.WindowAndroid; +import org.chromium.components.content_settings.LifetimeMode; import java.util.ArrayList; import java.util.List; -@@ -63,6 +64,9 @@ public class PermissionDialogDelegate { +@@ -66,6 +67,9 @@ public class PermissionDialogDelegate { // Prompt(screen) variant we want to display on the dialog. private @EmbeddedPromptVariant int mEmbeddedPromptVariant; @@ -573,7 +573,7 @@ diff --git a/components/permissions/android/java/src/org/chromium/components/per /** * Defines a (potentially empty) list of ranges represented as pairs of , * which shall be used by the UI to format the specified ranges as bold text. -@@ -132,6 +136,15 @@ public class PermissionDialogDelegate { +@@ -135,6 +139,15 @@ public class PermissionDialogDelegate { .acceptThisTime(mNativeDelegatePtr, PermissionDialogDelegate.this); } @@ -592,7 +592,7 @@ diff --git a/components/permissions/android/java/src/org/chromium/components/per diff --git a/components/permissions/android/java/src/org/chromium/components/permissions/PermissionDialogModelFactory.java b/components/permissions/android/java/src/org/chromium/components/permissions/PermissionDialogModelFactory.java --- a/components/permissions/android/java/src/org/chromium/components/permissions/PermissionDialogModelFactory.java +++ b/components/permissions/android/java/src/org/chromium/components/permissions/PermissionDialogModelFactory.java -@@ -12,6 +12,18 @@ import org.chromium.ui.UiUtils; +@@ -13,6 +13,18 @@ import org.chromium.ui.UiUtils; import org.chromium.ui.modaldialog.ModalDialogProperties; import org.chromium.ui.modelutil.PropertyModel; @@ -609,9 +609,9 @@ diff --git a/components/permissions/android/java/src/org/chromium/components/per +import org.chromium.components.content_settings.LifetimeMode; + /** This class creates the model for the permission dialog. */ + @NullMarked class PermissionDialogModelFactory { - public static PropertyModel getModel( -@@ -65,7 +77,75 @@ class PermissionDialogModelFactory { +@@ -67,7 +79,75 @@ class PermissionDialogModelFactory { ModalDialogProperties.ButtonStyles.PRIMARY_FILLED_NEGATIVE_OUTLINE) .with(ModalDialogProperties.CHANGE_CUSTOM_VIEW_OR_BUTTONS, true); } @@ -691,7 +691,7 @@ diff --git a/components/permissions/android/java/src/org/chromium/components/per diff --git a/components/permissions/android/permission_prompt/embedded_permission_prompt_android.cc b/components/permissions/android/permission_prompt/embedded_permission_prompt_android.cc --- a/components/permissions/android/permission_prompt/embedded_permission_prompt_android.cc +++ b/components/permissions/android/permission_prompt/embedded_permission_prompt_android.cc -@@ -105,7 +105,8 @@ void EmbeddedPermissionPromptAndroid::Acknowledge() { +@@ -109,7 +109,8 @@ void EmbeddedPermissionPromptAndroid::Acknowledge() { delegate()->FinalizeCurrentRequests(); } @@ -704,7 +704,7 @@ diff --git a/components/permissions/android/permission_prompt/embedded_permissio diff --git a/components/permissions/android/permission_prompt/embedded_permission_prompt_android.h b/components/permissions/android/permission_prompt/embedded_permission_prompt_android.h --- a/components/permissions/android/permission_prompt/embedded_permission_prompt_android.h +++ b/components/permissions/android/permission_prompt/embedded_permission_prompt_android.h -@@ -43,7 +43,7 @@ class EmbeddedPermissionPromptAndroid : public PermissionPromptAndroid { +@@ -44,7 +44,7 @@ class EmbeddedPermissionPromptAndroid : public PermissionPromptAndroid { const override; void Closing() override; void Accept() override; @@ -1378,7 +1378,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p request); } -@@ -1558,7 +1569,7 @@ void PermissionRequestManager::DoAutoResponseForTesting() { +@@ -1562,7 +1573,7 @@ void PermissionRequestManager::DoAutoResponseForTesting() { } switch (auto_response_for_test_) { case ACCEPT_ONCE: @@ -1402,7 +1402,7 @@ diff --git a/components/permissions/permission_request_manager.h b/components/pe void Dismiss() override; void Ignore() override; void FinalizeCurrentRequests() override; -@@ -374,9 +376,12 @@ class PermissionRequestManager +@@ -383,9 +385,12 @@ class PermissionRequestManager // Calls PermissionGranted on a request and all its duplicates. void PermissionGrantedIncludingDuplicates(PermissionRequest* request, diff --git a/build/patches/Add-menu-item-to-bookmark-all-tabs.patch b/build/patches/Add-menu-item-to-bookmark-all-tabs.patch index 39eb971a..e39840c0 100644 --- a/build/patches/Add-menu-item-to-bookmark-all-tabs.patch +++ b/build/patches/Add-menu-item-to-bookmark-all-tabs.patch @@ -4,32 +4,32 @@ Subject: Add menu item to bookmark all tabs License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - chrome/android/java/res/menu/main_menu.xml | 7 ++ - .../chrome/browser/ChromeTabbedActivity.java | 24 +++++++ - .../browser/bookmarks/BookmarkBridge.java | 67 +++++++++++++++++++ - .../bookmarks/android/bookmark_bridge.cc | 42 ++++++++++++ - .../bookmarks/android/bookmark_bridge.h | 8 +++ - .../browser/bookmarks/bookmark_html_writer.cc | 14 +++- - .../bookmark_merged_surface_service.cc | 3 + + chrome/android/java/res/menu/main_menu.xml | 7 +++ + .../chrome/browser/ChromeTabbedActivity.java | 43 +++++++++++++++++++ + .../bookmarks/android/bookmark_bridge.cc | 42 ++++++++++++++++++ + .../bookmarks/android/bookmark_bridge.h | 8 ++++ + .../browser/bookmarks/BookmarkBridge.java | 41 ++++++++++++++++++ + .../browser/bookmarks/bookmark_html_writer.cc | 14 +++++- + .../bookmark_merged_surface_service.cc | 3 ++ .../permanent_folder_ordering_tracker.cc | 2 + .../dialogs/DownloadLocationCustomView.java | 4 +- - .../strings/android_chrome_strings.grd | 3 + + .../strings/android_chrome_strings.grd | 3 ++ .../bookmark_ui_operations_helper.cc | 2 + - components/bookmark_bar_strings.grdp | 6 ++ - .../bookmarks/browser/bookmark_codec.cc | 20 +++++- - components/bookmarks/browser/bookmark_codec.h | 7 +- - .../browser/bookmark_load_details.cc | 14 +++- + components/bookmark_bar_strings.grdp | 6 +++ + .../bookmarks/browser/bookmark_codec.cc | 20 +++++++-- + components/bookmarks/browser/bookmark_codec.h | 7 ++- + .../browser/bookmark_load_details.cc | 14 ++++-- .../bookmarks/browser/bookmark_load_details.h | 2 + .../bookmarks/browser/bookmark_model.cc | 3 +- - components/bookmarks/browser/bookmark_model.h | 7 ++ - components/bookmarks/browser/bookmark_node.cc | 11 +++ - components/bookmarks/browser/bookmark_node.h | 3 + + components/bookmarks/browser/bookmark_model.h | 7 +++ + components/bookmarks/browser/bookmark_node.cc | 11 +++++ + components/bookmarks/browser/bookmark_node.h | 3 ++ .../bookmarks/browser/bookmark_storage.cc | 2 + - .../bookmarks/browser/bookmark_uuids.cc | 3 + + .../bookmarks/browser/bookmark_uuids.cc | 3 ++ components/bookmarks/browser/bookmark_uuids.h | 1 + - components/bookmarks/browser/model_loader.cc | 8 ++- + components/bookmarks/browser/model_loader.cc | 8 +++- .../bookmark_specifics_conversions.cc | 1 + - 25 files changed, 250 insertions(+), 14 deletions(-) + 25 files changed, 243 insertions(+), 14 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 @@ -45,7 +45,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re -@@ -189,6 +193,9 @@ found in the LICENSE file. +@@ -198,6 +202,9 @@ found in the LICENSE file. @@ -66,7 +66,25 @@ 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; -@@ -3053,6 +3054,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn +@@ -253,12 +254,17 @@ import org.chromium.chrome.browser.ui.RootUiCoordinator; + import org.chromium.chrome.browser.ui.appmenu.AppMenuPropertiesDelegate; + import org.chromium.chrome.browser.ui.desktop_windowing.AppHeaderUtils; + import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeUtils; ++import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar; ++import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager; ++import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarController; + import org.chromium.chrome.browser.ui.searchactivityutils.SearchActivityClient; + import org.chromium.chrome.browser.ui.searchactivityutils.SearchActivityExtras.IntentOrigin; + import org.chromium.chrome.browser.undo_tab_close_snackbar.UndoBarController; + import org.chromium.chrome.browser.usage_stats.UsageStatsService; + import org.chromium.chrome.browser.util.ChromeAccessibilityUtil; + import org.chromium.chrome.browser.xr.XrLayoutStateObserver; ++import org.chromium.components.bookmarks.BookmarkId; ++import org.chromium.components.bookmarks.BookmarkItem; + import org.chromium.components.browser_ui.bottomsheet.BottomSheetController; + import org.chromium.components.browser_ui.edge_to_edge.SystemBarColorHelper; + import org.chromium.components.browser_ui.edge_to_edge.TabbedSystemBarColorHelper; +@@ -3103,6 +3109,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn getTabModelSelectorSupplier().get(), closeAllTabsRunnable); RecordUserAction.record("MobileMenuCloseAllTabs"); @@ -75,7 +93,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct } else if (id == R.id.close_all_incognito_tabs_menu_id) { // Close only incognito tabs Runnable closeAllTabsRunnable = -@@ -3138,6 +3141,27 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn +@@ -3191,6 +3199,41 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn getTabModalLifetimeHandler().onOmniboxFocusChanged(hasFocus); } @@ -94,134 +112,29 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct + if (tab.isNativePage()) { + continue; + } -+ bookmarkModel.addToTabsCollection(this, tab); ++ bookmarkModel.addToTabsCollection(tab); + } -+ bookmarkModel.finishedAddingToTabsCollection(this, getSnackbarManager()); ++ BookmarkId parent = bookmarkModel.getTabsCollectionFolderId(); ++ BookmarkItem bookmarkItem = bookmarkModel.getBookmarkById(parent); ++ String folderName = ""; ++ if (bookmarkItem != null) { ++ folderName = bookmarkItem.getTitle(); ++ } ++ SnackbarController snackbarController = new SnackbarController() { ++ @Override ++ public void onAction(Object actionData) { ++ } ++ }; ++ Snackbar snackbar = Snackbar.make(folderName, snackbarController, Snackbar.TYPE_ACTION, ++ Snackbar.UMA_BOOKMARK_ADDED) ++ .setTemplateText(getString(R.string.bookmark_page_saved_folder)); ++ getSnackbarManager().showSnackbar(snackbar); + }); + } + private void recordLauncherShortcutAction(boolean isIncognito) { if (isIncognito) { RecordUserAction.record("Android.LauncherShortcut.NewIncognitoTab"); -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java -@@ -17,6 +17,7 @@ import org.jni_zero.JniType; - import org.jni_zero.NativeMethods; - - import org.chromium.base.ContextUtils; -+import org.chromium.base.Log; - import org.chromium.base.ObserverList; - import org.chromium.base.ThreadUtils; - import org.chromium.base.metrics.RecordUserAction; -@@ -24,6 +25,11 @@ import org.chromium.base.supplier.Supplier; - import org.chromium.chrome.browser.partnerbookmarks.PartnerBookmark; - import org.chromium.chrome.browser.partnerbookmarks.PartnerBookmarksShim; - import org.chromium.chrome.browser.profiles.Profile; -+import org.chromium.chrome.browser.tab.Tab; -+import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar; -+import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager; -+import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarController; -+import org.chromium.chrome.R; - import org.chromium.components.bookmarks.BookmarkId; - import org.chromium.components.bookmarks.BookmarkItem; - import org.chromium.components.bookmarks.BookmarkType; -@@ -83,6 +89,8 @@ import org.chromium.ui.modaldialog.DialogDismissalCause; - class BookmarkBridge { - private final ObserverList mObservers = new ObserverList<>(); - -+ private static final String TAG = "BookmarkBridge"; -+ - private long mNativeBookmarkBridge; - private Profile mProfile; - private boolean mIsDoingExtensiveChanges; -@@ -411,6 +419,16 @@ class BookmarkBridge { - return mMobileFolderId; - } - -+ /** -+ * @return The BookmarkId for the Tabs collecction folder node -+ */ -+ public BookmarkId getTabsCollectionFolderId() { -+ ThreadUtils.assertOnUiThread(); -+ assert mIsNativeBookmarkModelLoaded; -+ return BookmarkBridgeJni.get().getTabsCollectionFolderId( -+ mNativeBookmarkBridge, BookmarkBridge.this); -+ } -+ - /** Returns Id representing the special "other" folder from bookmark model. */ - public BookmarkId getOtherFolderId() { - ThreadUtils.assertOnUiThread(); -@@ -1132,6 +1150,50 @@ class BookmarkBridge { - .addToReadingList(mNativeBookmarkBridge, parentId, title, url); - } - -+ // Used to bookmark all tabs in a specific folder, created if not existing -+ public BookmarkId addToTabsCollection(Context context, Tab tab) { -+ BookmarkId parent = getTabsCollectionFolderId(); -+ BookmarkId existingId = BookmarkBridgeJni.get().getBookmarkIdForTabsCollection( -+ mNativeBookmarkBridge, tab.getOriginalUrl()); -+ if (existingId != null && existingId.getId() != BookmarkId.INVALID_ID) { -+ BookmarkId existingBookmarkId = new BookmarkId(existingId.getId(), BookmarkType.NORMAL); -+ BookmarkItem existingBookmark = getBookmarkById(existingBookmarkId); -+ if (parent.equals(existingBookmark.getParentId())) { -+ // bookmark already exists in the tabs collection folder -+ return existingBookmarkId; -+ } -+ } -+ BookmarkId bookmarkId = -+ addBookmark(parent, getChildCount(parent), tab.getTitle(), tab.getUrl()); -+ -+ if (bookmarkId == null) { -+ Log.e(TAG, -+ "Failed to add bookmarks: parentTypeAndId %s", parent); -+ } -+ return bookmarkId; -+ } -+ -+ public void finishedAddingToTabsCollection(Activity activity, SnackbarManager snackbarManager) { -+ BookmarkId parent = getTabsCollectionFolderId(); -+ -+ BookmarkItem bookmarkItem = getBookmarkById(parent); -+ String folderName; -+ if (bookmarkItem != null) { -+ folderName = bookmarkItem.getTitle(); -+ } else { -+ folderName = ""; -+ } -+ SnackbarController snackbarController = new SnackbarController() { -+ @Override -+ public void onAction(Object actionData) { -+ } -+ }; -+ Snackbar snackbar = Snackbar.make(folderName, snackbarController, Snackbar.TYPE_ACTION, -+ Snackbar.UMA_BOOKMARK_ADDED) -+ .setTemplateText(activity.getString(R.string.bookmark_page_saved_folder)); -+ snackbarManager.showSnackbar(snackbar); -+ } -+ - /** - * Helper method to mark an item as read. - * -@@ -1345,6 +1407,9 @@ class BookmarkBridge { - BookmarkId getMostRecentlyAddedUserBookmarkIdForUrl( - long nativeBookmarkBridge, @JniType("GURL") GURL url); - -+ BookmarkId getBookmarkIdForTabsCollection( -+ long nativeBookmarkBridge, GURL url); -+ - BookmarkItem getBookmarkById(long nativeBookmarkBridge, long id, int type); - - void getTopLevelFolderIds( -@@ -1366,6 +1431,8 @@ class BookmarkBridge { - - BookmarkId getRootFolderId(long nativeBookmarkBridge); - -+ BookmarkId getTabsCollectionFolderId(long nativeBookmarkBridge, BookmarkBridge caller); -+ - BookmarkId getMobileFolderId(long nativeBookmarkBridge); - - BookmarkId getOtherFolderId(long nativeBookmarkBridge); diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browser/bookmarks/android/bookmark_bridge.cc --- a/chrome/browser/bookmarks/android/bookmark_bridge.cc +++ b/chrome/browser/bookmarks/android/bookmark_bridge.cc @@ -320,6 +233,99 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser base::android::ScopedJavaLocalRef AddFolder( JNIEnv* env, const base::android::JavaParamRef& j_parent_id_obj, +diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java +--- a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java ++++ b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java +@@ -18,6 +18,7 @@ import org.jni_zero.JniType; + import org.jni_zero.NativeMethods; + + import org.chromium.base.ContextUtils; ++import org.chromium.base.Log; + import org.chromium.base.ObserverList; + import org.chromium.base.ThreadUtils; + import org.chromium.base.metrics.RecordUserAction; +@@ -26,6 +27,7 @@ import org.chromium.chrome.browser.partnerbookmarks.PartnerBookmarksShim; + import org.chromium.chrome.browser.preferences.ChromePreferenceKeys; + import org.chromium.chrome.browser.preferences.ChromeSharedPreferences; + import org.chromium.chrome.browser.profiles.Profile; ++import org.chromium.chrome.browser.tab.Tab; + import org.chromium.components.bookmarks.BookmarkId; + import org.chromium.components.bookmarks.BookmarkItem; + import org.chromium.components.bookmarks.BookmarkType; +@@ -46,6 +48,7 @@ import java.util.function.BiConsumer; + class BookmarkBridge { + private static OneshotSupplierImpl + sPartnerBookmarkIteratorSupplier = new OneshotSupplierImpl<>(); ++ private static final String TAG = "BookmarkBridge"; + + private final ObserverList mObservers = new ObserverList<>(); + private final Profile mProfile; +@@ -383,6 +386,16 @@ class BookmarkBridge { + return mMobileFolderId; + } + ++ /** ++ * @return The BookmarkId for the Tabs collecction folder node ++ */ ++ public BookmarkId getTabsCollectionFolderId() { ++ ThreadUtils.assertOnUiThread(); ++ assert mIsNativeBookmarkModelLoaded; ++ return BookmarkBridgeJni.get().getTabsCollectionFolderId( ++ mNativeBookmarkBridge, BookmarkBridge.this); ++ } ++ + /** Returns Id representing the special "other" folder from bookmark model. */ + public BookmarkId getOtherFolderId() { + ThreadUtils.assertOnUiThread(); +@@ -894,6 +907,29 @@ class BookmarkBridge { + .addToReadingList(mNativeBookmarkBridge, parentId, title, url); + } + ++ // Used to bookmark all tabs in a specific folder, created if not existing ++ public BookmarkId addToTabsCollection(Tab tab) { ++ BookmarkId parent = getTabsCollectionFolderId(); ++ BookmarkId existingId = BookmarkBridgeJni.get().getBookmarkIdForTabsCollection( ++ mNativeBookmarkBridge, tab.getOriginalUrl()); ++ if (existingId != null && existingId.getId() != BookmarkId.INVALID_ID) { ++ BookmarkId existingBookmarkId = new BookmarkId(existingId.getId(), BookmarkType.NORMAL); ++ BookmarkItem existingBookmark = getBookmarkById(existingBookmarkId); ++ if (parent.equals(existingBookmark.getParentId())) { ++ // bookmark already exists in the tabs collection folder ++ return existingBookmarkId; ++ } ++ } ++ BookmarkId bookmarkId = ++ addBookmark(parent, getChildCount(parent), tab.getTitle(), tab.getUrl()); ++ ++ if (bookmarkId == null) { ++ Log.e(TAG, ++ "Failed to add bookmarks: parentTypeAndId %s", parent); ++ } ++ return bookmarkId; ++ } ++ + /** + * Helper method to mark an item as read. + * +@@ -1111,6 +1147,9 @@ class BookmarkBridge { + BookmarkId getMostRecentlyAddedUserBookmarkIdForUrl( + long nativeBookmarkBridge, @JniType("GURL") GURL url); + ++ BookmarkId getBookmarkIdForTabsCollection( ++ long nativeBookmarkBridge, GURL url); ++ + BookmarkItem getBookmarkById(long nativeBookmarkBridge, long id, int type); + + void getTopLevelFolderIds( +@@ -1132,6 +1171,8 @@ class BookmarkBridge { + + BookmarkId getRootFolderId(long nativeBookmarkBridge); + ++ BookmarkId getTabsCollectionFolderId(long nativeBookmarkBridge, BookmarkBridge caller); ++ + BookmarkId getMobileFolderId(long nativeBookmarkBridge); + + BookmarkId getOtherFolderId(long nativeBookmarkBridge); diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc --- a/chrome/browser/bookmarks/bookmark_html_writer.cc +++ b/chrome/browser/bookmarks/bookmark_html_writer.cc @@ -381,7 +387,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 -@@ -29,6 +29,7 @@ BookmarkParentFolder GetBookmarkParentFolderFromPermanentType( +@@ -32,6 +32,7 @@ BookmarkParentFolder GetBookmarkParentFolderFromPermanentType( BookmarkNode::Type type) { switch (type) { case bookmarks::BookmarkNode::URL: @@ -389,7 +395,7 @@ diff --git a/chrome/browser/bookmarks/bookmark_merged_surface_service.cc b/chrom NOTREACHED(); case bookmarks::BookmarkNode::FOLDER: // TODO(crbug.com/381252292): Consider extending type with a value -@@ -67,6 +68,8 @@ std::optional GetIfPermanentFolderType( +@@ -70,6 +71,8 @@ std::optional GetIfPermanentFolderType( case BookmarkNode::Type::URL: NOTREACHED(); @@ -409,7 +415,7 @@ diff --git a/chrome/browser/bookmarks/permanent_folder_ordering_tracker.cc b/chr NOTREACHED(); case bookmarks::BookmarkNode::BOOKMARK_BAR: -@@ -226,6 +227,7 @@ void PermanentFolderOrderingTracker::SetTrackedPermanentNodes() { +@@ -235,6 +236,7 @@ void PermanentFolderOrderingTracker::SetTrackedPermanentNodes() { switch (tracked_type_) { case bookmarks::BookmarkNode::URL: case bookmarks::BookmarkNode::FOLDER: @@ -441,7 +447,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 -@@ -4447,6 +4447,9 @@ To change this setting, BEGIN_LINKdelete the Chrome d +@@ -4487,6 +4487,9 @@ To change this setting, BEGIN_LINKdelete the Chrome d Select tabs @@ -716,7 +722,7 @@ diff --git a/components/bookmarks/browser/bookmark_load_details.h b/components/b diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmarks/browser/bookmark_model.cc --- a/components/bookmarks/browser/bookmark_model.cc +++ b/components/bookmarks/browser/bookmark_model.cc -@@ -809,7 +809,7 @@ bool BookmarkModel::HasBookmarks() const { +@@ -835,7 +835,7 @@ bool BookmarkModel::HasBookmarks() const { bool BookmarkModel::HasNoUserCreatedBookmarksOrFolders() const { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); return bookmark_bar_node_->children().empty() && @@ -725,7 +731,7 @@ diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmar } bool BookmarkModel::IsBookmarked(const GURL& url) const { -@@ -1141,6 +1141,7 @@ void BookmarkModel::DoneLoading(std::unique_ptr details) { +@@ -1167,6 +1167,7 @@ void BookmarkModel::DoneLoading(std::unique_ptr details) { bookmark_bar_node_ = details->bb_node(); other_node_ = details->other_folder_node(); mobile_node_ = details->mobile_folder_node(); @@ -749,7 +755,7 @@ diff --git a/components/bookmarks/browser/bookmark_model.h b/components/bookmark bool is_root_node(const BookmarkNode* node) const { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); return node == root_; -@@ -602,6 +608,7 @@ class BookmarkModel : public BookmarkUndoProvider, +@@ -611,6 +617,7 @@ class BookmarkModel : public BookmarkUndoProvider, raw_ptr account_bookmark_bar_node_ = nullptr; raw_ptr account_other_node_ = nullptr; raw_ptr account_mobile_node_ = nullptr; @@ -796,7 +802,7 @@ diff --git a/components/bookmarks/browser/bookmark_node.h b/components/bookmarks MOBILE }; -@@ -241,6 +242,8 @@ class BookmarkPermanentNode : public BookmarkNode { +@@ -247,6 +248,8 @@ class BookmarkPermanentNode : public BookmarkNode { int64_t id); static std::unique_ptr CreateMobileBookmarks( int64_t id); diff --git a/build/patches/Add-menu-item-to-view-source.patch b/build/patches/Add-menu-item-to-view-source.patch index ea0b015f..d7424b04 100644 --- a/build/patches/Add-menu-item-to-view-source.patch +++ b/build/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 -@@ -119,6 +119,9 @@ found in the LICENSE file. +@@ -125,6 +125,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 -@@ -3086,6 +3086,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn +@@ -3135,6 +3135,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_DOWNLOADS_MANAGER); } RecordUserAction.record("MobileMenuDownloadManager"); @@ -54,7 +54,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct 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 -@@ -2524,6 +2524,11 @@ public abstract class ChromeActivity extends AsyncInitializationActivity +@@ -2531,6 +2531,11 @@ public abstract class ChromeActivity extends AsyncInitializationActivity 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 -@@ -580,6 +580,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -587,6 +587,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); -@@ -1293,6 +1294,23 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -1328,6 +1329,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 -@@ -303,6 +303,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat +@@ -304,6 +304,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat updateRequestDesktopSiteMenuItem( menu, currentTab, requestDesktopSiteVisible, isNativePage); diff --git a/build/patches/Add-option-to-disable-snapshots.patch b/build/patches/Add-option-to-disable-snapshots.patch index 2e68fd03..f84348e4 100644 --- a/build/patches/Add-option-to-disable-snapshots.patch +++ b/build/patches/Add-option-to-disable-snapshots.patch @@ -15,7 +15,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java -@@ -408,7 +408,12 @@ class TabGridViewBinder { +@@ -404,7 +404,12 @@ class TabGridViewBinder { if (result != null) { TabUtils.setDrawableAndUpdateImageMatrix(thumbnail, result, thumbnailSize); } else { @@ -29,7 +29,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser } }; if (sThumbnailFetcherForTesting != null) { -@@ -449,6 +454,7 @@ class TabGridViewBinder { +@@ -445,6 +450,7 @@ class TabGridViewBinder { */ private static void setFavicon( ImageView faviconView, PropertyModel model, TabListFaviconProvider.TabFavicon favicon) { @@ -84,7 +84,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/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 -@@ -139,6 +139,7 @@ import org.chromium.chrome.browser.preferences.ChromePreferenceKeys; +@@ -141,6 +141,7 @@ import org.chromium.chrome.browser.preferences.ChromePreferenceKeys; import org.chromium.chrome.browser.preferences.ChromeSharedPreferences; import org.chromium.chrome.browser.preferences.Pref; import org.chromium.chrome.browser.printing.TabPrinter; @@ -92,7 +92,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.profiles.ProfileManager; import org.chromium.chrome.browser.profiles.ProfileProvider; -@@ -612,7 +613,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity +@@ -613,7 +614,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity new TabContentManager( this, mBrowserControlsManagerSupplier.get(), @@ -199,7 +199,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 -@@ -5954,6 +5954,14 @@ To change this setting, BEGIN_LINKdelete the Chrome d +@@ -6016,6 +6016,14 @@ To change this setting, BEGIN_LINKdelete the Chrome d Your %1$swww.amazon.com timer ran out. It'll start again tomorrow. diff --git a/build/patches/Add-option-to-force-tablet-UI.patch b/build/patches/Add-option-to-force-tablet-UI.patch index 0ec3592a..892dc610 100644 --- a/build/patches/Add-option-to-force-tablet-UI.patch +++ b/build/patches/Add-option-to-force-tablet-UI.patch @@ -169,7 +169,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 -@@ -758,7 +758,9 @@ public abstract class ChromeActivity extends AsyncInitializationActivity +@@ -759,7 +759,9 @@ public abstract class ChromeActivity extends AsyncInitializationActivity // Inflate the correct toolbar layout for the device. int toolbarLayoutId = getToolbarLayoutId(); if (toolbarLayoutId != ActivityUtils.NO_RESOURCE_ID && controlContainer != null) { @@ -183,15 +183,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 -@@ -114,6 +114,7 @@ import org.chromium.components.tab_group_sync.SavedTabGroup; - import org.chromium.components.tab_group_sync.TabGroupSyncService; +@@ -115,6 +115,7 @@ import org.chromium.components.tab_group_sync.TabGroupSyncService; + import org.chromium.components.tab_group_sync.TriggerSource; 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.modaldialog.ModalDialogManager; -@@ -4060,8 +4061,13 @@ public class StripLayoutHelper +@@ -4113,8 +4114,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(); @@ -210,7 +210,7 @@ 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 -@@ -94,6 +94,7 @@ import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateMa +@@ -93,6 +93,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; @@ -218,7 +218,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over import org.chromium.ui.base.LocalizationUtils; import org.chromium.ui.base.PageTransition; import org.chromium.ui.base.WindowAndroid; -@@ -453,7 +454,10 @@ public class StripLayoutHelperManager +@@ -450,7 +451,10 @@ public class StripLayoutHelperManager mIsLayoutOptimizationsEnabled = ToolbarFeatures.isTabStripWindowLayoutOptimizationEnabled(true); @@ -252,7 +252,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 -@@ -620,7 +620,9 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -664,7 +664,9 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { @Override public int getControlContainerHeightResource() { @@ -266,16 +266,16 @@ 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 -@@ -109,6 +109,8 @@ import org.chromium.chrome.browser.paint_preview.DemoPaintPreview; +@@ -100,6 +100,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; +import org.chromium.chrome.browser.preferences.ChromePreferenceKeys; +import org.chromium.chrome.browser.preferences.ChromeSharedPreferences; - import org.chromium.chrome.browser.price_insights.PriceInsightsButtonController; - import org.chromium.chrome.browser.price_tracking.CurrentTabPriceTrackingStateSupplier; - import org.chromium.chrome.browser.price_tracking.PriceTrackingButtonController; -@@ -1777,7 +1779,9 @@ public class RootUiCoordinator + import org.chromium.chrome.browser.profiles.Profile; + import org.chromium.chrome.browser.quick_delete.QuickDeleteController; + import org.chromium.chrome.browser.quick_delete.QuickDeleteDelegateImpl; +@@ -1616,7 +1618,9 @@ public class RootUiCoordinator if (!mSupportsFindInPageSupplier.getAsBoolean()) return; int stubId = R.id.find_toolbar_stub; @@ -300,7 +300,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 -@@ -280,6 +280,7 @@ public final class ChromePreferenceKeys { +@@ -286,6 +286,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"; @@ -351,7 +351,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro 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 --- 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 -@@ -35,6 +35,7 @@ import org.chromium.chrome.browser.ui.desktop_windowing.AppHeaderUtils.Windowing +@@ -38,6 +38,7 @@ import org.chromium.chrome.browser.ui.desktop_windowing.AppHeaderUtils.Windowing import org.chromium.components.browser_ui.desktop_windowing.AppHeaderState; import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateManager; import org.chromium.components.browser_ui.edge_to_edge.EdgeToEdgeStateProvider; @@ -359,7 +359,7 @@ diff --git a/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/c import org.chromium.ui.InsetObserver; import org.chromium.ui.InsetObserver.WindowInsetsConsumer; import org.chromium.ui.InsetsRectProvider; -@@ -260,6 +261,7 @@ public class AppHeaderCoordinator +@@ -266,6 +267,7 @@ public class AppHeaderCoordinator private static @DesktopWindowHeuristicResult int checkIsInDesktopWindow( InsetsRectProvider insetsRectProvider, @DesktopWindowHeuristicResult int currentResult) { @@ -370,7 +370,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 -@@ -799,7 +799,7 @@ public class LocationBarCoordinator +@@ -790,7 +790,7 @@ public class LocationBarCoordinator } private boolean isTabletWindow() { @@ -382,7 +382,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 -@@ -1657,6 +1657,13 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1671,6 +1671,13 @@ Your Google account may have other forms of browsing history like searches and a Hide your IP address @@ -499,7 +499,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; -@@ -143,8 +144,25 @@ public class ToolbarControlContainer extends OptimizedFrameLayout +@@ -144,8 +145,25 @@ public class ToolbarControlContainer extends OptimizedFrameLayout } @Override @@ -529,15 +529,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 -@@ -63,6 +63,7 @@ import org.chromium.chrome.browser.util.BrowserUiUtils; - import org.chromium.chrome.browser.util.BrowserUiUtils.ModuleTypeOnStartAndNtp; +@@ -63,6 +63,7 @@ import org.chromium.chrome.browser.util.BrowserUiUtils.ModuleTypeOnStartAndNtp; import org.chromium.components.feature_engagement.Tracker; + import org.chromium.ui.MotionEventUtils; import org.chromium.ui.base.ViewUtils; +import org.chromium.ui.base.DeviceFormFactor; import org.chromium.ui.util.TokenHolder; import org.chromium.url.GURL; -@@ -590,7 +591,9 @@ public abstract class ToolbarLayout extends FrameLayout +@@ -583,7 +584,9 @@ public abstract class ToolbarLayout extends FrameLayout * not have a tab strip. */ protected int getTabStripHeightFromResource() { @@ -559,7 +559,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow import org.chromium.ui.resources.dynamics.DynamicResourceReadyOnceCallback; import org.chromium.ui.util.TokenHolder; -@@ -559,6 +560,7 @@ class HeightTransitionHandler { +@@ -556,6 +557,7 @@ class HeightTransitionHandler { if (TabStripTransitionCoordinator.sHeightTransitionThresholdForTesting != null) { return TabStripTransitionCoordinator.sHeightTransitionThresholdForTesting; } @@ -578,7 +578,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow /** Class used to manage tab strip visibility and height updates. */ public class TabStripTransitionCoordinator implements ComponentCallbacks, AppHeaderObserver { -@@ -153,7 +154,10 @@ public class TabStripTransitionCoordinator implements ComponentCallbacks, AppHea +@@ -154,7 +155,10 @@ public class TabStripTransitionCoordinator implements ComponentCallbacks, AppHea mTabStripReservedTopPadding = controlContainerView() .getResources() @@ -639,7 +639,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c Preference captions = findPreference(PREF_CAPTIONS); captions.setOnPreferenceClickListener( preference -> { -@@ -165,6 +175,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment +@@ -163,6 +173,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment public boolean onPreferenceChange(Preference preference, Object newValue) { if (PREF_FORCE_ENABLE_ZOOM.equals(preference.getKey())) { mDelegate.getForceEnableZoomAccessibilityDelegate().setValue((Boolean) newValue); diff --git a/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch b/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch index 286ce005..24e3a967 100644 --- a/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch +++ b/build/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; -@@ -1666,8 +1667,10 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn +@@ -1695,8 +1696,10 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn boolean hadCipherData = CipherLazyHolder.sCipherInstance.restoreFromBundle(getSavedInstanceState()); @@ -105,7 +105,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 -@@ -5479,6 +5479,12 @@ To change this setting, BEGIN_LINKdelete the Chrome d +@@ -5541,6 +5541,12 @@ To change this setting, BEGIN_LINKdelete the Chrome d IMAGE diff --git a/build/patches/Add-option-to-use-home-page-as-NTP.patch b/build/patches/Add-option-to-use-home-page-as-NTP.patch index 19ba9f2b..aae0e8e1 100644 --- a/build/patches/Add-option-to-use-home-page-as-NTP.patch +++ b/build/patches/Add-option-to-use-home-page-as-NTP.patch @@ -34,7 +34,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser /** * A mediator for the TabGridDialog component, responsible for communicating with the components' * coordinator as well as managing the business logic for dialog show/hide. -@@ -918,9 +921,15 @@ public class TabGridDialogMediator +@@ -930,9 +933,15 @@ public class TabGridDialogMediator return; } @@ -54,15 +54,15 @@ 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/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 -@@ -25,6 +25,7 @@ import org.chromium.chrome.browser.collaboration.CollaborationServiceFactory; +@@ -34,6 +34,7 @@ import org.chromium.chrome.browser.collaboration.CollaborationServiceFactory; 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; -+import org.chromium.chrome.browser.homepage.HomepageManager; import org.chromium.chrome.browser.layouts.LayoutStateProvider; ++import org.chromium.chrome.browser.homepage.HomepageManager; import org.chromium.chrome.browser.layouts.LayoutStateProvider.LayoutStateObserver; import org.chromium.chrome.browser.layouts.LayoutType; -@@ -366,10 +367,15 @@ public class TabGroupUiMediator implements BackPressHandler, ThemeColorObserver, + import org.chromium.chrome.browser.profiles.Profile; +@@ -401,10 +402,15 @@ public class TabGroupUiMediator implements BackPressHandler, ThemeColorObserver, assert relatedTabs.size() > 0; Tab parentTabToAttach = relatedTabs.get(relatedTabs.size() - 1); @@ -107,7 +107,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over /** * A coordinator for the context menu on the tab strip by long-pressing on the group titles. It is * responsible for creating a list of menu items, setting up the menu and displaying the menu. -@@ -197,9 +200,15 @@ public class TabGroupContextMenuCoordinator extends TabGroupOverflowMenuCoordina +@@ -199,9 +202,15 @@ public class TabGroupContextMenuCoordinator extends TabGroupOverflowMenuCoordina /* didCloseCallback= */ null); recordUserAction("DeleteGroup"); } else if (menuId == org.chromium.chrome.R.id.open_new_tab_in_group) { @@ -208,7 +208,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome import org.chromium.chrome.browser.prefetch.settings.PreloadPagesSettingsBridge; import org.chromium.chrome.browser.prefetch.settings.PreloadPagesState; import org.chromium.chrome.browser.profiles.Profile; -@@ -485,6 +486,13 @@ public class ChromeTabCreator extends TabCreator { +@@ -487,6 +488,13 @@ public class ChromeTabCreator extends TabCreator { * @return the created tab. */ public Tab launchUrl(String url, @TabLaunchType int type, Intent intent, long intentTimestamp) { @@ -225,7 +225,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 -@@ -293,6 +293,7 @@ public final class ChromePreferenceKeys { +@@ -299,6 +299,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"; @@ -247,7 +247,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 -@@ -1478,6 +1478,9 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1492,6 +1492,9 @@ Your Google account may have other forms of browsing history like searches and a Last hour @@ -272,9 +272,9 @@ 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 -@@ -1326,6 +1326,10 @@ inline constexpr char kShowHomeButton[] = "browser.show_home_button"; - // toolbar. - inline constexpr char kShowForwardButton[] = "browser.show_forward_button"; +@@ -1319,6 +1319,10 @@ inline constexpr char kShowForwardButton[] = "browser.show_forward_button"; + // by enterprise policy. + inline constexpr char kGeminiSettings[] = "browser.gemini_settings"; +// A boolean specifying whether opening a new tab should open the Home page +// instead of the New Tab page. diff --git a/build/patches/Add-search-engine.patch b/build/patches/Add-search-engine.patch index 797e7b8f..26d7de69 100644 --- a/build/patches/Add-search-engine.patch +++ b/build/patches/Add-search-engine.patch @@ -68,7 +68,7 @@ diff --git a/components/resources/search_engine_choice_scaled_resources.grdp b/c diff --git a/components/search_engines/BUILD.gn b/components/search_engines/BUILD.gn --- a/components/search_engines/BUILD.gn +++ b/components/search_engines/BUILD.gn -@@ -70,6 +70,7 @@ static_library("search_engines") { +@@ -72,6 +72,7 @@ static_library("search_engines") { "//third_party/metrics_proto", "//third_party/omnibox_proto", "//third_party/search_engines_data:prepopulated_engines", @@ -76,7 +76,7 @@ diff --git a/components/search_engines/BUILD.gn b/components/search_engines/BUIL ] deps = [ -@@ -155,6 +156,7 @@ source_set("search_engine_utils") { +@@ -157,6 +158,7 @@ source_set("search_engine_utils") { ":search_engine_type", "//components/google/core/common", "//third_party/search_engines_data:prepopulated_engines", @@ -84,7 +84,7 @@ diff --git a/components/search_engines/BUILD.gn b/components/search_engines/BUIL ] deps = [ "//url" ] -@@ -235,6 +237,7 @@ source_set("unit_tests") { +@@ -237,6 +239,7 @@ source_set("unit_tests") { "//testing/gmock", "//testing/gtest", "//third_party/search_engines_data:prepopulated_engines", @@ -169,7 +169,7 @@ diff --git a/components/search_engines/search_engine_choice/search_engine_choice diff --git a/components/search_engines/search_engine_countries-inc.cc b/components/search_engines/search_engine_countries-inc.cc --- a/components/search_engines/search_engine_countries-inc.cc +++ b/components/search_engines/search_engine_countries-inc.cc -@@ -1452,5 +1452,7 @@ const std::vector GetPrepopulationSetFromCountryID( +@@ -1453,5 +1453,7 @@ const std::vector GetPrepopulationSetFromCountryID( for (size_t i = 0; i < num_engines; i++) { t_url.push_back(engines[i]); } @@ -180,12 +180,12 @@ diff --git a/components/search_engines/search_engine_countries-inc.cc b/componen diff --git a/components/search_engines/search_engine_type.h b/components/search_engines/search_engine_type.h --- a/components/search_engines/search_engine_type.h +++ b/components/search_engines/search_engine_type.h -@@ -91,10 +91,15 @@ enum SearchEngineType { - SEARCH_ENGINE_YOU = 72, - SEARCH_ENGINE_STARTER_PACK_GEMINI = 73, - SEARCH_ENGINE_LILO = 74, -+ SEARCH_ENGINE_GOOGLE_EN = 75, -+ SEARCH_ENGINE_DUCKDUCKGOLIGHT = 76, +@@ -94,10 +94,15 @@ enum SearchEngineType { + SEARCH_ENGINE_STARTPAGE = 75, + SEARCH_ENGINE_STARTER_PACK_PAGE = 76, + SEARCH_ENGINE_MCAFEE = 77, ++ SEARCH_ENGINE_GOOGLE_EN = 78, ++ SEARCH_ENGINE_DUCKDUCKGOLIGHT = 79, SEARCH_ENGINE_MAX // Bounding value needed for UMA histogram macro. }; @@ -199,7 +199,7 @@ diff --git a/components/search_engines/search_engine_type.h b/components/search_ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc --- a/components/search_engines/template_url_prepopulate_data.cc +++ b/components/search_engines/template_url_prepopulate_data.cc -@@ -29,6 +29,8 @@ +@@ -28,6 +28,8 @@ #include "components/version_info/version_info.h" #include "third_party/search_engines_data/resources/definitions/prepopulated_engines.h" @@ -208,7 +208,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon namespace TemplateURLPrepopulateData { // Helpers -------------------------------------------------------------------- -@@ -78,7 +80,6 @@ GetPrepopulatedEnginesForEeaRegionCountries(int country_id, +@@ -67,7 +69,6 @@ GetPrepopulatedEnginesForEeaRegionCountries(CountryID country_id, generator.seed(profile_seed); std::shuffle(t_urls.begin(), t_urls.end(), generator); @@ -219,7 +219,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon diff --git a/components/search_engines/template_url_prepopulate_data.h b/components/search_engines/template_url_prepopulate_data.h --- a/components/search_engines/template_url_prepopulate_data.h +++ b/components/search_engines/template_url_prepopulate_data.h -@@ -32,13 +32,6 @@ struct PrepopulatedEngine; +@@ -31,13 +31,6 @@ struct PrepopulatedEngine; extern const int kMaxPrepopulatedEngineID; diff --git a/build/patches/Add-setting-to-clear-data-on-exit.patch b/build/patches/Add-setting-to-clear-data-on-exit.patch index f43012c9..bd6a4167 100644 --- a/build/patches/Add-setting-to-clear-data-on-exit.patch +++ b/build/patches/Add-setting-to-clear-data-on-exit.patch @@ -33,7 +33,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html components/browsing_data/core/pref_names.cc | 17 ++++ components/browsing_data/core/pref_names.h | 10 +++ .../search_engines/template_url_service.cc | 1 + - content/browser/dips/dips_service_impl.cc | 2 +- + content/browser/btm/btm_service_impl.cc | 2 +- content/browser/storage_partition_impl.cc | 1 + .../public/browser/browsing_data_remover.h | 7 +- 32 files changed, 386 insertions(+), 33 deletions(-) @@ -43,7 +43,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html 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 -@@ -322,6 +322,7 @@ chrome_java_sources = [ +@@ -253,6 +253,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataCheckBoxPreference.java", "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFetcher.java", "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java", @@ -69,7 +69,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/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 -@@ -184,6 +184,7 @@ import org.chromium.chrome.browser.profiles.ProfileProvider; +@@ -186,6 +186,7 @@ import org.chromium.chrome.browser.profiles.ProfileProvider; import org.chromium.chrome.browser.quick_delete.QuickDeleteController; import org.chromium.chrome.browser.quick_delete.QuickDeleteDelegateImpl; import org.chromium.chrome.browser.quick_delete.QuickDeleteMetricsDelegate; @@ -77,7 +77,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct import org.chromium.chrome.browser.read_later.ReadingListBackPressHandler; import org.chromium.chrome.browser.recent_tabs.CrossDevicePaneFactory; import org.chromium.chrome.browser.reengagement.ReengagementNotificationController; -@@ -1666,7 +1667,11 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn +@@ -1700,7 +1701,11 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn Intent intent = getIntent(); boolean hadCipherData = @@ -329,7 +329,7 @@ new file mode 100644 diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp --- a/chrome/app/settings_strings.grdp +++ b/chrome/app/settings_strings.grdp -@@ -2203,6 +2203,16 @@ +@@ -2200,6 +2200,16 @@ Delete browsing data @@ -443,7 +443,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager. diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc --- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc +++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc -@@ -360,6 +360,7 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData( +@@ -358,6 +358,7 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData( uint64_t origin_type_mask, base::OnceCallback callback) { CHECK(((remove_mask & @@ -451,7 +451,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate. ~content::BrowsingDataRemover::DATA_TYPE_AVOID_CLOSING_CONNECTIONS & ~constants::FILTERABLE_DATA_TYPES) == 0) || filter_builder->MatchesAllOriginsAndDomains()); -@@ -467,6 +468,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData( +@@ -465,6 +466,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData( CreateTaskCompletionClosure(TracingDataType::kHistory), &history_task_tracker_); } @@ -461,7 +461,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate. if (ClipboardRecentContent::GetInstance()) ClipboardRecentContent::GetInstance()->SuppressClipboardContent(); -@@ -575,6 +579,11 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData( +@@ -573,6 +577,11 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData( // and SSL host state are scoped to hosts and represent them as std::string. // Rename the method to indicate its more general usage. if (profile_->GetSSLHostStateDelegate()) { @@ -473,7 +473,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate. profile_->GetSSLHostStateDelegate()->Clear( filter_builder->MatchesAllOriginsAndDomains() ? base::RepeatingCallback() -@@ -603,9 +612,13 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData( +@@ -601,9 +610,13 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData( } device_event_log::Clear(delete_begin_, delete_end_); @@ -487,7 +487,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate. content::BackgroundTracingManager::GetInstance().DeleteTracesInDateRange( delete_begin_, delete_end_); -@@ -1309,6 +1322,8 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData( +@@ -1308,6 +1321,8 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData( if (should_clear_zero_suggest_and_session_token && template_url_service) template_url_service->ClearSessionToken(); @@ -499,7 +499,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate. 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 -@@ -535,6 +535,23 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() { +@@ -538,6 +538,23 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() { (*s_allowlist)[browsing_data::prefs::kLastClearBrowsingDataTab] = settings_api::PrefType::kNumber; @@ -526,7 +526,7 @@ diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chro diff --git a/chrome/browser/profiles/android/java/src/org/chromium/chrome/browser/profiles/ProfileManagerUtils.java b/chrome/browser/profiles/android/java/src/org/chromium/chrome/browser/profiles/ProfileManagerUtils.java --- a/chrome/browser/profiles/android/java/src/org/chromium/chrome/browser/profiles/ProfileManagerUtils.java +++ b/chrome/browser/profiles/android/java/src/org/chromium/chrome/browser/profiles/ProfileManagerUtils.java -@@ -52,10 +52,15 @@ public class ProfileManagerUtils { +@@ -54,10 +54,15 @@ public class ProfileManagerUtils { } } @@ -557,7 +557,7 @@ diff --git a/chrome/browser/profiles/android/profile_manager_utils.cc b/chrome/b diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc -@@ -1431,6 +1431,19 @@ void ProfileManager::DoFinalInit(ProfileInfo* profile_info, +@@ -1441,6 +1441,19 @@ void ProfileManager::DoFinalInit(ProfileInfo* profile_info, } } @@ -577,7 +577,7 @@ diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profile void ProfileManager::DoFinalInitForServices(Profile* profile, bool go_off_the_record) { if (!do_final_services_init_ || -@@ -2117,7 +2130,7 @@ void ProfileManager::OnBrowserClosed(Browser* browser) { +@@ -2114,7 +2127,7 @@ void ProfileManager::OnBrowserClosed(Browser* browser) { Profile* original_profile = profile->GetOriginalProfile(); // Do nothing if the closed window is not the last window of the same profile. for (Browser* browser_iter : *BrowserList::GetInstance()) { @@ -655,7 +655,7 @@ diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_ diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.ts b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.ts --- a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.ts +++ b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.ts -@@ -239,6 +239,7 @@ export class SettingsClearBrowsingDataDialogElement extends +@@ -222,6 +222,7 @@ export class SettingsClearBrowsingDataDialogElement extends value: () => [loadTimeData.getString('basicPageTitle'), loadTimeData.getString('advancedPageTitle'), @@ -663,7 +663,7 @@ diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_ ], }, -@@ -363,6 +364,7 @@ export class SettingsClearBrowsingDataDialogElement extends +@@ -343,6 +344,7 @@ export class SettingsClearBrowsingDataDialogElement extends } this.clearButtonDisabled_ = this.getSelectedDataTypes_(page as HTMLElement).length === 0; @@ -674,7 +674,7 @@ diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_ 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 -@@ -1570,6 +1570,9 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1584,6 +1584,9 @@ Your Google account may have other forms of browsing history like searches and a Some of your history might not show up here. To see all your Chrome history, open full Chrome history. Also, your Google Account may have other forms of browsing history at <link>myactivity.google.com</link>. @@ -701,7 +701,7 @@ new file mode 100644 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 -@@ -1911,6 +1911,7 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source, +@@ -1919,6 +1919,7 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source, {"clearedData", IDS_SETTINGS_CLEARED_DATA}, {"clearBrowsingData", IDS_SETTINGS_CLEAR_BROWSING_DATA}, {"clearBrowsingDataDescription", IDS_SETTINGS_CLEAR_DATA_DESCRIPTION}, @@ -731,7 +731,7 @@ diff --git a/components/browsing_data/content/browsing_data_helper.cc b/componen diff --git a/components/browsing_data/core/BUILD.gn b/components/browsing_data/core/BUILD.gn --- a/components/browsing_data/core/BUILD.gn +++ b/components/browsing_data/core/BUILD.gn -@@ -62,6 +62,10 @@ if (is_android) { +@@ -61,6 +61,10 @@ if (is_android) { visibility = [ ":*" ] sources = [ "browsing_data_utils.h" ] } @@ -742,7 +742,7 @@ diff --git a/components/browsing_data/core/BUILD.gn b/components/browsing_data/c java_cpp_enum("cookie_or_cache_deletion_choice_javagen") { # External code should depend on ":java" instead. visibility = [ ":*" ] -@@ -71,6 +75,7 @@ if (is_android) { +@@ -70,6 +74,7 @@ if (is_android) { android_library("java") { srcjar_deps = [ ":browsing_data_utils_javagen", @@ -809,7 +809,7 @@ diff --git a/components/browsing_data/core/browsing_data_policies_utils.h b/comp diff --git a/components/browsing_data/core/browsing_data_utils.cc b/components/browsing_data/core/browsing_data_utils.cc --- a/components/browsing_data/core/browsing_data_utils.cc +++ b/components/browsing_data/core/browsing_data_utils.cc -@@ -346,6 +346,37 @@ bool GetDeletionPreferenceFromDataType( +@@ -335,6 +335,37 @@ bool GetDeletionPreferenceFromDataType( BrowsingDataType data_type, ClearBrowsingDataTab clear_browsing_data_tab, std::string* out_pref) { @@ -910,7 +910,7 @@ diff --git a/components/browsing_data/core/pref_names.h b/components/browsing_da diff --git a/components/search_engines/template_url_service.cc b/components/search_engines/template_url_service.cc --- a/components/search_engines/template_url_service.cc +++ b/components/search_engines/template_url_service.cc -@@ -810,6 +810,7 @@ void TemplateURLService::RemoveAutoGeneratedForUrlsBetween( +@@ -862,6 +862,7 @@ void TemplateURLService::RemoveAutoGeneratedForUrlsBetween( if (turl->date_created() >= created_after && (created_before.is_null() || turl->date_created() < created_before) && turl->safe_for_autoreplace() && turl->prepopulate_id() == 0 && @@ -918,9 +918,9 @@ diff --git a/components/search_engines/template_url_service.cc b/components/sear turl->starter_pack_id() == 0 && !MatchesDefaultSearchProvider(turl) && (url_filter.is_null() || url_filter.Run(turl->GenerateSearchURL(search_terms_data())))) { -diff --git a/content/browser/dips/dips_service_impl.cc b/content/browser/dips/dips_service_impl.cc ---- a/content/browser/dips/dips_service_impl.cc -+++ b/content/browser/dips/dips_service_impl.cc +diff --git a/content/browser/btm/btm_service_impl.cc b/content/browser/btm/btm_service_impl.cc +--- a/content/browser/btm/btm_service_impl.cc ++++ b/content/browser/btm/btm_service_impl.cc @@ -221,7 +221,7 @@ class StateClearer : public BrowsingDataRemover::Observer { remove_mask &= ~BrowsingDataRemover::DATA_TYPE_PRIVACY_SANDBOX; remover->RemoveWithFilterAndReply( diff --git a/build/patches/Add-setting-to-invert-tap-and-long-tap.patch b/build/patches/Add-setting-to-invert-tap-and-long-tap.patch index 2d1ff21c..bb0e6432 100644 --- a/build/patches/Add-setting-to-invert-tap-and-long-tap.patch +++ b/build/patches/Add-setting-to-invert-tap-and-long-tap.patch @@ -128,7 +128,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr 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 --- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java -@@ -347,6 +347,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { +@@ -285,6 +285,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { if (mParams.isAnchor()) { ModelList linkGroup = new ModelList(); @@ -138,7 +138,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr if (FirstRunStatus.getFirstRunFlowComplete() && !isEmptyUrl(mParams.getUrl()) && UrlUtilities.isAcceptedScheme(mParams.getUrl())) { -@@ -738,6 +741,8 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { +@@ -676,6 +679,8 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { getProfile(), false); }); @@ -169,17 +169,17 @@ 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 @@ -343,6 +343,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { - &kTabDragDropAndroid, + &kTabGroupParityBottomSheetAndroid, &kToolbarPhoneCleanup, - &kTabGroupCreationDialogAndroid, -+ &blink::features::kShowAlwaysContextMenuOnLinks, &kTabResumptionModuleAndroid, ++ &blink::features::kShowAlwaysContextMenuOnLinks, &kTabStateFlatBuffer, + &kTabStripContextMenuAndroid, &kTabStripGroupCollapseAndroid, 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 -@@ -410,6 +410,8 @@ public abstract class ChromeFeatureList { +@@ -418,6 +418,8 @@ public abstract class ChromeFeatureList { "DisableToolbarSwipeUp"; public static final String MOVE_TOP_TOOLBAR_TO_BOTTOM = "MoveTopToolbarToBottom"; @@ -188,7 +188,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f public static final String NOTIFICATION_PERMISSION_VARIANT = "NotificationPermissionVariant"; public static final String NOTIFICATION_PERMISSION_BOTTOM_SHEET = "NotificationPermissionBottomSheet"; -@@ -773,6 +775,8 @@ public abstract class ChromeFeatureList { +@@ -809,6 +811,8 @@ public abstract class ChromeFeatureList { newCachedFlag(DISABLE_TOOLBAR_SWIPE_UP, false); public static final CachedFlag sMoveTopToolbarToBottom = newCachedFlag(MOVE_TOP_TOOLBAR_TO_BOTTOM, false); @@ -197,7 +197,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f public static final CachedFlag sPaintPreviewDemo = newCachedFlag(PAINT_PREVIEW_DEMO, false); public static final CachedFlag sPostGetMyMemoryStateToBackground = newCachedFlag(POST_GET_MEMORY_PRESSURE_TO_BACKGROUND, true); -@@ -959,6 +963,7 @@ public abstract class ChromeFeatureList { +@@ -993,6 +997,7 @@ public abstract class ChromeFeatureList { sTabWindowManagerReportIndicesMismatch, sTraceBinderIpc, sUseChimeAndroidSdk, @@ -208,7 +208,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f 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 -@@ -1722,6 +1722,12 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1736,6 +1736,12 @@ Your Google account may have other forms of browsing history like searches and a Disable toolbar swipe up @@ -221,7 +221,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro -@@ -3281,6 +3287,9 @@ To change this setting, BEGIN_LINKdelete the Chrome d +@@ -3309,6 +3315,9 @@ To change this setting, BEGIN_LINKdelete the Chrome d Open in new Chrome tab @@ -272,7 +272,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c Preference captions = findPreference(PREF_CAPTIONS); captions.setOnPreferenceClickListener( preference -> { -@@ -214,6 +223,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment +@@ -212,6 +221,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment } else if (PREF_DISABLE_TOOLBAR_SWIPE_UP.equals(preference.getKey())) { mDisableToolbarSwipeUpDelegate.setValue((Boolean) newValue); mDelegate.requestRestart(getActivity()); @@ -297,15 +297,15 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c diff --git a/components/embedder_support/android/java/src/org/chromium/components/embedder_support/contextmenu/ContextMenuItemDelegate.java b/components/embedder_support/android/java/src/org/chromium/components/embedder_support/contextmenu/ContextMenuItemDelegate.java --- a/components/embedder_support/android/java/src/org/chromium/components/embedder_support/contextmenu/ContextMenuItemDelegate.java +++ b/components/embedder_support/android/java/src/org/chromium/components/embedder_support/contextmenu/ContextMenuItemDelegate.java -@@ -9,6 +9,7 @@ import android.net.Uri; - import androidx.annotation.IntDef; +@@ -10,6 +10,7 @@ import androidx.annotation.IntDef; + import org.chromium.build.annotations.NullMarked; import org.chromium.content_public.browser.WebContents; +import org.chromium.content_public.common.Referrer; import org.chromium.url.GURL; import java.lang.annotation.Retention; -@@ -148,6 +149,8 @@ public interface ContextMenuItemDelegate { +@@ -150,6 +151,8 @@ public interface ContextMenuItemDelegate { */ GURL getPageUrl(); @@ -344,7 +344,7 @@ new file mode 100644 diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third_party/blink/renderer/core/html/html_anchor_element.cc --- a/third_party/blink/renderer/core/html/html_anchor_element.cc +++ b/third_party/blink/renderer/core/html/html_anchor_element.cc -@@ -63,6 +63,7 @@ +@@ -64,6 +64,7 @@ #include "third_party/blink/renderer/core/loader/render_blocking_resource_manager.h" #include "third_party/blink/renderer/core/navigation_api/navigation_api.h" #include "third_party/blink/renderer/core/page/chrome_client.h" @@ -352,7 +352,7 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third #include "third_party/blink/renderer/core/page/page.h" #include "third_party/blink/renderer/core/speculation_rules/document_speculation_rules.h" #include "third_party/blink/renderer/platform/heap/garbage_collected.h" -@@ -503,6 +504,17 @@ void HTMLAnchorElementBase::NavigateToHyperlink( +@@ -504,6 +505,17 @@ void HTMLAnchorElementBase::NavigateToHyperlink( bool is_trusted, base::TimeTicks platform_time_stamp, KURL completed_url) { @@ -370,8 +370,8 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third LocalDOMWindow* window = GetDocument().domWindow(); if (!window) { return; -@@ -585,6 +597,15 @@ void HTMLAnchorElementBase::NavigateToHyperlink( - request.GetReferrerPolicy())); +@@ -594,6 +606,15 @@ void HTMLAnchorElementBase::NavigateToHyperlink( + frame_request.SetImpression(impression); } + if (!do_not_show_context_menu && @@ -386,7 +386,7 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third Frame* target_frame = frame->Tree().FindOrCreateFrameForNavigation(frame_request, target).frame; -@@ -627,7 +648,7 @@ Element* HTMLAnchorElementBase::interestTargetElement() { +@@ -637,7 +658,7 @@ Element* HTMLAnchorElementBase::interestTargetElement() { html_names::kInteresttargetAttr); } @@ -395,7 +395,7 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third event.SetDefaultHandled(); LocalDOMWindow* window = GetDocument().domWindow(); -@@ -723,13 +744,12 @@ void HTMLAnchorElementBase::HandleClick(MouseEvent& event) { +@@ -733,13 +754,12 @@ void HTMLAnchorElementBase::HandleClick(MouseEvent& event) { return; } @@ -413,7 +413,7 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third // We distinguish single/double click with some modifiers. // See the comment of `EventHandler.delayed_navigation_task_handle_`. auto task_handle = PostDelayedCancellableTask( -@@ -739,7 +759,9 @@ void HTMLAnchorElementBase::HandleClick(MouseEvent& event) { +@@ -749,7 +769,9 @@ void HTMLAnchorElementBase::HandleClick(MouseEvent& event) { frame->GetEventHandler().SetDelayedNavigationTaskHandle( std::move(task_handle)); } else { @@ -451,7 +451,7 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.h b/third_ diff --git a/third_party/blink/renderer/core/html/html_image_element.cc b/third_party/blink/renderer/core/html/html_image_element.cc --- a/third_party/blink/renderer/core/html/html_image_element.cc +++ b/third_party/blink/renderer/core/html/html_image_element.cc -@@ -36,6 +36,7 @@ +@@ -37,6 +37,7 @@ #include "third_party/blink/renderer/core/dom/events/event_dispatch_forbidden_scope.h" #include "third_party/blink/renderer/core/dom/node_traversal.h" #include "third_party/blink/renderer/core/dom/shadow_root.h" @@ -459,7 +459,7 @@ diff --git a/third_party/blink/renderer/core/html/html_image_element.cc b/third_ #include "third_party/blink/renderer/core/frame/attribution_src_loader.h" #include "third_party/blink/renderer/core/frame/deprecation/deprecation.h" #include "third_party/blink/renderer/core/frame/local_dom_window.h" -@@ -63,6 +64,7 @@ +@@ -64,6 +65,7 @@ #include "third_party/blink/renderer/core/media_type_names.h" #include "third_party/blink/renderer/core/page/chrome_client.h" #include "third_party/blink/renderer/core/page/page.h" @@ -467,7 +467,7 @@ diff --git a/third_party/blink/renderer/core/html/html_image_element.cc b/third_ #include "third_party/blink/renderer/core/paint/timing/paint_timing.h" #include "third_party/blink/renderer/core/probe/core_probes.h" #include "third_party/blink/renderer/core/resize_observer/resize_observer_entry.h" -@@ -797,6 +799,21 @@ void HTMLImageElement::DidFinishLifecycleUpdate( +@@ -794,6 +796,21 @@ void HTMLImageElement::DidFinishLifecycleUpdate( } } @@ -504,7 +504,7 @@ diff --git a/third_party/blink/renderer/core/html/html_image_element.h b/third_p diff --git a/third_party/blink/renderer/core/page/context_menu_controller.cc b/third_party/blink/renderer/core/page/context_menu_controller.cc --- a/third_party/blink/renderer/core/page/context_menu_controller.cc +++ b/third_party/blink/renderer/core/page/context_menu_controller.cc -@@ -197,14 +197,16 @@ void ContextMenuController::DocumentDetached(Document* document) { +@@ -198,14 +198,16 @@ void ContextMenuController::DocumentDetached(Document* document) { } } @@ -524,7 +524,7 @@ diff --git a/third_party/blink/renderer/core/page/context_menu_controller.cc b/t mouse_event->SetDefaultHandled(); } -@@ -428,7 +430,8 @@ bool ContextMenuController::ShouldShowContextMenuFromTouch( +@@ -430,7 +432,8 @@ bool ContextMenuController::ShouldShowContextMenuFromTouch( bool ContextMenuController::ShowContextMenu(LocalFrame* frame, const PhysicalOffset& point, WebMenuSourceType source_type, @@ -534,7 +534,7 @@ diff --git a/third_party/blink/renderer/core/page/context_menu_controller.cc b/t // Displaying the context menu in this function is a big hack as we don't // have context, i.e. whether this is being invoked via a script or in // response to user input (Mouse event WM_RBUTTONDOWN, -@@ -451,6 +454,16 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame, +@@ -453,6 +456,16 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame, if (!result.InnerNodeOrImageMapImage()) return false; @@ -551,7 +551,7 @@ diff --git a/third_party/blink/renderer/core/page/context_menu_controller.cc b/t // Clear any previously set cached results if we are resetting the hit test // result. image_selection_cached_result_ = nullptr; -@@ -782,11 +795,13 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame, +@@ -798,11 +811,13 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame, SetAutofillData(result.InnerNode(), data); diff --git a/build/patches/Add-site-engagement-flag.patch b/build/patches/Add-site-engagement-flag.patch index 52f5e3b1..add02cd5 100644 --- a/build/patches/Add-site-engagement-flag.patch +++ b/build/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 -@@ -166,6 +166,7 @@ +@@ -161,6 +161,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" diff --git a/build/patches/Add-support-for-ISupportHelpAndFeedback.patch b/build/patches/Add-support-for-ISupportHelpAndFeedback.patch index c376258c..9aa51e14 100644 --- a/build/patches/Add-support-for-ISupportHelpAndFeedback.patch +++ b/build/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; -@@ -442,8 +443,12 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity +@@ -441,8 +442,12 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity finishCurrentSettings(mainFragment); return true; } else if (item.getItemId() == R.id.menu_id_general_help) { diff --git a/build/patches/Add-support-to-jxl.patch b/build/patches/Add-support-to-jxl.patch index 6bb8d1b8..fe8f4fab 100644 --- a/build/patches/Add-support-to-jxl.patch +++ b/build/patches/Add-support-to-jxl.patch @@ -84,7 +84,7 @@ Enabled by default diff --git a/DEPS b/DEPS --- a/DEPS +++ b/DEPS -@@ -476,6 +476,10 @@ vars = { +@@ -480,6 +480,10 @@ vars = { # Three lines of non-changing comments so that # the commit queue can handle CLs rolling feed # and whatever else without interference from each other. @@ -95,7 +95,7 @@ diff --git a/DEPS b/DEPS 'highway_revision': '00fe003dac355b979f36157f9407c7c46448958e', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling ffmpeg -@@ -1842,6 +1846,9 @@ deps = { +@@ -1846,6 +1850,9 @@ deps = { 'src/third_party/dawn': Var('dawn_git') + '/dawn.git' + '@' + Var('dawn_revision'), @@ -316,7 +316,7 @@ diff --git a/media/BUILD.gn b/media/BUILD.gn diff --git a/media/media_options.gni b/media/media_options.gni --- a/media/media_options.gni +++ b/media/media_options.gni -@@ -142,6 +142,9 @@ declare_args() { +@@ -141,6 +141,9 @@ declare_args() { # `enable_libaom` should likely also be overriddent to false. enable_av1_decoder = enable_dav1d_decoder @@ -324,7 +324,7 @@ diff --git a/media/media_options.gni b/media/media_options.gni + enable_jxl_decoder = is_android || is_win + # Enable HEVC/H265 demuxing. Actual decoding must be provided by the - # platform. Always enable this for Lacros, it determines support at runtime. + # platform. # TODO(crbug.com/1336055): Revisit the default value for this setting as it diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc --- a/net/base/mime_util.cc @@ -348,7 +348,7 @@ diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc diff --git a/net/base/mime_util_unittest.cc b/net/base/mime_util_unittest.cc --- a/net/base/mime_util_unittest.cc +++ b/net/base/mime_util_unittest.cc -@@ -40,6 +40,7 @@ TEST(MimeUtilTest, GetWellKnownMimeTypeFromExtension) { +@@ -39,6 +39,7 @@ TEST(MimeUtilTest, GetWellKnownMimeTypeFromExtension) { {FILE_PATH_LITERAL("webm"), "video/webm"}, {FILE_PATH_LITERAL("weba"), "audio/webm"}, {FILE_PATH_LITERAL("avif"), "image/avif"}, @@ -356,15 +356,15 @@ diff --git a/net/base/mime_util_unittest.cc b/net/base/mime_util_unittest.cc {FILE_PATH_LITERAL("epub"), "application/epub+zip"}, {FILE_PATH_LITERAL("apk"), "application/vnd.android.package-archive"}, {FILE_PATH_LITERAL("cer"), "application/x-x509-ca-cert"}, -@@ -81,6 +82,7 @@ TEST(MimeUtilTest, ExtensionTest) { +@@ -80,6 +81,7 @@ TEST(MimeUtilTest, ExtensionTest) { {FILE_PATH_LITERAL("webm"), {"video/webm"}}, {FILE_PATH_LITERAL("weba"), {"audio/webm"}}, {FILE_PATH_LITERAL("avif"), {"image/avif"}}, + {FILE_PATH_LITERAL("jxl"), {"image/jxl"}}, - #if BUILDFLAG(IS_CHROMEOS_ASH) + #if BUILDFLAG(IS_CHROMEOS) // These are test cases for testing platform mime types on ChromeOS. {FILE_PATH_LITERAL("epub"), {"application/epub+zip"}}, -@@ -497,6 +499,7 @@ TEST(MimeUtilTest, TestGetExtensionsForMimeType) { +@@ -496,6 +498,7 @@ TEST(MimeUtilTest, TestGetExtensionsForMimeType) { {"MeSsAge/*", 1, "eml"}, {"message/", 0, nullptr, true}, {"image/avif", 1, "avif"}, @@ -464,7 +464,7 @@ diff --git a/third_party/blink/common/mime_util/mime_util_unittest.cc b/third_pa diff --git a/third_party/blink/public/devtools_protocol/browser_protocol.pdl b/third_party/blink/public/devtools_protocol/browser_protocol.pdl --- a/third_party/blink/public/devtools_protocol/browser_protocol.pdl +++ b/third_party/blink/public/devtools_protocol/browser_protocol.pdl -@@ -4652,6 +4652,7 @@ domain Emulation +@@ -4747,6 +4747,7 @@ domain Emulation experimental type DisabledImageType extends string enum avif @@ -605,7 +605,7 @@ diff --git a/third_party/blink/renderer/modules/webcodecs/image_decoder_fuzzer.c diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -2394,6 +2394,10 @@ source_set("blink_platform_unittests_sources") { +@@ -2403,6 +2403,10 @@ source_set("blink_platform_unittests_sources") { sources += [ "text/locale_icu_test.cc" ] } @@ -616,7 +616,7 @@ diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/re sources += [ "testing/run_all_tests.cc" ] configs += [ -@@ -2440,6 +2444,7 @@ source_set("blink_platform_unittests_sources") { +@@ -2448,6 +2452,7 @@ source_set("blink_platform_unittests_sources") { "//third_party/blink/renderer/platform/wtf", "//third_party/dawn/src/dawn/native", "//third_party/dawn/src/dawn/wire", @@ -2215,7 +2215,7 @@ diff --git a/third_party/blink/tools/commit_stats/git-dirs.txt b/third_party/bli diff --git a/third_party/blink/web_tests/TestExpectations b/third_party/blink/web_tests/TestExpectations --- a/third_party/blink/web_tests/TestExpectations +++ b/third_party/blink/web_tests/TestExpectations -@@ -5510,6 +5510,12 @@ crbug.com/1199522 http/tests/devtools/layers/layers-3d-view-hit-testing.js [ Fai +@@ -5432,6 +5432,12 @@ crbug.com/1199522 http/tests/devtools/layers/layers-3d-view-hit-testing.js [ Fai # Started failing after rolling new version of check-layout-th.js css3/flexbox/perpendicular-writing-modes-inside-flex-item.html [ Failure ] @@ -2231,7 +2231,7 @@ diff --git a/third_party/blink/web_tests/TestExpectations b/third_party/blink/we diff --git a/third_party/blink/web_tests/VirtualTestSuites b/third_party/blink/web_tests/VirtualTestSuites --- a/third_party/blink/web_tests/VirtualTestSuites +++ b/third_party/blink/web_tests/VirtualTestSuites -@@ -437,6 +437,15 @@ +@@ -409,6 +409,15 @@ "args": ["--enable-blink-features=FractionalScrollOffsets"], "expires": "Jun 1, 2025" }, @@ -2646,7 +2646,7 @@ new file mode 100644 diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml --- a/tools/metrics/histograms/enums.xml +++ b/tools/metrics/histograms/enums.xml -@@ -14593,6 +14593,7 @@ from previous Chrome versions. +@@ -14717,6 +14717,7 @@ from previous Chrome versions. diff --git a/build/patches/Add-webGL-site-setting.patch b/build/patches/Add-webGL-site-setting.patch index bc6548a1..d3838e14 100644 --- a/build/patches/Add-webGL-site-setting.patch +++ b/build/patches/Add-webGL-site-setting.patch @@ -206,7 +206,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context diff --git a/third_party/blink/renderer/core/execution_context/execution_context.h b/third_party/blink/renderer/core/execution_context/execution_context.h --- a/third_party/blink/renderer/core/execution_context/execution_context.h +++ b/third_party/blink/renderer/core/execution_context/execution_context.h -@@ -116,6 +116,8 @@ enum ReasonForCallingCanExecuteScripts { +@@ -115,6 +115,8 @@ enum ReasonForCallingCanExecuteScripts { enum ReferrerPolicySource { kPolicySourceHttpHeader, kPolicySourceMetaTag }; @@ -218,7 +218,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc --- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc +++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -297,6 +297,13 @@ void WebGLRenderingContextBase::InitializeWebGLContextLimits( +@@ -298,6 +298,13 @@ void WebGLRenderingContextBase::InitializeWebGLContextLimits( } } @@ -232,7 +232,7 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_ba unsigned WebGLRenderingContextBase::CurrentMaxGLContexts() { base::AutoLock locker(WebGLContextLimitLock()); DCHECK(webgl_context_limits_initialized_); -@@ -566,25 +573,6 @@ static String ExtractWebGLContextCreationError( +@@ -567,25 +574,6 @@ static String ExtractWebGLContextCreationError( const Platform::GraphicsInfo& info) { StringBuilder builder; builder.Append("Could not create a WebGL context"); @@ -258,7 +258,7 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_ba FormatWebGLStatusString("ErrorMessage", info.error_message.Utf8().c_str(), builder); builder.Append('.'); -@@ -644,6 +632,12 @@ WebGLRenderingContextBase::CreateWebGraphicsContext3DProvider( +@@ -645,6 +633,12 @@ WebGLRenderingContextBase::CreateWebGraphicsContext3DProvider( const CanvasContextCreationAttributesCore& attributes, Platform::ContextType context_type, Platform::GraphicsInfo* graphics_info) { @@ -274,7 +274,7 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_ba diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h --- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h +++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h -@@ -1936,6 +1936,8 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext, +@@ -1931,6 +1931,8 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext, DOMArrayBufferView* pixels, int64_t offset); diff --git a/build/patches/Allow-building-without-enable_reporting.patch b/build/patches/Allow-building-without-enable_reporting.patch index 26571b6c..e5589892 100644 --- a/build/patches/Allow-building-without-enable_reporting.patch +++ b/build/patches/Allow-building-without-enable_reporting.patch @@ -22,11 +22,11 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../network/public/mojom/network_context.mojom | 3 +++ .../core/frame/csp/content_security_policy.cc | 3 +++ .../blink/renderer/core/frame/local_frame.cc | 3 +++ - .../blink/renderer/core/frame/local_frame.h | 4 +++- + .../blink/renderer/core/frame/local_frame.h | 3 +++ .../renderer/core/frame/reporting_context.cc | 9 +++++++++ .../renderer/core/frame/reporting_context.h | 7 +++++-- .../renderer/core/frame/reporting_observer.cc | 3 +-- - 22 files changed, 63 insertions(+), 26 deletions(-) + 22 files changed, 63 insertions(+), 25 deletions(-) create mode 100644 cromite_flags/services/network/public/cpp/features_cc/Allow-building-without-enable_reporting.inc diff --git a/chrome/browser/net/chrome_report_sender.cc b/chrome/browser/net/chrome_report_sender.cc @@ -43,7 +43,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 -@@ -1473,6 +1473,7 @@ String BuildReportStatus(const net::ReportingReport::Status status) { +@@ -1474,6 +1474,7 @@ String BuildReportStatus(const net::ReportingReport::Status status) { } } @@ -51,7 +51,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->ForEachRenderFrameHostImplWithAction( -@@ -1486,6 +1487,7 @@ std::vector ComputeReportingURLs(RenderFrameHostImpl* frame_host) { +@@ -1487,6 +1488,7 @@ std::vector ComputeReportingURLs(RenderFrameHostImpl* frame_host) { }); return urls; } @@ -108,7 +108,7 @@ diff --git a/content/browser/network/reporting_service_proxy.cc b/content/browse #include "content/browser/service_worker/service_worker_host.h" #include "content/browser/worker_host/dedicated_worker_host.h" #include "content/browser/worker_host/shared_worker_host.h" -@@ -222,12 +223,14 @@ class ReportingServiceProxyImpl : public blink::mojom::ReportingServiceProxy { +@@ -226,12 +227,14 @@ class ReportingServiceProxyImpl : public blink::mojom::ReportingServiceProxy { const std::string& group, const std::string& type, base::Value::Dict body) { @@ -126,7 +126,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 -@@ -15703,12 +15703,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport( +@@ -15759,12 +15759,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport( } } } @@ -138,7 +138,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b - std::move(body)); } - void RenderFrameHostImpl::SendCommitNavigation( + void RenderFrameHostImpl::UpdateOrDisableCompositorMetricRecorder() const { diff --git a/content/browser/security/coop/cross_origin_opener_policy_reporter.cc b/content/browser/security/coop/cross_origin_opener_policy_reporter.cc --- a/content/browser/security/coop/cross_origin_opener_policy_reporter.cc +++ b/content/browser/security/coop/cross_origin_opener_policy_reporter.cc @@ -300,7 +300,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 -@@ -470,14 +470,14 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext +@@ -475,14 +475,14 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext const GURL& url, const std::optional& reporting_source, const net::NetworkAnonymizationKey& network_anonymization_key, @@ -332,7 +332,7 @@ diff --git a/services/network/public/cpp/parsed_headers.cc b/services/network/pu 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 -@@ -1590,7 +1590,6 @@ mojom("mojom") { +@@ -1668,7 +1668,6 @@ mojom("mojom") { export_define_blink = "BLINK_PLATFORM_IMPLEMENTATION=1" export_header_blink = "third_party/blink/public/platform/web_common.h" if (enable_reporting) { @@ -343,7 +343,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 -@@ -1205,6 +1205,7 @@ interface NetworkContext { +@@ -1208,6 +1208,7 @@ interface NetworkContext { // provided `network_anonymization_key`. // // Spec: https://w3c.github.io/reporting/#concept-reports @@ -351,7 +351,7 @@ diff --git a/services/network/public/mojom/network_context.mojom b/services/netw QueueReport(string type, string group, url.mojom.Url url, -@@ -1212,6 +1213,7 @@ interface NetworkContext { +@@ -1215,6 +1216,7 @@ interface NetworkContext { NetworkAnonymizationKey network_anonymization_key, mojo_base.mojom.DictionaryValue body); @@ -359,7 +359,7 @@ diff --git a/services/network/public/mojom/network_context.mojom b/services/netw QueueEnterpriseReport(string type, string group, url.mojom.Url url, -@@ -1222,6 +1224,7 @@ interface NetworkContext { +@@ -1225,6 +1227,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`. @@ -378,7 +378,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 "services/network/public/cpp/web_sandbox_flags.h" -@@ -1295,6 +1296,7 @@ void ContentSecurityPolicy::ReportViolation( +@@ -1345,6 +1346,7 @@ void ContentSecurityPolicy::ReportViolation( return; } @@ -386,7 +386,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); -@@ -1302,6 +1304,7 @@ void ContentSecurityPolicy::ReportViolation( +@@ -1352,6 +1354,7 @@ void ContentSecurityPolicy::ReportViolation( // `context_frame` (i.e. we're not processing 'frame-ancestors'). if (delegate_ && !context_frame) delegate_->DispatchViolationEvent(*violation_data, element); @@ -405,7 +405,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" -@@ -2796,9 +2797,11 @@ DocumentResourceCoordinator* LocalFrame::GetDocumentResourceCoordinator() { +@@ -2752,9 +2753,11 @@ DocumentResourceCoordinator* LocalFrame::GetDocumentResourceCoordinator() { return CHECK_DEREF(GetDocument()).GetResourceCoordinator(); } @@ -428,11 +428,10 @@ 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" -@@ -659,8 +660,9 @@ class CORE_EXPORT LocalFrame final - void FinishedScrollSequence(); +@@ -650,7 +651,9 @@ class CORE_EXPORT LocalFrame final + return client_hints_preferences_; + } - SmoothScrollSequencer* GetSmoothScrollSequencer() const; -- +#if BUILDFLAG(ENABLE_REPORTING) mojom::blink::ReportingServiceProxy* GetReportingService(); +#endif @@ -494,7 +493,7 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.cc b/third_ const String& type = report->type(); if (!(type == ReportType::kCSPViolation || type == ReportType::kCSPHash || type == ReportType::kDeprecation || -@@ -254,6 +262,7 @@ void ReportingContext::SendToReportingAPI(Report* report, +@@ -255,6 +263,7 @@ void ReportingContext::SendToReportingAPI(Report* report, url, endpoint, body->featureId(), body->disposition(), body->message(), body->sourceFile(), line_number, column_number); } diff --git a/build/patches/Allow-building-without-supervised-users.patch b/build/patches/Allow-building-without-supervised-users.patch index 30af6ffb..2fe30d8e 100644 --- a/build/patches/Allow-building-without-supervised-users.patch +++ b/build/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 -@@ -784,7 +784,6 @@ if (current_toolchain == default_toolchain) { +@@ -786,7 +786,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", @@ -34,7 +34,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn diff --git a/chrome/android/java/src/org/chromium/chrome/browser/feedback/ChromeFeedbackCollector.java b/chrome/android/java/src/org/chromium/chrome/browser/feedback/ChromeFeedbackCollector.java --- a/chrome/android/java/src/org/chromium/chrome/browser/feedback/ChromeFeedbackCollector.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/feedback/ChromeFeedbackCollector.java -@@ -92,7 +92,6 @@ public class ChromeFeedbackCollector extends FeedbackCollectorGetPrefs()->SetString(prefs::kProfileName, profile_name); } @@ -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); -@@ -1970,9 +1966,6 @@ void ProfileManager::AddProfileToStorage(Profile* profile) { +@@ -1976,9 +1972,6 @@ void ProfileManager::AddProfileToStorage(Profile* profile) { init_params.icon_index = profile->GetPrefs()->GetInteger(prefs::kProfileAvatarIndex); @@ -218,7 +218,7 @@ diff --git a/components/supervised_user/core/browser/supervised_user_service.cc diff --git a/components/supervised_user/core/browser/supervised_user_utils.cc b/components/supervised_user/core/browser/supervised_user_utils.cc --- a/components/supervised_user/core/browser/supervised_user_utils.cc +++ b/components/supervised_user/core/browser/supervised_user_utils.cc -@@ -300,6 +300,7 @@ GURL NormalizeUrl(const GURL& url) { +@@ -308,6 +308,7 @@ GURL NormalizeUrl(const GURL& url) { } bool AreWebFilterPrefsDefault(const PrefService& pref_service) { @@ -229,9 +229,9 @@ 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 -@@ -171,4 +171,10 @@ BASE_FEATURE(kReplaceSupervisionSystemCapabilitiesWithAccountCapabilitiesOnIOS, +@@ -185,4 +185,10 @@ BASE_FEATURE(kReplaceSupervisionSystemCapabilitiesWithAccountCapabilitiesOnIOS, "ReplaceSupervisionSystemCapabilitiesWithAccountCapabilitiesOnIOS", - base::FEATURE_DISABLED_BY_DEFAULT); + base::FEATURE_ENABLED_BY_DEFAULT); #endif + +SET_CROMITE_FEATURE_DISABLED(kLocalWebApprovals); diff --git a/build/patches/Allow-playing-audio-in-background.patch b/build/patches/Allow-playing-audio-in-background.patch index d69d5d87..1f07a677 100644 --- a/build/patches/Allow-playing-audio-in-background.patch +++ b/build/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 -@@ -1311,6 +1311,12 @@ void WebMediaPlayerImpl::OnSelectedVideoTrackChanged( +@@ -1343,6 +1343,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 std::vector& enabled_track_ids) { DCHECK(main_task_runner_->BelongsToCurrentThread()); -@@ -3710,7 +3716,10 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const { +@@ -3749,7 +3755,10 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const { : HasAudio(); // Audio only stream is allowed to play when in background. diff --git a/build/patches/Always-use-new-tab-page-for-default-home-page.patch b/build/patches/Always-use-new-tab-page-for-default-home-page.patch index a625a469..6237297f 100644 --- a/build/patches/Always-use-new-tab-page-for-default-home-page.patch +++ b/build/patches/Always-use-new-tab-page-for-default-home-page.patch @@ -32,14 +32,14 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/Homepa diff --git a/chrome/browser/partnerbookmarks/android/java/src/org/chromium/chrome/browser/partnerbookmarks/PartnerBookmarksProviderIterator.java b/chrome/browser/partnerbookmarks/android/java/src/org/chromium/chrome/browser/partnerbookmarks/PartnerBookmarksProviderIterator.java --- a/chrome/browser/partnerbookmarks/android/java/src/org/chromium/chrome/browser/partnerbookmarks/PartnerBookmarksProviderIterator.java +++ b/chrome/browser/partnerbookmarks/android/java/src/org/chromium/chrome/browser/partnerbookmarks/PartnerBookmarksProviderIterator.java -@@ -61,6 +61,7 @@ public class PartnerBookmarksProviderIterator implements PartnerBookmark.Bookmar - * @return Iterator over bookmarks or null. - */ - public static PartnerBookmarksProviderIterator createIfAvailable() { -+ if ((true)) return null; - try { - Cursor cursor = - ContextUtils.getApplicationContext() +@@ -68,6 +68,7 @@ public class PartnerBookmarksProviderIterator implements PartnerBookmark.Bookmar + new AsyncTask<@Nullable Cursor>() { + @Override + protected @Nullable Cursor doInBackground() { ++ if ((true)) return null; + try { + return ContextUtils.getApplicationContext() + .getContentResolver() diff --git a/chrome/browser/partnercustomizations/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java b/chrome/browser/partnercustomizations/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java --- a/chrome/browser/partnercustomizations/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java +++ b/chrome/browser/partnercustomizations/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java diff --git a/build/patches/Android-fonts-fingerprinting-mitigation.patch b/build/patches/Android-fonts-fingerprinting-mitigation.patch index ee7bff8c..891b1216 100644 --- a/build/patches/Android-fonts-fingerprinting-mitigation.patch +++ b/build/patches/Android-fonts-fingerprinting-mitigation.patch @@ -37,11 +37,11 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html .../skia/src/ports/SkFontConfigInterface.cpp | 4 + .../ports/SkFontConfigInterface_direct.cpp | 5 + .../src/ports/SkFontConfigInterface_direct.h | 1 + - .../skia/src/ports/SkFontMgr_android.cpp | 263 ++- + .../skia/src/ports/SkFontMgr_android.cpp | 278 ++- .../skia/src/ports/SkFontMgr_android_data.cpp | 1640 +++++++++++++++++ .../src/ports/SkFontMgr_android_parser.cpp | 49 +- .../skia/src/ports/SkFontMgr_android_parser.h | 5 +- - 35 files changed, 2399 insertions(+), 72 deletions(-) + 35 files changed, 2407 insertions(+), 79 deletions(-) create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Android-fonts-fingerprinting-mitigation.grdp create mode 100644 components/component_updater/installer_policies/fonts_pack_component_installer.cc create mode 100644 components/component_updater/installer_policies/fonts_pack_component_installer.h @@ -92,7 +92,7 @@ diff --git a/chrome/android/java/res/xml/developer_preferences.xml b/chrome/andr diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -7648,6 +7648,13 @@ static_library("browser") { +@@ -7698,6 +7698,13 @@ static_library("browser") { } } @@ -109,9 +109,9 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn diff --git a/chrome/browser/component_updater/registration.cc b/chrome/browser/component_updater/registration.cc --- a/chrome/browser/component_updater/registration.cc +++ b/chrome/browser/component_updater/registration.cc -@@ -118,10 +118,20 @@ - #include "chrome/browser/component_updater/wasm_tts_engine_component_installer.h" - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +@@ -122,10 +122,20 @@ + #include "chrome/browser/component_updater/file_type_policies_component_installer.h" + #endif +#if BUILDFLAG(IS_ANDROID) +#include "components/component_updater/installer_policies/fonts_pack_component_installer.h" @@ -160,7 +160,7 @@ diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn diff --git a/components/component_updater/installer_policies/BUILD.gn b/components/component_updater/installer_policies/BUILD.gn --- a/components/component_updater/installer_policies/BUILD.gn +++ b/components/component_updater/installer_policies/BUILD.gn -@@ -34,6 +34,13 @@ static_library("installer_policies_no_content_deps") { +@@ -36,6 +36,13 @@ static_library("installer_policies_no_content_deps") { "trust_token_key_commitments_component_installer_policy.h", ] @@ -497,14 +497,14 @@ diff --git a/components/services/font/public/cpp/font_loader.cc b/components/ser diff --git a/components/services/font/public/cpp/font_loader.h b/components/services/font/public/cpp/font_loader.h --- a/components/services/font/public/cpp/font_loader.h +++ b/components/services/font/public/cpp/font_loader.h -@@ -52,6 +52,7 @@ class FontLoader : public SkFontConfigInterface, - SkString* out_family_name, +@@ -54,6 +54,7 @@ class FontLoader : public SkFontConfigInterface, SkFontStyle* out_style) override; - SkStreamAsset* openStream(const FontIdentity& identity) override; + SkStreamAsset* openStream(const FontIdentity& identity) override + LOCKS_EXCLUDED(mapped_font_files_lock_); + SkStreamAsset* openStreamFromName(const char* filename) override; sk_sp makeTypeface(const FontIdentity& identity, - sk_sp mgr) override; - + sk_sp mgr) override + LOCKS_EXCLUDED(typeface_cache_lock_); diff --git a/components/services/font/public/cpp/font_service_thread.cc b/components/services/font/public/cpp/font_service_thread.cc --- a/components/services/font/public/cpp/font_service_thread.cc +++ b/components/services/font/public/cpp/font_service_thread.cc @@ -600,7 +600,7 @@ diff --git a/components/services/font/public/mojom/font_service.mojom b/componen diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn -@@ -2524,6 +2524,17 @@ source_set("browser") { +@@ -2543,6 +2543,17 @@ source_set("browser") { ] } @@ -618,7 +618,7 @@ diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn if (is_linux || is_chromeos) { sources -= [ "file_system_access/file_path_watcher/file_path_watcher_stub.cc" ] -@@ -2566,6 +2577,13 @@ source_set("browser") { +@@ -2585,6 +2596,13 @@ source_set("browser") { ] } @@ -664,7 +664,7 @@ diff --git a/content/browser/renderer_host/render_process_host_impl_receiver_bin diff --git a/content/child/BUILD.gn b/content/child/BUILD.gn --- a/content/child/BUILD.gn +++ b/content/child/BUILD.gn -@@ -135,6 +135,13 @@ target(link_target_type, "child") { +@@ -136,6 +136,13 @@ target(link_target_type, "child") { ] } @@ -681,7 +681,7 @@ diff --git a/content/child/BUILD.gn b/content/child/BUILD.gn diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn --- a/content/renderer/BUILD.gn +++ b/content/renderer/BUILD.gn -@@ -355,6 +355,10 @@ target(link_target_type, "renderer") { +@@ -357,6 +357,10 @@ target(link_target_type, "renderer") { deps += [ "//services/screen_ai/public/mojom" ] } @@ -823,7 +823,7 @@ new file mode 100644 diff --git a/skia/BUILD.gn b/skia/BUILD.gn --- a/skia/BUILD.gn +++ b/skia/BUILD.gn -@@ -446,6 +446,18 @@ component("skia") { +@@ -440,6 +440,18 @@ component("skia") { sources += skia_ports_fci_sources } @@ -959,7 +959,7 @@ diff --git a/third_party/skia/src/ports/SkFontConfigInterface_direct.h b/third_p diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia/src/ports/SkFontMgr_android.cpp --- a/third_party/skia/src/ports/SkFontMgr_android.cpp +++ b/third_party/skia/src/ports/SkFontMgr_android.cpp -@@ -26,6 +26,7 @@ +@@ -27,6 +27,7 @@ #include "src/core/SkTypefaceCache.h" #include "src/ports/SkFontMgr_android_parser.h" #include "src/ports/SkTypeface_proxy.h" @@ -967,7 +967,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia #include #include -@@ -35,6 +36,91 @@ using namespace skia_private; +@@ -36,6 +37,91 @@ using namespace skia_private; class SkData; namespace { @@ -1058,17 +1058,18 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia + class SkTypeface_AndroidSystem : public SkTypeface_proxy { public: - SkTypeface_AndroidSystem(sk_sp proxy, -@@ -144,7 +230,7 @@ template sk_sp sk_sp_static_cast(sk_sp&& s) { + static sk_sp Make(sk_sp realTypeface, +@@ -110,7 +196,8 @@ using StreamForPathCache = skia_private::THashMap stream = SkStream::MakeFromFile(pathName.c_str()); +- std::unique_ptr* streamPtr = streamForPath.find(pathName); +- if (!streamPtr) { +- streamPtr = streamForPath.set(pathName, SkStream::MakeFromFile(pathName.c_str())); +- } +- if (!*streamPtr) { +- SkDEBUGF("Requested font file %s cannot be opened.\n", pathName.c_str()); +- continue; +- } +- std::unique_ptr stream = (*streamPtr)->duplicate(); - if (!stream) { -- SkDEBUGF("Requested font file %s does not exist or cannot be opened.\n", -- pathName.c_str()); +- SkDEBUGF("Requested font file %s could not be duplicated.\n", pathName.c_str()); - continue; + const int ttcIndex = fontFile.fIndex; + SkString familyName; @@ -1093,10 +1101,17 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia + + std::unique_ptr stream; + if (!custom && !fontFile.fFileName.startsWith('#')) { -+ stream = SkStream::MakeFromFile(pathName.c_str()); ++ std::unique_ptr* streamPtr = streamForPath.find(pathName); ++ if (!streamPtr) { ++ streamPtr = streamForPath.set(pathName, SkStream::MakeFromFile(pathName.c_str())); ++ } ++ if (!*streamPtr) { ++ SkDEBUGF("Requested font file %s cannot be opened.\n", pathName.c_str()); ++ continue; ++ } ++ stream = (*streamPtr)->duplicate(); + if (!stream) { -+ SkDEBUGF("Requested font file %s does not exist or cannot be opened.\n", -+ pathName.c_str()); ++ SkDEBUGF("Requested font file %s could not be duplicated.\n", pathName.c_str()); + continue; + } + } else if (custom) { @@ -1116,6 +1131,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia + fontFile.fVariationDesignPosition.begin(), + fontFile.fVariationDesignPosition.size() }; + // TODO: this creates the proxy with the given stream, so always cacheFontFiles. - auto proxy = scanner->MakeFromStream( - std::move(stream), - SkFontArguments().setCollectionIndex(fontFile.fIndex) @@ -1137,7 +1153,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia } uint32_t variant = family.fVariant; -@@ -187,13 +295,25 @@ public: +@@ -161,13 +270,25 @@ public: // The first specified family name overrides the family name found in the font. // TODO: SkTypeface_AndroidSystem::onCreateFamilyNameIterator should return // all of the specified family names in addition to the names found in the font. @@ -1169,7 +1185,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia int weight = fontFile.fWeight != 0 ? fontFile.fWeight : fontStyle.weight(); SkFontStyle::Slant slant = fontStyle.slant(); switch (fontFile.fStyle) { -@@ -204,6 +324,19 @@ public: +@@ -178,6 +299,19 @@ public: } fontStyle = SkFontStyle(weight, fontStyle.width(), slant); @@ -1186,10 +1202,10 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia + custom)); + continue; + } - fStyles.push_back().reset( - new SkTypeface_AndroidSystem(proxy, - pathName, -@@ -238,15 +371,18 @@ public: + fStyles.push_back( + SkTypeface_AndroidSystem::Make(proxy, + fontStyle, proxy->isFixedPitch(), +@@ -206,15 +340,18 @@ public: return fStyles[index]; } @@ -1211,7 +1227,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia SkString fFallbackFor; friend struct NameToFamily; -@@ -267,24 +403,26 @@ struct NameToFamily { +@@ -235,24 +372,26 @@ struct NameToFamily { class SkFontMgr_Android : public SkFontMgr { public: @@ -1242,7 +1258,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia } this->buildNameToFamilyMap(families, custom ? custom->fIsolated : false); this->findDefaultStyleSet(); -@@ -342,33 +480,53 @@ protected: +@@ -310,33 +449,53 @@ protected: return sset->matchStyle(style); } @@ -1311,7 +1327,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia } } return nullptr; -@@ -391,7 +549,7 @@ protected: +@@ -359,7 +518,7 @@ protected: for (int bcp47Index = bcp47Count; bcp47Index --> 0;) { SkLanguage lang(bcp47[bcp47Index]); while (!lang.getTag().isEmpty()) { @@ -1320,7 +1336,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia find_family_style_character(currentFamilyName, fFallbackNameToFamilyMap, style, SkToBool(elegant), lang.getTag(), character); -@@ -402,7 +560,7 @@ protected: +@@ -370,7 +529,7 @@ protected: lang = lang.getParent(); } } @@ -1329,7 +1345,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia find_family_style_character(currentFamilyName, fFallbackNameToFamilyMap, style, SkToBool(elegant), SkString(), character); -@@ -453,6 +611,7 @@ protected: +@@ -421,6 +580,7 @@ protected: private: std::unique_ptr fScanner; @@ -1337,16 +1353,16 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia TArray> fStyleSets; sk_sp fDefaultStyleSet; -@@ -472,7 +631,7 @@ private: +@@ -442,7 +602,7 @@ private: } sk_sp newSet = -- sk_make_sp(family, fScanner.get(), isolated); -+ sk_make_sp(family, fScanner.get(), isolated, custom_.get()); +- sk_make_sp(family, fScanner.get(), isolated, streamForPath); ++ sk_make_sp(family, fScanner.get(), isolated, streamForPath, custom_.get()); if (0 == newSet->count()) { return; } -@@ -516,11 +675,11 @@ static char const * const gSystemFontUseStrings[] = { +@@ -487,11 +647,11 @@ static char const * const gSystemFontUseStrings[] = { } // namespace @@ -1361,7 +1377,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia if (custom) { SkASSERT(0 <= custom->fSystemFontUse); SkASSERT(custom->fSystemFontUse < std::size(gSystemFontUseStrings)); -@@ -530,5 +689,5 @@ sk_sp SkFontMgr_New_Android(const SkFontMgr_Android_CustomFonts* cust +@@ -501,5 +661,5 @@ sk_sp SkFontMgr_New_Android(const SkFontMgr_Android_CustomFonts* cust custom->fFontsXml, custom->fFallbackFontsXml); } diff --git a/build/patches/Ask-for-restart-on-connection-change.patch b/build/patches/Ask-for-restart-on-connection-change.patch index 71d9f4dd..3fcf5538 100644 --- a/build/patches/Ask-for-restart-on-connection-change.patch +++ b/build/patches/Ask-for-restart-on-connection-change.patch @@ -281,7 +281,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 -@@ -1239,7 +1239,10 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -1309,7 +1309,10 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { mActivity, mStatusIndicatorCoordinator, isUrlBarFocusedSupplier, @@ -403,7 +403,7 @@ diff --git a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browse 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 -@@ -109,6 +109,8 @@ public interface TabWindowManager { +@@ -110,6 +110,8 @@ public interface TabWindowManager { */ int getIncognitoTabCount(); @@ -415,8 +415,8 @@ 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 -@@ -458,6 +458,16 @@ public class TabWindowManagerImpl implements ActivityStateListener, TabWindowMan - return null; +@@ -476,6 +476,16 @@ public class TabWindowManagerImpl implements ActivityStateListener, TabWindowMan + return tabGroupModelFilter.getRelatedTabListForRootId(rootId); } + @Override @@ -430,7 +430,7 @@ diff --git a/chrome/browser/tabmodel/internal/android/java/src/org/chromium/chro + } + @Override - public TabModelSelector getTabModelSelectorById(int index) { + public @Nullable TabModelSelector getTabModelSelectorById(int index) { return mSelectors.get(index); diff --git a/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Ask-for-restart-on-connection-change.grdp b/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Ask-for-restart-on-connection-change.grdp new file mode 100644 @@ -562,7 +562,7 @@ diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/bro mProfileImageView = (ImageView) mContainerView.findViewById(R.id.snackbar_profile_image); mEdgeToEdgeSupplier = edgeToEdgeSupplier; if (SnackbarManager.isFloatingSnackbarEnabled()) { -@@ -394,6 +399,12 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver { +@@ -408,6 +413,12 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver { mActionButtonView.setVisibility(View.VISIBLE); mActionButtonView.setContentDescription(snackbar.getActionText()); setViewText(mActionButtonView, snackbar.getActionText(), animate); @@ -615,7 +615,7 @@ diff --git a/content/browser/web_contents/web_contents_android.h b/content/brows diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -3748,8 +3748,10 @@ void WebContentsImpl::Stop() { +@@ -3779,8 +3779,10 @@ void WebContentsImpl::Stop() { void WebContentsImpl::SetPageFrozen(bool frozen) { TRACE_EVENT1("content", "WebContentsImpl::SetPageFrozen", "frozen", frozen); @@ -642,7 +642,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/webcon @Override public void setDisplayCutoutSafeArea(Rect insets) { if (mNativeWebContentsAndroid == 0) return; -@@ -1459,6 +1465,8 @@ public class WebContentsImpl +@@ -1453,6 +1459,8 @@ public class WebContentsImpl void setFocus(long nativeWebContentsAndroid, boolean focused); @@ -711,7 +711,7 @@ new file mode 100644 diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc --- a/third_party/blink/renderer/core/dom/document.cc +++ b/third_party/blink/renderer/core/dom/document.cc -@@ -4307,6 +4307,7 @@ void Document::DispatchUnloadEvents(UnloadEventTimingInfo* unload_timing_info) { +@@ -4308,6 +4308,7 @@ void Document::DispatchUnloadEvents(UnloadEventTimingInfo* unload_timing_info) { } void Document::DispatchFreezeEvent() { @@ -722,7 +722,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink 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 -@@ -3231,6 +3231,7 @@ void LocalFrame::DidFreeze() { +@@ -3187,6 +3187,7 @@ void LocalFrame::DidFreeze() { LoaderFreezeMode freeze_mode = GetLoaderFreezeMode(); GetDocument()->Fetcher()->SetDefersLoading(freeze_mode); Loader().SetDefersLoading(freeze_mode); @@ -730,7 +730,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/ } void LocalFrame::DidResume() { -@@ -3245,6 +3246,7 @@ void LocalFrame::DidResume() { +@@ -3201,6 +3202,7 @@ void LocalFrame::DidResume() { GetDocument()->Fetcher()->SetDefersLoading(LoaderFreezeMode::kNone); Loader().SetDefersLoading(LoaderFreezeMode::kNone); diff --git a/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch b/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch index b494c711..27974571 100644 --- a/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch +++ b/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch @@ -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 -@@ -485,9 +485,8 @@ +@@ -479,9 +479,8 @@ { // AudioContext.playoutStats interface. // https://chromestatus.com/feature/5172818344148992 diff --git a/build/patches/Block-gateway-attacks-via-websockets.patch b/build/patches/Block-gateway-attacks-via-websockets.patch index 24fc5191..46d6aba4 100644 --- a/build/patches/Block-gateway-attacks-via-websockets.patch +++ b/build/patches/Block-gateway-attacks-via-websockets.patch @@ -60,7 +60,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context diff --git a/third_party/blink/renderer/core/loader/base_fetch_context.h b/third_party/blink/renderer/core/loader/base_fetch_context.h --- a/third_party/blink/renderer/core/loader/base_fetch_context.h +++ b/third_party/blink/renderer/core/loader/base_fetch_context.h -@@ -84,6 +84,7 @@ class CORE_EXPORT BaseFetchContext : public FetchContext { +@@ -86,6 +86,7 @@ class CORE_EXPORT BaseFetchContext : public FetchContext { virtual SubresourceFilter* GetSubresourceFilter() const = 0; virtual bool ShouldBlockWebSocketByMixedContentCheck(const KURL&) const = 0; @@ -71,7 +71,7 @@ diff --git a/third_party/blink/renderer/core/loader/base_fetch_context.h b/third diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/third_party/blink/renderer/core/loader/frame_fetch_context.cc --- a/third_party/blink/renderer/core/loader/frame_fetch_context.cc +++ b/third_party/blink/renderer/core/loader/frame_fetch_context.cc -@@ -996,6 +996,26 @@ bool FrameFetchContext::ShouldBlockRequestByInspector(const KURL& url) const { +@@ -1000,6 +1000,26 @@ bool FrameFetchContext::ShouldBlockRequestByInspector(const KURL& url) const { return should_block_request; } @@ -101,7 +101,7 @@ diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/thi diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.h b/third_party/blink/renderer/core/loader/frame_fetch_context.h --- a/third_party/blink/renderer/core/loader/frame_fetch_context.h +++ b/third_party/blink/renderer/core/loader/frame_fetch_context.h -@@ -182,6 +182,7 @@ class CORE_EXPORT FrameFetchContext final : public BaseFetchContext, +@@ -183,6 +183,7 @@ class CORE_EXPORT FrameFetchContext final : public BaseFetchContext, bool ShouldBlockWebSocketByMixedContentCheck(const KURL&) const override; std::unique_ptr CreateWebSocketHandshakeThrottle() override; diff --git a/build/patches/Block-leakage-of-urls-in-sandbox-iframes.patch b/build/patches/Block-leakage-of-urls-in-sandbox-iframes.patch index 92b5e55d..493d470a 100644 --- a/build/patches/Block-leakage-of-urls-in-sandbox-iframes.patch +++ b/build/patches/Block-leakage-of-urls-in-sandbox-iframes.patch @@ -25,7 +25,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html 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 -@@ -4967,7 +4967,17 @@ void RenderFrameHostImpl::SetLastCommittedOrigin( +@@ -4971,7 +4971,17 @@ void RenderFrameHostImpl::SetLastCommittedOrigin( } void RenderFrameHostImpl::SetInheritedBaseUrl(const GURL& inherited_base_url) { @@ -106,7 +106,7 @@ diff --git a/third_party/blink/renderer/core/frame/location.cc b/third_party/bli 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 -@@ -827,6 +827,11 @@ WebString DocumentLoader::HttpMethod() const { +@@ -834,6 +834,11 @@ WebString DocumentLoader::HttpMethod() const { } const AtomicString& DocumentLoader::GetReferrer() const { @@ -118,7 +118,7 @@ diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_p return referrer_; } -@@ -2930,6 +2935,13 @@ void DocumentLoader::CommitNavigation() { +@@ -2940,6 +2945,13 @@ void DocumentLoader::CommitNavigation() { response_.HttpHeaderField(http_names::kDocumentPolicyReportOnly)); } @@ -135,7 +135,7 @@ diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_p diff --git a/third_party/blink/renderer/core/loader/document_loader.h b/third_party/blink/renderer/core/loader/document_loader.h --- a/third_party/blink/renderer/core/loader/document_loader.h +++ b/third_party/blink/renderer/core/loader/document_loader.h -@@ -780,7 +780,7 @@ class CORE_EXPORT DocumentLoader : public GarbageCollected, +@@ -782,7 +782,7 @@ class CORE_EXPORT DocumentLoader : public GarbageCollected, // |archive_|, but won't have |loading_main_document_from_mhtml_archive_| set. bool loading_main_document_from_mhtml_archive_ = false; const bool loading_srcdoc_ = false; diff --git a/build/patches/Block-qjz9zk-or-trk-requests.patch b/build/patches/Block-qjz9zk-or-trk-requests.patch index 5742a106..d2ebe964 100644 --- a/build/patches/Block-qjz9zk-or-trk-requests.patch +++ b/build/patches/Block-qjz9zk-or-trk-requests.patch @@ -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 -@@ -1085,6 +1085,8 @@ component("net") { +@@ -1087,6 +1087,8 @@ component("net") { "url_request/url_request_http_job.cc", "url_request/url_request_http_job.h", "url_request/url_request_interceptor.cc", @@ -203,7 +203,7 @@ diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc #include "base/synchronization/lock.h" #include "base/task/single_thread_task_runner.h" #include "base/types/optional_util.h" -@@ -53,6 +54,7 @@ +@@ -54,6 +55,7 @@ #include "net/url_request/url_request_redirect_job.h" #include "url/gurl.h" #include "url/origin.h" @@ -211,7 +211,7 @@ diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc namespace net { -@@ -635,6 +637,12 @@ URLRequest::URLRequest(base::PassKey pass_key, +@@ -642,6 +644,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" -@@ -601,6 +602,8 @@ std::unique_ptr URLRequestContextBuilder::Build() { +@@ -594,6 +595,8 @@ std::unique_ptr URLRequestContextBuilder::Build() { job_factory->SetProtocolHandler(scheme_handler.first, std::move(scheme_handler.second)); } diff --git a/build/patches/Bookmarks-select-all-menu-entry.patch b/build/patches/Bookmarks-select-all-menu-entry.patch index 71eb9e18..6165bbc2 100644 --- a/build/patches/Bookmarks-select-all-menu-entry.patch +++ b/build/patches/Bookmarks-select-all-menu-entry.patch @@ -28,36 +28,30 @@ diff --git a/chrome/android/java/res/menu/bookmark_toolbar_menu_improved.xml b/c +@@ -184,6 +185,11 @@ public class BookmarkToolbar extends SelectableListToolbar void setCurrentFolder(BookmarkId folder) { mCurrentFolder = mBookmarkModel.getBookmarkById(folder); enableImportExportMenu(); + enableSelectAllMenu(); - } - - void enableImportExportMenu() { - getMenu().findItem(R.id.import_menu_id).setVisible(true); - getMenu().findItem(R.id.export_menu_id).setVisible(true); - } ++ } + + void enableSelectAllMenu() { + getMenu().findItem(R.id.select_all_menu_id).setVisible(true); } - void setNavigateBackRunnable(Runnable navigateBackRunnable) { -@@ -218,6 +224,17 @@ public class BookmarkToolbar extends SelectableListToolbar + void enableImportExportMenu() { +@@ -215,6 +221,17 @@ public class BookmarkToolbar extends SelectableListToolbar mExportBookmarkRunnable.run(); return true; } @@ -75,7 +69,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm return mMenuIdClickedFunction.apply(menuItem.getItemId()); } -@@ -235,6 +252,7 @@ public class BookmarkToolbar extends SelectableListToolbar +@@ -232,6 +249,7 @@ public class BookmarkToolbar extends SelectableListToolbar getMenu().findItem(R.id.import_menu_id).setVisible(mCurrentFolder != null); getMenu().findItem(R.id.export_menu_id).setVisible(mCurrentFolder != null); diff --git a/build/patches/Bromite-auto-updater.patch b/build/patches/Bromite-auto-updater.patch index beeb9b71..9e03eaae 100644 --- a/build/patches/Bromite-auto-updater.patch +++ b/build/patches/Bromite-auto-updater.patch @@ -35,11 +35,13 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../omaha/inline/InlineUpdateController.java | 57 ++++ .../safety_hub/SafetyHubFetchService.java | 5 - .../strings/android_chrome_strings.grd | 23 +- - .../endpoint_fetcher/endpoint_fetcher.cc | 125 ++++++-- - .../endpoint_fetcher/endpoint_fetcher.h | 23 +- + .../ui/lens/lens_overlay_query_controller.cc | 1 + + .../endpoint_fetcher/endpoint_fetcher.cc | 133 ++++++-- + .../endpoint_fetcher/endpoint_fetcher.h | 24 ++ + components/manta/base_provider.cc | 1 + .../Bromite-auto-updater.inc | 3 + .../Bromite-auto-updater.inc | 1 + - 31 files changed, 1226 insertions(+), 98 deletions(-) + 33 files changed, 1240 insertions(+), 95 deletions(-) create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/omaha/CromiteUpdateStatusProvider.java create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/BromiteInlineUpdateController.java create mode 100644 chrome/browser/endpoint_fetcher/BUILD.gn @@ -81,7 +83,7 @@ diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni 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 -@@ -870,6 +870,8 @@ chrome_java_sources = [ +@@ -802,6 +802,8 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/omaha/OmahaBase.java", "java/src/org/chromium/chrome/browser/omaha/OmahaDelegate.java", "java/src/org/chromium/chrome/browser/omaha/OmahaDelegateBase.java", @@ -672,7 +674,7 @@ new file mode 100644 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2525,6 +2525,12 @@ static_library("browser") { +@@ -2546,6 +2546,12 @@ static_library("browser") { } if (is_android) { @@ -1096,7 +1098,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 -@@ -373,6 +373,7 @@ public abstract class ChromeFeatureList { +@@ -380,6 +380,7 @@ public abstract class ChromeFeatureList { public static final String HISTORY_PANE_ANDROID = "HistoryPaneAndroid"; public static final String HTTPS_FIRST_BALANCED_MODE = "HttpsFirstBalancedMode"; public static final String INCOGNITO_SCREENSHOT = "IncognitoScreenshot"; @@ -1120,17 +1122,18 @@ diff --git a/chrome/browser/omaha/android/BUILD.gn b/chrome/browser/omaha/androi diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/OmahaPrefUtils.java b/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/OmahaPrefUtils.java --- a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/OmahaPrefUtils.java +++ b/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/OmahaPrefUtils.java -@@ -7,7 +7,9 @@ package org.chromium.chrome.browser.omaha; +@@ -7,8 +7,10 @@ package org.chromium.chrome.browser.omaha; import android.content.Context; import android.content.SharedPreferences; +import org.chromium.base.Log; import org.chromium.base.ContextUtils; + import org.chromium.build.annotations.NullMarked; +import org.chromium.base.version_info.VersionInfo; + @NullMarked public class OmahaPrefUtils { - // Flags for retrieving the OmahaClient's state after it's written to disk. -@@ -22,7 +24,55 @@ public class OmahaPrefUtils { +@@ -24,7 +26,55 @@ public class OmahaPrefUtils { static final String PREF_TIMESTAMP_FOR_NEW_REQUEST = "timestampForNewRequest"; static final String PREF_TIMESTAMP_FOR_NEXT_POST_ATTEMPT = "timestampForNextPostAttempt"; static final String PREF_TIMESTAMP_OF_INSTALL = "timestampOfInstall"; @@ -1190,15 +1193,15 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java b/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java --- a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java +++ b/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java -@@ -11,6 +11,7 @@ import androidx.annotation.IntDef; - import androidx.annotation.Nullable; - +@@ -12,6 +12,7 @@ import androidx.annotation.IntDef; import org.chromium.base.CommandLine; + import org.chromium.build.annotations.NullMarked; + import org.chromium.build.annotations.Nullable; +import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.flags.ChromeSwitches; import org.chromium.chrome.browser.omaha.UpdateStatusProvider.UpdateState; import org.chromium.components.variations.VariationsAssociatedData; -@@ -36,10 +37,12 @@ public class UpdateConfigs { +@@ -38,10 +39,12 @@ public class UpdateConfigs { private static final String UPDATE_AVAILABLE_SWITCH_VALUE = "update_available"; private static final String UNSUPPORTED_OS_VERSION_SWITCH_VALUE = "unsupported_os_version"; @@ -1212,7 +1215,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o @Retention(RetentionPolicy.SOURCE) public @interface UpdateFlowConfiguration { /** Turns off all update indicators. */ -@@ -49,6 +52,12 @@ public class UpdateConfigs { +@@ -51,6 +54,12 @@ public class UpdateConfigs { * Requires Omaha to say an update is available, and only ever Intents out to Play Store. */ int INTENT_ONLY = 2; @@ -1225,7 +1228,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o } /** -@@ -124,6 +133,13 @@ public class UpdateConfigs { +@@ -126,6 +135,13 @@ public class UpdateConfigs { return DEFAULT_UPDATE_ATTRIBUTION_WINDOW_MS; } @@ -1239,7 +1242,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o /** * Gets a String VariationsAssociatedData parameter. Also checks for a command-line switch * with the same name, for easy local testing. -@@ -137,4 +153,13 @@ public class UpdateConfigs { +@@ -139,4 +155,13 @@ public class UpdateConfigs { } return value; } @@ -1256,18 +1259,18 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/UpdateStatusProvider.java b/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/UpdateStatusProvider.java --- a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/UpdateStatusProvider.java +++ b/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/UpdateStatusProvider.java -@@ -4,6 +4,7 @@ +@@ -6,6 +6,7 @@ package org.chromium.chrome.browser.omaha; - package org.chromium.chrome.browser.omaha; + import static org.chromium.build.NullUtil.assumeNonNull; +import android.app.Activity; import android.content.ActivityNotFoundException; import android.content.Context; import android.content.Intent; -@@ -15,9 +16,11 @@ import android.text.TextUtils; +@@ -15,9 +16,11 @@ import android.os.StatFs; + import android.text.TextUtils; + import androidx.annotation.IntDef; - import androidx.annotation.NonNull; - import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; -import com.google.android.gms.common.GooglePlayServicesUtil; @@ -1278,15 +1281,15 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o import org.chromium.base.BuildInfo; import org.chromium.base.Callback; import org.chromium.base.ObserverList; -@@ -27,6 +30,7 @@ import org.chromium.base.task.AsyncTask; - import org.chromium.base.task.AsyncTask.Status; - import org.chromium.base.task.PostTask; - import org.chromium.base.task.TaskTraits; +@@ -30,6 +33,7 @@ import org.chromium.base.task.TaskTraits; + import org.chromium.build.annotations.NullMarked; + import org.chromium.build.annotations.Nullable; + import org.chromium.build.annotations.RequiresNonNull; +import org.chromium.chrome.browser.omaha.inline.InlineUpdateController; import org.chromium.chrome.browser.omaha.metrics.UpdateSuccessMetrics; import org.chromium.chrome.browser.preferences.ChromePreferenceKeys; import org.chromium.chrome.browser.preferences.ChromeSharedPreferences; -@@ -36,30 +40,37 @@ import java.io.File; +@@ -39,6 +43,11 @@ import java.io.File; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -1298,9 +1301,10 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o /** * Provides the current update state for Chrome. This update state is asynchronously determined and * can change as Chrome runs. - * +@@ -46,24 +55,26 @@ import java.lang.annotation.RetentionPolicy; * For manually testing this functionality, see {@link UpdateConfigs}. */ + @NullMarked -public class UpdateStatusProvider { +public abstract class UpdateStatusProvider implements ActivityStateListener { /** @@ -1332,7 +1336,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o } /** A set of properties that represent the current update state for Chrome. */ -@@ -93,6 +104,12 @@ public class UpdateStatusProvider { +@@ -97,6 +108,12 @@ public class UpdateStatusProvider { */ private boolean mIsSimulated; @@ -1345,7 +1349,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o public UpdateStatus() {} UpdateStatus(UpdateStatus other) { -@@ -101,11 +118,13 @@ public class UpdateStatusProvider { +@@ -105,11 +122,13 @@ public class UpdateStatusProvider { latestVersion = other.latestVersion; latestUnsupportedVersion = other.latestUnsupportedVersion; mIsSimulated = other.mIsSimulated; @@ -1359,7 +1363,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o private final UpdateQuery mOmahaQuery; private final UpdateSuccessMetrics mMetrics; private @Nullable UpdateStatus mStatus; -@@ -113,11 +132,6 @@ public class UpdateStatusProvider { +@@ -117,11 +136,6 @@ public class UpdateStatusProvider { /** Whether or not we've recorded the initial update status yet. */ private boolean mRecordedInitialStatus; @@ -1371,7 +1375,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o /** * Adds {@code observer} to notify about update state changes. It is safe to call this multiple * times with the same {@code observer}. This method will always notify {@code observer} of the -@@ -173,6 +187,30 @@ public class UpdateStatusProvider { +@@ -177,6 +191,30 @@ public class UpdateStatusProvider { pingObservers(); } @@ -1402,7 +1406,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o /** * Starts the intent update process, if possible * @param context An {@link Context} that will be used to fire off the update intent. -@@ -180,12 +218,11 @@ public class UpdateStatusProvider { +@@ -184,12 +222,11 @@ public class UpdateStatusProvider { * @return Whether or not the update intent was sent and had a valid handler. */ public boolean startIntentUpdate(Context context, boolean newTask) { @@ -1416,7 +1420,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(mStatus.updateUrl)); if (newTask) intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); context.startActivity(intent); -@@ -196,9 +233,15 @@ public class UpdateStatusProvider { +@@ -200,9 +237,15 @@ public class UpdateStatusProvider { return true; } @@ -1433,8 +1437,8 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o + ApplicationStatus.registerStateListenerForAllActivities(this); } - private void pingObservers() { -@@ -206,35 +249,52 @@ public class UpdateStatusProvider { + @RequiresNonNull("mStatus") +@@ -211,35 +254,52 @@ public class UpdateStatusProvider { } private void resolveStatus() { @@ -1444,10 +1448,10 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o } // We pull the Omaha result once as it will never change. - if (mStatus == null) mStatus = new UpdateStatus(mOmahaQuery.getResult()); + if (mStatus == null) mStatus = new UpdateStatus(assumeNonNull(mOmahaQuery.getResult())); - if (!mStatus.mIsSimulated) { -- mStatus.updateState = mOmahaQuery.getResult().updateState; +- mStatus.updateState = assumeNonNull(mOmahaQuery.getResult()).updateState; + if (mStatus.mIsSimulated) { // used only during tests + if (mStatus.mIsInlineSimulated) { + @UpdateState @@ -1455,7 +1459,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o + String updateUrl = mInlineController.getUpdateUrl(); + + if (inlineState == UpdateState.NONE) { -+ mStatus.updateState = mOmahaQuery.getResult().updateState; ++ mStatus.updateState = assumeNonNull(mOmahaQuery.getResult()).updateState; + } else { + mStatus.updateState = inlineState; + mStatus.updateUrl = updateUrl; @@ -1488,15 +1492,15 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o private @Nullable UpdateStatus mStatus; -- public UpdateQuery(@NonNull Runnable resultReceiver) { +- public UpdateQuery(Runnable resultReceiver) { + private InlineUpdateController mInlineController; + -+ public UpdateQuery(InlineUpdateController inlineController, @NonNull Runnable resultReceiver) { ++ public UpdateQuery(InlineUpdateController inlineController, Runnable resultReceiver) { + mInlineController = inlineController; mCallback = resultReceiver; } -@@ -246,7 +306,7 @@ public class UpdateStatusProvider { +@@ -251,7 +311,7 @@ public class UpdateStatusProvider { protected UpdateStatus doInBackground() { UpdateStatus testStatus = getTestStatus(); if (testStatus != null) return testStatus; @@ -1505,7 +1509,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o } @Override -@@ -264,6 +324,8 @@ public class UpdateStatusProvider { +@@ -269,6 +329,8 @@ public class UpdateStatusProvider { status.mIsSimulated = true; status.updateState = forcedUpdateState; @@ -1514,7 +1518,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o // Push custom configurations for certain update states. switch (forcedUpdateState) { case UpdateState.UPDATE_AVAILABLE: -@@ -281,31 +343,33 @@ public class UpdateStatusProvider { +@@ -286,31 +348,33 @@ public class UpdateStatusProvider { return status; } @@ -1574,7 +1578,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/VersionNumberGetter.java b/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/VersionNumberGetter.java --- a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/VersionNumberGetter.java +++ b/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/VersionNumberGetter.java -@@ -22,8 +22,8 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList; +@@ -24,8 +24,8 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList; public class VersionNumberGetter { private static VersionNumberGetter sInstance = new VersionNumberGetter(); @@ -1650,9 +1654,9 @@ new file mode 100644 diff --git a/chrome/browser/safety_hub/android/java/src/org/chromium/chrome/browser/safety_hub/SafetyHubFetchService.java b/chrome/browser/safety_hub/android/java/src/org/chromium/chrome/browser/safety_hub/SafetyHubFetchService.java --- a/chrome/browser/safety_hub/android/java/src/org/chromium/chrome/browser/safety_hub/SafetyHubFetchService.java +++ b/chrome/browser/safety_hub/android/java/src/org/chromium/chrome/browser/safety_hub/SafetyHubFetchService.java -@@ -78,9 +78,6 @@ public class SafetyHubFetchService implements SigninManager.SignInStateObserver, - mSigninManager.addSignInStateObserver(this); - } +@@ -82,9 +82,6 @@ public class SafetyHubFetchService implements SigninManager.SignInStateObserver, + mLocalPasswordsFetchService = + new SafetyHubPasswordsFetchService(passwordManagerHelper, prefService, null); - // Fetch latest update status. - UpdateStatusProvider.getInstance().addObserver(mUpdateCallback); @@ -1660,7 +1664,7 @@ diff --git a/chrome/browser/safety_hub/android/java/src/org/chromium/chrome/brow recordMetricForUnusedSitePermissionsSettingState(); } -@@ -109,8 +106,6 @@ public class SafetyHubFetchService implements SigninManager.SignInStateObserver, +@@ -113,8 +110,6 @@ public class SafetyHubFetchService implements SigninManager.SignInStateObserver, if (mSigninManager != null) { mSigninManager.removeSignInStateObserver(this); } @@ -1672,7 +1676,7 @@ diff --git a/chrome/browser/safety_hub/android/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 -@@ -2360,6 +2360,12 @@ Your Google account may have other forms of browsing history like searches and a +@@ -2397,6 +2397,12 @@ Your Google account may have other forms of browsing history like searches and a Chrome updates are no longer supported for this version of Android @@ -1685,7 +1689,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro -@@ -4298,7 +4304,10 @@ To change this setting, BEGIN_LINKdelete the Chrome d +@@ -4332,7 +4338,10 @@ To change this setting, BEGIN_LINKdelete the Chrome d @@ -1697,7 +1701,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Newer version is available -@@ -4309,6 +4318,18 @@ To change this setting, BEGIN_LINKdelete the Chrome d +@@ -4343,6 +4352,18 @@ To change this setting, BEGIN_LINKdelete the Chrome d Android version is unsupported @@ -1716,11 +1720,22 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro New window +diff --git a/chrome/browser/ui/lens/lens_overlay_query_controller.cc b/chrome/browser/ui/lens/lens_overlay_query_controller.cc +--- a/chrome/browser/ui/lens/lens_overlay_query_controller.cc ++++ b/chrome/browser/ui/lens/lens_overlay_query_controller.cc +@@ -771,6 +771,7 @@ LensOverlayQueryController::CreateEndpointFetcher( + /*post_data=*/request_string, + /*headers=*/request_headers, + /*cors_exempt_headers=*/cors_exempt_headers, chrome::GetChannel(), ++ kTrafficAnnotationTag, + /*request_params=*/ + EndpointFetcher::RequestParams::Builder(http_method, + kTrafficAnnotationTag) diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoint_fetcher/endpoint_fetcher.cc --- a/components/endpoint_fetcher/endpoint_fetcher.cc +++ b/components/endpoint_fetcher/endpoint_fetcher.cc -@@ -20,6 +20,11 @@ - #include "services/network/public/cpp/simple_url_loader.h" +@@ -21,6 +21,11 @@ + #include "services/network/public/mojom/referrer_policy.mojom-shared.h" #include "services/network/public/mojom/url_response_head.mojom.h" +// used for the Bromite customization @@ -1731,47 +1746,71 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi namespace { const char kContentTypeKey[] = "Content-Type"; const char kDeveloperKey[] = "X-Developer-Key"; -@@ -83,6 +88,7 @@ EndpointFetcher::EndpointFetcher( - http_method_(http_method), - content_type_(content_type), - timeout_(timeout), +@@ -35,6 +40,8 @@ std::string GetHttpMethodString(const HttpMethod& http_method) { + return "POST"; + case HttpMethod::kDelete: + return "DELETE"; ++ case HttpMethod::kHead: ++ return "HEAD"; + default: + DCHECK(0) << base::StringPrintf("Unknown HttpMethod %d\n", + static_cast(http_method)); +@@ -49,6 +56,8 @@ HttpMethod GetHttpMethod(const std::string& http_method_string) { + return HttpMethod::kPost; + } else if (http_method_string == "DELETE") { + return HttpMethod::kDelete; ++ } else if (http_method_string == "HEAD") { ++ return HttpMethod::kHead; + } + return HttpMethod::kUndefined; + } +@@ -115,9 +124,11 @@ EndpointFetcher::EndpointFetcher( + const std::vector& headers, + const std::vector& cors_exempt_headers, + version_info::Channel channel, ++ const net::NetworkTrafficAnnotationTag& annotation_tag, + const RequestParams request_params) + : url_loader_factory_(url_loader_factory), + identity_manager_(nullptr), + intercept_redirect_(false), - post_data_(post_data), - headers_(headers), - cors_exempt_headers_(cors_exempt_headers), -@@ -103,6 +109,7 @@ EndpointFetcher::EndpointFetcher( - http_method_("GET"), - content_type_(std::string()), - timeout_(base::Milliseconds(0)), + consent_level_(std::nullopt), + sanitize_response_(true), + channel_(channel), +@@ -137,6 +148,7 @@ EndpointFetcher::EndpointFetcher( + const net::NetworkTrafficAnnotationTag& annotation_tag) + : url_loader_factory_(url_loader_factory), + identity_manager_(nullptr), + intercept_redirect_(false), - post_data_(std::string()), - annotation_tag_(annotation_tag), + consent_level_(std::nullopt), + sanitize_response_(false), + request_params_(EndpointFetcher::RequestParams::Builder(HttpMethod::kGet, +@@ -161,6 +173,7 @@ EndpointFetcher::EndpointFetcher( + : oauth_consumer_name_(oauth_consumer_name), url_loader_factory_(url_loader_factory), -@@ -128,6 +135,7 @@ EndpointFetcher::EndpointFetcher( - http_method_(http_method), - content_type_(content_type), - timeout_(timeout), + identity_manager_(identity_manager), + intercept_redirect_(false), - post_data_(post_data), - annotation_tag_(annotation_tag), - url_loader_factory_(url_loader_factory), -@@ -155,6 +163,7 @@ EndpointFetcher::EndpointFetcher( - http_method_(http_method), - content_type_(content_type), - timeout_(timeout), + consent_level_(consent_level), + sanitize_response_(true), + request_params_( +@@ -190,6 +203,7 @@ EndpointFetcher::EndpointFetcher( + bool is_oauth_fetch) + : url_loader_factory_(url_loader_factory), + identity_manager_(nullptr), + intercept_redirect_(false), - post_data_(post_data), - headers_(headers), - cors_exempt_headers_(cors_exempt_headers), -@@ -167,11 +176,29 @@ EndpointFetcher::EndpointFetcher( + consent_level_(std::nullopt), + sanitize_response_(true), + request_params_( +@@ -207,6 +221,7 @@ EndpointFetcher::EndpointFetcher( EndpointFetcher::EndpointFetcher( const net::NetworkTrafficAnnotationTag& annotation_tag) - : timeout_(kDefaultTimeOut), + : identity_manager_(nullptr), + intercept_redirect_(false), - annotation_tag_(annotation_tag), - identity_manager_(nullptr), consent_level_(std::nullopt), - sanitize_response_(true) {} + sanitize_response_(true), + request_params_( +@@ -215,6 +230,27 @@ EndpointFetcher::EndpointFetcher( + .SetTimeout(kDefaultTimeOut) + .Build()) {} +// constructor used by Bromite +EndpointFetcher::EndpointFetcher( @@ -1781,34 +1820,39 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi + int64_t timeout_ms, + const bool intercept_redirect, + const net::NetworkTrafficAnnotationTag& annotation_tag) -+ : url_(url), -+ http_method_(http_method), -+ timeout_(base::Milliseconds(timeout_ms)), -+ intercept_redirect_(intercept_redirect), -+ annotation_tag_(annotation_tag), -+ url_loader_factory_(url_loader_factory), ++ : url_loader_factory_(url_loader_factory), + identity_manager_(nullptr), -+ sanitize_response_(false) {} ++ intercept_redirect_(intercept_redirect), ++ consent_level_(std::nullopt), ++ sanitize_response_(false), ++ request_params_( ++ EndpointFetcher::RequestParams::Builder(GetHttpMethod(http_method), ++ annotation_tag) ++ .SetAuthType(NO_AUTH) ++ .SetTimeout(base::Milliseconds(timeout_ms)) ++ .SetUrl(url) ++ .Build()) {} + EndpointFetcher::~EndpointFetcher() = default; void EndpointFetcher::Fetch(EndpointFetcherCallback endpoint_fetcher_callback) { -@@ -229,11 +256,9 @@ void EndpointFetcher::PerformRequest( +@@ -272,12 +308,9 @@ void EndpointFetcher::PerformRequest( auto resource_request = std::make_unique(); - resource_request->method = http_method_; - resource_request->url = url_; + resource_request->method = GetHttpMethodString(request_params_.http_method()); + resource_request->url = request_params_.url(); - resource_request->credentials_mode = GetCredentialsMode(); - if (GetSetSiteForCookies()) { -- resource_request->site_for_cookies = net::SiteForCookies::FromUrl(url_); +- resource_request->site_for_cookies = +- net::SiteForCookies::FromUrl(request_params_.url()); - } - + resource_request->credentials_mode = network::mojom::CredentialsMode::kOmit; + resource_request->load_flags = net::LOAD_BYPASS_CACHE | net::LOAD_DISABLE_CACHE + | net::LOAD_DO_NOT_SAVE_COOKIES; - if (base::EqualsCaseInsensitiveASCII(http_method_, "POST")) { - resource_request->headers.SetHeader(kContentTypeKey, content_type_); - } -@@ -261,10 +286,27 @@ void EndpointFetcher::PerformRequest( + if (request_params_.http_method() == HttpMethod::kPost) { + resource_request->headers.SetHeader(kContentTypeKey, + request_params_.content_type()); +@@ -305,10 +338,26 @@ void EndpointFetcher::PerformRequest( default: break; } @@ -1821,8 +1865,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi // TODO(crbug.com/40641804) Make simple_url_loader_ local variable passed to // callback simple_url_loader_ = network::SimpleURLLoader::Create( - std::move(resource_request), annotation_tag_); -+ simple_url_loader_->SetTimeoutDuration(timeout_); + std::move(resource_request), request_params_.annotation_tag()); + simple_url_loader_->SetAllowHttpErrorResults(true); + + if (!response_) @@ -1834,17 +1877,19 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi + &EndpointFetcher::OnSimpleLoaderRedirect, base::Unretained(this))); + } - if (base::EqualsCaseInsensitiveASCII(http_method_, "POST")) { - simple_url_loader_->AttachStringForUpload(post_data_, content_type_); -@@ -275,15 +317,23 @@ void EndpointFetcher::PerformRequest( + if (request_params_.http_method() == HttpMethod::kPost) { + simple_url_loader_->AttachStringForUpload( +@@ -320,15 +369,25 @@ void EndpointFetcher::PerformRequest( } simple_url_loader_->SetRetryOptions(GetMaxRetries(), network::SimpleURLLoader::RETRY_ON_5XX); -- simple_url_loader_->SetTimeoutDuration(timeout_); +- simple_url_loader_->SetTimeoutDuration(request_params_.timeout()); - simple_url_loader_->SetAllowHttpErrorResults(true); - network::SimpleURLLoader::BodyAsStringCallbackDeprecated -+ LOG(INFO) << "performing " << http_method_ << " request to " << url_; -+ if (base::EqualsCaseInsensitiveASCII(http_method_, "HEAD")) { ++ LOG(INFO) << "performing " ++ << GetHttpMethodString(request_params_.http_method()) ++ << " request to " << url_; ++ if (request_params_.http_method() == HttpMethod::kHead) { + endpoint_fetcher_callback_ = std::move(endpoint_fetcher_callback); + + simple_url_loader_->DownloadHeadersOnly( @@ -1866,18 +1911,15 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi } void EndpointFetcher::OnResponseFetched( -@@ -361,24 +411,6 @@ void EndpointFetcher::OnSanitizationResult( +@@ -406,21 +465,6 @@ void EndpointFetcher::OnSanitizationResult( std::move(endpoint_fetcher_callback).Run(std::move(response)); } --network::mojom::CredentialsMode EndpointFetcher::GetCredentialsMode() { -- if (!request_params_.has_value()) { +-network::mojom::CredentialsMode EndpointFetcher::GetCredentialsMode() const { +- if (!request_params_.credentials_mode.has_value()) { - return network::mojom::CredentialsMode::kOmit; - } -- if (!request_params_.value().credentials_mode.has_value()) { -- return network::mojom::CredentialsMode::kOmit; -- } -- switch (request_params_.value().credentials_mode.value()) { +- switch (request_params_.credentials_mode.value()) { - case CredentialsMode::kOmit: - return network::mojom::CredentialsMode::kOmit; - case CredentialsMode::kInclude: @@ -1885,15 +1927,15 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi - } - DCHECK(0) << base::StringPrintf( - "Credentials mode %d not currently supported by EndpointFetcher\n", -- static_cast(request_params_.value().credentials_mode.value())); +- static_cast(request_params_.credentials_mode.value())); -} - - int EndpointFetcher::GetMaxRetries() { - if (!request_params_.has_value()) { + int EndpointFetcher::GetMaxRetries() const { + if (!request_params_.max_retries.has_value()) { return kNumRetries; -@@ -412,3 +444,38 @@ UploadProgressCallback EndpointFetcher::GetUploadProgressCallback() { +@@ -445,3 +489,38 @@ UploadProgressCallback EndpointFetcher::GetUploadProgressCallback() const { std::string EndpointFetcher::GetUrlForTesting() { - return url_.spec(); + return request_params_.url().spec(); } + +void EndpointFetcher::OnSimpleLoaderRedirect( @@ -1942,7 +1984,15 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.h b/components/endpoin namespace network { struct ResourceRequest; -@@ -58,6 +60,8 @@ enum class FetchErrorType { +@@ -61,6 +63,7 @@ enum class HttpMethod { + kGet = 0, + kPost = 1, + kDelete = 2, ++ kHead = 3, + }; + + enum AuthType { +@@ -76,6 +79,8 @@ enum AuthType { struct EndpointResponse { std::string response; @@ -1951,7 +2001,15 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.h b/components/endpoin int http_status_code{-1}; std::optional error_type; }; -@@ -175,6 +179,14 @@ class EndpointFetcher { +@@ -296,6 +301,7 @@ class EndpointFetcher { + const std::vector& headers, + const std::vector& cors_exempt_headers, + version_info::Channel channel, ++ const net::NetworkTrafficAnnotationTag& annotation_tag, + const RequestParams request_params); + + // Constructor if no authentication is needed. +@@ -304,6 +310,14 @@ class EndpointFetcher { const GURL& url, const net::NetworkTrafficAnnotationTag& annotation_tag); @@ -1966,7 +2024,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.h b/components/endpoin // Used for tests. Can be used if caller constructs their own // url_loader_factory and identity_manager. EndpointFetcher( -@@ -231,6 +243,11 @@ class EndpointFetcher { +@@ -360,6 +374,11 @@ class EndpointFetcher { void OnSanitizationResult(std::unique_ptr response, EndpointFetcherCallback endpoint_fetcher_callback, data_decoder::JsonSanitizer::Result result); @@ -1976,22 +2034,24 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.h b/components/endpoin + const network::mojom::URLResponseHead& response_head, + std::vector* removed_headers); - network::mojom::CredentialsMode GetCredentialsMode(); - int GetMaxRetries(); -@@ -243,10 +260,11 @@ class EndpointFetcher { - // Members set in constructor to be passed to network::ResourceRequest or + network::mojom::CredentialsMode GetCredentialsMode() const; + int GetMaxRetries() const; +@@ -370,12 +389,14 @@ class EndpointFetcher { // network::SimpleURLLoader. const std::string oauth_consumer_name_; -- const GURL url_; + signin::ScopeSet oauth_scopes_; + GURL url_; - const std::string http_method_; - const std::string content_type_; - base::TimeDelta timeout_; + + // Members set in constructor + const scoped_refptr url_loader_factory_; + // `identity_manager_` can be null if it is not needed for authentication (in + // this case, callers should invoke `PerformRequest` directly). + const raw_ptr identity_manager_; + const bool intercept_redirect_; - const std::string post_data_; - const std::vector headers_; - const std::vector cors_exempt_headers_; -@@ -270,6 +288,9 @@ class EndpointFetcher { + // `consent_level_` is used together with `identity_manager_`, so it can be + // null if `identity_manager_` is null. + const std::optional consent_level_; +@@ -388,6 +409,9 @@ class EndpointFetcher { access_token_fetcher_; std::unique_ptr simple_url_loader_; @@ -2001,6 +2061,17 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.h b/components/endpoin base::WeakPtrFactory weak_ptr_factory_{this}; }; +diff --git a/components/manta/base_provider.cc b/components/manta/base_provider.cc +--- a/components/manta/base_provider.cc ++++ b/components/manta/base_provider.cc +@@ -160,6 +160,7 @@ std::unique_ptr BaseProvider::CreateEndpointFetcherForDemoMode( + /*cors_exempt_headers=*/std::vector(), + // ChromeOS always uses the stable channel API key + version_info::Channel::STABLE, ++ annotation_tag, + EndpointFetcher::RequestParams::Builder(kHttpMethod, annotation_tag) + .Build()); + } diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Bromite-auto-updater.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Bromite-auto-updater.inc new file mode 100644 --- /dev/null diff --git a/build/patches/Bromite-subresource-adblocker.patch b/build/patches/Bromite-subresource-adblocker.patch index c707f34a..afecc126 100644 --- a/build/patches/Bromite-subresource-adblocker.patch +++ b/build/patches/Bromite-subresource-adblocker.patch @@ -66,7 +66,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 -@@ -322,6 +322,7 @@ if (current_toolchain == default_toolchain) { +@@ -320,6 +320,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", @@ -77,7 +77,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn 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 -@@ -436,6 +436,7 @@ chrome_java_resources = [ +@@ -443,6 +443,7 @@ chrome_java_resources = [ "java/res/layout/account_divider_preference.xml", "java/res/layout/account_management_account_row.xml", "java/res/layout/app_history_filter.xml", @@ -85,10 +85,10 @@ 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", -@@ -624,6 +625,7 @@ chrome_java_resources = [ - "java/res/xml/about_chrome_preferences.xml", +@@ -631,6 +632,7 @@ chrome_java_resources = [ "java/res/xml/account_management_preferences.xml", "java/res/xml/ad_services_config.xml", + "java/res/xml/appearance_preferences.xml", + "java/res/xml/adblock_preferences.xml", "java/res/xml/bookmark_widget_info.xml", "java/res/xml/clear_browsing_data_preferences.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 -@@ -941,6 +941,8 @@ chrome_java_sources = [ +@@ -874,6 +874,8 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/permissions/PermissionBlockedDialog.java", "java/src/org/chromium/chrome/browser/permissions/PermissionUpdateRequester.java", "java/src/org/chromium/chrome/browser/photo_picker/DecoderServiceImpl.java", @@ -180,7 +180,7 @@ new file mode 100644 diff --git a/chrome/android/java/res/values/styles.xml b/chrome/android/java/res/values/styles.xml --- a/chrome/android/java/res/values/styles.xml +++ b/chrome/android/java/res/values/styles.xml -@@ -256,6 +256,24 @@ found in the LICENSE file. +@@ -251,6 +251,24 @@ found in the LICENSE file. @@ -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 -@@ -923,9 +923,7 @@ public class TabModelImpl extends TabModelJniBridge { +@@ -916,9 +916,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 -@@ -16490,6 +16490,16 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -16534,6 +16534,16 @@ Please help our engineers fix this problem. Tell us what happened right before y Never show this again. @@ -460,16 +460,16 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources diff --git a/chrome/browser/after_startup_task_utils.cc b/chrome/browser/after_startup_task_utils.cc --- a/chrome/browser/after_startup_task_utils.cc +++ b/chrome/browser/after_startup_task_utils.cc -@@ -29,6 +29,8 @@ - #include "chromeos/startup/browser_params_proxy.h" - #endif // BUILDFLAG(IS_CHROMEOS_LACROS) +@@ -24,6 +24,8 @@ + #include "chrome/browser/ui/ash/login/login_display_host.h" + #endif +#include "chrome/browser/browser_process.h" + using content::BrowserThread; namespace { -@@ -134,6 +136,8 @@ void SetBrowserStartupIsComplete() { +@@ -129,6 +131,8 @@ void SetBrowserStartupIsComplete() { } GetAfterStartupTasks().clear(); GetAfterStartupTasks().shrink_to_fit(); @@ -481,7 +481,7 @@ diff --git a/chrome/browser/after_startup_task_utils.cc b/chrome/browser/after_s diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h --- a/chrome/browser/browser_process.h +++ b/chrome/browser/browser_process.h -@@ -32,6 +32,7 @@ +@@ -31,6 +31,7 @@ #include "chrome/common/buildflags.h" #include "components/safe_browsing/buildflags.h" #include "media/media_buildflags.h" @@ -489,7 +489,7 @@ diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h class BackgroundModeManager; class BrowserProcessPlatformPart; -@@ -89,6 +90,10 @@ namespace component_updater { +@@ -88,6 +89,10 @@ namespace component_updater { class ComponentUpdateService; } @@ -500,7 +500,7 @@ diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h namespace gcm { class GCMDriver; } -@@ -269,6 +274,7 @@ class BrowserProcess { +@@ -266,6 +271,7 @@ class BrowserProcess { #endif virtual component_updater::ComponentUpdateService* component_updater() = 0; @@ -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 -@@ -1240,6 +1240,34 @@ BrowserProcessImpl::component_updater() { +@@ -1236,6 +1236,34 @@ BrowserProcessImpl::component_updater() { return component_updater_.get(); } @@ -549,7 +549,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h --- a/chrome/browser/browser_process_impl.h +++ b/chrome/browser/browser_process_impl.h -@@ -217,6 +217,7 @@ class BrowserProcessImpl : public BrowserProcess, +@@ -214,6 +214,7 @@ class BrowserProcessImpl : public BrowserProcess, #endif component_updater::ComponentUpdateService* component_updater() override; @@ -557,7 +557,7 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_proc MediaFileSystemRegistry* media_file_system_registry() override; WebRtcLogUploader* webrtc_log_uploader() override; network_time::NetworkTimeTracker* network_time_tracker() override; -@@ -429,6 +430,7 @@ class BrowserProcessImpl : public BrowserProcess, +@@ -423,6 +424,7 @@ class BrowserProcessImpl : public BrowserProcess, // to concerns over integrity of data shared between profiles, // but some users of component updater only install per-user. std::unique_ptr component_updater_; @@ -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( +@@ -386,6 +386,9 @@ StartupProfileInfo CreateInitialProfile( // missing code in the above test. CHECK(profile_info.profile) << "Cannot get default profile."; @@ -576,8 +576,8 @@ diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_brows + g_browser_process->adblock_updater(); + #else - #if BUILDFLAG(IS_CHROMEOS_LACROS) - // Lacros has a special "primary" profile that is tied to the active ChromeOS + profile_info = + GetStartupProfile(/*cur_dir=*/base::FilePath(), parsed_command_line); 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 @@ -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 -@@ -640,6 +640,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) { +@@ -639,6 +639,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) { StubResolverConfigReader::RegisterPrefs(registry); DefaultDnsOverHttpsConfigSource::RegisterPrefs(registry); @@ -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 -@@ -2868,6 +2868,11 @@ inline constexpr char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled"; +@@ -2851,6 +2851,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 @@ -1573,17 +1573,17 @@ new file mode 100644 diff --git a/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.cc b/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.cc --- a/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.cc +++ b/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.cc -@@ -18,6 +18,9 @@ - #include "base/strings/stringprintf.h" +@@ -19,6 +19,9 @@ #include "base/trace_event/trace_event.h" #include "base/trace_event/traced_value.h" + #include "base/tracing/protos/chrome_track_event.pbzero.h" +#include "components/content_settings/core/common/content_settings_types.h" +#include "components/subresource_filter/content/browser/subresource_filter_content_settings_manager.h" +#include "components/subresource_filter/content/browser/subresource_filter_profile_context.h" #include "components/subresource_filter/content/browser/ad_tagging_utils.h" #include "components/subresource_filter/content/browser/content_subresource_filter_web_contents_helper.h" #include "components/subresource_filter/content/browser/profile_interaction_manager.h" -@@ -112,6 +115,7 @@ ContentSubresourceFilterThrottleManager:: +@@ -113,6 +116,7 @@ ContentSubresourceFilterThrottleManager:: profile_interaction_manager_( std::make_unique( profile_context)), @@ -1591,7 +1591,7 @@ diff --git a/components/subresource_filter/content/browser/content_subresource_f web_contents_helper_(web_contents_helper) {} ContentSubresourceFilterThrottleManager:: -@@ -679,6 +683,17 @@ ContentSubresourceFilterThrottleManager:: +@@ -624,6 +628,17 @@ ContentSubresourceFilterThrottleManager:: throttle->NotifyPageActivationWithRuleset(EnsureRulesetHandle(), ad_tagging_state); } @@ -1612,7 +1612,7 @@ diff --git a/components/subresource_filter/content/browser/content_subresource_f diff --git a/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.h b/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.h --- a/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.h +++ b/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.h -@@ -414,6 +414,8 @@ class ContentSubresourceFilterThrottleManager +@@ -406,6 +406,8 @@ class ContentSubresourceFilterThrottleManager std::unique_ptr profile_interaction_manager_; diff --git a/build/patches/Bubble-Locking-on-UI-DevTools.patch b/build/patches/Bubble-Locking-on-UI-DevTools.patch index eadad989..55056986 100644 --- a/build/patches/Bubble-Locking-on-UI-DevTools.patch +++ b/build/patches/Bubble-Locking-on-UI-DevTools.patch @@ -33,7 +33,7 @@ diff --git a/chrome/browser/ui/views/toolbar/reload_button.cc b/chrome/browser/u diff --git a/ui/views/widget/widget.h b/ui/views/widget/widget.h --- a/ui/views/widget/widget.h +++ b/ui/views/widget/widget.h -@@ -1362,6 +1362,19 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate, +@@ -1361,6 +1361,19 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate, void UpdateAccessibleNameForRootView(); void UpdateAccessibleURLForRootView(const GURL& url); @@ -53,7 +53,7 @@ diff --git a/ui/views/widget/widget.h b/ui/views/widget/widget.h protected: // Creates the RootView to be used within this Widget. Subclasses may override // to create custom RootViews that do specialized event processing. -@@ -1400,13 +1413,6 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate, +@@ -1399,13 +1412,6 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate, ui::ColorProviderKey GetColorProviderKey() const override; private: @@ -67,7 +67,7 @@ diff --git a/ui/views/widget/widget.h b/ui/views/widget/widget.h class PaintAsActiveLockImpl; friend class ButtonTest; -@@ -1417,11 +1423,6 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate, +@@ -1416,11 +1422,6 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate, friend class ui_devtools::BubbleLocking; friend void DisableActivationChangeHandlingForTests(); diff --git a/build/patches/Chrome-web-store-protection.patch b/build/patches/Chrome-web-store-protection.patch index 361f4a5b..882c44fe 100644 --- a/build/patches/Chrome-web-store-protection.patch +++ b/build/patches/Chrome-web-store-protection.patch @@ -14,14 +14,17 @@ Auto-update is disabled by default: it is possible to activate it with chrome:// License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html --- chrome/app/extensions_strings.grdp | 6 ++ - .../developer_private_api.cc | 38 +++++++++++- + .../developer_private_api.cc | 28 +++++++++ .../developer_private/developer_private_api.h | 3 + + .../developer_private_functions_desktop.cc | 1 + + .../developer_private_functions_shared.cc | 7 ++- + .../profile_info_generator.cc | 3 + .../webstore_private/webstore_private_api.cc | 15 ++++- + .../extensions/chrome_extension_system.cc | 1 + .../extensions/cws_info_service_factory.cc | 3 +- .../extensions/extension_management.cc | 1 + .../extension_safety_check_utils.cc | 3 +- .../browser/extensions/extension_service.cc | 4 +- - .../extensions/extension_system_impl.cc | 2 + .../chrome_extension_downloader_factory.cc | 1 - .../extensions/updater/extension_updater.cc | 40 ++++++++----- .../extensions/updater/extension_updater.h | 4 ++ @@ -45,9 +48,9 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html .../browser/updater/manifest_fetch_data.cc | 8 +-- .../browser/updater/safe_manifest_parser.cc | 1 + extensions/common/extension_features.cc | 14 +++++ - extensions/common/extension_features.h | 4 ++ + extensions/common/extension_features.h | 2 + .../definitions/developer_private.d.ts | 2 + - 34 files changed, 254 insertions(+), 109 deletions(-) + 37 files changed, 253 insertions(+), 108 deletions(-) create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Webstore-protection.inc diff --git a/chrome/app/extensions_strings.grdp b/chrome/app/extensions_strings.grdp @@ -69,26 +72,21 @@ diff --git a/chrome/app/extensions_strings.grdp b/chrome/app/extensions_strings. diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.cc b/chrome/browser/extensions/api/developer_private/developer_private_api.cc --- a/chrome/browser/extensions/api/developer_private/developer_private_api.cc +++ b/chrome/browser/extensions/api/developer_private/developer_private_api.cc -@@ -138,6 +138,12 @@ - #include "url/gurl.h" - #include "url/origin.h" +@@ -20,6 +20,12 @@ + #include "extensions/browser/permissions_manager.h" + #endif // !BUILDFLAG(IS_ANDROID) +#include "chrome/browser/about_flags.h" +#include "chrome/browser/browser_process.h" -+#include "components/flags_ui/pref_service_flags_storage.h" -+#include "components/flags_ui/feature_entry.h" -+#include "components/flags_ui/flags_storage.h" ++#include "components/webui/flags/pref_service_flags_storage.h" ++#include "components/webui/flags/feature_entry.h" ++#include "components/webui/flags/flags_storage.h" + namespace extensions { namespace developer = api::developer_private; -@@ -492,10 +498,32 @@ std::unique_ptr DeveloperPrivateAPI::CreateProfileInfo( - info->is_mv2_deprecation_notice_dismissed = - ManifestV2ExperimentManager::Get(profile) - ->DidUserAcknowledgeNoticeGlobally(); -- -+ info->is_extension_autoupdate_enabled = DeveloperPrivateAPI::IsExtensionAutoupdateEnabled(); - return info; +@@ -61,6 +67,28 @@ DeveloperPrivateAPI::GetFactoryInstance() { + return g_developer_private_api_factory.Pointer(); } +// static @@ -116,7 +114,23 @@ diff --git a/chrome/browser/extensions/api/developer_private/developer_private_a template <> void BrowserContextKeyedAPIFactory< DeveloperPrivateAPI>::DeclareFactoryDependencies() { -@@ -959,6 +987,7 @@ ExtensionFunction::ResponseAction DeveloperPrivateAutoUpdateFunction::Run() { +diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.h b/chrome/browser/extensions/api/developer_private/developer_private_api.h +--- a/chrome/browser/extensions/api/developer_private/developer_private_api.h ++++ b/chrome/browser/extensions/api/developer_private/developer_private_api.h +@@ -32,6 +32,9 @@ class DeveloperPrivateAPI : public BrowserContextKeyedAPI, + static BrowserContextKeyedAPIFactory* + GetFactoryInstance(); + ++ static bool IsExtensionAutoupdateEnabled(); ++ static void SetExtensionAutoupdateEnabled(bool enable); ++ + // Convenience method to get the DeveloperPrivateAPI for a profile. + static DeveloperPrivateAPI* Get(content::BrowserContext* context); + +diff --git a/chrome/browser/extensions/api/developer_private/developer_private_functions_desktop.cc b/chrome/browser/extensions/api/developer_private/developer_private_functions_desktop.cc +--- a/chrome/browser/extensions/api/developer_private/developer_private_functions_desktop.cc ++++ b/chrome/browser/extensions/api/developer_private/developer_private_functions_desktop.cc +@@ -209,6 +209,7 @@ ExtensionFunction::ResponseAction DeveloperPrivateAutoUpdateFunction::Run() { ExtensionUpdater::CheckParams params; params.fetch_priority = DownloadFetchPriority::kForeground; params.install_immediately = true; @@ -124,7 +138,10 @@ diff --git a/chrome/browser/extensions/api/developer_private/developer_private_a params.callback = base::BindOnce(&DeveloperPrivateAutoUpdateFunction::OnComplete, this); updater->CheckNow(std::move(params)); -@@ -1093,7 +1122,7 @@ DeveloperPrivateUpdateProfileConfigurationFunction::Run() { +diff --git a/chrome/browser/extensions/api/developer_private/developer_private_functions_shared.cc b/chrome/browser/extensions/api/developer_private/developer_private_functions_shared.cc +--- a/chrome/browser/extensions/api/developer_private/developer_private_functions_shared.cc ++++ b/chrome/browser/extensions/api/developer_private/developer_private_functions_shared.cc +@@ -311,7 +311,7 @@ DeveloperPrivateUpdateProfileConfigurationFunction::Run() { const developer::ProfileConfigurationUpdate& update = params->update; @@ -133,9 +150,9 @@ diff --git a/chrome/browser/extensions/api/developer_private/developer_private_a Profile* profile = Profile::FromBrowserContext(browser_context()); CHECK(profile); if (supervised_user::AreExtensionsPermissionsEnabled(profile)) { -@@ -1107,6 +1136,11 @@ DeveloperPrivateUpdateProfileConfigurationFunction::Run() { - ->MarkNoticeAsAcknowledgedGlobally(); +@@ -328,6 +328,11 @@ DeveloperPrivateUpdateProfileConfigurationFunction::Run() { } + #endif // !BUILDFLAG(IS_ANDROID) + if (update.is_extension_autoupdate_enabled.has_value()) { + DeveloperPrivateAPI::SetExtensionAutoupdateEnabled( @@ -145,23 +162,30 @@ diff --git a/chrome/browser/extensions/api/developer_private/developer_private_a return RespondNow(NoArguments()); } -diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.h b/chrome/browser/extensions/api/developer_private/developer_private_api.h ---- a/chrome/browser/extensions/api/developer_private/developer_private_api.h -+++ b/chrome/browser/extensions/api/developer_private/developer_private_api.h -@@ -244,6 +244,9 @@ class DeveloperPrivateAPI : public BrowserContextKeyedAPI, - static std::unique_ptr CreateProfileInfo( - Profile* profile); +diff --git a/chrome/browser/extensions/api/developer_private/profile_info_generator.cc b/chrome/browser/extensions/api/developer_private/profile_info_generator.cc +--- a/chrome/browser/extensions/api/developer_private/profile_info_generator.cc ++++ b/chrome/browser/extensions/api/developer_private/profile_info_generator.cc +@@ -7,6 +7,7 @@ + #include "build/build_config.h" + #include "chrome/browser/prefs/incognito_mode_prefs.h" + #include "chrome/browser/profiles/profile.h" ++#include "chrome/browser/extensions/api/developer_private/developer_private_api.h" + #include "chrome/common/pref_names.h" + #include "components/policy/core/common/policy_pref_names.h" + #include "components/prefs/pref_service.h" +@@ -46,6 +47,8 @@ developer::ProfileInfo CreateProfileInfo(Profile* profile) { + ->DidUserAcknowledgeNoticeGlobally(); + #endif // !BUILDFLAG(IS_ANDROID) -+ static bool IsExtensionAutoupdateEnabled(); -+ static void SetExtensionAutoupdateEnabled(bool enable); -+ - // Convenience method to get the DeveloperPrivateAPI for a profile. - static DeveloperPrivateAPI* Get(content::BrowserContext* context); ++ info.is_extension_autoupdate_enabled = ++ DeveloperPrivateAPI::IsExtensionAutoupdateEnabled(); + return info; + } diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc -@@ -65,6 +65,7 @@ +@@ -66,6 +66,7 @@ #include "extensions/browser/extension_util.h" #include "extensions/browser/extensions_browser_client.h" #include "extensions/common/extension.h" @@ -169,7 +193,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api #include "extensions/common/manifest.h" #include "extensions/common/manifest_constants.h" #include "extensions/common/manifest_handlers/permissions_parser.h" -@@ -224,6 +225,8 @@ WebstorePrivateApi::Delegate* test_delegate = nullptr; +@@ -222,6 +223,8 @@ WebstorePrivateApi::Delegate* test_delegate = nullptr; // there was previously stored data, or an empty string otherwise. The Set will // overwrite any previous login. std::string GetWebstoreLogin(Profile* profile) { @@ -178,7 +202,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api if (profile->GetPrefs()->HasPrefPath(kWebstoreLogin)) { return profile->GetPrefs()->GetString(kWebstoreLogin); } -@@ -231,11 +234,15 @@ std::string GetWebstoreLogin(Profile* profile) { +@@ -229,11 +232,15 @@ std::string GetWebstoreLogin(Profile* profile) { } void SetWebstoreLogin(Profile* profile, const std::string& login) { @@ -194,7 +218,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api switch (status) { case kCanRequest: return api::webstore_private::ExtensionInstallStatus::kCanRequest; -@@ -1158,7 +1165,8 @@ ExtensionFunction::ResponseAction +@@ -1156,7 +1163,8 @@ ExtensionFunction::ResponseAction WebstorePrivateIsInIncognitoModeFunction::Run() { Profile* profile = Profile::FromBrowserContext(browser_context()); return RespondNow(ArgumentList(IsInIncognitoMode::Results::Create( @@ -204,7 +228,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api } WebstorePrivateIsPendingCustodianApprovalFunction:: -@@ -1254,11 +1262,14 @@ WebstorePrivateGetReferrerChainFunction::Run() { +@@ -1252,11 +1260,14 @@ WebstorePrivateGetReferrerChainFunction::Run() { request.mutable_referrer_chain_options()->set_recent_navigations_to_collect( recent_navigations_to_collect); @@ -220,6 +244,17 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api #else return RespondNow(ArgumentList( api::webstore_private::GetReferrerChain::Results::Create(""))); +diff --git a/chrome/browser/extensions/chrome_extension_system.cc b/chrome/browser/extensions/chrome_extension_system.cc +--- a/chrome/browser/extensions/chrome_extension_system.cc ++++ b/chrome/browser/extensions/chrome_extension_system.cc +@@ -84,6 +84,7 @@ UninstallPingSender::FilterResult ShouldSendUninstallPing( + Profile* profile, + const Extension* extension, + UninstallReason reason) { ++ if ((true)) return UninstallPingSender::DO_NOT_SEND_PING; + ExtensionManagement* extension_management = + ExtensionManagementFactory::GetForBrowserContext(profile); + if (extension && (extension->from_webstore() || diff --git a/chrome/browser/extensions/cws_info_service_factory.cc b/chrome/browser/extensions/cws_info_service_factory.cc --- a/chrome/browser/extensions/cws_info_service_factory.cc +++ b/chrome/browser/extensions/cws_info_service_factory.cc @@ -260,7 +295,7 @@ diff --git a/chrome/browser/extensions/extension_safety_check_utils.cc b/chrome/ diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc -@@ -446,8 +446,6 @@ ExtensionService::ExtensionService( +@@ -435,8 +435,6 @@ ExtensionService::ExtensionService( UpgradeDetector::GetInstance()->AddObserver(this); @@ -269,7 +304,7 @@ diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/ext ExtensionManagementFactory::GetForBrowserContext(profile_)->AddObserver(this); // Set up the ExtensionUpdater. -@@ -1762,7 +1760,7 @@ void ExtensionService::OnExtensionManagementSettingsChanged() { +@@ -1463,7 +1461,7 @@ void ExtensionService::OnExtensionManagementSettingsChanged() { // unpublished extensions should not be enabled. This update allows // unpublished extensions to be disabled sooner rather than waiting till the // next regularly scheduled fetch. @@ -278,25 +313,6 @@ diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/ext pref_names::kExtensionUnpublishedAvailability) != kAllowUnpublishedExtensions) { CWSInfoService::Get(profile_)->CheckAndMaybeFetchInfo(); -diff --git a/chrome/browser/extensions/extension_system_impl.cc b/chrome/browser/extensions/extension_system_impl.cc ---- a/chrome/browser/extensions/extension_system_impl.cc -+++ b/chrome/browser/extensions/extension_system_impl.cc -@@ -56,6 +56,7 @@ - #include "extensions/browser/updater/uninstall_ping_sender.h" - #include "extensions/browser/user_script_manager.h" - #include "extensions/common/constants.h" -+#include "extensions/common/extension_features.h" - #include "extensions/common/features/feature_channel.h" - #include "extensions/common/manifest_url_handlers.h" - #include "ui/message_center/public/cpp/notifier_id.h" -@@ -83,6 +84,7 @@ UninstallPingSender::FilterResult ShouldSendUninstallPing( - Profile* profile, - const Extension* extension, - UninstallReason reason) { -+ if ((true)) return UninstallPingSender::DO_NOT_SEND_PING; - ExtensionManagement* extension_management = - ExtensionManagementFactory::GetForBrowserContext(profile); - if (extension && (extension->from_webstore() || diff --git a/chrome/browser/extensions/updater/chrome_extension_downloader_factory.cc b/chrome/browser/extensions/updater/chrome_extension_downloader_factory.cc --- a/chrome/browser/extensions/updater/chrome_extension_downloader_factory.cc +++ b/chrome/browser/extensions/updater/chrome_extension_downloader_factory.cc @@ -311,7 +327,7 @@ diff --git a/chrome/browser/extensions/updater/chrome_extension_downloader_facto diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/browser/extensions/updater/extension_updater.cc --- a/chrome/browser/extensions/updater/extension_updater.cc +++ b/chrome/browser/extensions/updater/extension_updater.cc -@@ -49,6 +49,7 @@ +@@ -50,6 +50,7 @@ #include "extensions/browser/updater/extension_update_data.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" @@ -319,7 +335,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro #include "extensions/common/extension_set.h" #include "extensions/common/extension_updater_uma.h" #include "extensions/common/extension_urls.h" -@@ -203,6 +204,10 @@ void ExtensionUpdater::Start() { +@@ -205,6 +206,10 @@ void ExtensionUpdater::Start() { DCHECK(!weak_ptr_factory_.HasWeakPtrs()); DCHECK(registry_); alive_ = true; @@ -330,7 +346,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro // Check soon, and set up the first delayed check. if (!g_skip_scheduled_checks_for_tests) { if (g_should_immediately_update) -@@ -335,7 +340,8 @@ void ExtensionUpdater::AddToDownloader( +@@ -338,7 +343,8 @@ void ExtensionUpdater::AddToDownloader( const Extension& extension = **extension_iter; const ExtensionId& extension_id = extension.id(); if (!Manifest::IsAutoUpdateableLocation(extension.location())) { @@ -340,7 +356,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro continue; } // An extension might be overwritten by policy, and have its update url -@@ -349,7 +355,7 @@ void ExtensionUpdater::AddToDownloader( +@@ -352,7 +358,7 @@ void ExtensionUpdater::AddToDownloader( continue; } @@ -349,7 +365,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro update_check_params->update_info[extension_id] = GetExtensionUpdateData(extension_id); } else if (AddExtensionToDownloader(extension, request_id, -@@ -388,6 +394,12 @@ bool ExtensionUpdater::AddExtensionToDownloader( +@@ -391,6 +397,12 @@ bool ExtensionUpdater::AddExtensionToDownloader( } void ExtensionUpdater::CheckNow(CheckParams params) { @@ -362,7 +378,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro if (params.ids.empty()) { // Checking all extensions. Cancel pending DoCheckSoon() call if there's // one, as it would be redundant. -@@ -396,7 +408,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) { +@@ -399,7 +411,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) { int request_id = next_request_id_++; @@ -371,7 +387,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro if (params.ids.empty()) NotifyStarted(); -@@ -469,7 +481,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) { +@@ -472,7 +484,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) { update_check_params.update_info[pending_id] = GetExtensionUpdateData(pending_id); } else if (!Manifest::IsAutoUpdateableLocation(info->install_source())) { @@ -380,7 +396,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro continue; } // We have to mark high-priority extensions (such as policy-forced -@@ -479,7 +491,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) { +@@ -482,7 +494,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) { // See https://crbug.com/904600 and https://crbug.com/965686. const bool is_high_priority_extension_pending = pending_extension_manager->HasHighPriorityPendingExtension(); @@ -389,7 +405,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro update_check_params.update_info[pending_id] = GetExtensionUpdateData(pending_id); update_check_params.update_info[pending_id].is_corrupt_reinstall = -@@ -502,6 +514,8 @@ void ExtensionUpdater::CheckNow(CheckParams params) { +@@ -505,6 +517,8 @@ void ExtensionUpdater::CheckNow(CheckParams params) { LOG(WARNING) << "Corrupt extension with id " << pending_id << " will be reinstalled with ExtensionDownloader."; } @@ -398,7 +414,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro } else { InstallStageTracker::Get(profile_)->ReportFailure( pending_id, -@@ -514,13 +528,6 @@ void ExtensionUpdater::CheckNow(CheckParams params) { +@@ -517,13 +531,6 @@ void ExtensionUpdater::CheckNow(CheckParams params) { AddToDownloader(®istry_->disabled_extensions(), pending_ids, request_id, params.fetch_priority, &update_check_params); ExtensionSet remotely_disabled_extensions; @@ -412,7 +428,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro AddToDownloader(&remotely_disabled_extensions, pending_ids, request_id, params.fetch_priority, &update_check_params); } else { -@@ -528,7 +535,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) { +@@ -531,7 +538,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) { const Extension* extension = registry_->GetExtensionById(id, ExtensionRegistry::EVERYTHING); if (extension) { @@ -421,7 +437,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro update_check_params.update_info[id] = GetExtensionUpdateData(id); } else if (AddExtensionToDownloader(*extension, request_id, params.fetch_priority)) { -@@ -669,7 +676,7 @@ void ExtensionUpdater::OnExtensionDownloadFinished( +@@ -672,7 +679,7 @@ void ExtensionUpdater::OnExtensionDownloadFinished( file.extension_id, InstallStageTracker::Stage::INSTALLING); UpdatePingData(file.extension_id, ping); @@ -430,7 +446,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro FetchedCRXFile fetched(file, file_ownership_passed, request_ids, std::move(callback)); -@@ -680,6 +687,7 @@ void ExtensionUpdater::OnExtensionDownloadFinished( +@@ -683,6 +690,7 @@ void ExtensionUpdater::OnExtensionDownloadFinished( bool ExtensionUpdater::GetPingDataForExtension(const ExtensionId& id, DownloadPingData* ping_data) { @@ -459,7 +475,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro diff --git a/chrome/browser/extensions/updater/extension_updater.h b/chrome/browser/extensions/updater/extension_updater.h --- a/chrome/browser/extensions/updater/extension_updater.h +++ b/chrome/browser/extensions/updater/extension_updater.h -@@ -82,6 +82,8 @@ class ExtensionUpdater : public ExtensionDownloaderDelegate { +@@ -83,6 +83,8 @@ class ExtensionUpdater : public ExtensionDownloaderDelegate { // right away. bool install_immediately = false; @@ -468,7 +484,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.h b/chrome/brow // An extension update check can be originated by a user or by a scheduled // task. When the value of |fetch_priority| is FOREGROUND, the update // request was initiated by a user. -@@ -333,6 +335,8 @@ class ExtensionUpdater : public ExtensionDownloaderDelegate { +@@ -334,6 +336,8 @@ class ExtensionUpdater : public ExtensionDownloaderDelegate { base::TimeDelta frequency_; bool will_check_soon_ = false; @@ -492,7 +508,7 @@ diff --git a/chrome/browser/extensions/webstore_install_helper.cc b/chrome/brows diff --git a/chrome/browser/extensions/webstore_installer.cc b/chrome/browser/extensions/webstore_installer.cc --- a/chrome/browser/extensions/webstore_installer.cc +++ b/chrome/browser/extensions/webstore_installer.cc -@@ -626,7 +626,7 @@ void WebstoreInstaller::StartDownload( +@@ -591,7 +591,7 @@ void WebstoreInstaller::StartDownload( traffic_annotation)); params->set_file_path(file); params->set_initiator(render_frame_host->GetLastCommittedOrigin()); @@ -544,7 +560,7 @@ diff --git a/chrome/browser/resources/extensions/manager.ts b/chrome/browser/res diff --git a/chrome/browser/resources/extensions/service.ts b/chrome/browser/resources/extensions/service.ts --- a/chrome/browser/resources/extensions/service.ts +++ b/chrome/browser/resources/extensions/service.ts -@@ -299,6 +299,11 @@ export class Service implements ServiceInterface { +@@ -306,6 +306,11 @@ export class Service implements ServiceInterface { {inDeveloperMode: inDevMode}); } @@ -678,7 +694,7 @@ diff --git a/chrome/browser/ui/webui/extensions/extensions_ui.cc b/chrome/browse namespace extensions { namespace { -@@ -374,6 +376,8 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile, +@@ -375,6 +377,8 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile, {"itemSuspiciousInstallLearnMore", IDS_EXTENSIONS_ADDED_WITHOUT_KNOWLEDGE_LEARN_MORE}, {"toolbarDevMode", IDS_EXTENSIONS_DEVELOPER_MODE}, @@ -687,7 +703,7 @@ diff --git a/chrome/browser/ui/webui/extensions/extensions_ui.cc b/chrome/browse {"toolbarLoadUnpacked", IDS_EXTENSIONS_TOOLBAR_LOAD_UNPACKED}, {"toolbarLoadUnpackedDone", IDS_EXTENSIONS_TOOLBAR_LOAD_UNPACKED_DONE}, {"toolbarPack", IDS_EXTENSIONS_TOOLBAR_PACK}, -@@ -449,6 +453,10 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile, +@@ -459,6 +463,10 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile, "hostPermissionsLearnMoreLink", extension_permissions_constants::kRuntimeHostPermissionsHelpURL); source->AddBoolean(kInDevModeKey, in_dev_mode); @@ -724,7 +740,7 @@ diff --git a/chrome/browser/update_client/chrome_update_query_params_delegate.cc diff --git a/chrome/common/extensions/api/developer_private.idl b/chrome/common/extensions/api/developer_private.idl --- a/chrome/common/extensions/api/developer_private.idl +++ b/chrome/common/extensions/api/developer_private.idl -@@ -296,6 +296,7 @@ namespace developerPrivate { +@@ -300,6 +300,7 @@ namespace developerPrivate { boolean isIncognitoAvailable; boolean isChildAccount; boolean isMv2DeprecationNoticeDismissed; @@ -732,7 +748,7 @@ diff --git a/chrome/common/extensions/api/developer_private.idl b/chrome/common/ }; // DEPRECATED: Prefer ExtensionInfo. -@@ -355,6 +356,7 @@ namespace developerPrivate { +@@ -360,6 +361,7 @@ namespace developerPrivate { dictionary ProfileConfigurationUpdate { boolean? inDeveloperMode; boolean? isMv2DeprecationNoticeDismissed; @@ -1148,7 +1164,7 @@ diff --git a/extensions/browser/updater/extension_downloader.h b/extensions/brow diff --git a/extensions/browser/updater/manifest_fetch_data.cc b/extensions/browser/updater/manifest_fetch_data.cc --- a/extensions/browser/updater/manifest_fetch_data.cc +++ b/extensions/browser/updater/manifest_fetch_data.cc -@@ -105,7 +105,7 @@ ManifestFetchData::ManifestFetchData(const GURL& update_url, +@@ -108,7 +108,7 @@ ManifestFetchData::ManifestFetchData(const GURL& update_url, : base_url_(update_url), full_url_(update_url), brand_code_(brand_code), @@ -1157,7 +1173,7 @@ diff --git a/extensions/browser/updater/manifest_fetch_data.cc b/extensions/brow fetch_priority_(fetch_priority) { UpdateFullUrl(base_query_params); request_ids_.insert(request_id); -@@ -158,18 +158,12 @@ bool ManifestFetchData::AddExtension(const std::string& id, +@@ -161,18 +161,12 @@ bool ManifestFetchData::AddExtension(const std::string& id, // Compute the string we'd append onto the full_url_, and see if it fits. std::vector parts; parts.push_back("id=" + id); @@ -1190,8 +1206,8 @@ diff --git a/extensions/browser/updater/safe_manifest_parser.cc b/extensions/bro diff --git a/extensions/common/extension_features.cc b/extensions/common/extension_features.cc --- a/extensions/common/extension_features.cc +++ b/extensions/common/extension_features.cc -@@ -200,4 +200,18 @@ BASE_FEATURE(kUserScriptUserExtensionToggle, - "UserScriptUserExtensionToggle", +@@ -200,4 +200,18 @@ BASE_FEATURE(kDebuggerAPIRestrictedToDevMode, + "DebuggerAPIRestrictedToDevMode", base::FEATURE_DISABLED_BY_DEFAULT); +// Activates the auto update of extensions. @@ -1212,21 +1228,19 @@ diff --git a/extensions/common/extension_features.cc b/extensions/common/extensi diff --git a/extensions/common/extension_features.h b/extensions/common/extension_features.h --- a/extensions/common/extension_features.h +++ b/extensions/common/extension_features.h -@@ -240,6 +240,10 @@ BASE_DECLARE_FEATURE(kRemoveCoreSiteInstance); - // rather than the developer mode toggle on chrome://extensions. - BASE_DECLARE_FEATURE(kUserScriptUserExtensionToggle); +@@ -242,6 +242,8 @@ BASE_DECLARE_FEATURE(kUserScriptUserExtensionToggle); + // capability, even when no other API/feature might be restricted by it. + BASE_DECLARE_FEATURE(kDebuggerAPIRestrictedToDevMode); +BASE_DECLARE_FEATURE(kEnableExtensionAutoupdate); -+ +BASE_DECLARE_FEATURE(kEnableExtensionManagementToChromeStore); -+ } // namespace extensions_features #endif // EXTENSIONS_COMMON_EXTENSION_FEATURES_H_ diff --git a/tools/typescript/definitions/developer_private.d.ts b/tools/typescript/definitions/developer_private.d.ts --- a/tools/typescript/definitions/developer_private.d.ts +++ b/tools/typescript/definitions/developer_private.d.ts -@@ -281,6 +281,7 @@ declare global { +@@ -284,6 +284,7 @@ declare global { isIncognitoAvailable: boolean; isChildAccount: boolean; isMv2DeprecationNoticeDismissed: boolean; @@ -1234,7 +1248,7 @@ diff --git a/tools/typescript/definitions/developer_private.d.ts b/tools/typescr } export interface ExtensionConfigurationUpdate { -@@ -297,6 +298,7 @@ declare global { +@@ -301,6 +302,7 @@ declare global { export interface ProfileConfigurationUpdate { inDeveloperMode?: boolean; isMv2DeprecationNoticeDismissed?: boolean; diff --git a/build/patches/Client-hints-overrides.patch b/build/patches/Client-hints-overrides.patch index a6650a28..5dfefd8b 100644 --- a/build/patches/Client-hints-overrides.patch +++ b/build/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 -@@ -188,9 +188,7 @@ const blink::UserAgentBrandList GetUserAgentBrandList( +@@ -185,9 +185,7 @@ const blink::UserAgentBrandList GetUserAgentBrandList( bool parse_result = base::StringToInt(major_version, &major_version_number); DCHECK(parse_result); std::optional brand; @@ -44,15 +44,15 @@ diff --git a/components/embedder_support/user_agent_utils.cc b/components/embedd diff --git a/content/browser/client_hints/client_hints.cc b/content/browser/client_hints/client_hints.cc --- a/content/browser/client_hints/client_hints.cc +++ b/content/browser/client_hints/client_hints.cc -@@ -60,6 +60,7 @@ - #include "third_party/blink/public/common/permissions_policy/origin_with_possible_wildcards.h" - #include "third_party/blink/public/common/permissions_policy/permissions_policy.h" +@@ -62,6 +62,7 @@ + #include "third_party/blink/public/common/features.h" + #include "third_party/blink/public/common/page/page_zoom.h" #include "third_party/blink/public/common/user_agent/user_agent_metadata.h" +#include "third_party/blink/renderer/platform/runtime_enabled_features.h" #include "ui/display/display.h" #include "ui/display/screen.h" #include "url/origin.h" -@@ -704,7 +705,8 @@ void UpdateNavigationRequestClientUaHeadersImpl( +@@ -708,7 +709,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(); -@@ -886,10 +888,12 @@ void AddRequestClientHintsHeaders( +@@ -890,10 +892,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); -@@ -975,6 +979,7 @@ ParseAndPersistAcceptCHForNavigation( +@@ -974,6 +978,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 -@@ -1301,6 +1301,11 @@ void NavigationURLLoaderImpl::OnAcceptCHFrameReceived( +@@ -1305,6 +1305,11 @@ void NavigationURLLoaderImpl::OnAcceptCHFrameReceived( return; } @@ -131,7 +131,7 @@ new file mode 100644 diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc --- a/net/http/http_network_transaction.cc +++ b/net/http/http_network_transaction.cc -@@ -109,6 +109,7 @@ const size_t kMaxRestarts = 32; +@@ -105,6 +105,7 @@ const size_t kMaxRestarts = 32; // Returns true when Early Hints are allowed on the given protocol. bool EarlyHintsAreAllowedOn(HttpConnectionInfo connection_info) { @@ -156,12 +156,12 @@ diff --git a/third_party/blink/common/client_hints/client_hints.cc b/third_party @@ -14,6 +14,7 @@ #include "base/strings/string_util.h" #include "services/network/public/cpp/client_hints.h" - #include "third_party/blink/public/common/features.h" + #include "services/network/public/cpp/permissions_policy/client_hints_permissions_policy_mapping.h" +#include "third_party/blink/public/common/features_generated.h" - #include "third_party/blink/public/common/permissions_policy/permissions_policy.h" + #include "services/network/public/cpp/permissions_policy/permissions_policy.h" + #include "third_party/blink/public/common/features.h" #include "url/origin.h" - -@@ -108,11 +109,12 @@ const PolicyFeatureToClientHintMap& GetPolicyFeatureToClientHintMap() { +@@ -22,11 +23,12 @@ namespace blink { bool IsClientHintSentByDefault(network::mojom::WebClientHintsType type) { switch (type) { @@ -234,7 +234,7 @@ diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.idl b/third diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/third_party/blink/renderer/core/loader/frame_fetch_context.cc --- a/third_party/blink/renderer/core/loader/frame_fetch_context.cc +++ b/third_party/blink/renderer/core/loader/frame_fetch_context.cc -@@ -217,6 +217,8 @@ bool ShouldSendClientHint(const PermissionsPolicy& policy, +@@ -224,6 +224,8 @@ bool ShouldSendClientHint(const network::PermissionsPolicy& policy, bool is_1p_origin, network::mojom::blink::WebClientHintsType type, const ClientHintsPreferences& hints_preferences) { @@ -243,7 +243,7 @@ diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/thi // For subresource requests, sending the hint in the fetch request based on // the permissions policy. if (!policy.IsFeatureEnabledForOrigin( -@@ -610,7 +612,7 @@ void FrameFetchContext::AddClientHintsIfNecessary( +@@ -604,7 +606,7 @@ void FrameFetchContext::AddClientHintsIfNecessary( } // Only send User Agent hints if the info is available @@ -255,8 +255,8 @@ 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 -@@ -438,6 +438,11 @@ - name: "AriaNotify", +@@ -439,6 +439,11 @@ + name: "AriaNotifyV2", status: "test", }, + { @@ -275,6 +275,6 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 - status: "test", + name: "ClientHintUAHighEntropyValuesPermissionPolicy", // disabled by default }, - // This ensures that clipboard event fires on a target node which is - // focused in case no visible selection is present. + { + // Enables the API for getting a unique token of the system clipboard's -- diff --git a/build/patches/Close-Sessions-On-Ip-Change.patch b/build/patches/Close-Sessions-On-Ip-Change.patch index a0f994b1..b0d3afec 100644 --- a/build/patches/Close-Sessions-On-Ip-Change.patch +++ b/build/patches/Close-Sessions-On-Ip-Change.patch @@ -87,7 +87,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 -@@ -485,7 +485,7 @@ const base::FeatureParam kIpPrivacyOnlyInIncognito{ +@@ -485,7 +485,7 @@ BASE_FEATURE_PARAM(size_t, // NetworkChangeNotifier::AreNetworkHandlesSupported). #if BUILDFLAG(IS_ANDROID) inline constexpr auto kMigrateSessionsOnNetworkChangeV2Default = diff --git a/build/patches/Content-settings-infrastructure.patch b/build/patches/Content-settings-infrastructure.patch index 380d7c32..a138928e 100644 --- a/build/patches/Content-settings-infrastructure.patch +++ b/build/patches/Content-settings-infrastructure.patch @@ -44,9 +44,9 @@ Require: bromite-build-utils.patch .../BromiteCustomContentSettingImpl.java | 412 ++++++++++++++++++ ...tomTriStateSiteSettingsPreferenceImpl.java | 24 + .../ContentSettingsResources.java | 16 +- - .../site_settings/SingleCategorySettings.java | 55 ++- + .../site_settings/SingleCategorySettings.java | 56 ++- .../site_settings/SingleWebsiteSettings.java | 58 ++- - .../site_settings/SiteSettings.java | 31 +- + .../site_settings/SiteSettings.java | 33 +- .../site_settings/SiteSettingsCategory.java | 18 +- .../site_settings/SiteSettingsDelegate.java | 2 + .../TriStateSiteSettingsPreference.java | 13 +- @@ -84,7 +84,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 + - 73 files changed, 1941 insertions(+), 104 deletions(-) + 73 files changed, 1942 insertions(+), 106 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 @@ -98,7 +98,7 @@ 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 -@@ -68,6 +68,10 @@ import org.chromium.url.GURL; +@@ -67,6 +67,10 @@ import org.chromium.url.GURL; import java.util.List; import java.util.Set; @@ -109,7 +109,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 = -@@ -242,7 +246,7 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate { +@@ -236,7 +240,7 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate { @Override public boolean isHelpAndFeedbackEnabled() { @@ -118,7 +118,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/C } @Override -@@ -399,6 +403,17 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate { +@@ -393,6 +397,17 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate { return mPrivacySandboxBridge.getRelatedWebsiteSetOwner(memberOrigin); } @@ -151,7 +151,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 -@@ -1432,4 +1432,5 @@ +@@ -1526,4 +1526,5 @@ @@ -710,7 +710,7 @@ diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -1791,6 +1791,7 @@ static_library("ui") { +@@ -1789,6 +1789,7 @@ static_library("ui") { "//components/commerce/core/mojom:mojo_bindings", "//components/commerce/core/webui", "//components/endpoint_fetcher:endpoint_fetcher", @@ -718,10 +718,10 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn "//components/enterprise/common:files_scan_data", "//components/feedback/proto", "//components/headless/policy", -@@ -5006,6 +5007,7 @@ static_library("ui") { +@@ -5001,6 +5002,7 @@ static_library("ui") { + "//components/power_bookmarks/storage", "//components/prefs", "//components/reading_list/features:flags", - "//components/segmentation_platform/embedder/default_model:default_model", + "//components/strings:components_strings_grit", "//components/services/app_service", "//components/soda", @@ -729,7 +729,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn diff --git a/chrome/browser/ui/views/controls/rich_controls_container_view.h b/chrome/browser/ui/views/controls/rich_controls_container_view.h --- a/chrome/browser/ui/views/controls/rich_controls_container_view.h +++ b/chrome/browser/ui/views/controls/rich_controls_container_view.h -@@ -48,6 +48,13 @@ class RichControlsContainerView : public views::FlexLayoutView { +@@ -50,6 +50,13 @@ class RichControlsContainerView : public views::FlexLayoutView { return AddChildView(std::move(control_view)); } @@ -754,7 +754,7 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_main_view.cc b/chrome/b #include "ui/views/view_class_properties.h" #if BUILDFLAG(FULL_SAFE_BROWSING) -@@ -256,8 +257,20 @@ void PageInfoMainView::SetPermissionInfo( +@@ -258,8 +259,20 @@ void PageInfoMainView::SetPermissionInfo( scroll_view->SetDrawOverflowIndicator(false); auto* content_view = scroll_view->SetContents(std::make_unique()); @@ -777,7 +777,7 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_main_view.cc b/chrome/b content_view->SetID(PageInfoViewFactory::VIEW_ID_PAGE_INFO_PERMISSION_VIEW); content_view->SetProperty(views::kElementIdentifierKey, kPermissionsElementId); -@@ -272,11 +285,16 @@ void PageInfoMainView::SetPermissionInfo( +@@ -274,11 +287,16 @@ void PageInfoMainView::SetPermissionInfo( } } @@ -794,7 +794,7 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_main_view.cc b/chrome/b toggle_row->SetProperty(views::kCrossAxisAlignmentKey, views::LayoutAlignment::kStretch); syncable_permission_rows_.emplace(permission.type, toggle_row); -@@ -284,6 +302,8 @@ void PageInfoMainView::SetPermissionInfo( +@@ -286,6 +304,8 @@ void PageInfoMainView::SetPermissionInfo( } for (auto& object : chosen_object_info_list) { @@ -803,7 +803,7 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_main_view.cc b/chrome/b // The view takes ownership of the object info. auto object_view = std::make_unique( std::move(object), -@@ -294,6 +314,10 @@ void PageInfoMainView::SetPermissionInfo( +@@ -296,6 +316,10 @@ void PageInfoMainView::SetPermissionInfo( content_view->AddChildView(std::move(object_view))); } @@ -862,7 +862,7 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_view_factory.cc b/chrom diff --git a/chrome/browser/ui/views/page_info/page_info_view_factory.h b/chrome/browser/ui/views/page_info/page_info_view_factory.h --- a/chrome/browser/ui/views/page_info/page_info_view_factory.h +++ b/chrome/browser/ui/views/page_info/page_info_view_factory.h -@@ -94,6 +94,11 @@ class PageInfoViewFactory { +@@ -95,6 +95,11 @@ class PageInfoViewFactory { const PageInfo::PermissionInfo& info, bool blocked_on_system_level = false); @@ -1071,7 +1071,7 @@ diff --git a/chrome/browser/ui/views/page_info/permission_toggle_row_view.cc b/c + if (choose_button_) { + choose_button_->SetEnabledTextColors(std::nullopt); + if (permission_.setting == CONTENT_SETTING_DEFAULT) { -+ choose_button_->SetTextColorId(views::Button::ButtonState::STATE_NORMAL, ++ choose_button_->SetTextColor(views::Button::ButtonState::STATE_NORMAL, + ui::kColorLabelForeground); + } + } @@ -1110,7 +1110,7 @@ diff --git a/chrome/browser/ui/views/page_info/permission_toggle_row_view.cc b/c + } + choose_button_->SetText(caption); + if (permission_.setting == CONTENT_SETTING_DEFAULT) { -+ choose_button_->SetTextColorId(views::Button::ButtonState::STATE_NORMAL, ++ choose_button_->SetTextColor(views::Button::ButtonState::STATE_NORMAL, + ui::kColorLabelForeground); + } + } @@ -1120,7 +1120,7 @@ diff --git a/chrome/browser/ui/views/page_info/permission_toggle_row_view.cc b/c diff --git a/chrome/browser/ui/views/page_info/permission_toggle_row_view.h b/chrome/browser/ui/views/page_info/permission_toggle_row_view.h --- a/chrome/browser/ui/views/page_info/permission_toggle_row_view.h +++ b/chrome/browser/ui/views/page_info/permission_toggle_row_view.h -@@ -16,6 +16,11 @@ +@@ -17,6 +17,11 @@ #include "ui/views/controls/label.h" #include "ui/views/view.h" @@ -1132,7 +1132,7 @@ diff --git a/chrome/browser/ui/views/page_info/permission_toggle_row_view.h b/ch class ChromePageInfoUiDelegate; class PageInfoNavigationHandler; -@@ -31,7 +36,8 @@ class PageInfoBubbleViewTestApi; +@@ -32,7 +37,8 @@ class PageInfoBubbleViewTestApi; // A view that shows a permission that a site is able to access, and // allows the user to control via toggle whether that access is granted. Has a // button that opens a subpage with more controls. @@ -1142,7 +1142,7 @@ diff --git a/chrome/browser/ui/views/page_info/permission_toggle_row_view.h b/ch METADATA_HEADER(PermissionToggleRowView, views::View) public: -@@ -68,6 +74,12 @@ class PermissionToggleRowView : public views::View { +@@ -69,6 +75,12 @@ class PermissionToggleRowView : public views::View { private: friend class test::PageInfoBubbleViewTestApi; @@ -1155,7 +1155,7 @@ diff --git a/chrome/browser/ui/views/page_info/permission_toggle_row_view.h b/ch void OnToggleButtonPressed(); void AddToggleButton(const std::u16string& toggle_accessible_name, int icon_label_spacing); -@@ -86,6 +98,10 @@ class PermissionToggleRowView : public views::View { +@@ -87,6 +99,10 @@ class PermissionToggleRowView : public views::View { raw_ptr toggle_button_ = nullptr; raw_ptr spacer_view_ = nullptr; @@ -1177,7 +1177,7 @@ 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" -@@ -73,6 +74,9 @@ +@@ -74,6 +75,9 @@ #include "components/dom_distiller/core/dom_distiller_features.h" #include "components/google/core/common/google_util.h" #include "components/history/core/common/pref_names.h" @@ -1187,7 +1187,7 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provide #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" -@@ -3802,6 +3806,56 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, +@@ -3812,6 +3816,56 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, policy_indicator::AddLocalizedStrings(html_source); AddSecurityKeysStrings(html_source); @@ -1256,8 +1256,8 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/b #include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_pattern.h" #include "components/content_settings/core/common/content_settings_types.h" -@@ -249,13 +251,13 @@ constexpr auto kContentSettingsTypeGroupNames = std::to_array< - {ContentSettingsType::POINTER_LOCK, nullptr}, +@@ -250,13 +252,13 @@ constexpr auto kContentSettingsTypeGroupNames = std::to_array< + {ContentSettingsType::REVOKED_DISRUPTIVE_NOTIFICATION_PERMISSIONS, nullptr}, }); -static_assert( @@ -1277,7 +1277,7 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/b struct SiteSettingSourceStringMapping { SiteSettingSource source; -@@ -503,6 +505,13 @@ bool HasRegisteredGroupName(ContentSettingsType type) { +@@ -504,6 +506,13 @@ bool HasRegisteredGroupName(ContentSettingsType type) { return true; } } @@ -1291,7 +1291,7 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/b return false; } -@@ -516,11 +525,24 @@ ContentSettingsType ContentSettingsTypeFromGroupName(std::string_view name) { +@@ -517,11 +526,24 @@ ContentSettingsType ContentSettingsTypeFromGroupName(std::string_view name) { return entry.type; } } @@ -1317,7 +1317,7 @@ 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 -@@ -535,7 +557,6 @@ std::string_view ContentSettingsTypeToGroupName(ContentSettingsType type) { +@@ -536,7 +558,6 @@ std::string_view ContentSettingsTypeToGroupName(ContentSettingsType type) { return entry.name ? entry.name : std::string_view(); } } @@ -1325,7 +1325,7 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/b NOTREACHED() << static_cast(type) << " is not a recognized content settings type."; } -@@ -644,6 +665,13 @@ std::vector GetVisiblePermissionCategories( +@@ -645,6 +666,13 @@ std::vector GetVisiblePermissionCategories( base_types->push_back(ContentSettingsType::WEB_APP_INSTALLATION); } @@ -1505,7 +1505,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 -@@ -147,6 +147,23 @@ android_library("java") { +@@ -148,6 +148,23 @@ android_library("java") { ":site_settings_jni_headers", "//components/content_settings/android:java_pref_names_srcjar", ] @@ -1529,7 +1529,7 @@ diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/b } android_library("javatests") { -@@ -195,6 +212,7 @@ robolectric_library("junit") { +@@ -196,6 +213,7 @@ robolectric_library("junit") { } android_resources("java_resources") { @@ -1555,7 +1555,7 @@ diff --git a/components/browser_ui/site_settings/android/java/res/xml/site_setti diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/AllSiteSettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/AllSiteSettings.java --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/AllSiteSettings.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/AllSiteSettings.java -@@ -386,7 +386,8 @@ public class AllSiteSettings extends BaseSiteSettingsFragment +@@ -397,7 +397,8 @@ public class AllSiteSettings extends BaseSiteSettingsFragment if (queryHasChanged) getInfoForOrigins(); }); @@ -1565,7 +1565,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c MenuItem help = menu.add( Menu.NONE, -@@ -398,6 +399,8 @@ public class AllSiteSettings extends BaseSiteSettingsFragment +@@ -409,6 +410,8 @@ public class AllSiteSettings extends BaseSiteSettingsFragment getResources(), R.drawable.ic_help_and_feedback, getContext().getTheme())); @@ -2183,8 +2183,8 @@ new file mode 100644 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/ContentSettingsResources.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/ContentSettingsResources.java --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/ContentSettingsResources.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/ContentSettingsResources.java -@@ -37,7 +37,7 @@ import org.chromium.device.DeviceFeatureMap; - @SuppressLint("UseSparseArrays") +@@ -40,7 +40,7 @@ import org.chromium.device.DeviceFeatureMap; + @NullMarked public class ContentSettingsResources { /** An inner class contains all the resources for a ContentSettingsType */ - private static class ResourceItem { @@ -2192,7 +2192,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c private final int mIcon; private final int mTitle; private final @ContentSettingValues @Nullable Integer mDefaultEnabledValue; -@@ -46,7 +46,7 @@ public class ContentSettingsResources { +@@ -49,7 +49,7 @@ public class ContentSettingsResources { private final int mDisabledSummary; private final int mSummaryOverrideForScreenReader; @@ -2201,16 +2201,16 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c int icon, int title, @ContentSettingValues @Nullable Integer defaultEnabledValue, -@@ -445,6 +445,8 @@ public class ContentSettingsResources { +@@ -450,6 +450,8 @@ public class ContentSettingsResources { R.string.website_settings_category_vr_blocked, R.string.website_settings_category_vr_a11y); } + ResourceItem ri = BromiteCustomContentSettingImpl.getResourceItem(contentType); + if (ri != null) return ri; assert false; // NOTREACHED - return null; + return assumeNonNull(null); } -@@ -603,6 +605,14 @@ public class ContentSettingsResources { +@@ -608,6 +610,14 @@ public class ContentSettingsResources { return getResourceItem(contentType).getDefaultDisabledValue(); } @@ -2225,10 +2225,10 @@ 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. * -@@ -776,6 +786,8 @@ public class ContentSettingsResources { +@@ -781,6 +791,8 @@ public class ContentSettingsResources { * Blocked states, in that order. */ - public static int[] getTriStateSettingDescriptionIDs(int contentType) { + public static int @Nullable [] getTriStateSettingDescriptionIDs(int contentType) { + int[] value = BromiteCustomContentSettingImpl.getTriStateSettingDescriptionIDs(contentType); + if (value != null) return value; if (contentType == ContentSettingsType.PROTECTED_MEDIA_IDENTIFIER) { @@ -2237,7 +2237,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/SingleCategorySettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java -@@ -324,6 +324,10 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment +@@ -334,6 +334,10 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment website.site() .getContentSetting( browserContextHandle, mCategory.getContentSettingsType()); @@ -2248,7 +2248,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c if (contentSetting != null) { return ContentSettingValues.BLOCK == contentSetting; } -@@ -488,6 +492,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment +@@ -519,6 +523,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment ? new HashSet<>(getArguments().getStringArrayList(EXTRA_SELECTED_DOMAINS)) : null; @@ -2256,7 +2256,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c configureGlobalToggles(); if (mCategory.getType() == SiteSettingsCategory.Type.REQUEST_DESKTOP_SITE) { RecordUserAction.record("DesktopSiteContentSetting.SettingsPage.Entered"); -@@ -523,7 +528,8 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment +@@ -554,7 +559,8 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment if (queryHasChanged) getInfoForOrigins(); }); @@ -2266,7 +2266,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c MenuItem help = menu.add( Menu.NONE, -@@ -535,12 +541,20 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment +@@ -566,12 +572,20 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment getResources(), R.drawable.ic_help_and_feedback, getContext().getTheme())); @@ -2287,7 +2287,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c if (mCategory.getType() == SiteSettingsCategory.Type.PROTECTED_MEDIA) { getSiteSettingsDelegate() .launchProtectedContentHelpAndFeedbackActivity(getActivity()); -@@ -612,6 +626,11 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment +@@ -644,6 +658,11 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment BrowserContextHandle browserContextHandle = getSiteSettingsDelegate().getBrowserContextHandle(); PrefService prefService = UserPrefs.get(browserContextHandle); @@ -2299,7 +2299,7 @@ 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; -@@ -789,7 +808,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment +@@ -827,7 +846,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment ? R.string.website_settings_add_site_description_javascript_optimizer_block : R.string.website_settings_add_site_description_javascript_optimizer_allow; } @@ -2308,7 +2308,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c } // OnPreferenceClickListener: -@@ -903,10 +922,11 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment +@@ -947,10 +966,11 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment default: break; } @@ -2323,7 +2323,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c getPreferenceScreen() .addPreference( new AddExceptionPreference( -@@ -1091,8 +1111,16 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment +@@ -1138,9 +1158,16 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment private boolean isBlocked() { switch (mGlobalToggleLayout) { case GlobalToggleLayout.TRI_STATE_TOGGLE: @@ -2336,13 +2336,14 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c + } TriStateSiteSettingsPreference triStateToggle = getPreferenceScreen().findPreference(TRI_STATE_TOGGLE_KEY); +- assumeNonNull(triStateToggle); + if (triStateToggle == null) return true; return (triStateToggle.getCheckedSetting() == ContentSettingValues.BLOCK); case GlobalToggleLayout.TRI_STATE_COOKIE_TOGGLE: TriStateCookieSettingsPreference triStateCookieToggle = -@@ -1162,7 +1190,11 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment - infoText.setSummary( - R.string.website_settings_category_javascript_optimizer_page_description); +@@ -1269,7 +1296,11 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment + } else if (res_id != -1) { + infoText.setSummary(res_id); } else { - screen.removePreference(infoText); + int infoMessage = BromiteCustomContentSettingImpl.getCategoryDescription(mCategory); @@ -2353,7 +2354,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c } // Hide the anti-abuse text preferences, as needed. -@@ -1199,6 +1231,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment +@@ -1314,6 +1345,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment } else { screen.removePreference(mLocationTriStatePref); } @@ -2361,7 +2362,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c if (permissionBlockedByOs) { maybeShowOsWarning(screen); -@@ -1357,7 +1390,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment +@@ -1491,7 +1523,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment getSiteSettingsDelegate().getBrowserContextHandle(), contentType); int[] descriptionIds = ContentSettingsResources.getTriStateSettingDescriptionIDs(contentType); @@ -2370,7 +2371,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c } private void configureBinaryToggle(ChromeSwitchPreference binaryToggle, int contentType) { -@@ -1481,6 +1514,14 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment +@@ -1615,6 +1647,14 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment @ContentSettingValues Integer value = site.getContentSetting(browserContextHandle, contentSettingsType); @@ -2388,15 +2389,15 @@ 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 -@@ -51,6 +51,7 @@ import java.util.Collection; +@@ -54,6 +54,7 @@ import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.List; /** Shows the permissions and other settings for a particular website. */ - public class SingleWebsiteSettings extends BaseSiteSettingsFragment -@@ -177,7 +178,7 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment + @NullMarked +@@ -181,7 +182,7 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment case ContentSettingsType.FILE_SYSTEM_WRITE_GUARD: return "file_system_write_guard_permission_list"; default: @@ -2405,10 +2406,10 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c } } -@@ -566,8 +567,21 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment - +@@ -577,8 +578,21 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment private void setupContentSettingsPreferences() { - mMaxPermissionOrder = findPreference(PREF_PERMISSIONS_HEADER).getOrder(); + Preference permissionsHeaderPref = assumeNonNull(findPreference(PREF_PERMISSIONS_HEADER)); + mMaxPermissionOrder = permissionsHeaderPref.getOrder(); - for (@ContentSettingsType.EnumType int type : SiteSettingsUtil.SETTINGS_ORDER) { - Preference preference = new ChromeSwitchPreference(getStyledContext()); + List order = BromiteCustomContentSettingImpl.getSettingsOrder(); @@ -2429,7 +2430,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c preference.setKey(getPreferenceKey(type)); if (type == ContentSettingsType.ADS) { -@@ -1144,20 +1158,32 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment +@@ -1183,20 +1197,32 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment @ContentSettingValues @Nullable Integer value, boolean isEmbargoed, boolean isOneTime) { @@ -2470,7 +2471,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c AppCompatResources.getColorStateList(getContext(), mHighlightColor) .getDefaultColor()); } -@@ -1372,14 +1398,20 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment +@@ -1413,14 +1439,20 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment if (newValue instanceof Boolean) { permission = (Boolean) newValue ? getEnabledValue(type) : ContentSettingValues.BLOCK; } else { @@ -2484,7 +2485,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c + permission = (Integer) newValue; } - mSite.setContentSetting(browserContextHandle, type, permission); + assumeNonNull(mSite).setContentSetting(browserContextHandle, type, permission); // In Clank, one time grants are only possible via prompt, not via page // info. preference.setSummary( @@ -2496,7 +2497,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/SiteSettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettings.java --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettings.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettings.java -@@ -53,6 +53,7 @@ public class SiteSettings extends BaseSiteSettingsFragment +@@ -57,6 +57,7 @@ public class SiteSettings extends BaseSiteSettingsFragment SettingsUtils.addPreferencesFromResource(this, R.xml.site_settings_preferences); mPageTitle.set(getContext().getString(R.string.prefs_site_settings)); @@ -2504,7 +2505,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c configurePreferences(); updatePreferenceStates(); } -@@ -79,7 +80,7 @@ public class SiteSettings extends BaseSiteSettingsFragment +@@ -87,7 +88,7 @@ public class SiteSettings extends BaseSiteSettingsFragment // Remove unsupported settings categories. for (@SiteSettingsCategory.Type int type = 0; @@ -2512,8 +2513,8 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c + type < BromiteCustomContentSettingImpl.NUM_ENTRIES(); type++) { if (!getSiteSettingsDelegate().isCategoryVisible(type)) { - getPreferenceScreen().removePreference(findPreference(type)); -@@ -101,7 +102,7 @@ public class SiteSettings extends BaseSiteSettingsFragment + Preference pref = assumeNonNull(findPreference(type)); +@@ -113,7 +114,7 @@ public class SiteSettings extends BaseSiteSettingsFragment @CookieControlsMode int cookieControlsMode = UserPrefs.get(browserContextHandle).getInteger(COOKIE_CONTROLS_MODE); @@ -2522,7 +2523,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. -@@ -176,19 +177,21 @@ public class SiteSettings extends BaseSiteSettingsFragment +@@ -191,20 +192,22 @@ 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. @@ -2532,10 +2533,11 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c - setting, /* isOneTime= */ false)); } else { - @ContentSettingValues -- int defaultForToggle = +- Integer defaultForToggle = - checked - ? ContentSettingsResources.getDefaultEnabledValue(contentType) - : ContentSettingsResources.getDefaultDisabledValue(contentType); +- assumeNonNull(defaultForToggle); - p.setSummary( - ContentSettingsResources.getCategorySummary( - defaultForToggle, /* isOneTime= */ false)); @@ -2545,10 +2547,11 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c + p.setSummary(summary); + } else { + @ContentSettingValues -+ int defaultForToggle = ++ Integer defaultForToggle = + checked + ? ContentSettingsResources.getDefaultEnabledValue(contentType) + : ContentSettingsResources.getDefaultDisabledValue(contentType); ++ assumeNonNull(defaultForToggle); + summary = ContentSettingsResources.getCategorySummary( + contentType, defaultForToggle, /* isOneTime= */ false); + p.setSummary(summary); @@ -2559,7 +2562,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/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 -@@ -75,7 +75,7 @@ public class SiteSettingsCategory { +@@ -77,7 +77,7 @@ public class SiteSettingsCategory { Type.TRACKING_PROTECTION, Type.FILE_EDITING, Type.JAVASCRIPT_OPTIMIZER, @@ -2568,7 +2571,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c }) @Retention(RetentionPolicy.SOURCE) public @interface Type { -@@ -117,7 +117,7 @@ public class SiteSettingsCategory { +@@ -119,7 +119,7 @@ public class SiteSettingsCategory { int JAVASCRIPT_OPTIMIZER = 33; /** Number of handled categories used for calculating array sizes. */ @@ -2577,7 +2580,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c } private final BrowserContextHandle mBrowserContextHandle; -@@ -166,6 +166,9 @@ public class SiteSettingsCategory { +@@ -170,6 +170,9 @@ public class SiteSettingsCategory { } else { permission = ""; } @@ -2587,7 +2590,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c return new SiteSettingsCategory(browserContextHandle, type, permission); } -@@ -174,7 +177,7 @@ public class SiteSettingsCategory { +@@ -178,7 +181,7 @@ public class SiteSettingsCategory { @ContentSettingsType.EnumType int contentSettingsType) { assert contentSettingsType != -1; assert Type.ALL_SITES == 0; @@ -2596,8 +2599,8 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c if (contentSettingsType(i) == contentSettingsType) { return createFromType(browserContextHandle, i); } -@@ -185,7 +188,7 @@ public class SiteSettingsCategory { - public static SiteSettingsCategory createFromPreferenceKey( +@@ -189,7 +192,7 @@ public class SiteSettingsCategory { + public static @Nullable SiteSettingsCategory createFromPreferenceKey( BrowserContextHandle browserContextHandle, String preferenceKey) { assert Type.ALL_SITES == 0; - for (@Type int i = Type.ALL_SITES; i < Type.NUM_ENTRIES; i++) { @@ -2605,7 +2608,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c if (preferenceKey(i).equals(preferenceKey)) { return createFromType(browserContextHandle, i); } -@@ -262,8 +265,7 @@ public class SiteSettingsCategory { +@@ -266,8 +269,7 @@ public class SiteSettingsCategory { case Type.TRACKING_PROTECTION: return ContentSettingsType.DEFAULT; // Conversion unavailable. } @@ -2615,7 +2618,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c } /** -@@ -354,8 +356,12 @@ public class SiteSettingsCategory { +@@ -358,8 +360,12 @@ public class SiteSettingsCategory { case Type.ZOOM: return "zoom"; default: @@ -2631,7 +2634,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 -@@ -217,6 +217,8 @@ public interface SiteSettingsDelegate { +@@ -218,6 +218,8 @@ public interface SiteSettingsDelegate { */ String getRelatedWebsiteSetOwner(String memberOrigin); @@ -2643,15 +2646,15 @@ 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/TriStateSiteSettingsPreference.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/TriStateSiteSettingsPreference.java --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/TriStateSiteSettingsPreference.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/TriStateSiteSettingsPreference.java -@@ -13,6 +13,7 @@ import androidx.preference.PreferenceViewHolder; - +@@ -18,6 +18,7 @@ import org.chromium.build.annotations.NullMarked; + import org.chromium.build.annotations.Nullable; import org.chromium.components.browser_ui.widget.RadioButtonWithDescription; import org.chromium.components.content_settings.ContentSettingValues; +import org.chromium.components.content_settings.ContentSettingsType; /** A 3-state Allowed/Ask/Blocked radio group Preference used for SiteSettings. */ - public class TriStateSiteSettingsPreference extends Preference -@@ -23,6 +24,7 @@ public class TriStateSiteSettingsPreference extends Preference + @NullMarked +@@ -29,6 +30,7 @@ public class TriStateSiteSettingsPreference extends Preference private RadioButtonWithDescription mAsk; private RadioButtonWithDescription mBlocked; private RadioGroup mRadioGroup; @@ -2659,19 +2662,19 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c public TriStateSiteSettingsPreference(Context context, AttributeSet attrs) { super(context, attrs); -@@ -42,7 +44,9 @@ public class TriStateSiteSettingsPreference extends Preference +@@ -48,7 +50,9 @@ public class TriStateSiteSettingsPreference extends Preference * @param descriptionIds An array of 3 resource IDs for descriptions for * Allowed, Ask and Blocked states, in that order. */ -- public void initialize(@ContentSettingValues int setting, int[] descriptionIds) { +- public void initialize(@ContentSettingValues int setting, int @Nullable [] descriptionIds) { + public void initialize(@ContentSettingsType.EnumType int contentType, -+ @ContentSettingValues int setting, int[] descriptionIds) { ++ @ContentSettingValues int setting, int @Nullable [] descriptionIds) { + mContentType = contentType; mSetting = setting; mDescriptionIds = descriptionIds; } -@@ -75,6 +79,13 @@ public class TriStateSiteSettingsPreference extends Preference - mRadioGroup = (RadioGroup) holder.findViewById(R.id.radio_button_layout); +@@ -86,6 +90,13 @@ public class TriStateSiteSettingsPreference extends Preference + mRadioGroup = assumeNonNull(radioGroup); mRadioGroup.setOnCheckedChangeListener(this); + BromiteCustomContentSetting cs = @@ -2687,7 +2690,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 -@@ -327,7 +327,11 @@ public final class Website implements WebsiteEntry { +@@ -331,7 +331,11 @@ public final class Website implements WebsiteEntry { RecordUserAction.record("SoundContentSetting.UnmuteBy.SiteSettings"); } } @@ -2703,7 +2706,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 -@@ -110,7 +110,7 @@ public class WebsitePermissionsFetcher { +@@ -111,7 +111,7 @@ public class WebsitePermissionsFetcher { case ContentSettingsType.USB_GUARD: return WebsitePermissionsType.CHOSEN_OBJECT_INFO; default: @@ -2715,7 +2718,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/WebsitePreferenceBridge.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java -@@ -291,7 +291,7 @@ public class WebsitePreferenceBridge { +@@ -321,7 +321,7 @@ public class WebsitePreferenceBridge { case ContentSettingsType.PROTECTED_MEDIA_IDENTIFIER: return true; default: @@ -2724,7 +2727,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c } } -@@ -307,7 +307,6 @@ public class WebsitePreferenceBridge { +@@ -337,7 +337,6 @@ public class WebsitePreferenceBridge { public static boolean isCategoryEnabled( BrowserContextHandle browserContextHandle, @ContentSettingsType.EnumType int contentSettingsType) { @@ -2811,7 +2814,7 @@ diff --git a/components/content_settings/android/BUILD.gn b/components/content_s diff --git a/components/content_settings/core/browser/BUILD.gn b/components/content_settings/core/browser/BUILD.gn --- a/components/content_settings/core/browser/BUILD.gn +++ b/components/content_settings/core/browser/BUILD.gn -@@ -84,6 +84,13 @@ static_library("browser") { +@@ -86,6 +86,13 @@ static_library("browser") { } configs += [ "//build/config/compiler:wexit_time_destructors" ] @@ -2842,7 +2845,7 @@ diff --git a/components/content_settings/core/browser/content_settings_registry. namespace content_settings { -@@ -858,6 +859,7 @@ void ContentSettingsRegistry::Init() { +@@ -859,6 +860,7 @@ void ContentSettingsRegistry::Init() { WebsiteSettingsRegistry::DESKTOP, ContentSettingsInfo::INHERIT_IN_INCOGNITO, ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY); @@ -2853,7 +2856,7 @@ diff --git a/components/content_settings/core/browser/content_settings_registry. diff --git a/components/content_settings/core/browser/content_settings_uma_util.cc b/components/content_settings/core/browser/content_settings_uma_util.cc --- a/components/content_settings/core/browser/content_settings_uma_util.cc +++ b/components/content_settings/core/browser/content_settings_uma_util.cc -@@ -212,11 +212,7 @@ void RecordContentSettingsHistogram(const std::string& name, +@@ -215,11 +215,7 @@ void RecordContentSettingsHistogram(const std::string& name, } int ContentSettingTypeToHistogramValue(ContentSettingsType content_setting) { @@ -3185,10 +3188,10 @@ diff --git a/components/content_settings/core/common/content_settings_mojom_trai diff --git a/components/content_settings/core/common/content_settings_types.mojom b/components/content_settings/core/common/content_settings_types.mojom --- a/components/content_settings/core/common/content_settings_types.mojom +++ b/components/content_settings/core/common/content_settings_types.mojom -@@ -475,5 +475,7 @@ enum ContentSettingsType { - - // Content settings for access to the Controlled Frame API. - CONTROLLED_FRAME, +@@ -479,5 +479,7 @@ enum ContentSettingsType { + // Website setting which is used for UnusedSitePermissionsService to + // store revoked notification permissions of disruptive sites. + REVOKED_DISRUPTIVE_NOTIFICATION_PERMISSIONS, + +#include "components/content_settings/core/common/bromite_content_settings.inc" }; @@ -3403,7 +3406,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" -@@ -1267,6 +1268,14 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info, +@@ -1258,6 +1259,14 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info, // applies to permissions listed in |kPermissionType|. bool PageInfo::ShouldShowPermission( const PageInfo::PermissionInfo& info) const { @@ -3418,7 +3421,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) { -@@ -1383,7 +1392,19 @@ void PageInfo::PresentSitePermissions() { +@@ -1374,7 +1383,19 @@ void PageInfo::PresentSitePermissions() { HostContentSettingsMap* content_settings = GetContentSettings(); DCHECK(web_contents_); @@ -3464,7 +3467,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; -@@ -626,6 +634,12 @@ PageInfoUI::~PageInfoUI() = default; +@@ -628,6 +636,12 @@ PageInfoUI::~PageInfoUI() = default; // static std::u16string PageInfoUI::PermissionTypeToUIString(ContentSettingsType type) { @@ -3477,7 +3480,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); -@@ -636,6 +650,12 @@ std::u16string PageInfoUI::PermissionTypeToUIString(ContentSettingsType type) { +@@ -638,6 +652,12 @@ std::u16string PageInfoUI::PermissionTypeToUIString(ContentSettingsType type) { // static std::u16string PageInfoUI::PermissionTypeToUIStringMidSentence( ContentSettingsType type) { @@ -3490,7 +3493,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); -@@ -1077,6 +1097,11 @@ bool PageInfoUI::ContentSettingsTypeInPageInfo(ContentSettingsType type) { +@@ -1079,6 +1099,11 @@ bool PageInfoUI::ContentSettingsTypeInPageInfo(ContentSettingsType type) { if (info.type == type) return true; } @@ -3571,15 +3574,15 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context diff --git a/third_party/blink/renderer/core/execution_context/execution_context.h b/third_party/blink/renderer/core/execution_context/execution_context.h --- a/third_party/blink/renderer/core/execution_context/execution_context.h +++ b/third_party/blink/renderer/core/execution_context/execution_context.h -@@ -44,6 +44,7 @@ - #include "third_party/blink/public/mojom/permissions_policy/permissions_policy.mojom-blink-forward.h" +@@ -43,6 +43,7 @@ + #include "third_party/blink/public/mojom/frame/lifecycle.mojom-blink-forward.h" #include "third_party/blink/public/mojom/permissions_policy/policy_disposition.mojom-blink-forward.h" #include "third_party/blink/public/mojom/v8_cache_options.mojom-blink-forward.h" +#include "third_party/blink/public/platform/web_content_settings_client.h" #include "third_party/blink/renderer/bindings/core/v8/sanitize_script_errors.h" #include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/core/execution_context/security_context.h" -@@ -103,6 +104,10 @@ class SecurityOrigin; +@@ -102,6 +103,10 @@ class SecurityOrigin; class ScriptState; class ScriptWrappable; class TrustedTypePolicyFactory; diff --git a/build/patches/Cromite-Branding--improve-settings-ui.patch b/build/patches/Cromite-Branding--improve-settings-ui.patch index ae6efbec..0fba8fb0 100644 --- a/build/patches/Cromite-Branding--improve-settings-ui.patch +++ b/build/patches/Cromite-Branding--improve-settings-ui.patch @@ -18,7 +18,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.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 -@@ -643,7 +643,7 @@ chrome_java_resources = [ +@@ -650,7 +650,7 @@ chrome_java_resources = [ "java/res/xml/manage_sync_preferences.xml", "java/res/xml/personalize_google_services_preferences.xml", "java/res/xml/incognito_preferences.xml", diff --git a/build/patches/Cromite-Branding.patch b/build/patches/Cromite-Branding.patch index 49a2f68f..06adab72 100644 --- a/build/patches/Cromite-Branding.patch +++ b/build/patches/Cromite-Branding.patch @@ -9180,7 +9180,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/Br diff --git a/chrome/app/extensions_strings.grdp b/chrome/app/extensions_strings.grdp --- a/chrome/app/extensions_strings.grdp +++ b/chrome/app/extensions_strings.grdp -@@ -392,7 +392,7 @@ +@@ -398,7 +398,7 @@ No recent activities @@ -9189,7 +9189,7 @@ diff --git a/chrome/app/extensions_strings.grdp b/chrome/app/extensions_strings. No description provided -@@ -530,7 +530,7 @@ +@@ -536,7 +536,7 @@ My extensions @@ -9201,15 +9201,15 @@ diff --git a/chrome/app/extensions_strings.grdp b/chrome/app/extensions_strings. diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp --- a/chrome/app/settings_strings.grdp +++ b/chrome/app/settings_strings.grdp -@@ -275,7 +275,7 @@ - Change +@@ -81,7 +81,7 @@ + Accessibility - + - Open Chrome Web Store + Open Chromedontreplace Web Store - - + + Add accessibility features diff --git a/chrome/app/theme/chromium/BRANDING b/chrome/app/theme/chromium/BRANDING --- a/chrome/app/theme/chromium/BRANDING +++ b/chrome/app/theme/chromium/BRANDING @@ -13155,7 +13155,7 @@ e)fqMZZ`3a)Ds&5H @@ -13255,7 +13255,7 @@ diff --git a/chrome/browser/resources/settings/settings_menu/settings_menu.html 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 -@@ -2425,7 +2425,7 @@ Your Google account may have other forms of browsing history like searches and a +@@ -2462,7 +2462,7 @@ Your Google account may have other forms of browsing history like searches and a About Chrome @@ -13278,16 +13278,16 @@ diff --git a/chrome/browser/ui/toolbar/chrome_labs/chrome_labs_utils.cc b/chrome diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h --- a/chrome/common/url_constants.h +++ b/chrome/common/url_constants.h -@@ -136,7 +136,7 @@ inline constexpr char kChromeHelpViaMenuURL[] = - #endif // BUILDFLAG(IS_CHROMEOS_ASH) +@@ -135,7 +135,7 @@ inline constexpr char kChromeHelpViaMenuURL[] = + #endif // BUILDFLAG(IS_CHROMEOS) inline constexpr char kChromeHelpViaWebUIURL[] = - "https://support.google.com/chrome?p=help&ctx=settings"; + "https://github.com/uazo/cromite/issues"; - #if BUILDFLAG(IS_CHROMEOS_ASH) + #if BUILDFLAG(IS_CHROMEOS) inline constexpr char kChromeOsHelpViaWebUIURL[] = #if BUILDFLAG(GOOGLE_CHROME_BRANDING) -@@ -199,7 +199,7 @@ inline constexpr char kChromeUIUntrustedNewTabPageUrl[] = +@@ -198,7 +198,7 @@ inline constexpr char kChromeUIUntrustedNewTabPageUrl[] = "chrome-untrusted://new-tab-page/"; // The URL for the Chromium project used in the About dialog. @@ -18225,15 +18225,15 @@ diff --git a/components/omnibox/browser/vector_icons/product_chrome_refresh.icon -// found in the LICENSE file. - -CANVAS_DIMENSIONS, 15, --MOVE_TO, 4.92f, 7.5f, --R_CUBIC_TO, 0, 0.71f, 0.25f, 1.31f, 0.76f, 1.82f, --R_CUBIC_TO, 0.51f, 0.51f, 1.12f, 0.76f, 1.82f, 0.76f, --R_CUBIC_TO, 0.7f, 0, 1.31f, -0.25f, 1.82f, -0.76f, --R_CUBIC_TO, 0.51f, -0.51f, 0.76f, -1.12f, 0.76f, -1.82f, --R_CUBIC_TO, 0, -0.7f, -0.25f, -1.31f, -0.76f, -1.82f, --R_ARC_TO, 2.49f, 2.49f, 0, 0, 0, -1.82f, -0.76f, --R_CUBIC_TO, -0.7f, 0, -1.31f, 0.25f, -1.82f, 0.76f, --R_ARC_TO, 2.49f, 2.49f, 0, 0, 0, -0.76f, 1.82f, +-MOVE_TO, 4.92, 7.5, +-R_CUBIC_TO, 0, 0.71, 0.25, 1.31, 0.76, 1.82, +-R_CUBIC_TO, 0.51, 0.51, 1.12, 0.76, 1.82, 0.76, +-R_CUBIC_TO, 0.7, 0, 1.31, -0.25, 1.82, -0.76, +-R_CUBIC_TO, 0.51, -0.51, 0.76, -1.12, 0.76, -1.82, +-R_CUBIC_TO, 0, -0.7, -0.25, -1.31, -0.76, -1.82, +-R_ARC_TO, 2.49, 2.49, 0, 0, 0, -1.82, -0.76, +-R_CUBIC_TO, -0.7, 0, -1.31, 0.25, -1.82, 0.76, +-R_ARC_TO, 2.49, 2.49, 0, 0, 0, -0.76, 1.82, +CANVAS_DIMENSIONS, 16, +MOVE_TO, 15.99f, 8, +CUBIC_TO, 15.99f, 9.83f, 15.37f, 11.52f, 14.34f, 12.87f, @@ -18245,47 +18245,47 @@ diff --git a/components/omnibox/browser/vector_icons/product_chrome_refresh.icon +CUBIC_TO, 14.47f, 3.29f, 14.38f, 3.18f, 14.29f, 3.07f, +CUBIC_TO, 15.36f, 4.43f, 15.99f, 6.14f, 15.99f, 8, CLOSE, --MOVE_TO, 7.5f, 11.48f, --R_CUBIC_TO, 0.14f, 0, 0.28f, 0, 0.41f, -0.02f, --R_CUBIC_TO, 0.13f, -0.01f, 0.26f, -0.04f, 0.39f, -0.07f, --LINE_TO, 6.77f, 14.06f, --R_CUBIC_TO, -1.65f, -0.19f, -3.04f, -0.89f, -4.15f, -2.12f, --CUBIC_TO, 1.5f, 10.71f, 0.94f, 9.24f, 0.94f, 7.55f, --R_CUBIC_TO, 0, -0.46f, 0.05f, -0.9f, 0.13f, -1.33f, --R_CUBIC_TO, 0.08f, -0.44f, 0.22f, -0.85f, 0.39f, -1.25f, --R_LINE_TO, 2.63f, 4.55f, --R_CUBIC_TO, 0.34f, 0.59f, 0.81f, 1.07f, 1.41f, 1.43f, --R_CUBIC_TO, 0.6f, 0.36f, 1.26f, 0.54f, 2.01f, 0.54f, +-MOVE_TO, 7.5, 11.48, +-R_CUBIC_TO, 0.14, 0, 0.28, 0, 0.41, -0.02, +-R_CUBIC_TO, 0.13, -0.01, 0.26, -0.04, 0.39, -0.07, +-LINE_TO, 6.77, 14.06, +-R_CUBIC_TO, -1.65, -0.19, -3.04, -0.89, -4.15, -2.12, +-CUBIC_TO, 1.5, 10.71, 0.94, 9.24, 0.94, 7.55, +-R_CUBIC_TO, 0, -0.46, 0.05, -0.9, 0.13, -1.33, +-R_CUBIC_TO, 0.08, -0.44, 0.22, -0.85, 0.39, -1.25, +-R_LINE_TO, 2.63, 4.55, +-R_CUBIC_TO, 0.34, 0.59, 0.81, 1.07, 1.41, 1.43, +-R_CUBIC_TO, 0.6, 0.36, 1.26, 0.54, 2.01, 0.54, +MOVE_TO, 14.29f, 3.07f, +CUBIC_TO, 14.29f, 3.06f, 14.28f, 3.05f, 14.27f, 3.04f, +CUBIC_TO, 14.28f, 3.05f, 14.29f, 3.06f, 14.29f, 3.07f, CLOSE, --R_MOVE_TO, 0, -7.87f, --R_CUBIC_TO, -0.87f, 0, -1.65f, 0.25f, -2.33f, 0.77f, --R_ARC_TO, 3.95f, 3.95f, 0, 0, 0, -1.42f, 1.94f, --LINE_TO, 2.21f, 3.66f, --R_ARC_TO, 6.79f, 6.79f, 0, 0, 1, 2.27f, -1.94f, --CUBIC_TO, 5.4f, 1.22f, 6.4f, 0.98f, 7.5f, 0.98f, --R_CUBIC_TO, 1.1f, 0, 2.08f, 0.24f, 2.99f, 0.72f, --ARC_TO, 6.66f, 6.66f, 0, 0, 1, 12.76f, 3.6f, --H_LINE_TO, 7.51f, --R_LINE_TO, -0.01f, 0.01f, +-R_MOVE_TO, 0, -7.87, +-R_CUBIC_TO, -0.87, 0, -1.65, 0.25, -2.33, 0.77, +-R_ARC_TO, 3.95, 3.95, 0, 0, 0, -1.42, 1.94, +-LINE_TO, 2.21, 3.66, +-R_ARC_TO, 6.79, 6.79, 0, 0, 1, 2.27, -1.94, +-CUBIC_TO, 5.4, 1.22, 6.4, 0.98, 7.5, 0.98, +-R_CUBIC_TO, 1.1, 0, 2.08, 0.24, 2.99, 0.72, +-ARC_TO, 6.66, 6.66, 0, 0, 1, 12.76, 3.6, +-H_LINE_TO, 7.51, +-R_LINE_TO, -0.01, 0.01, +MOVE_TO, 14.34f, 12.87f, +CUBIC_TO, 14.29f, 12.93f, 14.24f, 12.99f, 14.2f, 13.05f, +CUBIC_TO, 14.24f, 12.99f, 14.29f, 12.93f, 14.34f, 12.87f, CLOSE, --R_MOVE_TO, 6.01f, 1.31f, --R_CUBIC_TO, 0.19f, 0.4f, 0.32f, 0.83f, 0.41f, 1.27f, --R_CUBIC_TO, 0.09f, 0.44f, 0.15f, 0.89f, 0.15f, 1.36f, --R_CUBIC_TO, 0, 1.7f, -0.55f, 3.16f, -1.68f, 4.38f, --R_CUBIC_TO, -1.11f, 1.23f, -2.47f, 1.93f, -4.1f, 2.13f, --R_LINE_TO, 2.63f, -4.55f, --R_CUBIC_TO, 0.17f, -0.28f, 0.29f, -0.59f, 0.38f, -0.92f, --R_CUBIC_TO, 0.09f, -0.34f, 0.15f, -0.69f, 0.15f, -1.05f, --R_CUBIC_TO, 0, -0.52f, -0.09f, -0.99f, -0.28f, -1.42f, --R_ARC_TO, 3.96f, 3.96f, 0, 0, 0, -0.74f, -1.2f, --R_H_LINE_TO, 3.08f, --R_V_LINE_TO, 0.01f, +-R_MOVE_TO, 6.01, 1.31, +-R_CUBIC_TO, 0.19, 0.4, 0.32, 0.83, 0.41, 1.27, +-R_CUBIC_TO, 0.09, 0.44, 0.15, 0.89, 0.15, 1.36, +-R_CUBIC_TO, 0, 1.7, -0.55, 3.16, -1.68, 4.38, +-R_CUBIC_TO, -1.11, 1.23, -2.47, 1.93, -4.1, 2.13, +-R_LINE_TO, 2.63, -4.55, +-R_CUBIC_TO, 0.17, -0.28, 0.29, -0.59, 0.38, -0.92, +-R_CUBIC_TO, 0.09, -0.34, 0.15, -0.69, 0.15, -1.05, +-R_CUBIC_TO, 0, -0.52, -0.09, -0.99, -0.28, -1.42, +-R_ARC_TO, 3.96, 3.96, 0, 0, 0, -0.74, -1.2, +-R_H_LINE_TO, 3.08, +-R_V_LINE_TO, 0.01, +MOVE_TO, 14.27f, 3.04f, +CUBIC_TO, 14.19f, 2.94f, 14.11f, 2.84f, 14.02f, 2.74f, +CUBIC_TO, 14.11f, 2.84f, 14.19f, 2.94f, 14.27f, 3.04f, @@ -18957,7 +18957,7 @@ diff --git a/components/webui/version/resources/about_version_mobile.css b/compo 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 -@@ -564,19 +564,22 @@ void ResolveInvalidConfigurations() { +@@ -571,19 +571,22 @@ void ResolveInvalidConfigurations() { base::FeatureList::IsEnabled( features::kPrivacySandboxAdsAPIsM1Override)) && !base::FeatureList::IsEnabled(blink::features::kFencedFrames)) { @@ -18984,7 +18984,7 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features. << "Fenced frames must be enabled in order to enable local " "unpartitioned " << "data access. Use --" << switches::kEnableFeatures << "=" -@@ -584,12 +587,14 @@ void ResolveInvalidConfigurations() { +@@ -591,12 +594,14 @@ void ResolveInvalidConfigurations() { WebRuntimeFeatures::EnableFeatureFromString( "FencedFramesLocalUnpartitionedDataAccess", false); } @@ -18994,13 +18994,13 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features. // Topics API cannot be enabled without the support of the browser process. // The Document API should be additionally gated by the // `kBrowsingTopicsDocumentAPI` feature. - if (!base::FeatureList::IsEnabled(blink::features::kBrowsingTopics)) { + if (!base::FeatureList::IsEnabled(network::features::kBrowsingTopics)) { - LOG_IF(WARNING, WebRuntimeFeatures::IsTopicsAPIEnabled()) + CHECK(!WebRuntimeFeatures::IsTopicsAPIEnabled()) << "Topics cannot be enabled in this configuration. Use --" << switches::kEnableFeatures << "=" - << blink::features::kBrowsingTopics.name << " in addition."; -@@ -597,30 +602,23 @@ void ResolveInvalidConfigurations() { + << network::features::kBrowsingTopics.name << " in addition."; +@@ -604,30 +609,23 @@ void ResolveInvalidConfigurations() { WebRuntimeFeatures::EnableTopicsDocumentAPI(false); WebRuntimeFeatures::EnableTopicsImgAPI(false); } else { @@ -19017,14 +19017,14 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features. + CHECK(false) << "kBrowsingTopics is enabled!"; } - if (!base::FeatureList::IsEnabled(blink::features::kSharedStorageAPI)) { + if (!base::FeatureList::IsEnabled(network::features::kSharedStorageAPI)) { - LOG_IF(WARNING, WebRuntimeFeatures::IsSharedStorageAPIEnabled()) - << "SharedStorage cannot be enabled in this " + CHECK(!WebRuntimeFeatures::IsSharedStorageAPIEnabled()) + << "SharedStorage for M118+ cannot be enabled in this " "configuration. Use --" << switches::kEnableFeatures << "=" - << blink::features::kSharedStorageAPI.name << " in addition."; + << network::features::kSharedStorageAPI.name << " in addition."; WebRuntimeFeatures::EnableSharedStorageAPI(false); + } else { + CHECK(false) << "kSharedStorageAPI is enabled!"; @@ -19037,21 +19037,21 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features. << "AttributionReporting cannot be enabled in this " "configuration. Use --" << switches::kEnableFeatures << "=" -@@ -628,23 +626,25 @@ void ResolveInvalidConfigurations() { +@@ -635,23 +633,25 @@ void ResolveInvalidConfigurations() { << " in addition."; WebRuntimeFeatures::EnableAttributionReporting(false); } + CHECK(!base::FeatureList::IsEnabled(attribution_reporting::features::kConversionMeasurement)) + << "kConversionMeasurement is enabled!"; - if (!base::FeatureList::IsEnabled(blink::features::kInterestGroupStorage)) { + if (!base::FeatureList::IsEnabled(network::features::kInterestGroupStorage)) { - LOG_IF(WARNING, - WebRuntimeFeatures::IsAdInterestGroupAPIEnabledByRuntimeFlag()) + CHECK(!WebRuntimeFeatures::IsAdInterestGroupAPIEnabledByRuntimeFlag()) << "AdInterestGroupAPI cannot be enabled in this " "configuration. Use --" << switches::kEnableFeatures << "=" - << blink::features::kInterestGroupStorage.name << " in addition."; + << network::features::kInterestGroupStorage.name << " in addition."; WebRuntimeFeatures::EnableAdInterestGroupAPI(false); WebRuntimeFeatures::EnableFledge(false); + } else { diff --git a/build/patches/Customize-selection-popup.patch b/build/patches/Customize-selection-popup.patch index c18793cd..ce030106 100644 --- a/build/patches/Customize-selection-popup.patch +++ b/build/patches/Customize-selection-popup.patch @@ -37,7 +37,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActionMod 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 -@@ -781,10 +781,17 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn +@@ -798,10 +798,17 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn @TabLaunchType int type, @TabCreationState int creationState, boolean markedForSelection) { @@ -62,7 +62,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activity_glue/ActivityTabWebContentsDelegateAndroid.java b/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activity_glue/ActivityTabWebContentsDelegateAndroid.java --- a/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activity_glue/ActivityTabWebContentsDelegateAndroid.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activity_glue/ActivityTabWebContentsDelegateAndroid.java -@@ -195,12 +195,20 @@ public class ActivityTabWebContentsDelegateAndroid extends TabWebContentsDelegat +@@ -196,12 +196,20 @@ public class ActivityTabWebContentsDelegateAndroid extends TabWebContentsDelegat // Skip opening a new Tab if it doesn't make sense. if (mTab.isClosing()) return false; @@ -81,9 +81,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activit tabCreator.createTabWithWebContents( - mTab, webContents, TabLaunchType.FROM_LONGPRESS_FOREGROUND, url); + mTab, webContents, tabLaunchType, url); + if (!success) return false; - if (success) { - if (disposition == WindowOpenDisposition.NEW_FOREGROUND_TAB) { + if (disposition == WindowOpenDisposition.NEW_FOREGROUND_TAB) { diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerImpl.java --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerImpl.java @@ -95,7 +95,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo import org.chromium.base.ObserverList; import org.chromium.base.TraceEvent; import org.chromium.base.supplier.ObservableSupplier; -@@ -237,6 +238,13 @@ public class LayoutManagerImpl +@@ -238,6 +239,13 @@ public class LayoutManagerImpl != TabLaunchType .FROM_COLLABORATION_BACKGROUND_IN_GROUP) || (!getTabModelSelector().isIncognitoSelected() && incognito); @@ -130,7 +130,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextM 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 -@@ -28,6 +28,7 @@ import androidx.appcompat.content.res.AppCompatResources; +@@ -27,6 +27,7 @@ import androidx.appcompat.app.AppCompatActivity; import org.chromium.base.BuildInfo; import org.chromium.base.Callback; import org.chromium.base.CallbackController; @@ -138,7 +138,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi import org.chromium.base.TraceEvent; import org.chromium.base.lifetime.Destroyable; import org.chromium.base.metrics.RecordUserAction; -@@ -823,11 +824,16 @@ public class RootUiCoordinator +@@ -783,11 +784,16 @@ public class RootUiCoordinator TrackerFactory.getTrackerForProfile(tab.getProfile()) .notifyEvent(EventConstants.WEB_SEARCH_PERFORMED); diff --git a/build/patches/Disable-Accessibility-service-by-default.patch b/build/patches/Disable-Accessibility-service-by-default.patch index 0fd46947..a5113b1b 100644 --- a/build/patches/Disable-Accessibility-service-by-default.patch +++ b/build/patches/Disable-Accessibility-service-by-default.patch @@ -42,7 +42,7 @@ diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibil 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 -@@ -1095,6 +1095,11 @@ public class WebContentsAccessibilityImpl extends AccessibilityNodeProviderCompa +@@ -1100,6 +1100,11 @@ public class WebContentsAccessibilityImpl extends AccessibilityNodeProviderCompa structure.setChildCount(0); return; } diff --git a/build/patches/Disable-Android-Tab-Declutter.patch b/build/patches/Disable-Android-Tab-Declutter.patch new file mode 100644 index 00000000..b50c6fb9 --- /dev/null +++ b/build/patches/Disable-Android-Tab-Declutter.patch @@ -0,0 +1,40 @@ +From: uazo +Date: Tue, 1 Apr 2025 11:37:52 +0000 +Subject: Disable Android Tab Declutter + +Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html +License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html +--- + .../org/chromium/chrome/browser/flags/ChromeFeatureList.java | 4 ++-- + .../chrome_feature_list_cc/Disable-Android-Tab-Declutter.inc | 1 + + 2 files changed, 3 insertions(+), 2 deletions(-) + create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-Android-Tab-Declutter.inc + +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 +@@ -1032,7 +1032,7 @@ public abstract class ChromeFeatureList { + public static final MutableFlagWithSafeDefault sAndroidDumpOnScrollWithoutResource = + newMutableFlagWithSafeDefault(ANDROID_DUMP_ON_SCROLL_WITHOUT_RESOURCE, false); + public static final MutableFlagWithSafeDefault sAndroidTabDeclutter = +- newMutableFlagWithSafeDefault(ANDROID_TAB_DECLUTTER, true); ++ newMutableFlagWithSafeDefault(ANDROID_TAB_DECLUTTER, false); + public static final MutableFlagWithSafeDefault sAndroidTabDeclutterArchiveAllButActiveTab = + newMutableFlagWithSafeDefault(ANDROID_TAB_DECLUTTER_ARCHIVE_ALL_BUT_ACTIVE, false); + public static final MutableFlagWithSafeDefault sAndroidTabDeclutterArchiveDuplicateTabs = +@@ -1514,7 +1514,7 @@ public abstract class ChromeFeatureList { + public static final MutableBooleanParamWithSafeDefault sShouldBlockCapturesForFullscreenParam = + sSuppressionToolbarCaptures.newBooleanParam("block_for_fullscreen", false); + public static final MutableBooleanParamWithSafeDefault sAndroidTabDeclutterArchiveEnabled = +- sAndroidTabDeclutter.newBooleanParam("android_tab_declutter_archive_enabled", true); ++ sAndroidTabDeclutter.newBooleanParam("android_tab_declutter_archive_enabled", false); + public static final MutableIntParamWithSafeDefault sAndroidTabDeclutterArchiveTimeDeltaHours = + sAndroidTabDeclutter.newIntParam( + "android_tab_declutter_archive_time_delta_hours", 21 * 24); +diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-Android-Tab-Declutter.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-Android-Tab-Declutter.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-Android-Tab-Declutter.inc +@@ -0,0 +1 @@ ++SET_CROMITE_FEATURE_DISABLED(kAndroidTabDeclutter); +-- diff --git a/build/patches/Disable-Compose-feature.patch b/build/patches/Disable-Compose-feature.patch index ca16c5a8..f7312a6d 100644 --- a/build/patches/Disable-Compose-feature.patch +++ b/build/patches/Disable-Compose-feature.patch @@ -13,7 +13,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -8151,6 +8151,12 @@ static_library("browser") { +@@ -8180,6 +8180,12 @@ static_library("browser") { deps += [ "//components/segmentation_platform/internal:optimization_guide_segmentation_handler" ] } @@ -26,7 +26,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn if (enable_compose) { sources += [ "compose/chrome_compose_client.cc", -@@ -8166,7 +8172,6 @@ static_library("browser") { +@@ -8195,7 +8201,6 @@ static_library("browser") { ] deps += [ @@ -34,7 +34,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "//chrome/common/compose", "//chrome/common/compose:mojo_bindings", "//components/autofill/content/browser:browser", -@@ -8609,7 +8614,7 @@ source_set("font_pref") { +@@ -8640,7 +8645,7 @@ source_set("font_pref") { deps = [ "//chrome/common" ] } diff --git a/build/patches/Disable-Compression-Dictionary-Transport.patch b/build/patches/Disable-Compression-Dictionary-Transport.patch index 50c8b974..fd37d28f 100644 --- a/build/patches/Disable-Compression-Dictionary-Transport.patch +++ b/build/patches/Disable-Compression-Dictionary-Transport.patch @@ -10,7 +10,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -875,12 +875,14 @@ +@@ -889,12 +889,14 @@ } }, { diff --git a/build/patches/Disable-FedCm.patch b/build/patches/Disable-FedCm.patch index 29aeea16..c0df0888 100644 --- a/build/patches/Disable-FedCm.patch +++ b/build/patches/Disable-FedCm.patch @@ -26,7 +26,7 @@ new file mode 100644 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -1830,7 +1830,7 @@ +@@ -1914,7 +1914,7 @@ { name: "FedCm", public: true, diff --git a/build/patches/Disable-Feeback-Collector.patch b/build/patches/Disable-Feeback-Collector.patch index c4dfdb08..4777b90e 100644 --- a/build/patches/Disable-Feeback-Collector.patch +++ b/build/patches/Disable-Feeback-Collector.patch @@ -29,7 +29,7 @@ diff --git a/chrome/browser/feedback/BUILD.gn b/chrome/browser/feedback/BUILD.gn diff --git a/chrome/browser/feedback/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java b/chrome/browser/feedback/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java --- a/chrome/browser/feedback/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java +++ b/chrome/browser/feedback/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java -@@ -28,6 +28,7 @@ import org.chromium.components.signin.identitymanager.ConsentLevel; +@@ -29,6 +29,7 @@ import org.chromium.components.signin.identitymanager.ConsentLevel; import org.chromium.components.signin.identitymanager.IdentityManager; import java.util.HashMap; @@ -37,7 +37,7 @@ diff --git a/chrome/browser/feedback/android/java/src/org/chromium/chrome/browse import java.util.List; import java.util.Map; -@@ -69,31 +70,8 @@ public abstract class FeedbackCollector implements Runnable { +@@ -73,31 +74,8 @@ public abstract class FeedbackCollector implements Runnable { @Nullable ScreenshotSource screenshotTask, T initParams, Profile profile) { diff --git a/build/patches/Disable-GSA-by-default.patch b/build/patches/Disable-GSA-by-default.patch index cb6deae6..e4b3dcdf 100644 --- a/build/patches/Disable-GSA-by-default.patch +++ b/build/patches/Disable-GSA-by-default.patch @@ -25,7 +25,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.j import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteCoordinator; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.profiles.ProfileManager; -@@ -263,9 +262,6 @@ public class IntentHandler { +@@ -275,9 +274,6 @@ public class IntentHandler { public static final String EXTRA_SKIP_PRECONNECT = "org.chromium.chrome.browser.skip_preconnect"; @@ -35,7 +35,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.j private static Pair sPendingReferrer; private static int sReferrerId; private static String sPendingIncognitoUrl; -@@ -539,8 +535,6 @@ public class IntentHandler { +@@ -551,8 +547,6 @@ public class IntentHandler { return ExternalAppId.LINE; } else if (packageName.equals(PACKAGE_WHATSAPP)) { return ExternalAppId.WHATSAPP; @@ -206,16 +206,16 @@ diff --git a/chrome/browser/ui/android/google_bottom_bar/java/src/org/chromium/c diff --git a/chrome/browser/ui/android/pdf/java/src/org/chromium/chrome/browser/pdf/PdfCoordinator.java b/chrome/browser/ui/android/pdf/java/src/org/chromium/chrome/browser/pdf/PdfCoordinator.java --- a/chrome/browser/ui/android/pdf/java/src/org/chromium/chrome/browser/pdf/PdfCoordinator.java +++ b/chrome/browser/ui/android/pdf/java/src/org/chromium/chrome/browser/pdf/PdfCoordinator.java -@@ -246,7 +246,7 @@ public class PdfCoordinator { +@@ -249,7 +249,7 @@ public class PdfCoordinator { } - String requestAssistContent(String filename, boolean isWorkProfile) { + @Nullable String requestAssistContent(String filename, boolean isWorkProfile) { - if (mUri == null) { + if ((true)) { return null; } String structuredData; -@@ -264,8 +264,6 @@ public class PdfCoordinator { +@@ -267,8 +267,6 @@ public class PdfCoordinator { } catch (JSONException e) { return null; } diff --git a/build/patches/Disable-GetInstalledRelatedApps-API.patch b/build/patches/Disable-GetInstalledRelatedApps-API.patch index e53a7f33..89d604d8 100644 --- a/build/patches/Disable-GetInstalledRelatedApps-API.patch +++ b/build/patches/Disable-GetInstalledRelatedApps-API.patch @@ -16,7 +16,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/components/installedapp/android/java/src/org/chromium/components/installedapp/InstalledAppProviderImpl.java b/components/installedapp/android/java/src/org/chromium/components/installedapp/InstalledAppProviderImpl.java --- a/components/installedapp/android/java/src/org/chromium/components/installedapp/InstalledAppProviderImpl.java +++ b/components/installedapp/android/java/src/org/chromium/components/installedapp/InstalledAppProviderImpl.java -@@ -153,6 +153,7 @@ public class InstalledAppProviderImpl implements InstalledAppProvider { +@@ -161,6 +161,7 @@ public class InstalledAppProviderImpl implements InstalledAppProvider { final RelatedApplication[] relatedApps, final Url manifestUrl, final FilterInstalledApps_Response callback) { @@ -58,7 +58,7 @@ new file mode 100644 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -2511,9 +2511,8 @@ +@@ -2538,9 +2538,8 @@ name: "InspectorGhostRules", }, { diff --git a/build/patches/Disable-Real-Box.patch b/build/patches/Disable-Real-Box.patch index fc785ec5..620f8cac 100644 --- a/build/patches/Disable-Real-Box.patch +++ b/build/patches/Disable-Real-Box.patch @@ -13,7 +13,7 @@ Real-box is search box in ntp 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 -@@ -2323,7 +2323,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -2217,7 +2217,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, registry->RegisterBooleanPref( prefs::kLensRegionSearchEnabled, true, user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); @@ -21,7 +21,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse + registry->RegisterBooleanPref(prefs::kLensDesktopNTPSearchEnabled, false); #endif - #if !BUILDFLAG(IS_ANDROID) + registry->RegisterListPref( diff --git a/chrome/browser/resources/new_tab_page/app.html b/chrome/browser/resources/new_tab_page/app.html --- a/chrome/browser/resources/new_tab_page/app.html +++ b/chrome/browser/resources/new_tab_page/app.html diff --git a/build/patches/Disable-WebGPU.patch b/build/patches/Disable-WebGPU.patch index 313e0fb2..125cff8e 100644 --- a/build/patches/Disable-WebGPU.patch +++ b/build/patches/Disable-WebGPU.patch @@ -12,7 +12,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.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 -@@ -549,6 +549,8 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs( +@@ -556,6 +556,8 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs( WebRuntimeFeatures::EnableRemotePlayback(false); @@ -24,7 +24,7 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features. 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 -@@ -243,7 +243,7 @@ BASE_FEATURE(kEnableDrDc, +@@ -235,7 +235,7 @@ BASE_FEATURE(kEnableDrDc, // enabled by default on supported platforms. #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || \ BUILDFLAG(IS_ANDROID) diff --git a/build/patches/Disable-all-predictors-code.patch b/build/patches/Disable-all-predictors-code.patch index 76b61403..35f4bc98 100644 --- a/build/patches/Disable-all-predictors-code.patch +++ b/build/patches/Disable-all-predictors-code.patch @@ -16,6 +16,8 @@ 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 +-- + .../search_prefetch/field_trial_settings.cc | 4 ++++ + .../search_prefetch_url_loader_interceptor.cc | 1 + .../chrome_browser_main_extra_parts_profiles.cc | 1 - chrome/browser/safe_browsing/BUILD.gn | 1 - ...fication_content_detection_service_factory.cc | 5 +++++ @@ -23,11 +25,12 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../read_anything/read_aloud_app_model.cc | 16 ++++++++++++++-- .../read_anything/read_aloud_app_model.h | 9 ++++++++- .../read_anything_app_controller.cc | 10 ++++++++++ - .../read_anything/read_anything_app_controller.h | 4 ++++ + .../read_anything/read_anything_app_controller.h | 6 ++++++ chrome/utility/BUILD.gn | 2 +- chrome/utility/services.cc | 8 -------- .../integrators/autofill_optimization_guide.cc | 5 +++-- .../omnibox/browser/autocomplete_controller.cc | 4 ++++ + .../omnibox/browser/base_search_provider.cc | 4 ++-- .../optimization_guide/core/hints_fetcher.cc | 1 + .../optimization_guide/core/hints_manager.cc | 5 +++++ .../core/optimization_guide_features.cc | 15 +++++++++------ @@ -38,28 +41,30 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../page_content_annotations_model_manager.cc | 1 + .../notification_content_detection/BUILD.gn | 7 +++++++ components/safe_browsing/core/common/features.cc | 1 + - .../Disable-all-predictors-code.inc | 3 +++ + .../Disable-all-predictors-code.inc | 2 ++ .../Disable-all-predictors-code.inc | 1 + .../Disable-all-predictors-code.inc | 1 + .../features_cc/Disable-all-predictors-code.inc | 3 +++ .../features_cc/Disable-all-predictors-code.inc | 1 + + .../features_cc/Disable-all-predictors-code.inc | 1 + .../features_cc/Disable-all-predictors-code.inc | 2 ++ services/webnn/features.gni | 2 +- .../core/html/parser/html_document_parser.cc | 1 + .../document_speculation_rules.cc | 1 + .../platform/runtime_enabled_features.json5 | 2 +- - 43 files changed, 114 insertions(+), 45 deletions(-) + 47 files changed, 123 insertions(+), 47 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 create mode 100644 cromite_flags/components/permissions/features_cc/Disable-all-predictors-code.inc + create mode 100644 cromite_flags/net/base/features_cc/Disable-all-predictors-code.inc create mode 100644 cromite_flags/services/network/public/cpp/features_cc/Disable-all-predictors-code.inc create mode 100644 cromite_flags/third_party/blink/common/features_cc/Disable-all-predictors-code.inc diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -746,8 +746,6 @@ static_library("browser") { +@@ -755,8 +755,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", @@ -68,9 +73,9 @@ 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", -@@ -2261,7 +2259,7 @@ static_library("browser") { +@@ -2281,7 +2279,7 @@ static_library("browser") { + "//components/resources", "//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/notification_content_detection:constants", @@ -180,7 +185,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 -@@ -498,7 +498,6 @@ void OptimizationGuideKeyedService::RemoveObserverForOptimizationTargetModel( +@@ -500,7 +500,6 @@ void OptimizationGuideKeyedService::RemoveObserverForOptimizationTargetModel( void OptimizationGuideKeyedService::RegisterOptimizationTypes( const std::vector& optimization_types) { @@ -191,10 +196,10 @@ diff --git a/chrome/browser/optimization_guide/optimization_guide_keyed_service. diff --git a/chrome/browser/permissions/BUILD.gn b/chrome/browser/permissions/BUILD.gn --- a/chrome/browser/permissions/BUILD.gn +++ b/chrome/browser/permissions/BUILD.gn -@@ -41,8 +41,6 @@ source_set("permissions") { - "permission_manager_factory.h", - "permission_revocation_request.cc", +@@ -40,8 +40,6 @@ source_set("permissions") { "permission_revocation_request.h", + "permissions_ai_handler.cc", + "permissions_ai_handler.h", - "prediction_based_permission_ui_selector.cc", - "prediction_based_permission_ui_selector.h", "prediction_model_handler_provider.cc", @@ -203,8 +208,8 @@ diff --git a/chrome/browser/permissions/BUILD.gn b/chrome/browser/permissions/BU diff --git a/chrome/browser/permissions/chrome_permissions_client.cc b/chrome/browser/permissions/chrome_permissions_client.cc --- a/chrome/browser/permissions/chrome_permissions_client.cc +++ b/chrome/browser/permissions/chrome_permissions_client.cc -@@ -416,8 +416,6 @@ ChromePermissionsClient::CreatePermissionUiSelectors( - std::make_unique()); +@@ -418,8 +418,6 @@ ChromePermissionsClient::CreatePermissionUiSelectors( + #endif selectors.emplace_back(std::make_unique( Profile::FromBrowserContext(browser_context))); - selectors.emplace_back(std::make_unique( @@ -251,10 +256,32 @@ diff --git a/chrome/browser/predictors/predictors_features.cc b/chrome/browser/p } // namespace +diff --git a/chrome/browser/preloading/prefetch/search_prefetch/field_trial_settings.cc b/chrome/browser/preloading/prefetch/search_prefetch/field_trial_settings.cc +--- a/chrome/browser/preloading/prefetch/search_prefetch/field_trial_settings.cc ++++ b/chrome/browser/preloading/prefetch/search_prefetch/field_trial_settings.cc +@@ -146,3 +146,7 @@ const base::FeatureParam + kSuppressesSearchPrefetchOnSlowNetworkThreshold{ + &kSuppressesSearchPrefetchOnSlowNetwork, + "slow_network_threshold_for_search_prefetch", base::Milliseconds(208)}; ++ ++SET_CROMITE_FEATURE_DISABLED(kSearchPrefetchServicePrefetching); ++SET_CROMITE_FEATURE_DISABLED(kSearchPrefetchWithNoVarySearchDiskCache); ++SET_CROMITE_FEATURE_DISABLED(kSearchNavigationPrefetch); +diff --git a/chrome/browser/preloading/prefetch/search_prefetch/search_prefetch_url_loader_interceptor.cc b/chrome/browser/preloading/prefetch/search_prefetch/search_prefetch_url_loader_interceptor.cc +--- a/chrome/browser/preloading/prefetch/search_prefetch/search_prefetch_url_loader_interceptor.cc ++++ b/chrome/browser/preloading/prefetch/search_prefetch/search_prefetch_url_loader_interceptor.cc +@@ -84,6 +84,7 @@ SearchPrefetchURLLoader::RequestHandler + SearchPrefetchURLLoaderInterceptor::MaybeCreateLoaderForRequest( + const network::ResourceRequest& tentative_resource_request, + content::FrameTreeNodeId frame_tree_node_id) { ++ if ((true)) return {}; + // Do not intercept non-main frame navigations. + if (!tentative_resource_request.is_outermost_main_frame) { + // Use the is_outermost_main_frame flag instead of obtaining the 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 -@@ -1134,7 +1134,6 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1122,7 +1122,6 @@ void ChromeBrowserMainExtraPartsProfiles:: base::FeatureList::IsEnabled( permissions::features::kPermissionOnDeviceGeolocationPredictions) || base::FeatureList::IsEnabled(permissions::features::kPermissionsAIv1)) { @@ -265,9 +292,9 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc 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 -@@ -52,7 +52,6 @@ static_library("safe_browsing") { +@@ -49,7 +49,6 @@ static_library("safe_browsing") { + "//components/safe_browsing:buildflags", "//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", @@ -276,7 +303,7 @@ diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsin 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 @@ +@@ -15,6 +15,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" @@ -284,15 +311,15 @@ diff --git a/chrome/browser/safe_browsing/notification_content_detection_service #include "content/public/browser/browser_context.h" namespace safe_browsing { -@@ -63,6 +64,7 @@ std::unique_ptr NotificationContentDetectionServiceFactory:: - return nullptr; - } - +@@ -85,6 +86,7 @@ NotificationContentDetectionServiceFactory:: + content::BrowserContext* context) const { + CHECK(opt_guide); + CHECK(context); +#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:: +@@ -92,6 +94,9 @@ NotificationContentDetectionServiceFactory:: {base::MayBlock(), base::TaskPriority::BEST_EFFORT}); return std::make_unique( opt_guide, background_task_runner, database_manager, context); @@ -305,7 +332,7 @@ diff --git a/chrome/browser/safe_browsing/notification_content_detection_service 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 -@@ -419,7 +419,6 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { +@@ -430,7 +430,6 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { } MixedContentSettingsTabHelper::CreateForWebContents(web_contents); NavigationMetricsRecorder::CreateForWebContents(web_contents); @@ -393,10 +420,10 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.cc 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 @@ +@@ -8,7 +8,10 @@ + #include "base/metrics/single_sample_metrics.h" #include "base/values.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" @@ -404,7 +431,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.h #include "chrome/renderer/accessibility/read_anything/read_aloud_traversal_utils.h" #include "ui/accessibility/ax_node_position.h" -@@ -87,8 +90,10 @@ class ReadAloudAppModel { +@@ -86,8 +89,10 @@ class ReadAloudAppModel { bool is_docs, const std::set* current_nodes); @@ -415,7 +442,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.h // Increments the processed_granularity_index_, updating ReadAloud's state of // the current granularity to refer to the next granularity. The current -@@ -242,9 +247,11 @@ class ReadAloudAppModel { +@@ -241,9 +246,11 @@ class ReadAloudAppModel { // still needs to be read. bool NoValidTextRemainingInCurrentNode(bool is_pdf, bool is_docs) const; @@ -427,7 +454,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.h // Once the phrase segmentation has completed for a given sentence, update the // granularity with the phrase boundaries, and calculate phrases for the next -@@ -306,7 +313,7 @@ class ReadAloudAppModel { +@@ -305,7 +312,7 @@ class ReadAloudAppModel { // Whether a phrase calculation for a sentence is currently underway. (We // do not initiate a second calculation before the first has completed.) @@ -439,17 +466,17 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.h 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 -@@ -26,7 +26,9 @@ +@@ -27,7 +27,9 @@ #include "base/strings/utf_string_conversions.h" - #include "chrome/common/read_anything/read_anything_constants.h" + #include "chrome/common/read_anything/read_anything_util.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_anything/read_aloud_traversal_utils.h" + #include "chrome/renderer/accessibility/read_anything/read_anything_app_model.h" #include "chrome/renderer/accessibility/read_anything/read_anything_node_utils.h" - #include "components/language/core/common/locale_util.h" -@@ -1452,6 +1454,7 @@ void ReadAnythingAppController::OnConnected() { +@@ -1454,6 +1456,7 @@ void ReadAnythingAppController::OnConnected() { render_frame()->GetBrowserInterfaceBroker().GetInterface( std::move(page_handler_factory_receiver)); @@ -457,7 +484,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_anything_app_contr // Get the dependency parser model used by phrase-based highlighting. if (read_aloud_model_.GetDependencyParserModel().IsAvailable()) { return; -@@ -1460,6 +1463,7 @@ void ReadAnythingAppController::OnConnected() { +@@ -1462,6 +1465,7 @@ void ReadAnythingAppController::OnConnected() { page_handler_->GetDependencyParserModel( base::BindOnce(&ReadAnythingAppController::UpdateDependencyParserModel, weak_ptr_factory_.GetWeakPtr())); @@ -465,7 +492,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_anything_app_contr } void ReadAnythingAppController::OnCopy() const { -@@ -1669,11 +1673,13 @@ std::vector ReadAnythingAppController::GetCurrentText() { +@@ -1666,11 +1670,13 @@ std::vector ReadAnythingAppController::GetCurrentText() { } void ReadAnythingAppController::PreprocessTextForSpeech() { @@ -479,7 +506,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_anything_app_contr } void ReadAnythingAppController::MovePositionToNextGranularity() { -@@ -1851,14 +1857,18 @@ bool ReadAnythingAppController::IsDocsLoadMoreButtonVisible() const { +@@ -1848,14 +1854,18 @@ bool ReadAnythingAppController::IsDocsLoadMoreButtonVisible() const { void ReadAnythingAppController::UpdateDependencyParserModel( base::File model_file) { @@ -511,7 +538,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_anything_app_contr class ReadAnythingAppControllerTest; class ReadAnythingAppControllerScreen2xDataCollectionModeTest; -@@ -378,7 +380,9 @@ class ReadAnythingAppController +@@ -275,7 +277,9 @@ class ReadAnythingAppController // available. void UpdateDependencyParserModel(base::File model_file); @@ -519,6 +546,16 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_anything_app_contr DependencyParserModel& GetDependencyParserModelForTesting(); +#endif + // Called when distillation has completed. + void OnAXTreeDistilled(const ui::AXTreeID& tree_id, +@@ -376,7 +380,9 @@ class ReadAnythingAppController + + // Helpers for logging UmaHistograms based on times recorded in WebUI. + void IncrementMetricCount(const std::string& metric); ++#if BUILDFLAG(BUILD_WITH_TFLITE_LIB) + void LogSpeechEventCounts(); ++#endif + // Stores a screenshot of the page and triggers distillation to record protos. // This function is not used in production and is behind the disabled diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn @@ -536,7 +573,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 -@@ -243,13 +243,6 @@ auto RunMirroringService( +@@ -245,13 +245,6 @@ auto RunMirroringService( std::move(receiver), content::UtilityThread::Get()->GetIOTaskRunner()); } @@ -550,7 +587,7 @@ diff --git a/chrome/utility/services.cc b/chrome/utility/services.cc #endif // !BUILDFLAG(IS_ANDROID) #if BUILDFLAG(ENABLE_BROWSER_SPEECH_SERVICE) -@@ -466,7 +459,6 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services) { +@@ -470,7 +463,6 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services) { #if !BUILDFLAG(IS_ANDROID) services.Add(RunProfileImporter); services.Add(RunMirroringService); @@ -561,7 +598,7 @@ diff --git a/chrome/utility/services.cc b/chrome/utility/services.cc diff --git a/components/autofill/core/browser/integrators/autofill_optimization_guide.cc b/components/autofill/core/browser/integrators/autofill_optimization_guide.cc --- a/components/autofill/core/browser/integrators/autofill_optimization_guide.cc +++ b/components/autofill/core/browser/integrators/autofill_optimization_guide.cc -@@ -229,6 +229,7 @@ void AutofillOptimizationGuide::OnDidParseForm( +@@ -258,6 +258,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`. @@ -569,7 +606,7 @@ diff --git a/components/autofill/core/browser/integrators/autofill_optimization_ decider_->RegisterOptimizationTypes( std::vector( std::move(optimization_types).extract())); -@@ -280,7 +281,7 @@ bool AutofillOptimizationGuide::ShouldBlockSingleFieldSuggestions( +@@ -335,7 +336,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`. @@ -578,7 +615,7 @@ diff --git a/components/autofill/core/browser/integrators/autofill_optimization_ optimization_guide::OptimizationGuideDecision decision = decider_->CanApplyOptimization( url, optimization_guide::proto::IBAN_AUTOFILL_BLOCKED, -@@ -306,7 +307,7 @@ bool AutofillOptimizationGuide::ShouldBlockFormFieldSuggestion( +@@ -361,7 +362,7 @@ bool AutofillOptimizationGuide::ShouldBlockFormFieldSuggestion( const CreditCard& card) const { if (auto optimization_type = GetVcnMerchantOptOutOptimizationTypeForCard(card); @@ -616,10 +653,30 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/ // Appends available autocompletion of the given type, subtype, and number to // the existing available autocompletions string, encoding according to the +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 +@@ -99,14 +99,14 @@ BaseSearchProvider::BaseSearchProvider(AutocompleteProvider::Type type, + bool BaseSearchProvider::ShouldPrefetch(const AutocompleteMatch& match) { + // TODO (manukh): `GetAdditionalInfoForDebugging()` shouldn't be used for + // non-debugging purposes. +- return match.GetAdditionalInfoForDebugging(kShouldPrefetchKey) == kTrue; ++ return false; + } + + // static + bool BaseSearchProvider::ShouldPrerender(const AutocompleteMatch& match) { + // TODO (manukh): `GetAdditionalInfoForDebugging()` shouldn't be used for + // non-debugging purposes. +- return match.GetAdditionalInfoForDebugging(kShouldPrerenderKey) == kTrue; ++ return false; + } + + // static 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 -@@ -196,6 +196,7 @@ bool HintsFetcher::FetchOptimizationGuideServiceHints( +@@ -198,6 +198,7 @@ bool HintsFetcher::FetchOptimizationGuideServiceHints( bool skip_cache, HintsFetchedCallback hints_fetched_callback, std::optional request_context_metadata) { @@ -630,7 +687,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 -@@ -391,6 +391,7 @@ void HintsManager::Shutdown() { +@@ -393,6 +393,7 @@ void HintsManager::Shutdown() { OptimizationGuideDecision HintsManager::GetOptimizationGuideDecisionFromOptimizationTypeDecision( OptimizationTypeDecision optimization_type_decision) { @@ -638,7 +695,7 @@ diff --git a/components/optimization_guide/core/hints_manager.cc b/components/op switch (optimization_type_decision) { case OptimizationTypeDecision::kAllowedByOptimizationFilter: case OptimizationTypeDecision::kAllowedByHint: -@@ -1100,6 +1101,7 @@ void HintsManager::CanApplyOptimizationOnDemand( +@@ -1102,6 +1103,7 @@ void HintsManager::CanApplyOptimizationOnDemand( OnDemandOptimizationGuideDecisionRepeatingCallback callback, std::optional request_context_metadata) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); @@ -646,7 +703,7 @@ diff --git a/components/optimization_guide/core/hints_manager.cc b/components/op InsertionOrderedSet urls_to_fetch; InsertionOrderedSet hosts_to_fetch; -@@ -1403,6 +1405,9 @@ OptimizationTypeDecision HintsManager::CanApplyOptimization( +@@ -1405,6 +1407,9 @@ OptimizationTypeDecision HintsManager::CanApplyOptimization( bool skip_cache, OptimizationMetadata* optimization_metadata) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); @@ -799,10 +856,10 @@ diff --git a/components/safe_browsing/content/browser/notification_content_detec 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 -@@ -233,6 +233,7 @@ BASE_FEATURE(kLocalListsUseSBv5, +@@ -250,6 +250,7 @@ constexpr base::FeatureParam kMaliciousApkDownloadCheckTelemetryOnly{ BASE_FEATURE(kOnDeviceNotificationContentDetectionModel, "OnDeviceNotificationContentDetectionModel", - base::FEATURE_DISABLED_BY_DEFAULT); + base::FEATURE_ENABLED_BY_DEFAULT); +SET_CROMITE_FEATURE_DISABLED(kOnDeviceNotificationContentDetectionModel); constexpr base::FeatureParam @@ -811,10 +868,9 @@ diff --git a/cromite_flags/chrome/browser/browser_features_cc/Disable-all-predic new file mode 100644 --- /dev/null +++ b/cromite_flags/chrome/browser/browser_features_cc/Disable-all-predictors-code.inc -@@ -0,0 +1,3 @@ +@@ -0,0 +1,2 @@ +SET_CROMITE_FEATURE_DISABLED(kBookmarkTriggerForPrerender2); +SET_CROMITE_FEATURE_DISABLED(kNewTabPageTriggerForPrerender2); -+SET_CROMITE_FEATURE_DISABLED(kSupportSearchSuggestionForPrerender2); diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-all-predictors-code.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-all-predictors-code.inc new file mode 100644 --- /dev/null @@ -835,6 +891,12 @@ new file mode 100644 +SET_CROMITE_FEATURE_DISABLED(kPermissionOnDeviceNotificationPredictions); +SET_CROMITE_FEATURE_DISABLED(kPermissionOnDeviceGeolocationPredictions); +SET_CROMITE_FEATURE_DISABLED(kPermissionPredictionsV2); +diff --git a/cromite_flags/net/base/features_cc/Disable-all-predictors-code.inc b/cromite_flags/net/base/features_cc/Disable-all-predictors-code.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/net/base/features_cc/Disable-all-predictors-code.inc +@@ -0,0 +1 @@ ++SET_CROMITE_FEATURE_DISABLED(kHttpCacheNoVarySearch); diff --git a/cromite_flags/services/network/public/cpp/features_cc/Disable-all-predictors-code.inc b/cromite_flags/services/network/public/cpp/features_cc/Disable-all-predictors-code.inc new file mode 100644 --- /dev/null @@ -851,19 +913,19 @@ new file mode 100644 diff --git a/services/webnn/features.gni b/services/webnn/features.gni --- a/services/webnn/features.gni +++ b/services/webnn/features.gni -@@ -5,7 +5,7 @@ - import("//build/config/features.gni") +@@ -7,7 +7,7 @@ import("//services/on_device_model/on_device_model.gni") declare_args() { -- webnn_use_tflite = is_android || is_chromeos || is_linux || is_win -+ webnn_use_tflite = false #is_android || is_chromeos || is_linux || is_win + # TFLite is used as a fallback option on macOS and Windows. +- webnn_use_tflite = is_android || is_chromeos || is_linux || is_mac || is_win ++ webnn_use_tflite = false #is_android || is_chromeos || is_linux || is_mac || is_win - # Enable logging of TFLite profiling information on MLGraph destruction. - webnn_enable_tflite_profiler = false + # Enable the GPU delegate provided by the Optimization Guide library. + webnn_use_chrome_ml_api = enable_ml_internal diff --git a/third_party/blink/renderer/core/html/parser/html_document_parser.cc b/third_party/blink/renderer/core/html/parser/html_document_parser.cc --- a/third_party/blink/renderer/core/html/parser/html_document_parser.cc +++ b/third_party/blink/renderer/core/html/parser/html_document_parser.cc -@@ -1757,6 +1757,7 @@ ALWAYS_INLINE bool HTMLDocumentParser::ShouldCheckTimeBudget( +@@ -1752,6 +1752,7 @@ ALWAYS_INLINE bool HTMLDocumentParser::ShouldCheckTimeBudget( } bool HTMLDocumentParser::ShouldSkipPreloadScan() { @@ -885,7 +947,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 -@@ -3401,7 +3401,7 @@ +@@ -3440,7 +3440,7 @@ // // It also has some feature params defined throughout the codebase. name: "Prerender2", diff --git a/build/patches/Disable-all-promo-dialogs.patch b/build/patches/Disable-all-promo-dialogs.patch index cb8cc806..b1a676b0 100644 --- a/build/patches/Disable-all-promo-dialogs.patch +++ b/build/patches/Disable-all-promo-dialogs.patch @@ -17,7 +17,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html 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 -@@ -1511,6 +1511,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -1597,6 +1597,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { } private boolean maybeShowPromo(Profile profile) { diff --git a/build/patches/Disable-conversion-measurement-api.patch b/build/patches/Disable-conversion-measurement-api.patch index eaeb5e5e..c6ed28b0 100644 --- a/build/patches/Disable-conversion-measurement-api.patch +++ b/build/patches/Disable-conversion-measurement-api.patch @@ -38,8 +38,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../browser/AttributionOsLevelManager.java | 349 +----------------- .../public/browser/content_browser_client.cc | 7 +- .../public/browser/navigation_controller.cc | 1 - - .../Disable-conversion-measurement-api.inc | 1 + - .../Disable-conversion-measurement-api.inc | 10 + + .../Disable-conversion-measurement-api.inc | 2 + + .../Disable-conversion-measurement-api.inc | 8 + .../attribution/request_headers_internal.cc | 1 + services/network/network_context.cc | 20 - .../network/public/cpp/attribution_utils.cc | 2 + @@ -47,7 +47,7 @@ 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 | 20 +- ui/events/android/motion_event_android.cc | 8 +- - 36 files changed, 101 insertions(+), 430 deletions(-) + 36 files changed, 100 insertions(+), 430 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 @@ -127,7 +127,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro 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 -@@ -151,6 +151,8 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate { +@@ -150,6 +150,8 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate { // not great to dynamically remove the preference in this way. case SiteSettingsCategory.Type.ADS: return SiteSettingsCategory.adsCategoryEnabled(); @@ -151,7 +151,7 @@ diff --git a/chrome/browser/k_anonymity_service/k_anonymity_trust_token_getter.c 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 -@@ -635,11 +635,6 @@ +@@ -674,11 +674,6 @@ @@ -210,7 +210,7 @@ diff --git a/components/attribution_reporting/features.cc b/components/attributi diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc --- a/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc -@@ -689,7 +689,7 @@ void ContentSettingsRegistry::Init() { +@@ -690,7 +690,7 @@ void ContentSettingsRegistry::Init() { ContentSettingsInfo::INHERIT_IN_INCOGNITO, ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY); @@ -275,7 +275,7 @@ diff --git a/content/browser/aggregation_service/aggregatable_report_sender.cc b diff --git a/content/browser/attribution_reporting/attribution_data_host_manager_impl.cc b/content/browser/attribution_reporting/attribution_data_host_manager_impl.cc --- a/content/browser/attribution_reporting/attribution_data_host_manager_impl.cc +++ b/content/browser/attribution_reporting/attribution_data_host_manager_impl.cc -@@ -758,11 +758,9 @@ class AttributionDataHostManagerImpl::PendingRegistrationData { +@@ -797,11 +797,9 @@ class AttributionDataHostManagerImpl::PendingRegistrationData { headers->GetNormalizedHeader( attribution_reporting::kAttributionReportingRegisterTriggerHeader); @@ -289,7 +289,7 @@ diff --git a/content/browser/attribution_reporting/attribution_data_host_manager const bool has_source = web_source_header.has_value() || os_source_header.has_value(); -@@ -1121,6 +1119,8 @@ void AttributionDataHostManagerImpl::ParseHeader( +@@ -1160,6 +1158,8 @@ void AttributionDataHostManagerImpl::ParseHeader( Registrations& registrations, HeaderPendingDecode pending_decode, Registrar registrar) { @@ -310,7 +310,7 @@ diff --git a/content/browser/attribution_reporting/attribution_host.cc b/content #endif } -@@ -318,6 +316,7 @@ void AttributionHost::NotifyNavigationRegistrationData( +@@ -332,6 +330,7 @@ void AttributionHost::NotifyNavigationRegistrationData( return; } @@ -321,7 +321,7 @@ diff --git a/content/browser/attribution_reporting/attribution_host.cc b/content diff --git a/content/browser/attribution_reporting/attribution_manager_impl.cc b/content/browser/attribution_reporting/attribution_manager_impl.cc --- a/content/browser/attribution_reporting/attribution_manager_impl.cc +++ b/content/browser/attribution_reporting/attribution_manager_impl.cc -@@ -573,11 +573,7 @@ bool IsOperationAllowed( +@@ -552,11 +552,7 @@ bool IsOperationAllowed( } std::unique_ptr CreateOsLevelManager() { @@ -382,7 +382,7 @@ diff --git a/content/browser/attribution_reporting/attribution_report_network_se diff --git a/content/browser/attribution_reporting/attribution_storage_sql.cc b/content/browser/attribution_reporting/attribution_storage_sql.cc --- a/content/browser/attribution_reporting/attribution_storage_sql.cc +++ b/content/browser/attribution_reporting/attribution_storage_sql.cc -@@ -532,6 +532,8 @@ void AssignSourceForDeactivationOrDeletion( +@@ -533,6 +533,8 @@ void AssignSourceForDeactivationOrDeletion( } } @@ -391,7 +391,7 @@ diff --git a/content/browser/attribution_reporting/attribution_storage_sql.cc b/ } // namespace // static -@@ -554,9 +556,9 @@ bool AttributionStorageSql::Transaction::Commit() { +@@ -555,9 +557,9 @@ bool AttributionStorageSql::Transaction::Commit() { AttributionStorageSql::AttributionStorageSql( const base::FilePath& user_data_directory, AttributionResolverDelegate* delegate) @@ -407,7 +407,7 @@ diff --git a/content/browser/attribution_reporting/attribution_storage_sql.cc b/ 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 -@@ -10242,6 +10242,7 @@ bool RenderFrameHostImpl::IsFencedFrameReportingFromRendererAllowed( +@@ -10254,6 +10254,7 @@ bool RenderFrameHostImpl::IsFencedFrameReportingFromRendererAllowed( return false; } @@ -415,7 +415,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b if (!IsActive()) { // reportEvent is not allowed when this RenderFrameHost or one of its // ancestors is not active. -@@ -14046,6 +14047,16 @@ void RenderFrameHostImpl::BindTrustTokenQueryAnswerer( +@@ -14093,6 +14094,16 @@ void RenderFrameHostImpl::BindTrustTokenQueryAnswerer( return; } @@ -448,7 +448,7 @@ diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage - this, path, special_storage_policy_); - } - - if (base::FeatureList::IsEnabled(blink::features::kInterestGroupStorage)) { + if (base::FeatureList::IsEnabled(network::features::kInterestGroupStorage)) { // Auction worklets on non-Android use dedicated processes; on Android due // to high cost of process launch they try to reuse renderers. @@ -1542,9 +1533,6 @@ void StoragePartitionImpl::Initialize( @@ -986,23 +986,22 @@ diff --git a/cromite_flags/services/network/public/cpp/features_cc/Disable-conve new file mode 100644 --- /dev/null +++ b/cromite_flags/services/network/public/cpp/features_cc/Disable-conversion-measurement-api.inc -@@ -0,0 +1 @@ -+// none +@@ -0,0 +1,2 @@ ++SET_CROMITE_FEATURE_DISABLED(kBrowsingTopics); ++SET_CROMITE_FEATURE_DISABLED(kInterestGroupStorage); diff --git a/cromite_flags/third_party/blink/common/features_cc/Disable-conversion-measurement-api.inc b/cromite_flags/third_party/blink/common/features_cc/Disable-conversion-measurement-api.inc new file mode 100644 --- /dev/null +++ b/cromite_flags/third_party/blink/common/features_cc/Disable-conversion-measurement-api.inc -@@ -0,0 +1,10 @@ +@@ -0,0 +1,8 @@ +SET_CROMITE_FEATURE_DISABLED(kAdAuctionSignals); -+SET_CROMITE_FEATURE_DISABLED(kBrowsingTopics); +SET_CROMITE_FEATURE_DISABLED(kBrowsingTopicsDocumentAPI); +SET_CROMITE_FEATURE_DISABLED(kBrowsingTopicsParameters); +SET_CROMITE_FEATURE_DISABLED(kFledge); +SET_CROMITE_FEATURE_DISABLED(kFledgeBiddingAndAuctionServer); -+SET_CROMITE_FEATURE_DISABLED(kInterestGroupStorage); +SET_CROMITE_FEATURE_DISABLED(kPrivateAggregationApi); -+SET_CROMITE_FEATURE_DISABLED(kBiddingAndScoringDebugReportingAPI); +SET_CROMITE_FEATURE_DISABLED(kAllowURNsInIframes); ++SET_CROMITE_FEATURE_DISABLED(kFledgeSampleDebugReports); diff --git a/services/network/attribution/request_headers_internal.cc b/services/network/attribution/request_headers_internal.cc --- a/services/network/attribution/request_headers_internal.cc +++ b/services/network/attribution/request_headers_internal.cc @@ -1017,7 +1016,7 @@ diff --git a/services/network/attribution/request_headers_internal.cc b/services 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 -@@ -2637,26 +2637,6 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( +@@ -2683,26 +2683,6 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( builder.set_network_quality_estimator( network_service_->network_quality_estimator()); } @@ -1078,7 +1077,7 @@ diff --git a/third_party/blink/renderer/core/frame/attribution_src_loader.cc b/t 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 -@@ -1575,7 +1575,7 @@ void Page::UpdateBrowsingContextGroup( +@@ -1623,7 +1623,7 @@ void Page::UpdateBrowsingContextGroup( void Page::SetAttributionSupport( network::mojom::AttributionSupport attribution_support) { @@ -1101,7 +1100,7 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 origin_trial_feature_name: "AdInterestGroupAPI", implied_by: ["Fledge", "Parakeet"], public: true, -@@ -464,8 +464,8 @@ +@@ -458,8 +458,8 @@ name: "AtomicMoveRangePreservation", }, { @@ -1112,7 +1111,7 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 base_feature: "none", public: true, }, -@@ -3445,8 +3445,8 @@ +@@ -3482,8 +3482,8 @@ base_feature: "none", }, { @@ -1123,7 +1122,7 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 base_feature: "none", public: true, }, -@@ -4356,16 +4356,16 @@ +@@ -4450,16 +4450,16 @@ status: "experimental", }, { diff --git a/build/patches/Disable-crash-reporting.patch b/build/patches/Disable-crash-reporting.patch index 59aafb0f..9a1854d5 100644 --- a/build/patches/Disable-crash-reporting.patch +++ b/build/patches/Disable-crash-reporting.patch @@ -12,7 +12,7 @@ Subject: Disable crash reporting 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 -@@ -2708,15 +2708,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( +@@ -2716,15 +2716,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( base::NumberToString(pid)); } #endif @@ -31,7 +31,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch 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 -@@ -15651,6 +15651,7 @@ void RenderFrameHostImpl::OnSameDocumentCommitProcessed( +@@ -15707,6 +15707,7 @@ void RenderFrameHostImpl::OnSameDocumentCommitProcessed( void RenderFrameHostImpl::MaybeGenerateCrashReport( base::TerminationStatus status, int exit_code) { @@ -42,7 +42,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -9851,7 +9851,7 @@ void WebContentsImpl::RendererUnresponsive( +@@ -9924,7 +9924,7 @@ void WebContentsImpl::RendererUnresponsive( base::UmaHistogramEnumeration( "ReportingAndNEL.UnresponsiveRenderer.CrashReportOutcome", outcome); @@ -54,7 +54,7 @@ diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser diff --git a/third_party/blink/renderer/controller/javascript_call_stack_collector.cc b/third_party/blink/renderer/controller/javascript_call_stack_collector.cc --- a/third_party/blink/renderer/controller/javascript_call_stack_collector.cc +++ b/third_party/blink/renderer/controller/javascript_call_stack_collector.cc -@@ -84,7 +84,7 @@ void GenerateJavaScriptCallStack(v8::Isolate* isolate, void* data) { +@@ -130,7 +130,7 @@ void GenerateJavaScriptCallStack(v8::Isolate* isolate, void* data) { return; } ExecutionContext* execution_context = ToExecutionContext(script_state); diff --git a/build/patches/Disable-fetching-of-all-field-trials.patch b/build/patches/Disable-fetching-of-all-field-trials.patch index 453cc3e3..98b6357a 100644 --- a/build/patches/Disable-fetching-of-all-field-trials.patch +++ b/build/patches/Disable-fetching-of-all-field-trials.patch @@ -39,7 +39,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/android_webview/browser/aw_browser_context.cc b/android_webview/browser/aw_browser_context.cc --- a/android_webview/browser/aw_browser_context.cc +++ b/android_webview/browser/aw_browser_context.cc -@@ -537,6 +537,7 @@ AwBrowserContext::RetrieveInProgressDownloadManager() { +@@ -489,6 +489,7 @@ AwBrowserContext::RetrieveInProgressDownloadManager() { content::OriginTrialsControllerDelegate* AwBrowserContext::GetOriginTrialsControllerDelegate() { @@ -136,7 +136,7 @@ diff --git a/android_webview/nonembedded/java/src/org/chromium/android_webview/s diff --git a/chrome/browser/metrics/chrome_browser_sampling_trials.cc b/chrome/browser/metrics/chrome_browser_sampling_trials.cc --- a/chrome/browser/metrics/chrome_browser_sampling_trials.cc +++ b/chrome/browser/metrics/chrome_browser_sampling_trials.cc -@@ -60,6 +60,8 @@ void CreateFallbackSamplingTrial( +@@ -66,6 +66,8 @@ void CreateFallbackSamplingTrial( const int reporting_full_rate_per_mille, const bool starts_active, base::FeatureList* feature_list) { @@ -145,7 +145,7 @@ diff --git a/chrome/browser/metrics/chrome_browser_sampling_trials.cc b/chrome/b scoped_refptr trial( base::FieldTrialList::FactoryGetFieldTrial( trial_name, /*total_probability=*/1000, "Default", entropy_provider)); -@@ -111,6 +113,8 @@ void CreateFallbackUkmSamplingTrial( +@@ -118,6 +120,8 @@ void CreateFallbackUkmSamplingTrial( const base::FieldTrial::EntropyProvider& entropy_provider, bool is_stable_channel, base::FeatureList* feature_list) { @@ -157,7 +157,7 @@ diff --git a/chrome/browser/metrics/chrome_browser_sampling_trials.cc b/chrome/b 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 -@@ -848,7 +848,6 @@ void SystemNetworkContextManager::AddSSLConfigToNetworkContextParams( +@@ -847,7 +847,6 @@ void SystemNetworkContextManager::AddSSLConfigToNetworkContextParams( void SystemNetworkContextManager::ConfigureDefaultNetworkContextParams( network::mojom::NetworkContextParams* network_context_params) { @@ -179,7 +179,7 @@ diff --git a/chrome/browser/origin_trials/origin_trials_factory.cc b/chrome/brow diff --git a/components/ukm/ukm_recorder_impl.cc b/components/ukm/ukm_recorder_impl.cc --- a/components/ukm/ukm_recorder_impl.cc +++ b/components/ukm/ukm_recorder_impl.cc -@@ -189,6 +189,9 @@ std::string WebDXFeaturesToStringForDebug(const std::set& features) { +@@ -192,6 +192,9 @@ std::string WebDXFeaturesToStringForDebug(const std::set& features) { UkmRecorderImpl::UkmRecorderImpl() : sampling_seed_(static_cast(base::RandUint64())) { @@ -284,7 +284,7 @@ diff --git a/components/variations/net/variations_http_headers.cc b/components/v diff --git a/components/variations/service/variations_field_trial_creator_base.cc b/components/variations/service/variations_field_trial_creator_base.cc --- a/components/variations/service/variations_field_trial_creator_base.cc +++ b/components/variations/service/variations_field_trial_creator_base.cc -@@ -130,6 +130,7 @@ Study::CpuArchitecture GetCurrentCpuArchitecture() { +@@ -132,6 +132,7 @@ Study::CpuArchitecture GetCurrentCpuArchitecture() { } #if BUILDFLAG(FIELDTRIAL_TESTING_ENABLED) @@ -292,7 +292,7 @@ diff --git a/components/variations/service/variations_field_trial_creator_base.c // Determines whether the field trial testing config defined in // testing/variations/fieldtrial_testing_config.json should be applied. If the // "disable_fieldtrial_testing_config" GN flag is set to true, then the testing -@@ -337,9 +338,6 @@ bool VariationsFieldTrialCreatorBase::SetUpFieldTrials( +@@ -339,9 +340,6 @@ bool VariationsFieldTrialCreatorBase::SetUpFieldTrials( synthetic_trial_registry, std::move(client_filterable_state)); } @@ -302,7 +302,7 @@ diff --git a/components/variations/service/variations_field_trial_creator_base.c platform_field_trials->RegisterFeatureOverrides(feature_list.get()); base::FeatureList::SetInstance(std::move(feature_list)); -@@ -651,6 +649,7 @@ bool VariationsFieldTrialCreatorBase::CreateTrialsFromSeed( +@@ -653,6 +651,7 @@ bool VariationsFieldTrialCreatorBase::CreateTrialsFromSeed( SafeSeedManagerBase* safe_seed_manager, SyntheticTrialRegistry* synthetic_trial_registry, std::unique_ptr client_state) { @@ -310,7 +310,7 @@ diff --git a/components/variations/service/variations_field_trial_creator_base.c // This histogram name uses "VariationsFieldTrialCreator" rather than // "VariationsFieldTrialCreatorBase" for consistency with historical data TRACE_EVENT0("startup", "VariationsFieldTrialCreator::CreateTrialsFromSeed"); -@@ -763,6 +762,7 @@ bool VariationsFieldTrialCreatorBase::CreateTrialsFromSeed( +@@ -765,6 +764,7 @@ bool VariationsFieldTrialCreatorBase::CreateTrialsFromSeed( void VariationsFieldTrialCreatorBase::LoadSeedFromJsonFile( const base::FilePath& json_seed_path) { @@ -362,7 +362,7 @@ diff --git a/content/browser/loader/url_loader_throttles.cc b/content/browser/lo ClientHintsControllerDelegate* client_hint_delegate = browser_context->GetClientHintsControllerDelegate(); -@@ -141,11 +139,6 @@ CreateContentBrowserURLLoaderThrottlesForKeepAlive( +@@ -143,11 +141,6 @@ CreateContentBrowserURLLoaderThrottlesForKeepAlive( std::vector> throttles = GetContentClient()->browser()->CreateURLLoaderThrottlesForKeepAlive( request, browser_context, wc_getter, frame_tree_node_id); @@ -389,7 +389,7 @@ diff --git a/content/browser/origin_trials/origin_trials_utils.cc b/content/brow diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -836,6 +836,7 @@ void PersistOriginTrialsFromHeaders( +@@ -832,6 +832,7 @@ void PersistOriginTrialsFromHeaders( const network::mojom::URLResponseHead* response, BrowserContext* browser_context, ukm::SourceId source_id) { @@ -450,7 +450,7 @@ diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_p diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_request.h b/third_party/blink/renderer/platform/loader/fetch/resource_request.h --- a/third_party/blink/renderer/platform/loader/fetch/resource_request.h +++ b/third_party/blink/renderer/platform/loader/fetch/resource_request.h -@@ -553,7 +553,6 @@ class PLATFORM_EXPORT ResourceRequestHead { +@@ -556,7 +556,6 @@ class PLATFORM_EXPORT ResourceRequestHead { } void SetTrustTokenParams( std::optional params) { diff --git a/build/patches/Disable-idle-detection.patch b/build/patches/Disable-idle-detection.patch index ec0dbe71..e609650c 100644 --- a/build/patches/Disable-idle-detection.patch +++ b/build/patches/Disable-idle-detection.patch @@ -6,7 +6,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- .../common/content_features_cc/Disable-idle-detection.inc | 4 ++++ .../common/content_features_h/Disable-idle-detection.inc | 1 + - .../permissions_policy/permissions_policy_features.json5 | 1 + + .../cpp/permissions_policy/permissions_policy_features.json5 | 1 + third_party/blink/renderer/modules/idle/idle_detector.idl | 3 ++- .../blink/renderer/platform/runtime_enabled_features.json5 | 5 +++++ 5 files changed, 13 insertions(+), 1 deletion(-) @@ -28,10 +28,10 @@ new file mode 100644 +++ b/cromite_flags/content/public/common/content_features_h/Disable-idle-detection.inc @@ -0,0 +1 @@ +CONTENT_EXPORT BASE_DECLARE_FEATURE(kIdleDetection); -diff --git a/third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5 b/third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5 ---- a/third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5 -+++ b/third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5 -@@ -339,6 +339,7 @@ +diff --git a/services/network/public/cpp/permissions_policy/permissions_policy_features.json5 b/services/network/public/cpp/permissions_policy/permissions_policy_features.json5 +--- a/services/network/public/cpp/permissions_policy/permissions_policy_features.json5 ++++ b/services/network/public/cpp/permissions_policy/permissions_policy_features.json5 +@@ -359,6 +359,7 @@ { name: "IdleDetection", permissions_policy_name: "idle-detection", diff --git a/build/patches/Disable-media-router-and-remoting-by-default.patch b/build/patches/Disable-media-router-and-remoting-by-default.patch index c541be81..83b264d9 100644 --- a/build/patches/Disable-media-router-and-remoting-by-default.patch +++ b/build/patches/Disable-media-router-and-remoting-by-default.patch @@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browser/media/router/media_router_feature.cc --- a/chrome/browser/media/router/media_router_feature.cc +++ b/chrome/browser/media/router/media_router_feature.cc -@@ -111,6 +111,7 @@ void ClearMediaRouterStoredPrefsForTesting() { +@@ -107,6 +107,7 @@ void ClearMediaRouterStoredPrefsForTesting() { } bool MediaRouterEnabled(content::BrowserContext* context) { @@ -23,7 +23,7 @@ diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browse #if !BUILDFLAG(IS_ANDROID) if (!base::FeatureList::IsEnabled(kMediaRouter)) { return false; -@@ -157,7 +158,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) { +@@ -153,7 +154,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) { registry->RegisterStringPref(prefs::kMediaRouterReceiverIdHashToken, "", PrefRegistry::PUBLIC); registry->RegisterBooleanPref( @@ -32,7 +32,7 @@ diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browse registry->RegisterBooleanPref( media_router::prefs::kMediaRouterShowCastSessionsStartedByOtherDevices, true); -@@ -219,4 +220,7 @@ bool IsCastMessageLoggingEnabled() { +@@ -215,4 +216,7 @@ bool IsCastMessageLoggingEnabled() { } #endif // !BUILDFLAG(IS_ANDROID) @@ -55,7 +55,7 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/p 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 -@@ -542,6 +542,8 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs( +@@ -549,6 +549,8 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs( WebRuntimeFeatures::EnableV8IdleTasks(true); } @@ -79,7 +79,7 @@ diff --git a/third_party/blink/renderer/modules/remoteplayback/remote_playback.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 -@@ -3558,14 +3558,10 @@ +@@ -3602,14 +3602,10 @@ base_feature: "none", }, { diff --git a/build/patches/Disable-minidump-upload-scheduling.patch b/build/patches/Disable-minidump-upload-scheduling.patch index dc8b3508..8adb69cc 100644 --- a/build/patches/Disable-minidump-upload-scheduling.patch +++ b/build/patches/Disable-minidump-upload-scheduling.patch @@ -11,7 +11,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoint_fetcher/endpoint_fetcher.cc --- a/components/endpoint_fetcher/endpoint_fetcher.cc +++ b/components/endpoint_fetcher/endpoint_fetcher.cc -@@ -388,7 +388,7 @@ void EndpointFetcher::OnResponseFetched( +@@ -442,7 +442,7 @@ void EndpointFetcher::OnResponseFetched( } } else { std::string net_error = net::ErrorToString(net_error_code); diff --git a/build/patches/Disable-omission-of-URL-elements.patch b/build/patches/Disable-omission-of-URL-elements.patch index 2b8b8d77..cc75e027 100644 --- a/build/patches/Disable-omission-of-URL-elements.patch +++ b/build/patches/Disable-omission-of-URL-elements.patch @@ -18,7 +18,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/share_sheet/ShareSheetBottomSheetContent.java b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/share_sheet/ShareSheetBottomSheetContent.java --- a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/share_sheet/ShareSheetBottomSheetContent.java +++ b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/share_sheet/ShareSheetBottomSheetContent.java -@@ -269,9 +269,7 @@ class ShareSheetBottomSheetContent implements BottomSheetContent, OnItemClickLis +@@ -270,9 +270,7 @@ class ShareSheetBottomSheetContent implements BottomSheetContent, OnItemClickLis ShareSheetLinkToggleCoordinator shareSheetLinkToggleCoordinator) { // Default preview is to show title + url. String title = mParams.getTitle(); @@ -32,7 +32,7 @@ diff --git a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/s diff --git a/chrome/browser/ui/android/ephemeraltab/java/src/org/chromium/chrome/browser/ephemeraltab/EphemeralTabSheetContent.java b/chrome/browser/ui/android/ephemeraltab/java/src/org/chromium/chrome/browser/ephemeraltab/EphemeralTabSheetContent.java --- a/chrome/browser/ui/android/ephemeraltab/java/src/org/chromium/chrome/browser/ephemeraltab/EphemeralTabSheetContent.java +++ b/chrome/browser/ui/android/ephemeraltab/java/src/org/chromium/chrome/browser/ephemeraltab/EphemeralTabSheetContent.java -@@ -235,8 +235,7 @@ public class EphemeralTabSheetContent implements BottomSheetContent { +@@ -236,8 +236,7 @@ public class EphemeralTabSheetContent implements BottomSheetContent { /** Sets the ephemeral tab URL. */ public void updateURL(GURL url) { TextView originView = mToolbarView.findViewById(R.id.origin); @@ -55,7 +55,7 @@ diff --git a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc b/c diff --git a/chrome/browser/ui/views/page_info/page_info_main_view.cc b/chrome/browser/ui/views/page_info/page_info_main_view.cc --- a/chrome/browser/ui/views/page_info/page_info_main_view.cc +++ b/chrome/browser/ui/views/page_info/page_info_main_view.cc -@@ -600,38 +600,42 @@ void PageInfoMainView::ChildPreferredSizeChanged(views::View* child) { +@@ -603,38 +603,42 @@ void PageInfoMainView::ChildPreferredSizeChanged(views::View* child) { } std::unique_ptr PageInfoMainView::CreateBubbleHeaderView() { diff --git a/build/patches/Disable-plugins-enumeration.patch b/build/patches/Disable-plugins-enumeration.patch index 59527feb..2c9a3c20 100644 --- a/build/patches/Disable-plugins-enumeration.patch +++ b/build/patches/Disable-plugins-enumeration.patch @@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 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 -@@ -2292,9 +2292,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() { +@@ -2288,9 +2288,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() { } PluginData* LocalFrame::GetPluginData() const { diff --git a/build/patches/Disable-prefers-reduced-transparency-media-query.patch b/build/patches/Disable-prefers-reduced-transparency-media-query.patch index cdd81838..fa13569d 100644 --- a/build/patches/Disable-prefers-reduced-transparency-media-query.patch +++ b/build/patches/Disable-prefers-reduced-transparency-media-query.patch @@ -51,7 +51,7 @@ diff --git a/third_party/blink/renderer/core/preferences/preference_manager.idl 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 -@@ -3394,6 +3394,10 @@ +@@ -3434,6 +3434,10 @@ name: "PrefersReducedData", status: "experimental", }, diff --git a/build/patches/Disable-privacy-issues-in-password-manager.patch b/build/patches/Disable-privacy-issues-in-password-manager.patch index 9373be9c..15a5c9a4 100644 --- a/build/patches/Disable-privacy-issues-in-password-manager.patch +++ b/build/patches/Disable-privacy-issues-in-password-manager.patch @@ -7,17 +7,17 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html --- chrome/android/java/AndroidManifest.xml | 9 --------- .../password_store_android_backend_bridge_helper_impl.cc | 1 + - .../android/password_store_android_local_backend.cc | 2 +- .../generated_password_leak_detection_pref.cc | 3 +-- .../password_receiver_service_factory.cc | 2 +- .../password_manager/password_sender_service_factory.cc | 2 +- .../affiliations/core/browser/affiliation_backend.cc | 1 + .../core/browser/affiliation_service_impl.cc | 4 ++++ components/affiliations/core/browser/facet_manager.cc | 4 ++++ + .../affiliation/password_affiliation_source_adapter.cc | 4 ++++ .../leak_detection/leak_detection_check_factory_impl.cc | 5 +++++ .../browser/leak_detection/leak_detection_check_impl.cc | 3 +-- .../Disable-privacy-issues-in-password-manager.inc | 1 + - 12 files changed, 21 insertions(+), 16 deletions(-) + 12 files changed, 24 insertions(+), 15 deletions(-) create mode 100644 cromite_flags/components/password_manager/core/browser/features/password_features_cc/Disable-privacy-issues-in-password-manager.inc diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml @@ -50,18 +50,6 @@ diff --git a/chrome/browser/password_manager/android/password_store_android_back base::android::BuildInfo* info = base::android::BuildInfo::GetInstance(); int current_gms_core_version; if (!base::StringToInt(info->gms_version_code(), ¤t_gms_core_version)) { -diff --git a/chrome/browser/password_manager/android/password_store_android_local_backend.cc b/chrome/browser/password_manager/android/password_store_android_local_backend.cc ---- a/chrome/browser/password_manager/android/password_store_android_local_backend.cc -+++ b/chrome/browser/password_manager/android/password_store_android_local_backend.cc -@@ -37,7 +37,7 @@ PasswordStoreAndroidLocalBackend::PasswordStoreAndroidLocalBackend( - // AccountBackend doesn't call `DisableSource` when sync is turned off. - // This is why we have to explicitly call it here whenever local GMSCore is - // created. -- password_affiliation_adapter.DisableSource(); -+ if ((true)) password_affiliation_adapter.DisableSource(); - } - - PasswordStoreAndroidLocalBackend::~PasswordStoreAndroidLocalBackend() = default; diff --git a/chrome/browser/password_manager/generated_password_leak_detection_pref.cc b/chrome/browser/password_manager/generated_password_leak_detection_pref.cc --- a/chrome/browser/password_manager/generated_password_leak_detection_pref.cc +++ b/chrome/browser/password_manager/generated_password_leak_detection_pref.cc @@ -102,7 +90,7 @@ diff --git a/chrome/browser/password_manager/password_sender_service_factory.cc diff --git a/components/affiliations/core/browser/affiliation_backend.cc b/components/affiliations/core/browser/affiliation_backend.cc --- a/components/affiliations/core/browser/affiliation_backend.cc +++ b/components/affiliations/core/browser/affiliation_backend.cc -@@ -401,6 +401,7 @@ void AffiliationBackend::OnMalformedResponse( +@@ -400,6 +400,7 @@ void AffiliationBackend::OnMalformedResponse( } bool AffiliationBackend::OnCanSendNetworkRequest() { @@ -138,6 +126,20 @@ diff --git a/components/affiliations/core/browser/facet_manager.cc b/components/ if (IsCachedDataFresh()) { AffiliatedFacetsWithUpdateTime affiliation; if (!backend_->ReadAffiliationsAndBrandingFromDatabase(facet_uri_, +diff --git a/components/password_manager/core/browser/affiliation/password_affiliation_source_adapter.cc b/components/password_manager/core/browser/affiliation/password_affiliation_source_adapter.cc +--- a/components/password_manager/core/browser/affiliation/password_affiliation_source_adapter.cc ++++ b/components/password_manager/core/browser/affiliation/password_affiliation_source_adapter.cc +@@ -27,6 +27,10 @@ PasswordAffiliationSourceAdapter::~PasswordAffiliationSourceAdapter() = default; + + void PasswordAffiliationSourceAdapter::GetFacets( + AffiliationSource::ResultCallback response_callback) { ++ if (((true))) { ++ std::move(response_callback).Run({}); ++ return; ++ } + on_password_forms_received_callback_ = std::move(response_callback); + store_->GetAllLogins(weak_ptr_factory_.GetWeakPtr()); + } diff --git a/components/password_manager/core/browser/leak_detection/leak_detection_check_factory_impl.cc b/components/password_manager/core/browser/leak_detection/leak_detection_check_factory_impl.cc --- a/components/password_manager/core/browser/leak_detection/leak_detection_check_factory_impl.cc +++ b/components/password_manager/core/browser/leak_detection/leak_detection_check_factory_impl.cc diff --git a/build/patches/Disable-privacy-sandbox.patch b/build/patches/Disable-privacy-sandbox.patch index 98199388..4ceb4155 100644 --- a/build/patches/Disable-privacy-sandbox.patch +++ b/build/patches/Disable-privacy-sandbox.patch @@ -27,17 +27,19 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../shared_storage_document_service_impl.cc | 9 +++++++++ .../features_cc/Disable-privacy-sandbox.inc | 1 + .../Disable-privacy-sandbox.inc | 1 + - .../features_cc/Disable-privacy-sandbox.inc | 2 ++ + .../features_cc/Disable-privacy-sandbox.inc | 1 + + .../features_cc/Disable-privacy-sandbox.inc | 1 + third_party/blink/common/features.cc | 1 + - 19 files changed, 48 insertions(+), 28 deletions(-) + 20 files changed, 48 insertions(+), 28 deletions(-) create mode 100644 cromite_flags/content/common/features_cc/Disable-privacy-sandbox.inc create mode 100644 cromite_flags/content/public/common/content_features_cc/Disable-privacy-sandbox.inc + create mode 100644 cromite_flags/services/network/public/cpp/features_cc/Disable-privacy-sandbox.inc create mode 100644 cromite_flags/third_party/blink/common/features_cc/Disable-privacy-sandbox.inc 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 -@@ -3486,6 +3486,9 @@ bool ChromeContentBrowserClient::IsAttributionReportingOperationAllowed( +@@ -3498,6 +3498,9 @@ bool ChromeContentBrowserClient::IsAttributionReportingOperationAllowed( const url::Origin* destination_origin, const url::Origin* reporting_origin, bool* can_bypass) { @@ -82,7 +84,7 @@ diff --git a/chrome/browser/first_party_sets/first_party_sets_policy_service.cc 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 -@@ -1296,7 +1296,7 @@ void RegisterProfilePrefsForMigration( +@@ -1200,7 +1200,7 @@ void RegisterProfilePrefsForMigration( registry->RegisterTimePref(kPlusAddressLastFetchedTime, base::Time()); // Deprecated 03/2024. @@ -94,7 +96,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse diff --git a/chrome/browser/privacy_sandbox/privacy_sandbox_service_impl.cc b/chrome/browser/privacy_sandbox/privacy_sandbox_service_impl.cc --- a/chrome/browser/privacy_sandbox/privacy_sandbox_service_impl.cc +++ b/chrome/browser/privacy_sandbox/privacy_sandbox_service_impl.cc -@@ -1261,7 +1261,7 @@ bool PrivacySandboxServiceImpl::IsRestrictedNoticeEnabled() { +@@ -1276,7 +1276,7 @@ bool PrivacySandboxServiceImpl::IsRestrictedNoticeEnabled() { void PrivacySandboxServiceImpl::SetRelatedWebsiteSetsDataAccessEnabled( bool enabled) { pref_service_->SetBoolean(prefs::kPrivacySandboxRelatedWebsiteSetsEnabled, @@ -127,7 +129,7 @@ diff --git a/chrome/browser/ui/privacy_sandbox/privacy_sandbox_prompt.cc b/chrom diff --git a/components/history/core/browser/history_backend.cc b/components/history/core/browser/history_backend.cc --- a/components/history/core/browser/history_backend.cc +++ b/components/history/core/browser/history_backend.cc -@@ -700,18 +700,7 @@ void HistoryBackend::SetBrowsingTopicsAllowed(ContextID context_id, +@@ -701,18 +701,7 @@ void HistoryBackend::SetBrowsingTopicsAllowed(ContextID context_id, if (!visit_id) return; @@ -162,7 +164,7 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_attestations/privacy_san diff --git a/components/privacy_sandbox/privacy_sandbox_features.cc b/components/privacy_sandbox/privacy_sandbox_features.cc --- a/components/privacy_sandbox/privacy_sandbox_features.cc +++ b/components/privacy_sandbox/privacy_sandbox_features.cc -@@ -283,4 +283,8 @@ BASE_FEATURE(kPrivacySandboxAllowPromptForBlocked3PCookies, +@@ -294,4 +294,8 @@ BASE_FEATURE(kPrivacySandboxAllowPromptForBlocked3PCookies, BASE_FEATURE(kPrivacySandboxEqualizedPromptButtons, "PrivacySandboxEqualizedPromptButtons", base::FEATURE_DISABLED_BY_DEFAULT); @@ -300,7 +302,7 @@ diff --git a/components/signin/public/identity_manager/account_capabilities.cc b diff --git a/content/browser/shared_storage/shared_storage_document_service_impl.cc b/content/browser/shared_storage/shared_storage_document_service_impl.cc --- a/content/browser/shared_storage/shared_storage_document_service_impl.cc +++ b/content/browser/shared_storage/shared_storage_document_service_impl.cc -@@ -128,6 +128,15 @@ void SharedStorageDocumentServiceImpl::CreateWorklet( +@@ -129,6 +129,15 @@ void SharedStorageDocumentServiceImpl::CreateWorklet( render_frame_host().GetLastCommittedOrigin().IsSameOriginWith( data_origin); @@ -328,17 +330,22 @@ new file mode 100644 +++ b/cromite_flags/content/public/common/content_features_cc/Disable-privacy-sandbox.inc @@ -0,0 +1 @@ +SET_CROMITE_FEATURE_DISABLED(kPrivacySandboxAdsAPIsOverride); +diff --git a/cromite_flags/services/network/public/cpp/features_cc/Disable-privacy-sandbox.inc b/cromite_flags/services/network/public/cpp/features_cc/Disable-privacy-sandbox.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/services/network/public/cpp/features_cc/Disable-privacy-sandbox.inc +@@ -0,0 +1 @@ ++SET_CROMITE_FEATURE_DISABLED(kSharedStorageAPI); diff --git a/cromite_flags/third_party/blink/common/features_cc/Disable-privacy-sandbox.inc b/cromite_flags/third_party/blink/common/features_cc/Disable-privacy-sandbox.inc new file mode 100644 --- /dev/null +++ b/cromite_flags/third_party/blink/common/features_cc/Disable-privacy-sandbox.inc -@@ -0,0 +1,2 @@ +@@ -0,0 +1 @@ +SET_CROMITE_FEATURE_DISABLED(kFencedFrames); -+SET_CROMITE_FEATURE_DISABLED(kSharedStorageAPI); 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 -@@ -2843,6 +2843,7 @@ BASE_FEATURE(kWebviewAccelerateSmallCanvases, +@@ -2688,6 +2688,7 @@ BASE_FEATURE(kWebviewAccelerateSmallCanvases, // constants for features in the section above. bool IsAllowURNsInIframeEnabled() { diff --git a/build/patches/Disable-references-to-fonts.googleapis.com.patch b/build/patches/Disable-references-to-fonts.googleapis.com.patch index aa4f0cf9..9914fdae 100644 --- a/build/patches/Disable-references-to-fonts.googleapis.com.patch +++ b/build/patches/Disable-references-to-fonts.googleapis.com.patch @@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/resources/side_panel/read_anything/read_anything_toolbar.ts b/chrome/browser/resources/side_panel/read_anything/read_anything_toolbar.ts --- a/chrome/browser/resources/side_panel/read_anything/read_anything_toolbar.ts +++ b/chrome/browser/resources/side_panel/read_anything/read_anything_toolbar.ts -@@ -371,9 +371,7 @@ export class ReadAnythingToolbarElement extends ReadAnythingToolbarElementBase { +@@ -369,9 +369,7 @@ export class ReadAnythingToolbarElement extends ReadAnythingToolbarElementBase { const link = document.createElement('link'); link.rel = 'preload'; link.as = 'style'; diff --git a/build/patches/Disable-safety-check.patch b/build/patches/Disable-safety-check.patch index 3b525e05..43eb7232 100644 --- a/build/patches/Disable-safety-check.patch +++ b/build/patches/Disable-safety-check.patch @@ -29,7 +29,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//chrome/browser/safety_hub/android:java", "//chrome/browser/screenshot_monitor:java", "//chrome/browser/search_engines/android:java", -@@ -1078,8 +1077,6 @@ if (current_toolchain == default_toolchain) { +@@ -1086,8 +1085,6 @@ if (current_toolchain == default_toolchain) { "//chrome/browser/readaloud/android:junit", "//chrome/browser/recent_tabs:junit", "//chrome/browser/recent_tabs/internal:junit", @@ -38,9 +38,9 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//chrome/browser/search_engines/android:junit", "//chrome/browser/search_resumption:junit", "//chrome/browser/signin/services/android:junit", -@@ -1347,8 +1344,6 @@ if (current_toolchain == default_toolchain) { - "//chrome/browser/privacy_sandbox/android:javatests", +@@ -1360,8 +1357,6 @@ if (current_toolchain == default_toolchain) { "//chrome/browser/quick_delete:javatests", + "//chrome/browser/renderer_host/android:javatests", "//chrome/browser/safe_browsing/android:javatests", - "//chrome/browser/safety_check/android:javatests", - "//chrome/browser/safety_hub/android:javatests", @@ -50,7 +50,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 -@@ -981,7 +981,6 @@ chrome_java_sources = [ +@@ -913,7 +913,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingPasswordReuseDialogBridge.java", "java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingReferringAppBridge.java", "java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingSettingsNavigation.java", @@ -135,9 +135,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Fragme 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 --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java -@@ -274,7 +274,7 @@ public class MainSettings extends ChromeBaseSettingsFragment - .removePreference(findPreference(PREF_TOOLBAR_SHORTCUT)); - }); +@@ -316,7 +316,7 @@ public class MainSettings extends ChromeBaseSettingsFragment + removePreferenceIfPresent(PREF_UI_THEME); + } - if (BuildInfo.getInstance().isAutomotive) { + if (((true)) || BuildInfo.getInstance().isAutomotive) { @@ -184,9 +184,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -3285,7 +3285,6 @@ static_library("browser") { - "//chrome/browser/reading_list/android", +@@ -3309,7 +3309,6 @@ static_library("browser") { "//chrome/browser/recent_tabs:jni_headers", + "//chrome/browser/regional_capabilities", "//chrome/browser/safe_browsing/android:safe_browsing_enums", - "//chrome/browser/safety_check/android", "//chrome/browser/safety_hub/android", @@ -208,7 +208,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc -@@ -544,7 +544,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { +@@ -559,7 +559,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { tpcd::trial::ValidityService::MaybeCreateForWebContents(web_contents); TrustedVaultEncryptionKeysTabHelper::CreateForWebContents(web_contents); #if BUILDFLAG(IS_ANDROID) @@ -220,15 +220,15 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettings.java --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettings.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettings.java -@@ -87,7 +87,7 @@ public class SiteSettings extends BaseSiteSettingsFragment +@@ -96,7 +96,7 @@ public class SiteSettings extends BaseSiteSettingsFragment } // Remove the permission autorevocation preference if Safety Hub is not enabled. - if (!getSiteSettingsDelegate().isSafetyHubEnabled()) { + if (((false)) && !getSiteSettingsDelegate().isSafetyHubEnabled()) { - getPreferenceScreen().removePreference(findPreference(PERMISSION_AUTOREVOCATION_PREF)); - getPreferenceScreen().removePreference(findPreference(DIVIDER_PREF)); - } + Preference autorevocationPref = + assumeNonNull(findPreference(PERMISSION_AUTOREVOCATION_PREF)); + getPreferenceScreen().removePreference(autorevocationPref); diff --git a/cromite_flags/chrome/common/chrome_features_cc/Disable-safety-check.inc b/cromite_flags/chrome/common/chrome_features_cc/Disable-safety-check.inc new file mode 100644 --- /dev/null diff --git a/build/patches/Disable-smart-selection-by-default.patch b/build/patches/Disable-smart-selection-by-default.patch index be6add65..a8020a1e 100644 --- a/build/patches/Disable-smart-selection-by-default.patch +++ b/build/patches/Disable-smart-selection-by-default.patch @@ -55,7 +55,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 -@@ -500,6 +500,7 @@ public abstract class ChromeFeatureList { +@@ -511,6 +511,7 @@ public abstract class ChromeFeatureList { public static final String SHOW_NEW_TAB_ANIMATIONS = "ShowNewTabAnimations"; public static final String SEARCH_RESUMPTION_MODULE_ANDROID = "SearchResumptionModuleAndroid"; public static final String SEED_ACCOUNTS_REVAMP = "SeedAccountsRevamp"; diff --git a/build/patches/Disable-some-signed-exchange-features.patch b/build/patches/Disable-some-signed-exchange-features.patch index f53d5612..cf84fa73 100644 --- a/build/patches/Disable-some-signed-exchange-features.patch +++ b/build/patches/Disable-some-signed-exchange-features.patch @@ -11,7 +11,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 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 -@@ -1558,7 +1558,7 @@ void ChromeContentBrowserClient::RegisterProfilePrefs( +@@ -1565,7 +1565,7 @@ void ChromeContentBrowserClient::RegisterProfilePrefs( site_isolation::prefs::kWebTriggeredIsolatedOrigins); registry->RegisterDictionaryPref( prefs::kDevToolsBackgroundServicesExpirationDict); diff --git a/build/patches/Disable-speechSynthesis-getVoices-API.patch b/build/patches/Disable-speechSynthesis-getVoices-API.patch index 54be7b49..49a5c5ce 100644 --- a/build/patches/Disable-speechSynthesis-getVoices-API.patch +++ b/build/patches/Disable-speechSynthesis-getVoices-API.patch @@ -11,18 +11,18 @@ Require: Timezone-customization.patch License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html --- - .../renderer/chrome_content_renderer_client.cc | 2 +- - .../renderer/content_settings_agent_impl.cc | 9 ++++++++- - .../renderer/content_settings_agent_impl.h | 2 ++ - content/browser/speech/tts_android.cc | 2 +- - content/browser/speech/tts_win.cc | 2 +- - .../Disable-speechSynthesis-getVoices-API.inc | 8 ++++++++ - .../Disable-speechSynthesis-getVoices-API.inc | 2 ++ - .../Disable-speechSynthesis-getVoices-API.inc | 3 +++ - .../Disable-speechSynthesis-getVoices-API.inc | 1 + - .../platform/web_content_settings_client.h | 2 ++ - .../renderer/modules/speech/speech_synthesis.cc | 17 ++++++++++++++--- - 11 files changed, 43 insertions(+), 7 deletions(-) + .../renderer/chrome_content_renderer_client.cc | 2 +- + .../renderer/content_settings_agent_impl.cc | 9 ++++++++- + .../renderer/content_settings_agent_impl.h | 2 ++ + content/browser/speech/tts_android.cc | 2 +- + content/browser/speech/tts_win.cc | 2 +- + .../Disable-speechSynthesis-getVoices-API.inc | 8 ++++++++ + .../Disable-speechSynthesis-getVoices-API.inc | 2 ++ + .../Disable-speechSynthesis-getVoices-API.inc | 3 +++ + .../Disable-speechSynthesis-getVoices-API.inc | 1 + + .../platform/web_content_settings_client.h | 2 ++ + .../modules/speech/speech_synthesis.cc | 18 +++++++++++++++--- + 11 files changed, 44 insertions(+), 7 deletions(-) create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Disable-speechSynthesis-getVoices-API.inc create mode 100644 cromite_flags/media/base/media_switches_cc/Disable-speechSynthesis-getVoices-API.inc create mode 100644 cromite_flags/third_party/blink/common/features_cc/Disable-speechSynthesis-getVoices-API.inc @@ -151,7 +151,15 @@ diff --git a/third_party/blink/public/platform/web_content_settings_client.h b/t diff --git a/third_party/blink/renderer/modules/speech/speech_synthesis.cc b/third_party/blink/renderer/modules/speech/speech_synthesis.cc --- a/third_party/blink/renderer/modules/speech/speech_synthesis.cc +++ b/third_party/blink/renderer/modules/speech/speech_synthesis.cc -@@ -35,6 +35,7 @@ +@@ -28,6 +28,7 @@ + #include + + #include "build/build_config.h" ++#include "third_party/blink/public/common/features.h" + #include "third_party/blink/public/common/privacy_budget/identifiability_metric_builder.h" + #include "third_party/blink/public/common/privacy_budget/identifiability_study_settings.h" + #include "third_party/blink/public/common/privacy_budget/identifiable_token.h" +@@ -35,6 +36,7 @@ #include "third_party/blink/public/common/thread_safe_browser_interface_broker_proxy.h" #include "third_party/blink/public/platform/browser_interface_broker_proxy.h" #include "third_party/blink/public/platform/platform.h" @@ -159,7 +167,7 @@ diff --git a/third_party/blink/renderer/modules/speech/speech_synthesis.cc b/thi #include "third_party/blink/renderer/bindings/modules/v8/v8_speech_synthesis_error_event_init.h" #include "third_party/blink/renderer/bindings/modules/v8/v8_speech_synthesis_event_init.h" #include "third_party/blink/renderer/core/dom/document.h" -@@ -93,9 +94,19 @@ SpeechSynthesis::SpeechSynthesis(LocalDOMWindow& window) +@@ -93,9 +95,19 @@ SpeechSynthesis::SpeechSynthesis(LocalDOMWindow& window) void SpeechSynthesis::OnSetVoiceList( Vector mojom_voices) { voice_list_.clear(); diff --git a/build/patches/Disable-text-fragments-by-default.patch b/build/patches/Disable-text-fragments-by-default.patch index 2839d791..f26e5750 100644 --- a/build/patches/Disable-text-fragments-by-default.patch +++ b/build/patches/Disable-text-fragments-by-default.patch @@ -74,7 +74,7 @@ new file mode 100644 diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc --- a/third_party/blink/renderer/core/dom/document.cc +++ b/third_party/blink/renderer/core/dom/document.cc -@@ -4578,9 +4578,14 @@ void Document::SetURL(const KURL& url) { +@@ -4579,9 +4579,14 @@ void Document::SetURL(const KURL& url) { TRACE_EVENT_FLAG_FLOW_IN | TRACE_EVENT_FLAG_FLOW_OUT, "url", new_url.GetString().Utf8()); @@ -92,7 +92,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -4300,10 +4300,9 @@ +@@ -4410,10 +4410,9 @@ }, { name: "TextFragmentIdentifiers", diff --git a/build/patches/Disable-third-party-origin-trials.patch b/build/patches/Disable-third-party-origin-trials.patch index 897fd5c8..de58014b 100644 --- a/build/patches/Disable-third-party-origin-trials.patch +++ b/build/patches/Disable-third-party-origin-trials.patch @@ -76,7 +76,7 @@ diff --git a/components/embedder_support/origin_trials/origin_trial_policy_impl. diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -9295,7 +9295,6 @@ void NavigationRequest::SetSourceSiteInstanceToInitiatorIfNeeded() { +@@ -9381,7 +9381,6 @@ void NavigationRequest::SetSourceSiteInstanceToInitiatorIfNeeded() { void NavigationRequest::ForceEnableOriginTrials( const std::vector& trials) { DCHECK(!HasCommitted()); @@ -223,7 +223,7 @@ diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_p } bool IsPagePopupRunningInWebTest(LocalFrame* frame) { -@@ -3271,10 +3261,6 @@ void DocumentLoader::CreateParserPostCommit() { +@@ -3281,10 +3271,6 @@ void DocumentLoader::CreateParserPostCommit() { } #endif // BUILDFLAG(IS_CHROMEOS) @@ -274,6 +274,6 @@ diff --git a/third_party/blink/renderer/core/origin_trials/origin_trial_context. bool OriginTrialContext::CanEnableTrialFromName(const StringView& trial_name) { + if ((true)) return false; if (trial_name == "FledgeBiddingAndAuctionServer") { - return base::FeatureList::IsEnabled(features::kInterestGroupStorage) && - base::FeatureList::IsEnabled( + return base::FeatureList::IsEnabled( + network::features::kInterestGroupStorage) && -- diff --git a/build/patches/Disable-various-metrics.patch b/build/patches/Disable-various-metrics.patch index e60cc2cd..b5fce273 100644 --- a/build/patches/Disable-various-metrics.patch +++ b/build/patches/Disable-various-metrics.patch @@ -92,8 +92,8 @@ diff --git a/chrome/browser/android/ntp/most_visited_sites_bridge.cc b/chrome/br 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 -@@ -1132,7 +1132,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) { - #endif // BUILDFLAG(IS_CHROMEOS_ASH) +@@ -1130,7 +1130,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) { + #endif // BUILDFLAG(IS_CHROMEOS) registry->RegisterBooleanPref(metrics::prefs::kMetricsReportingEnabled, - GoogleUpdateSettings::GetCollectStatsConsent()); @@ -112,7 +112,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch #include "chrome/browser/media/audio_service_util.h" #include "chrome/browser/media/prefs/capture_device_ranking.h" #include "chrome/browser/media/router/media_router_feature.h" -@@ -5236,16 +5235,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( +@@ -5238,16 +5237,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( content::NavigationHandle* handle) { std::vector> throttles; @@ -129,7 +129,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch #if BUILDFLAG(IS_ANDROID) // TODO(davidben): This is insufficient to integrate with prerender properly. // https://crbug.com/370595 -@@ -5378,10 +5367,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( +@@ -5380,10 +5369,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( } } diff --git a/build/patches/Do-not-build-API-keys-infobar.patch b/build/patches/Do-not-build-API-keys-infobar.patch index 70ec347c..cb244c01 100644 --- a/build/patches/Do-not-build-API-keys-infobar.patch +++ b/build/patches/Do-not-build-API-keys-infobar.patch @@ -11,7 +11,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -1178,8 +1178,6 @@ static_library("ui") { +@@ -1183,8 +1183,6 @@ static_library("ui") { "startup/default_browser_prompt/default_browser_prompt_manager.h", "startup/default_browser_prompt/default_browser_prompt_prefs.cc", "startup/default_browser_prompt/default_browser_prompt_prefs.h", diff --git a/build/patches/Do-not-check-for-the-presence-of-use-remoteexec.patch b/build/patches/Do-not-check-for-the-presence-of-use-remoteexec.patch index 384b4738..19e5ced0 100644 --- a/build/patches/Do-not-check-for-the-presence-of-use-remoteexec.patch +++ b/build/patches/Do-not-check-for-the-presence-of-use-remoteexec.patch @@ -3,23 +3,16 @@ Date: Mon, 3 Mar 2025 12:04:53 +0000 Subject: Do not check for the presence of use_remoteexec --- - build/toolchain/rbe.gni | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) + build/toolchain/remoteexec_defaults.gni | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/build/toolchain/rbe.gni b/build/toolchain/rbe.gni ---- a/build/toolchain/rbe.gni -+++ b/build/toolchain/rbe.gni -@@ -4,11 +4,7 @@ - - # Defines the configuration of Remote Build Execution (RBE). - --use_remoteexec_default = -- exec_script(rebase_path("//build/toolchain/use_remoteexec_value.py"), -- [], -- "value", -- []) -+use_remoteexec_default = false - - declare_args() { - # Deprecated: Please use reclient_bin_dir instead. +diff --git a/build/toolchain/remoteexec_defaults.gni b/build/toolchain/remoteexec_defaults.gni +--- a/build/toolchain/remoteexec_defaults.gni ++++ b/build/toolchain/remoteexec_defaults.gni +@@ -2,4 +2,4 @@ + # value of use_reclient. + # TODO(crbug.com/341167943): Use reclient only if use_siso=false. + use_reclient_on_siso = true +-use_reclient_on_ninja = true ++use_reclient_on_ninja = false -- diff --git a/build/patches/Do-not-compile-QR-code-sharing.patch b/build/patches/Do-not-compile-QR-code-sharing.patch index acc8d3ea..94310bba 100644 --- a/build/patches/Do-not-compile-QR-code-sharing.patch +++ b/build/patches/Do-not-compile-QR-code-sharing.patch @@ -19,7 +19,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 -@@ -2986,7 +2986,6 @@ generate_jni("chrome_jni_headers") { +@@ -3014,7 +3014,6 @@ generate_jni("chrome_jni_headers") { "../browser/share/android/java/src/org/chromium/chrome/browser/share/link_to_text/LinkToTextBridge.java", "../browser/share/android/java/src/org/chromium/chrome/browser/share/long_screenshots/bitmap_generation/LongScreenshotsTabService.java", "../browser/share/android/java/src/org/chromium/chrome/browser/share/long_screenshots/bitmap_generation/LongScreenshotsTabServiceFactory.java", @@ -30,15 +30,15 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn 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 -@@ -126,7 +126,6 @@ import org.chromium.chrome.browser.share.ShareButtonController; +@@ -110,7 +110,6 @@ import org.chromium.chrome.browser.recent_tabs.RestoreTabsFeatureHelper; + import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory; import org.chromium.chrome.browser.share.ShareDelegate; import org.chromium.chrome.browser.share.ShareDelegate.ShareOrigin; - import org.chromium.chrome.browser.share.ShareUtils; -import org.chromium.chrome.browser.share.qrcode.QrCodeDialog; import org.chromium.chrome.browser.share.scroll_capture.ScrollCaptureManager; import org.chromium.chrome.browser.tab.AccessibilityVisibilityHandler; import org.chromium.chrome.browser.tab.AutofillSessionLifetimeController; -@@ -587,10 +586,6 @@ public class RootUiCoordinator +@@ -565,10 +564,6 @@ public class RootUiCoordinator } public void onAttachFragment(Fragment fragment) { @@ -52,7 +52,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi 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 -@@ -1925,7 +1925,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -1830,7 +1830,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { registry->RegisterBooleanPref(prefs::kUiAutomationProviderEnabled, false); #endif @@ -64,10 +64,10 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse diff --git a/chrome/browser/share/BUILD.gn b/chrome/browser/share/BUILD.gn --- a/chrome/browser/share/BUILD.gn +++ b/chrome/browser/share/BUILD.gn -@@ -47,7 +47,6 @@ source_set("share") { +@@ -45,7 +45,6 @@ source_set("share") { + "default_ranking_android.cc", + "editor_screenshot_task.cc", "link_to_text_bridge.cc", - "page_info_sharing_bridge.cc", - "page_info_sharing_bridge.h", - "qr_code_generator_android.cc", ] deps += [ @@ -83,7 +83,7 @@ diff --git a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/s import org.chromium.chrome.browser.share.send_tab_to_self.SendTabToSelfAndroidBridge; import org.chromium.chrome.browser.share.send_tab_to_self.SendTabToSelfCoordinator; import org.chromium.chrome.browser.share.share_sheet.ChromeOptionShareCallback; -@@ -306,9 +305,6 @@ public abstract class ChromeProvidedSharingOptionsProviderBase { +@@ -300,9 +299,6 @@ public abstract class ChromeProvidedSharingOptionsProviderBase { } private void maybeAddQrCodeFirstPartyOption() { @@ -93,7 +93,7 @@ diff --git a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/s } private void maybeAddLongScreenshotFirstPartyOption() { -@@ -442,25 +438,6 @@ public abstract class ChromeProvidedSharingOptionsProviderBase { +@@ -436,25 +432,6 @@ public abstract class ChromeProvidedSharingOptionsProviderBase { .build(); } @@ -122,10 +122,10 @@ diff --git a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/s diff --git a/chrome/browser/share/android/java_sources.gni b/chrome/browser/share/android/java_sources.gni --- a/chrome/browser/share/android/java_sources.gni +++ b/chrome/browser/share/android/java_sources.gni -@@ -45,17 +45,6 @@ share_java_sources = [ - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/page_info_sheet/feedback/FeedbackSheetMediator.java", - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/page_info_sheet/feedback/FeedbackSheetProperties.java", - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/page_info_sheet/feedback/FeedbackSheetViewBinder.java", +@@ -30,17 +30,6 @@ share_java_sources = [ + "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/long_screenshots/bitmap_generation/LongScreenshotsTabService.java", + "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/long_screenshots/bitmap_generation/LongScreenshotsTabServiceFactory.java", + "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/long_screenshots/bitmap_generation/ScreenshotBoundsManager.java", - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QRCodeGenerator.java", - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QrCodeCoordinator.java", - "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QrCodeDialog.java", @@ -155,7 +155,7 @@ diff --git a/chrome/browser/sharing_hub/sharing_hub_features.cc b/chrome/browser diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc --- a/chrome/browser/ui/browser_command_controller.cc +++ b/chrome/browser/ui/browser_command_controller.cc -@@ -1798,10 +1798,10 @@ void BrowserCommandController::UpdateCommandsForFullscreenMode() { +@@ -1829,10 +1829,10 @@ void BrowserCommandController::UpdateCommandsForFullscreenMode() { command_updater_.UpdateCommandEnabled(IDC_CHROME_WHATS_NEW, show_main_ui); #endif command_updater_.UpdateCommandEnabled(IDC_CONTENT_CONTEXT_SHARING_SUBMENU, @@ -172,7 +172,7 @@ diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc --- a/chrome/browser/ui/browser_commands.cc +++ b/chrome/browser/ui/browser_commands.cc -@@ -1660,6 +1660,7 @@ void SendTabToSelf(Browser* browser) { +@@ -1656,6 +1656,7 @@ void SendTabToSelf(Browser* browser) { } bool CanGenerateQrCode(const Browser* browser) { diff --git a/build/patches/Do-not-link-with-libatomic.patch b/build/patches/Do-not-link-with-libatomic.patch index 6905dc07..ad1ce600 100644 --- a/build/patches/Do-not-link-with-libatomic.patch +++ b/build/patches/Do-not-link-with-libatomic.patch @@ -14,7 +14,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 -@@ -1090,7 +1090,7 @@ component("base") { +@@ -1096,7 +1096,7 @@ component("base") { # more robust check for this. if (!use_sysroot && (is_android || is_chromeos || (is_linux && !is_castos)) && host_toolchain != "//build/toolchain/cros:host") { diff --git a/build/patches/Do-not-store-passwords-by-default.patch b/build/patches/Do-not-store-passwords-by-default.patch index 3e3537cd..71bb2215 100644 --- a/build/patches/Do-not-store-passwords-by-default.patch +++ b/build/patches/Do-not-store-passwords-by-default.patch @@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/components/password_manager/core/browser/password_manager.cc b/components/password_manager/core/browser/password_manager.cc --- a/components/password_manager/core/browser/password_manager.cc +++ b/components/password_manager/core/browser/password_manager.cc -@@ -364,7 +364,7 @@ bool HasManuallyFilledFields(const PasswordForm& form) { +@@ -389,7 +389,7 @@ bool HasManuallyFilledFields(const PasswordForm& form) { void PasswordManager::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( @@ -19,7 +19,7 @@ diff --git a/components/password_manager/core/browser/password_manager.cc b/comp user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF); #if BUILDFLAG(IS_IOS) // Deprecated pref in profile prefs. -@@ -372,7 +372,7 @@ void PasswordManager::RegisterProfilePrefs( +@@ -397,7 +397,7 @@ void PasswordManager::RegisterProfilePrefs( false); #endif // BUILDFLAG(IS_IOS) registry->RegisterBooleanPref( @@ -28,7 +28,7 @@ diff --git a/components/password_manager/core/browser/password_manager.cc b/comp user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF); registry->RegisterBooleanPref( prefs::kWasAutoSignInFirstRunExperienceShown, false, -@@ -409,9 +409,9 @@ void PasswordManager::RegisterProfilePrefs( +@@ -434,9 +434,9 @@ void PasswordManager::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); registry->RegisterBooleanPref(prefs::kPasswordsPrefWithNewLabelUsed, false); #if BUILDFLAG(IS_ANDROID) diff --git a/build/patches/DoH-improvements.patch b/build/patches/DoH-improvements.patch index 18fd6e1d..2d6f6f23 100644 --- a/build/patches/DoH-improvements.patch +++ b/build/patches/DoH-improvements.patch @@ -128,7 +128,7 @@ diff --git a/net/dns/dns_client.cc b/net/dns/dns_client.cc diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc --- a/net/dns/host_resolver_manager.cc +++ b/net/dns/host_resolver_manager.cc -@@ -636,6 +636,7 @@ void HostResolverManager::SetDnsConfigOverrides(DnsConfigOverrides overrides) { +@@ -648,6 +648,7 @@ void HostResolverManager::SetDnsConfigOverrides(DnsConfigOverrides overrides) { bool changed = dns_client_->SetConfigOverrides(std::move(overrides)); if (changed) { @@ -162,7 +162,7 @@ diff --git a/net/dns/public/doh_provider_entry.cc b/net/dns/public/doh_provider_ diff --git a/net/dns/public/doh_provider_entry.h b/net/dns/public/doh_provider_entry.h --- a/net/dns/public/doh_provider_entry.h +++ b/net/dns/public/doh_provider_entry.h -@@ -58,7 +58,7 @@ struct NET_EXPORT DohProviderEntry { +@@ -59,7 +59,7 @@ struct NET_EXPORT DohProviderEntry { std::set ip_addresses; base::flat_set dns_over_tls_hostnames; DnsOverHttpsServerConfig doh_server_config; @@ -171,7 +171,7 @@ diff --git a/net/dns/public/doh_provider_entry.h b/net/dns/public/doh_provider_e std::string_view privacy_policy; bool display_globally; base::flat_set display_countries; -@@ -75,7 +75,7 @@ struct NET_EXPORT DohProviderEntry { +@@ -76,7 +76,7 @@ struct NET_EXPORT DohProviderEntry { std::initializer_list dns_over_53_server_ip_strs, base::flat_set dns_over_tls_hostnames, std::string dns_over_https_template, diff --git a/build/patches/Enable-Android-Dynamic-Performance-Framework.patch b/build/patches/Enable-Android-Dynamic-Performance-Framework.patch index 43ac10e3..1fc4485f 100644 --- a/build/patches/Enable-Android-Dynamic-Performance-Framework.patch +++ b/build/patches/Enable-Android-Dynamic-Performance-Framework.patch @@ -33,7 +33,7 @@ diff --git a/chrome/version.gni b/chrome/version.gni diff --git a/components/viz/common/features.cc b/components/viz/common/features.cc --- a/components/viz/common/features.cc +++ b/components/viz/common/features.cc -@@ -335,9 +335,11 @@ const base::FeatureParam kADPFBoostTimeout{ +@@ -334,9 +334,11 @@ const base::FeatureParam kADPFBoostTimeout{ // If enabled, Chrome includes the Renderer Main thread(s) into the // ADPF(Android Dynamic Performance Framework) hint session. @@ -48,7 +48,7 @@ diff --git a/components/viz/common/features.cc b/components/viz/common/features. diff --git a/components/viz/service/performance_hint/hint_session.cc b/components/viz/service/performance_hint/hint_session.cc --- a/components/viz/service/performance_hint/hint_session.cc +++ b/components/viz/service/performance_hint/hint_session.cc -@@ -303,16 +303,13 @@ bool IsAdpfEnabled() { +@@ -310,16 +310,13 @@ bool IsAdpfEnabled() { switches::kDisableAdpf)) { return false; } diff --git a/build/patches/Enable-Certificate-Transparency.patch b/build/patches/Enable-Certificate-Transparency.patch index b14eaa2d..4564a8d4 100644 --- a/build/patches/Enable-Certificate-Transparency.patch +++ b/build/patches/Enable-Certificate-Transparency.patch @@ -35,7 +35,7 @@ diff --git a/chrome/browser/browser_features.h b/chrome/browser/browser_features 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 -@@ -1020,7 +1020,7 @@ bool SystemNetworkContextManager::IsCertificateTransparencyEnabled() { +@@ -1019,7 +1019,7 @@ bool SystemNetworkContextManager::IsCertificateTransparencyEnabled() { // - on an opt-in basis for other builds and embedders, controlled with the // kCertificateTransparencyAskBeforeEnabling flag return base::FeatureList::IsEnabled( diff --git a/build/patches/Enable-Document-Open-Inheritance-Removal.patch b/build/patches/Enable-Document-Open-Inheritance-Removal.patch index 3750e763..90c61a34 100644 --- a/build/patches/Enable-Document-Open-Inheritance-Removal.patch +++ b/build/patches/Enable-Document-Open-Inheritance-Removal.patch @@ -11,7 +11,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc --- a/third_party/blink/renderer/core/dom/document.cc +++ b/third_party/blink/renderer/core/dom/document.cc -@@ -3527,70 +3527,6 @@ void Document::open(LocalDOMWindow* entered_window, +@@ -3528,70 +3528,6 @@ void Document::open(LocalDOMWindow* entered_window, // https://chromestatus.com/metrics/feature/timeline/popularity/4375 CountUse(WebFeature::kDocumentOpenMutateSandbox); } @@ -85,7 +85,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -1622,7 +1622,6 @@ +@@ -1706,7 +1706,6 @@ { name: "DocumentOpenSandboxInheritanceRemoval", status: "stable", diff --git a/build/patches/Enable-Global-Privacy-Control.patch b/build/patches/Enable-Global-Privacy-Control.patch index f6999b1d..25a8f781 100644 --- a/build/patches/Enable-Global-Privacy-Control.patch +++ b/build/patches/Enable-Global-Privacy-Control.patch @@ -61,7 +61,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.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 -@@ -634,6 +634,7 @@ chrome_java_resources = [ +@@ -641,6 +641,7 @@ chrome_java_resources = [ "java/res/xml/contextual_search_preferences.xml", "java/res/xml/developer_preferences.xml", "java/res/xml/do_not_track_preferences.xml", @@ -72,7 +72,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 -@@ -952,6 +952,7 @@ chrome_java_sources = [ +@@ -885,6 +885,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/settings/AdBlockPreferences.java", "java/src/org/chromium/chrome/browser/policy/PolicyAuditor.java", "java/src/org/chromium/chrome/browser/policy/PolicyAuditorBridge.java", @@ -198,7 +198,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp --- a/chrome/app/settings_strings.grdp +++ b/chrome/app/settings_strings.grdp -@@ -2057,6 +2057,21 @@ +@@ -2054,6 +2054,21 @@ Learn more about Do Not Track @@ -223,7 +223,7 @@ diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp 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 -@@ -392,6 +392,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() { +@@ -395,6 +395,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() { (*s_allowlist)[::prefs::kTrackingProtectionLevel] = settings_api::PrefType::kNumber; (*s_allowlist)[::prefs::kEnableDoNotTrack] = settings_api::PrefType::kBoolean; @@ -247,7 +247,7 @@ diff --git a/chrome/browser/renderer_preferences_util.cc b/chrome/browser/render diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resources/settings/BUILD.gn --- a/chrome/browser/resources/settings/BUILD.gn +++ b/chrome/browser/resources/settings/BUILD.gn -@@ -116,6 +116,7 @@ build_webui("build") { +@@ -117,6 +117,7 @@ build_webui("build") { "privacy_page/cookies_page.ts", "privacy_page/do_not_track_toggle.ts", "privacy_page/fingerprint_progress_arc.ts", @@ -258,7 +258,7 @@ diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resourc diff --git a/chrome/browser/resources/settings/privacy_page/cookies_page.html b/chrome/browser/resources/settings/privacy_page/cookies_page.html --- a/chrome/browser/resources/settings/privacy_page/cookies_page.html +++ b/chrome/browser/resources/settings/privacy_page/cookies_page.html -@@ -307,6 +307,8 @@ +@@ -308,6 +308,8 @@ @@ -480,7 +480,7 @@ diff --git a/chrome/browser/ui/prefs/pref_watcher.h b/chrome/browser/ui/prefs/pr 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 -@@ -1860,6 +1860,9 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source, +@@ -1868,6 +1868,9 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source, {"doNotTrackDialogMessage", IDS_SETTINGS_ENABLE_DO_NOT_TRACK_DIALOG_TEXT}, {"doNotTrackDialogLearnMoreA11yLabel", IDS_SETTINGS_ENABLE_DO_NOT_TRACK_DIALOG_LEARN_MORE_ACCESSIBILITY_LABEL}, @@ -596,7 +596,7 @@ diff --git a/content/browser/loader/browser_initiated_resource_request.cc b/cont diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -4589,6 +4589,10 @@ void RenderFrameImpl::FinalizeRequestInternal( +@@ -4603,6 +4603,10 @@ void RenderFrameImpl::FinalizeRequestInternal( request.SetHttpHeaderField( blink::WebString::FromUTF8(blink::kDoNotTrackHeader), "1"); } @@ -680,7 +680,7 @@ diff --git a/third_party/blink/public/mojom/renderer_preferences.mojom b/third_p diff --git a/third_party/blink/renderer/bindings/idl_in_modules.gni b/third_party/blink/renderer/bindings/idl_in_modules.gni --- a/third_party/blink/renderer/bindings/idl_in_modules.gni +++ b/third_party/blink/renderer/bindings/idl_in_modules.gni -@@ -1291,6 +1291,11 @@ static_idl_files_in_modules = [ +@@ -1300,6 +1300,11 @@ static_idl_files_in_modules = [ "//third_party/blink/renderer/modules/xr/xr_webgl_sub_image.idl", ] @@ -695,7 +695,7 @@ diff --git a/third_party/blink/renderer/bindings/idl_in_modules.gni b/third_part diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc --- a/third_party/blink/renderer/core/exported/web_view_impl.cc +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc -@@ -3560,6 +3560,9 @@ void WebViewImpl::UpdateRendererPreferences( +@@ -3556,6 +3556,9 @@ void WebViewImpl::UpdateRendererPreferences( GetSettings()->SetCaretBrowsingEnabled( renderer_preferences_.caret_browsing_enabled); @@ -794,7 +794,7 @@ new file mode 100644 diff --git a/third_party/blink/renderer/modules/service_worker/web_service_worker_fetch_context_impl.cc b/third_party/blink/renderer/modules/service_worker/web_service_worker_fetch_context_impl.cc --- a/third_party/blink/renderer/modules/service_worker/web_service_worker_fetch_context_impl.cc +++ b/third_party/blink/renderer/modules/service_worker/web_service_worker_fetch_context_impl.cc -@@ -156,6 +156,9 @@ void WebServiceWorkerFetchContextImpl::FinalizeRequest(WebURLRequest& request) { +@@ -150,6 +150,9 @@ void WebServiceWorkerFetchContextImpl::FinalizeRequest(WebURLRequest& request) { if (renderer_preferences_.enable_do_not_track) { request.SetHttpHeaderField(WebString::FromUTF8(kDoNotTrackHeader), "1"); } @@ -820,7 +820,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/url_loader/dedicat 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 -@@ -2785,6 +2785,11 @@ +@@ -2828,6 +2828,11 @@ status: "stable", base_feature: "none", }, diff --git a/build/patches/Enable-HEVC-by-default.patch b/build/patches/Enable-HEVC-by-default.patch index d3956ef8..caccce8d 100644 --- a/build/patches/Enable-HEVC-by-default.patch +++ b/build/patches/Enable-HEVC-by-default.patch @@ -12,7 +12,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 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 -@@ -328,8 +328,8 @@ BASE_FEATURE(kEnableTabMuting, +@@ -315,8 +315,8 @@ BASE_FEATURE(kEnableTabMuting, #if BUILDFLAG(ENABLE_PLATFORM_HEVC) // Enables HEVC hardware accelerated decoding. BASE_FEATURE(kPlatformHEVCDecoderSupport, diff --git a/build/patches/Enable-HighEfficiencyMode-by-default.patch b/build/patches/Enable-HighEfficiencyMode-by-default.patch index ee9c8d0f..a0fb2f96 100644 --- a/build/patches/Enable-HighEfficiencyMode-by-default.patch +++ b/build/patches/Enable-HighEfficiencyMode-by-default.patch @@ -21,7 +21,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/components/performance_manager/features.cc b/components/performance_manager/features.cc --- a/components/performance_manager/features.cc +++ b/components/performance_manager/features.cc -@@ -132,6 +132,7 @@ BASE_FEATURE(kUrgentPageDiscarding, +@@ -96,6 +96,7 @@ BASE_FEATURE(kUrgentPageDiscarding, BASE_FEATURE(kCPUMeasurementInFreezingPolicy, "CPUMeasurementInFreezingPolicy", base::FEATURE_ENABLED_BY_DEFAULT); @@ -29,7 +29,7 @@ diff --git a/components/performance_manager/features.cc b/components/performance BASE_FEATURE(kMemoryMeasurementInFreezingPolicy, "MemoryMeasurementInFreezingPolicy", -@@ -183,9 +184,14 @@ BASE_FEATURE(kRecordFreezingEligibilityUKM, +@@ -147,9 +148,14 @@ BASE_FEATURE(kRecordFreezingEligibilityUKM, "RecordFreezingEligibilityUKM", base::FEATURE_DISABLED_BY_DEFAULT); @@ -64,7 +64,7 @@ diff --git a/components/performance_manager/freezing/freezing_policy.cc b/compon diff --git a/components/performance_manager/public/features.h b/components/performance_manager/public/features.h --- a/components/performance_manager/public/features.h +++ b/components/performance_manager/public/features.h -@@ -183,6 +183,9 @@ BASE_DECLARE_FEATURE(kFreezingFollowsDiscardOptOut); +@@ -141,6 +141,9 @@ BASE_DECLARE_FEATURE(kFreezingFollowsDiscardOptOut); // When enabled, the freezing eligibility UKM event may be recorded. BASE_DECLARE_FEATURE(kRecordFreezingEligibilityUKM); diff --git a/build/patches/Enable-ImprovedBookmarks-by-default.patch b/build/patches/Enable-ImprovedBookmarks-by-default.patch index b67ce08a..cbd3d09e 100644 --- a/build/patches/Enable-ImprovedBookmarks-by-default.patch +++ b/build/patches/Enable-ImprovedBookmarks-by-default.patch @@ -5,9 +5,9 @@ Subject: Enable ImprovedBookmarks by default License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html --- chrome/android/java/res/layout/bookmark_search_box_row.xml | 4 ++-- + .../chrome/browser/bookmarks/BookmarkManagerOpenerImpl.java | 2 +- .../browser/bookmarks/BookmarkSearchBoxRowViewBinder.java | 2 ++ .../chromium/chrome/browser/bookmarks/BookmarkUiPrefs.java | 2 +- - .../org/chromium/chrome/browser/bookmarks/BookmarkUtils.java | 2 +- components/bookmarks/browser/bookmark_node.cc | 3 +-- 5 files changed, 7 insertions(+), 6 deletions(-) @@ -25,9 +25,21 @@ diff --git a/chrome/android/java/res/layout/bookmark_search_box_row.xml b/chrome android:orientation="horizontal"> callback = wrapCallback(model, BookmarkSearchBoxRowProperties.SEARCH_TEXT_CHANGE_CALLBACK); -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUiPrefs.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUiPrefs.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUiPrefs.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUiPrefs.java -@@ -21,7 +21,7 @@ import java.lang.annotation.RetentionPolicy; +diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUiPrefs.java b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUiPrefs.java +--- a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUiPrefs.java ++++ b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUiPrefs.java +@@ -20,7 +20,7 @@ import java.lang.annotation.RetentionPolicy; /** Self-documenting preference class for bookmarks. */ public class BookmarkUiPrefs { private static final @BookmarkRowDisplayPref int INITIAL_BOOKMARK_ROW_DISPLAY_PREF = @@ -56,18 +68,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm private static final @BookmarkRowSortOrder int INITIAL_BOOKMARK_ROW_SORT_ORDER = BookmarkRowSortOrder.MANUAL; -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java -@@ -562,7 +562,7 @@ public class BookmarkUtils { - RecordUserAction.record("MobileBookmarkManagerReopenBookmarksInSameSession"); - } - -- if (DeviceFormFactor.isNonMultiDisplayContextOnTablet(context)) { -+ if ((true)) { - showBookmarkManagerOnTablet( - context, - activity == null ? null : activity.getComponentName(), diff --git a/components/bookmarks/browser/bookmark_node.cc b/components/bookmarks/browser/bookmark_node.cc --- a/components/bookmarks/browser/bookmark_node.cc +++ b/components/bookmarks/browser/bookmark_node.cc diff --git a/build/patches/Enable-ProcessBoundStringEncryption-by-default.patch b/build/patches/Enable-ProcessBoundStringEncryption-by-default.patch index 51182811..fe44119c 100644 --- a/build/patches/Enable-ProcessBoundStringEncryption-by-default.patch +++ b/build/patches/Enable-ProcessBoundStringEncryption-by-default.patch @@ -14,7 +14,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/crypto/features.cc b/crypto/features.cc --- a/crypto/features.cc +++ b/crypto/features.cc -@@ -11,5 +11,7 @@ namespace crypto::features { +@@ -11,7 +11,9 @@ namespace crypto::features { BASE_FEATURE(kProcessBoundStringEncryption, "ProcessBoundStringEncryption", base::FEATURE_DISABLED_BY_DEFAULT); @@ -22,5 +22,7 @@ diff --git a/crypto/features.cc b/crypto/features.cc +#if BUILDFLAG(IS_WIN) +SET_CROMITE_FEATURE_ENABLED(kProcessBoundStringEncryption); +#endif - } // namespace crypto::features + // Disabled by default. + BASE_FEATURE(kLabelWindowsUnexportableKeys, + "LabelWindowsUnexportableKeys", -- diff --git a/build/patches/Enable-StrictOriginIsolation-and-SitePerProcess.patch b/build/patches/Enable-StrictOriginIsolation-and-SitePerProcess.patch index 59ffa7e8..773f2981 100644 --- a/build/patches/Enable-StrictOriginIsolation-and-SitePerProcess.patch +++ b/build/patches/Enable-StrictOriginIsolation-and-SitePerProcess.patch @@ -20,7 +20,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 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 -@@ -1525,7 +1525,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs( +@@ -1532,7 +1532,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs( registry->RegisterFilePathPref(prefs::kDiskCacheDir, base::FilePath()); registry->RegisterIntegerPref(prefs::kDiskCacheSize, 0); registry->RegisterStringPref(prefs::kIsolateOrigins, std::string()); @@ -29,7 +29,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch registry->RegisterBooleanPref(prefs::kTabFreezingEnabled, true); registry->RegisterIntegerPref(prefs::kSCTAuditingHashdanceReportCount, 0); registry->RegisterBooleanPref(prefs::kDataURLWhitespacePreservationEnabled, -@@ -1551,7 +1551,7 @@ void ChromeContentBrowserClient::RegisterProfilePrefs( +@@ -1558,7 +1558,7 @@ void ChromeContentBrowserClient::RegisterProfilePrefs( // user policy in addition to the same named ones in Local State (which are // used for mapping the command-line flags). registry->RegisterStringPref(prefs::kIsolateOrigins, std::string()); diff --git a/build/patches/Enable-component-updater.patch b/build/patches/Enable-component-updater.patch index 5f722cd7..006d891a 100644 --- a/build/patches/Enable-component-updater.patch +++ b/build/patches/Enable-component-updater.patch @@ -167,7 +167,7 @@ diff --git a/android_webview/nonembedded/webview_apk_process.h b/android_webview diff --git a/chrome/browser/component_updater/registration.cc b/chrome/browser/component_updater/registration.cc --- a/chrome/browser/component_updater/registration.cc +++ b/chrome/browser/component_updater/registration.cc -@@ -123,6 +123,8 @@ namespace component_updater { +@@ -127,6 +127,8 @@ namespace component_updater { void RegisterComponentsForUpdate() { auto* const cus = g_browser_process->component_updater(); @@ -619,7 +619,7 @@ diff --git a/components/update_client/request_sender.cc b/components/update_clie diff --git a/components/update_client/update_checker.cc b/components/update_client/update_checker.cc --- a/components/update_client/update_checker.cc +++ b/components/update_client/update_checker.cc -@@ -239,6 +239,10 @@ void UpdateCheckerImpl::CheckForUpdatesHelper( +@@ -242,6 +242,10 @@ void UpdateCheckerImpl::CheckForUpdatesHelper( config_->IsMachineExternallyManaged(), additional_attributes, updater_state_attributes, std::move(apps)); @@ -630,7 +630,7 @@ diff --git a/components/update_client/update_checker.cc b/components/update_clie cancellation_->OnCancel( base::MakeRefCounted(config_->GetNetworkFetcherFactory()) ->Send({url}, -@@ -248,7 +252,7 @@ void UpdateCheckerImpl::CheckForUpdatesHelper( +@@ -251,7 +255,7 @@ void UpdateCheckerImpl::CheckForUpdatesHelper( config_->GetProtocolHandlerFactory() ->CreateSerializer() ->Serialize(request), diff --git a/build/patches/Enable-darken-websites-checkbox-in-themes.patch b/build/patches/Enable-darken-websites-checkbox-in-themes.patch index b4dccda2..ee0bc9dc 100644 --- a/build/patches/Enable-darken-websites-checkbox-in-themes.patch +++ b/build/patches/Enable-darken-websites-checkbox-in-themes.patch @@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json --- a/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json -@@ -1856,9 +1856,9 @@ +@@ -1829,9 +1829,9 @@ "expiry_milestone": -1 }, { diff --git a/build/patches/Enable-gwp-asan-on-Android.patch b/build/patches/Enable-gwp-asan-on-Android.patch index 9a0e1579..0d234a03 100644 --- a/build/patches/Enable-gwp-asan-on-Android.patch +++ b/build/patches/Enable-gwp-asan-on-Android.patch @@ -21,7 +21,7 @@ in android there is a test function accessible in the developer settings. diff --git a/android_webview/lib/aw_main_delegate.cc b/android_webview/lib/aw_main_delegate.cc --- a/android_webview/lib/aw_main_delegate.cc +++ b/android_webview/lib/aw_main_delegate.cc -@@ -387,7 +387,7 @@ void AwMainDelegate::InitializeMemorySystem(const bool is_browser_process) { +@@ -384,7 +384,7 @@ void AwMainDelegate::InitializeMemorySystem(const bool is_browser_process) { const std::string process_type = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( switches::kProcessType); @@ -122,7 +122,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tracing/setting diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc --- a/chrome/app/chrome_main_delegate.cc +++ b/chrome/app/chrome_main_delegate.cc -@@ -1710,7 +1710,7 @@ void ChromeMainDelegate::InitializeMemorySystem() { +@@ -1721,7 +1721,7 @@ void ChromeMainDelegate::InitializeMemorySystem() { const std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); const bool is_browser_process = process_type.empty(); @@ -244,7 +244,7 @@ diff --git a/components/gwp_asan/client/gwp_asan.cc b/components/gwp_asan/client diff --git a/components/memory_system/memory_system.cc b/components/memory_system/memory_system.cc --- a/components/memory_system/memory_system.cc +++ b/components/memory_system/memory_system.cc -@@ -198,6 +198,7 @@ void MemorySystem::Impl::Initialize( +@@ -197,6 +197,7 @@ void MemorySystem::Impl::Initialize( if (gwp_asan_parameters) { InitializeGwpASan(*gwp_asan_parameters, initialization_data); diff --git a/build/patches/Enable-menu-on-reload-button.patch b/build/patches/Enable-menu-on-reload-button.patch index acb8e8cf..cde8864a 100644 --- a/build/patches/Enable-menu-on-reload-button.patch +++ b/build/patches/Enable-menu-on-reload-button.patch @@ -30,7 +30,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc -@@ -591,7 +591,7 @@ void ToolbarView::Update(WebContents* tab) { +@@ -577,7 +577,7 @@ void ToolbarView::Update(WebContents* tab) { } if (reload_) { diff --git a/build/patches/Enable-native-Android-autofill.patch b/build/patches/Enable-native-Android-autofill.patch index 75890cd8..0a8f2598 100644 --- a/build/patches/Enable-native-Android-autofill.patch +++ b/build/patches/Enable-native-Android-autofill.patch @@ -190,7 +190,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage 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 --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java -@@ -430,8 +430,7 @@ public class MainSettings extends ChromeBaseSettingsFragment +@@ -461,8 +461,7 @@ public class MainSettings extends ChromeBaseSettingsFragment private void updateAutofillPreferences() { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O @@ -217,7 +217,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. -@@ -1079,6 +1086,11 @@ class TabImpl implements Tab { +@@ -1061,6 +1068,11 @@ class TabImpl implements Tab { for (TabObserver observer : mObservers) observer.onDestroyed(this); mObservers.clear(); @@ -229,7 +229,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav mUserDataHost.destroy(); mTabViewManager.destroy(); hideNativePage(false, null); -@@ -1372,6 +1384,7 @@ class TabImpl implements Tab { +@@ -1354,6 +1366,7 @@ class TabImpl implements Tab { * @return iff the AutofillProvider should provide a ViewStructure when prompted. */ boolean providesAutofillStructure() { @@ -237,7 +237,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav if (!ChromeFeatureList.isEnabled( AutofillFeatures.AUTOFILL_VIRTUAL_VIEW_STRUCTURE_ANDROID)) { return false; -@@ -2154,16 +2167,21 @@ class TabImpl implements Tab { +@@ -2136,16 +2149,21 @@ class TabImpl implements Tab { * @return true if the the provider is available for the given WebContents. */ private boolean prepareAutofillProvider(WebContents newWebContents) { @@ -265,7 +265,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav mAutofillProvider = new AutofillProvider( getContext(), -@@ -2172,7 +2190,16 @@ class TabImpl implements Tab { +@@ -2154,7 +2172,16 @@ class TabImpl implements Tab { getContext().getString(R.string.app_name)); TabImplJni.get().initializeAutofillIfNecessary(mNativeTabAndroid); } @@ -286,7 +286,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav 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 -@@ -3662,28 +3662,6 @@ const FeatureEntry::FeatureVariation kLinkPreviewTriggerTypeVariations[] = { +@@ -3651,28 +3651,6 @@ const FeatureEntry::FeatureVariation kLinkPreviewTriggerTypeVariations[] = { std::size(kLinkPreviewTriggerTypeLongPress), nullptr}}; #endif // !BUILDFLAG(IS_ANDROID) @@ -315,7 +315,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc const FeatureEntry::FeatureParam kPrerender2WarmUpCompositorTriggerPointDidCommitLoad[] = { {"trigger_point", "did_commit_load"}}; -@@ -6164,15 +6142,6 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6182,15 +6160,6 @@ const FeatureEntry kFeatureEntries[] = { #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_ANDROID) @@ -347,19 +347,19 @@ diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_ diff --git a/chrome/browser/autofill/android/BUILD.gn b/chrome/browser/autofill/android/BUILD.gn --- a/chrome/browser/autofill/android/BUILD.gn +++ b/chrome/browser/autofill/android/BUILD.gn -@@ -144,7 +144,7 @@ android_library("bottom_sheet_utils_java") { +@@ -148,7 +148,7 @@ android_library("bottom_sheet_utils_java") { generate_jni("jni_headers") { sources = [ "java/src/org/chromium/chrome/browser/autofill/AddressNormalizerFactory.java", - "java/src/org/chromium/chrome/browser/autofill/AutofillClientProviderUtils.java", + #"java/src/org/chromium/chrome/browser/autofill/AutofillClientProviderUtils.java", "java/src/org/chromium/chrome/browser/autofill/AutofillImageFetcher.java", + "java/src/org/chromium/chrome/browser/autofill/AutofillImageFetcherFactory.java", "java/src/org/chromium/chrome/browser/autofill/AutofillProfileBridge.java", - "java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java", diff --git a/chrome/browser/autofill/android/java/src/org/chromium/chrome/browser/autofill/AutofillClientProviderUtils.java b/chrome/browser/autofill/android/java/src/org/chromium/chrome/browser/autofill/AutofillClientProviderUtils.java --- a/chrome/browser/autofill/android/java/src/org/chromium/chrome/browser/autofill/AutofillClientProviderUtils.java +++ b/chrome/browser/autofill/android/java/src/org/chromium/chrome/browser/autofill/AutofillClientProviderUtils.java -@@ -54,8 +54,8 @@ public class AutofillClientProviderUtils { +@@ -55,8 +55,8 @@ public class AutofillClientProviderUtils { * @return {@link AndroidAutofillAvailabilityStatus.AVAILABLE} if Android Autofill can be used * or a reason why it can't. */ @@ -372,7 +372,7 @@ diff --git a/chrome/browser/autofill/android/java/src/org/chromium/chrome/browse diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -782,12 +782,6 @@ const char kAutofillVcnEnrollRequestTimeoutDescription[] = +@@ -808,12 +808,6 @@ const char kAutofillVcnEnrollRequestTimeoutDescription[] = "VCN enrollment request. Upon timeout, the client will terminate the VCN " "enrollment UI, but the request may still succeed server-side."; @@ -388,7 +388,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -463,9 +463,6 @@ extern const char kAutofillUploadCardRequestTimeoutDescription[]; +@@ -481,9 +481,6 @@ extern const char kAutofillUploadCardRequestTimeoutDescription[]; extern const char kAutofillVcnEnrollRequestTimeoutName[]; extern const char kAutofillVcnEnrollRequestTimeoutDescription[]; @@ -401,7 +401,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio 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 -@@ -700,6 +700,12 @@ For more settings that use data to improve your Chrome experience, go to Save passwords @@ -540,7 +540,7 @@ diff --git a/chrome/browser/ui/autofill/autofill_client_provider.h b/chrome/brow diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc -@@ -363,9 +363,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { +@@ -372,9 +372,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { web_contents); ChainedBackNavigationTracker::CreateForWebContents(web_contents); chrome_browser_net::NetErrorTabHelper::CreateForWebContents(web_contents); @@ -548,9 +548,9 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc - ChromePasswordManagerClient::CreateForWebContents(web_contents); - } + ChromePasswordManagerClient::CreateForWebContents(web_contents); + #if BUILDFLAG(SAFE_BROWSING_AVAILABLE) ChromePasswordReuseDetectionManagerClient::CreateForWebContents(web_contents); - CreateSubresourceFilterWebContentsHelper(web_contents); - #if BUILDFLAG(ENABLE_RLZ) + #endif diff --git a/components/android_autofill/browser/BUILD.gn b/components/android_autofill/browser/BUILD.gn --- a/components/android_autofill/browser/BUILD.gn +++ b/components/android_autofill/browser/BUILD.gn @@ -589,7 +589,7 @@ diff --git a/components/android_autofill/browser/android_autofill_manager.h b/co diff --git a/components/android_autofill/browser/java/src/org/chromium/components/autofill/AutofillManagerWrapper.java b/components/android_autofill/browser/java/src/org/chromium/components/autofill/AutofillManagerWrapper.java --- a/components/android_autofill/browser/java/src/org/chromium/components/autofill/AutofillManagerWrapper.java +++ b/components/android_autofill/browser/java/src/org/chromium/components/autofill/AutofillManagerWrapper.java -@@ -51,6 +51,7 @@ public class AutofillManagerWrapper { +@@ -57,6 +57,7 @@ public class AutofillManagerWrapper { AutofillManagerWrapper manager = mManager.get(); if (manager == null) return; manager.mIsAutofillInputUiShowing = (event == EVENT_INPUT_SHOWN); @@ -597,7 +597,7 @@ diff --git a/components/android_autofill/browser/java/src/org/chromium/component if (event == EVENT_INPUT_SHOWN) manager.notifyInputUiChange(); } } -@@ -91,6 +92,7 @@ public class AutofillManagerWrapper { +@@ -99,6 +100,7 @@ public class AutofillManagerWrapper { // Uses Exception to catch various cases. (refer to crbug.com/1186406) Log.e(TAG, "getAutofillServiceComponentName", e); } @@ -605,7 +605,7 @@ diff --git a/components/android_autofill/browser/java/src/org/chromium/component if (componentName != null) { mPackageName = componentName.getPackageName(); mIsAwGCurrentAutofillService = -@@ -256,7 +258,7 @@ public class AutofillManagerWrapper { +@@ -266,7 +268,7 @@ public class AutofillManagerWrapper { /** Always check isLoggable() before call this method. */ public static void log(String log) { // Log.i() instead of Log.d() is used here because log.d() is stripped out in release build. @@ -614,7 +614,7 @@ diff --git a/components/android_autofill/browser/java/src/org/chromium/component } public static boolean isLoggable() { -@@ -269,6 +271,7 @@ public class AutofillManagerWrapper { +@@ -279,6 +281,7 @@ public class AutofillManagerWrapper { // NOTE: See the comment on TAG above for why this is still AwAutofillManager. // Check the system setting directly. sIsLoggable = android.util.Log.isLoggable(TAG, Log.DEBUG); @@ -625,7 +625,7 @@ diff --git a/components/android_autofill/browser/java/src/org/chromium/component diff --git a/components/android_autofill/browser/java/src/org/chromium/components/autofill/AutofillProvider.java b/components/android_autofill/browser/java/src/org/chromium/components/autofill/AutofillProvider.java --- a/components/android_autofill/browser/java/src/org/chromium/components/autofill/AutofillProvider.java +++ b/components/android_autofill/browser/java/src/org/chromium/components/autofill/AutofillProvider.java -@@ -195,13 +195,19 @@ public class AutofillProvider { +@@ -197,13 +197,19 @@ public class AutofillProvider { /** @return whether query autofill suggestion. */ public boolean shouldQueryAutofillSuggestion() { @@ -645,7 +645,7 @@ diff --git a/components/android_autofill/browser/java/src/org/chromium/component FocusField focusField = mRequest.getFocusField(); mAutofillManager.requestAutofill( mContainerView, -@@ -261,6 +267,7 @@ public class AutofillProvider { +@@ -263,6 +269,7 @@ public class AutofillProvider { float width, float height, boolean hasServerPrediction) { @@ -729,7 +729,7 @@ new file mode 100644 diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/components/autofill/content/browser/content_autofill_driver.cc --- a/components/autofill/content/browser/content_autofill_driver.cc +++ b/components/autofill/content/browser/content_autofill_driver.cc -@@ -252,6 +252,13 @@ void RouteToManager(ContentAutofillDriver& source, +@@ -251,6 +251,13 @@ void RouteToManager(ContentAutofillDriver& source, AutofillManager& manager = target.GetAutofillManager(); (manager.* manager_fun)(WithNewVersion(std::forward(args))...); @@ -743,7 +743,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co }, source, Lift(source, std::forward(args))...); } -@@ -639,6 +646,10 @@ ContentAutofillDriver::GetAutofillAgent() { +@@ -637,6 +644,10 @@ ContentAutofillDriver::GetAutofillAgent() { return autofill_agent_; } @@ -813,7 +813,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver_factory diff --git a/components/autofill/content/renderer/autofill_agent.cc b/components/autofill/content/renderer/autofill_agent.cc --- a/components/autofill/content/renderer/autofill_agent.cc +++ b/components/autofill/content/renderer/autofill_agent.cc -@@ -1423,12 +1423,16 @@ void AutofillAgent::ShowSuggestions( +@@ -1399,12 +1399,16 @@ void AutofillAgent::ShowSuggestions( password_generation_agent_->ShowPasswordGenerationSuggestions( input_element, form_cache)) { is_popup_possibly_visible_ = true; @@ -830,7 +830,7 @@ diff --git a/components/autofill/content/renderer/autofill_agent.cc b/components } // Password field elements should only have suggestions shown by the -@@ -1436,11 +1440,13 @@ void AutofillAgent::ShowSuggestions( +@@ -1412,11 +1416,13 @@ void AutofillAgent::ShowSuggestions( // `FormControlTypeForAutofill()` because we are interested in whether the // field is *currently* a password field, not whether it has ever been a // password field. @@ -847,7 +847,7 @@ diff --git a/components/autofill/content/renderer/autofill_agent.cc b/components diff --git a/components/autofill/content/renderer/password_autofill_agent.cc b/components/autofill/content/renderer/password_autofill_agent.cc --- a/components/autofill/content/renderer/password_autofill_agent.cc +++ b/components/autofill/content/renderer/password_autofill_agent.cc -@@ -912,7 +912,10 @@ void PasswordAutofillAgent::UpdatePasswordStateForTextChange( +@@ -843,7 +843,10 @@ void PasswordAutofillAgent::UpdatePasswordStateForTextChange( void PasswordAutofillAgent::TrackAutofilledElement( const WebFormControlElement& element) { @@ -900,7 +900,7 @@ diff --git a/components/autofill/core/browser/foundations/autofill_manager.h b/c diff --git a/components/autofill/core/browser/foundations/browser_autofill_manager.cc b/components/autofill/core/browser/foundations/browser_autofill_manager.cc --- a/components/autofill/core/browser/foundations/browser_autofill_manager.cc +++ b/components/autofill/core/browser/foundations/browser_autofill_manager.cc -@@ -644,6 +644,8 @@ base::WeakPtr BrowserAutofillManager::GetWeakPtr() { +@@ -639,6 +639,8 @@ base::WeakPtr BrowserAutofillManager::GetWeakPtr() { return weak_ptr_factory_.GetWeakPtr(); } @@ -924,7 +924,7 @@ diff --git a/components/autofill/core/browser/foundations/browser_autofill_manag 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 -@@ -759,7 +759,7 @@ BASE_FEATURE(kAutofillThirdPartyModeContentProvider, +@@ -790,7 +790,7 @@ BASE_FEATURE(kAutofillThirdPartyModeContentProvider, BASE_FEATURE(kAutofillVirtualViewStructureAndroid, "AutofillVirtualViewStructureAndroid", base::FEATURE_DISABLED_BY_DEFAULT); @@ -936,7 +936,7 @@ diff --git a/components/autofill/core/common/autofill_features.cc b/components/a diff --git a/components/autofill/core/common/autofill_features.h b/components/autofill/core/common/autofill_features.h --- a/components/autofill/core/common/autofill_features.h +++ b/components/autofill/core/common/autofill_features.h -@@ -269,28 +269,6 @@ COMPONENT_EXPORT(AUTOFILL) +@@ -278,28 +278,6 @@ COMPONENT_EXPORT(AUTOFILL) BASE_DECLARE_FEATURE(kAutofillThirdPartyModeContentProvider); COMPONENT_EXPORT(AUTOFILL) BASE_DECLARE_FEATURE(kAutofillVirtualViewStructureAndroid); @@ -989,7 +989,7 @@ diff --git a/components/autofill/core/common/autofill_prefs.cc b/components/auto diff --git a/components/autofill/core/common/autofill_prefs.h b/components/autofill/core/common/autofill_prefs.h --- a/components/autofill/core/common/autofill_prefs.h +++ b/components/autofill/core/common/autofill_prefs.h -@@ -121,6 +121,11 @@ inline constexpr char kAutofillUploadEventsLastResetTimestamp[] = +@@ -123,6 +123,11 @@ inline constexpr char kAutofillUploadEventsLastResetTimestamp[] = // retention policy was run. inline constexpr char kAutocompleteLastVersionRetentionPolicy[] = "autocomplete.retention_policy_last_version"; diff --git a/build/patches/Enable-network-isolation-features.patch b/build/patches/Enable-network-isolation-features.patch index ab372046..d6eccc48 100644 --- a/build/patches/Enable-network-isolation-features.patch +++ b/build/patches/Enable-network-isolation-features.patch @@ -9,10 +9,12 @@ PartitionNelAndReportingByNetworkIsolationKey, kSplitCacheByNavigationInitiator License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - .../browser/net/profile_network_context_service.cc | 2 +- - .../Enable-network-isolation-features.inc | 12 ++++++++++++ - .../Enable-network-isolation-features.inc | 1 + - 3 files changed, 14 insertions(+), 1 deletion(-) + .../browser/net/profile_network_context_service.cc | 2 +- + .../Enable-network-isolation-features.inc | 9 +++++++++ + .../Enable-network-isolation-features.inc | 1 + + net/http/http_cache.cc | 14 +++++++++----- + net/http/http_cache.h | 2 +- + 5 files changed, 21 insertions(+), 7 deletions(-) create mode 100644 cromite_flags/net/base/features_cc/Enable-network-isolation-features.inc create mode 100644 cromite_flags/services/network/public/cpp/features_cc/Enable-network-isolation-features.inc @@ -26,13 +28,13 @@ diff --git a/chrome/browser/net/profile_network_context_service.cc b/chrome/brow - (field_trial ? field_trial->group_name() : "None"); + (field_trial ? field_trial->group_name() : "EnableFeatureForTests"); - // For the HTTP Cache keying experiments, if a flag indicates that the user is - // in an experiment group, modify `current_field_trial_status` to ensure that + if (disk_cache::InBackendExperiment()) { + if (disk_cache::InSimpleBackendExperimentGroup()) { diff --git a/cromite_flags/net/base/features_cc/Enable-network-isolation-features.inc b/cromite_flags/net/base/features_cc/Enable-network-isolation-features.inc new file mode 100644 --- /dev/null +++ b/cromite_flags/net/base/features_cc/Enable-network-isolation-features.inc -@@ -0,0 +1,12 @@ +@@ -0,0 +1,9 @@ +SET_CROMITE_FEATURE_ENABLED(kSplitCodeCacheByNetworkIsolationKey); +SET_CROMITE_FEATURE_ENABLED(kPartitionConnectionsByNetworkIsolationKey); + @@ -40,15 +42,74 @@ new file mode 100644 + +// enable http cache partition +SET_CROMITE_FEATURE_ENABLED(kSplitCacheByNetworkIsolationKey); -+ -+// most restricted option (ByNavigationInitiator) used -+// it generates a cache key isolating all requests per initiator. -+// requests with initiators with an opaque origin are not cached -+SET_CROMITE_FEATURE_ENABLED(kSplitCacheByNavigationInitiator); ++// but disable cache for cross-site main frame navigation ++SET_CROMITE_FEATURE_ENABLED(kSplitCacheByCrossSiteMainFrameNavigationBoolean); diff --git a/cromite_flags/services/network/public/cpp/features_cc/Enable-network-isolation-features.inc b/cromite_flags/services/network/public/cpp/features_cc/Enable-network-isolation-features.inc new file mode 100644 --- /dev/null +++ b/cromite_flags/services/network/public/cpp/features_cc/Enable-network-isolation-features.inc @@ -0,0 +1 @@ +SET_CROMITE_FEATURE_ENABLED(kSplitAuthCacheByNetworkIsolationKey); +diff --git a/net/http/http_cache.cc b/net/http/http_cache.cc +--- a/net/http/http_cache.cc ++++ b/net/http/http_cache.cc +@@ -633,7 +633,7 @@ bool HttpCache::CanGenerateCacheKeyForRequest(const HttpRequestInfo* request) { + + // static + // Generate a key that can be used inside the cache. +-std::string HttpCache::GenerateCacheKey( ++std::string HttpCache::GenerateCacheKey2( + const GURL& url, + int load_flags, + const NetworkIsolationKey& network_isolation_key, +@@ -671,8 +671,8 @@ std::string HttpCache::GenerateCacheKey( + const bool is_initiator_cross_site = + initiator_site != net::SchemefulSite(url); + if (is_initiator_cross_site) { +- is_cross_site_main_frame_navigation_prefix = +- kCrossSiteMainFrameNavigationPrefix; ++ DLOG(INFO) << "---initiator_site cs=" << base::StrCat({"ni_", initiator_site.Serialize(), " "}); ++ return ""; + } + } + isolation_key = base::StrCat( +@@ -687,9 +687,11 @@ std::string HttpCache::GenerateCacheKey( + // Strip out the reference, username, and password sections of the URL and + // concatenate with the credential_key, the post_key, and the network + // isolation key if we are splitting the cache. +- return base::StringPrintf("%c/%" PRId64 "/%s%s", credential_key, ++ auto key = base::StringPrintf("%c/%" PRId64 "/%s%s", credential_key, + upload_data_identifier, isolation_key.c_str(), + HttpUtil::SpecForRequest(url).c_str()); ++ DLOG(INFO) << "---key=" << key; ++ return key; + } + + // static +@@ -712,10 +714,12 @@ HttpCache::GenerateCacheKeyForRequestWithAlternateURL( + const int64_t upload_data_identifier = + request->upload_data_stream ? request->upload_data_stream->identifier() + : int64_t(0); +- return GenerateCacheKey( ++ auto key = GenerateCacheKey2( + url, request->load_flags, request->network_isolation_key, + upload_data_identifier, request->is_subframe_document_resource, + request->is_main_frame_navigation, request->initiator); ++ if (key.empty()) return std::nullopt; ++ return key; + } + + // static +diff --git a/net/http/http_cache.h b/net/http/http_cache.h +--- a/net/http/http_cache.h ++++ b/net/http/http_cache.h +@@ -509,7 +509,7 @@ class NET_EXPORT HttpCache : public HttpTransactionFactory { + // Generates a cache key given the various pieces used to construct the key. + // Must not be called if a corresponding `CanGenerateCacheKeyForRequest` + // returns false. +- static std::string GenerateCacheKey( ++ static std::string GenerateCacheKey2( + const GURL& url, + int load_flags, + const NetworkIsolationKey& network_isolation_key, -- diff --git a/build/patches/Enable-platform-aac-audio-and-h264-video.patch b/build/patches/Enable-platform-aac-audio-and-h264-video.patch index 1efe6e67..3209b435 100644 --- a/build/patches/Enable-platform-aac-audio-and-h264-video.patch +++ b/build/patches/Enable-platform-aac-audio-and-h264-video.patch @@ -215,7 +215,7 @@ diff --git a/media/gpu/windows/supported_profile_helpers.cc b/media/gpu/windows/ diff --git a/media/media_options.gni b/media/media_options.gni --- a/media/media_options.gni +++ b/media/media_options.gni -@@ -61,6 +61,14 @@ declare_args() { +@@ -60,6 +60,14 @@ declare_args() { media_use_libvpx = false } diff --git a/build/patches/Enable-search-engine-settings-desktop-ui.patch b/build/patches/Enable-search-engine-settings-desktop-ui.patch index 0d64a896..91158a1b 100644 --- a/build/patches/Enable-search-engine-settings-desktop-ui.patch +++ b/build/patches/Enable-search-engine-settings-desktop-ui.patch @@ -12,10 +12,11 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html chrome/app/settings_strings.grdp | 3 + chrome/app/settings_strings_android.grdp | 260 ++++++++++++++++++ chrome/browser/BUILD.gn | 3 + - .../chrome_browser_interface_binders.cc | 12 + + .../chrome_browser_interface_binders.cc | 3 + + .../chrome_browser_interface_binders_webui.cc | 21 ++ chrome/browser/resources/BUILD.gn | 6 + chrome/browser/resources/settings/BUILD.gn | 2 +- - .../resources/settings/page_visibility.ts | 43 ++- + .../resources/settings/page_visibility.ts | 40 ++- .../search_engine_edit_dialog.html | 6 + .../search_engine_edit_dialog.ts | 6 +- .../search_engines_browser_proxy.ts | 8 +- @@ -26,7 +27,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html .../settings/settings_ui/settings_ui.html | 6 + .../resources/settings_shared/BUILD.gn | 2 +- chrome/browser/search/background/BUILD.gn | 4 +- - .../browser/search_engines/android/BUILD.gn | 2 + + .../browser/search_engines/android/BUILD.gn | 1 + .../java/res/layout/search_engine_layout.xml | 25 ++ .../settings/SearchEngineSettings.java | 21 ++ chrome/browser/ui/BUILD.gn | 18 ++ @@ -37,7 +38,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html .../template_url_table_model.cc | 9 +- .../search_engines/template_url_table_model.h | 6 +- .../browser/ui/webui/chrome_web_ui_configs.cc | 8 + - chrome/browser/ui/webui/favicon_source.cc | 18 ++ + chrome/browser/ui/webui/favicon_source.cc | 14 + chrome/browser/ui/webui/favicon_source.h | 2 + .../webui/settings/search_engines_handler.cc | 28 +- .../webui/settings/search_engines_handler.h | 3 +- @@ -69,14 +70,14 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html .../cr_components/managed_dialog/BUILD.gn | 2 +- .../cr_components/managed_footnote/BUILD.gn | 2 +- .../cr_components/theme_color_picker/BUILD.gn | 2 +- - ui/webui/resources/cr_elements/BUILD.gn | 4 +- + ui/webui/resources/cr_elements/BUILD.gn | 6 +- .../cr_elements/cr_dialog/cr_dialog.css | 2 +- .../resources/cr_elements/cr_shared_vars.css | 4 + ui/webui/resources/css/BUILD.gn | 2 +- ui/webui/resources/images/BUILD.gn | 2 +- ui/webui/resources/js/BUILD.gn | 2 +- ui/webui/resources/js/load_time_data.ts | 17 +- - 69 files changed, 1148 insertions(+), 68 deletions(-) + 70 files changed, 1153 insertions(+), 69 deletions(-) create mode 100644 chrome/app/settings_strings_android.grdp create mode 100644 chrome/browser/search_engines/android/java/res/layout/search_engine_layout.xml create mode 100644 chrome/browser/ui/webui/settings/settings_localized_strings_provider_android.cc @@ -130,16 +131,16 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources @@ -501,7 +506,7 @@ are declared in tools/grit/grit_args.gni. Disable - -- -+ + +- ++ Search cleared diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp --- a/chrome/app/settings_strings.grdp +++ b/chrome/app/settings_strings.grdp -@@ -2373,6 +2373,9 @@ +@@ -2370,6 +2370,9 @@ URL with %s in place of query @@ -417,7 +418,7 @@ new file mode 100644 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -3496,6 +3496,9 @@ static_library("browser") { +@@ -3527,6 +3527,9 @@ static_library("browser") { "//components/user_scripts/android", ] } @@ -430,7 +431,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn diff --git a/chrome/browser/chrome_browser_interface_binders.cc b/chrome/browser/chrome_browser_interface_binders.cc --- a/chrome/browser/chrome_browser_interface_binders.cc +++ b/chrome/browser/chrome_browser_interface_binders.cc -@@ -145,6 +145,9 @@ +@@ -84,6 +84,9 @@ #endif #if BUILDFLAG(IS_ANDROID) @@ -440,7 +441,23 @@ diff --git a/chrome/browser/chrome_browser_interface_binders.cc b/chrome/browser #include "chrome/browser/android/dom_distiller/distiller_ui_handle_android.h" #include "chrome/browser/facilitated_payments/payment_link_handler_binder.h" #include "chrome/browser/offline_pages/android/offline_page_auto_fetcher.h" -@@ -947,6 +950,15 @@ void PopulateChromeWebUIFrameBinders( +diff --git a/chrome/browser/chrome_browser_interface_binders_webui.cc b/chrome/browser/chrome_browser_interface_binders_webui.cc +--- a/chrome/browser/chrome_browser_interface_binders_webui.cc ++++ b/chrome/browser/chrome_browser_interface_binders_webui.cc +@@ -61,6 +61,12 @@ + #include "chrome/browser/ui/webui/whats_new/whats_new_ui.h" + #endif + ++#if BUILDFLAG(IS_ANDROID) ++#include "ui/webui/resources/cr_components/customize_color_scheme_mode/customize_color_scheme_mode.mojom.h" ++#include "ui/webui/resources/cr_components/help_bubble/help_bubble.mojom.h" ++#include "chrome/browser/ui/webui/settings/settings_ui.h" ++#endif ++ + #if BUILDFLAG(IS_ANDROID) + #include "chrome/browser/ui/webui/feed_internals/feed_internals.mojom.h" + #include "chrome/browser/ui/webui/feed_internals/feed_internals_ui.h" +@@ -460,6 +466,15 @@ void PopulateChromeWebUIFrameBinders( OnDeviceTranslationInternalsUI>(map); #endif @@ -456,6 +473,26 @@ diff --git a/chrome/browser/chrome_browser_interface_binders.cc b/chrome/browser #if !BUILDFLAG(IS_ANDROID) RegisterWebUIControllerInterfaceBinder< search_engine_choice::mojom::PageHandlerFactory, SearchEngineChoiceUI>( +@@ -562,6 +577,9 @@ void PopulateChromeWebUIFrameBinders( + RegisterWebUIControllerInterfaceBinder(map); + ++#if BUILDFLAG(IS_ANDROID) ++#error "Check this patch" ++#endif + RegisterWebUIControllerInterfaceBinder< + customize_color_scheme_mode::mojom:: + CustomizeColorSchemeModeHandlerFactory, +@@ -582,6 +600,9 @@ void PopulateChromeWebUIFrameBinders( + CertificateManagerUI>(map); + #endif // BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI) + ++#if BUILDFLAG(IS_ANDROID) ++#error "Check this patch" ++#endif + RegisterWebUIControllerInterfaceBinder< + help_bubble::mojom::HelpBubbleHandlerFactory, UserEducationInternalsUI, + settings::SettingsUI, ReadingListUI, NewTabPageUI, CustomizeChromeUI, diff --git a/chrome/browser/resources/BUILD.gn b/chrome/browser/resources/BUILD.gn --- a/chrome/browser/resources/BUILD.gn +++ b/chrome/browser/resources/BUILD.gn @@ -487,7 +524,7 @@ diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resourc diff --git a/chrome/browser/resources/settings/page_visibility.ts b/chrome/browser/resources/settings/page_visibility.ts --- a/chrome/browser/resources/settings/page_visibility.ts +++ b/chrome/browser/resources/settings/page_visibility.ts -@@ -43,8 +43,49 @@ export interface PrivacyPageVisibility { +@@ -42,8 +42,46 @@ export interface PrivacyPageVisibility { searchPrediction: boolean; } @@ -497,9 +534,6 @@ diff --git a/chrome/browser/resources/settings/page_visibility.ts b/chrome/brows + chrome.autofillPrivate = { + isUserEligibleForAutofillImprovements(): Promise { + return Promise.resolve(false); -+ }, -+ hasUserAnnotationsEntries(): Promise { -+ return Promise.resolve(false); + } + }; + @@ -783,7 +817,7 @@ diff --git a/chrome/browser/search/background/BUILD.gn b/chrome/browser/search/b diff --git a/chrome/browser/search_engines/android/BUILD.gn b/chrome/browser/search_engines/android/BUILD.gn --- a/chrome/browser/search_engines/android/BUILD.gn +++ b/chrome/browser/search_engines/android/BUILD.gn -@@ -79,12 +79,14 @@ android_resources("java_resources") { +@@ -80,6 +80,7 @@ android_resources("java_resources") { "java/res/layout/blocking_choice_dialog.xml", "java/res/layout/default_search_engine_dialog_view.xml", "java/res/layout/search_engine_choice_header.xml", @@ -791,13 +825,6 @@ diff --git a/chrome/browser/search_engines/android/BUILD.gn b/chrome/browser/sea "java/res/layout/search_engine_recent_title.xml", "java/res/layout/search_engine_with_logo.xml", "java/res/values/dimens.xml", - "java/res/values/ids.xml", - ] - deps = [ -+ "//chrome/browser/search/background:ntp_background_proto", - "//chrome/browser/ui/android/strings:ui_strings_grd", - "//components/browser_ui/styles/android:java_resources", - "//components/browser_ui/widget/android:java_resources", diff --git a/chrome/browser/search_engines/android/java/res/layout/search_engine_layout.xml b/chrome/browser/search_engines/android/java/res/layout/search_engine_layout.xml new file mode 100644 --- /dev/null @@ -876,7 +903,7 @@ diff --git a/chrome/browser/search_engines/android/java/src/org/chromium/chrome/ 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 -@@ -690,6 +690,12 @@ static_library("ui") { +@@ -693,6 +693,12 @@ static_library("ui") { "//v8:v8_version", ] @@ -889,7 +916,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn if (is_chrome_branded) { deps += [ "//components/plus_addresses/resources:vector_icons" ] } -@@ -975,6 +981,18 @@ static_library("ui") { +@@ -978,6 +984,18 @@ static_library("ui") { # TODO(b/335257259): Resolve circular deps. # Any circular includes must depend on the target "//chrome/browser:browser_public_dependencies". allow_circular_includes_from += [ "//chrome/browser/facilitated_payments" ] @@ -1092,7 +1119,7 @@ diff --git a/chrome/browser/ui/search_engines/template_url_table_model.h b/chrom 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 -@@ -61,6 +61,11 @@ +@@ -60,6 +60,11 @@ #include "components/user_scripts/browser/ui/user_scripts_ui.h" #endif @@ -1104,7 +1131,7 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_configs.cc b/chrome/browser/u #if BUILDFLAG(ENABLE_NACL) #include "chrome/browser/ui/webui/nacl_ui.h" #endif -@@ -398,4 +403,7 @@ void RegisterChromeWebUIConfigs() { +@@ -405,4 +410,7 @@ void RegisterChromeWebUIConfigs() { #if BUILDFLAG(IS_ANDROID) map.AddWebUIConfig(std::make_unique()); #endif @@ -1115,17 +1142,7 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_configs.cc b/chrome/browser/u diff --git a/chrome/browser/ui/webui/favicon_source.cc b/chrome/browser/ui/webui/favicon_source.cc --- a/chrome/browser/ui/webui/favicon_source.cc +++ b/chrome/browser/ui/webui/favicon_source.cc -@@ -15,7 +15,9 @@ - #include "chrome/browser/favicon/history_ui_favicon_request_handler_factory.h" - #include "chrome/browser/history/top_sites_factory.h" - #include "chrome/browser/profiles/profile.h" -+#if !BUILDFLAG(IS_ANDROID) - #include "chrome/browser/search/instant_service.h" -+#endif - #include "chrome/browser/ui/webui/webui_util_desktop.h" - #include "chrome/common/url_constants.h" - #include "chrome/common/webui_url_constants.h" -@@ -24,9 +26,11 @@ +@@ -22,9 +22,11 @@ #include "components/history/core/browser/top_sites.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/web_contents.h" @@ -1137,30 +1154,23 @@ diff --git a/chrome/browser/ui/webui/favicon_source.cc b/chrome/browser/ui/webui #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/resource/resource_scale_factor.h" -@@ -213,18 +217,22 @@ bool FaviconSource::ShouldServiceRequest( - const GURL& url, - content::BrowserContext* browser_context, - int render_process_id) { -+#if !BUILDFLAG(IS_ANDROID) - if (url.SchemeIs(chrome::kChromeSearchScheme)) { - return InstantService::ShouldServiceRequest(url, browser_context, - render_process_id); - } -+#endif - return URLDataSource::ShouldServiceRequest(url, browser_context, +@@ -226,6 +228,7 @@ bool FaviconSource::ShouldServiceRequest( render_process_id); } +#if !BUILDFLAG(IS_ANDROID) ui::NativeTheme* FaviconSource::GetNativeTheme( const content::WebContents::Getter& wc_getter) { + #if BUILDFLAG(IS_ANDROID) +@@ -234,6 +237,7 @@ ui::NativeTheme* FaviconSource::GetNativeTheme( return webui::GetNativeThemeDeprecated(wc_getter.Run()); + #endif } +#endif void FaviconSource::OnFaviconDataAvailable( content::URLDataSource::GotDataCallback callback, -@@ -248,7 +256,11 @@ void FaviconSource::SendDefaultResponse( +@@ -257,7 +261,11 @@ void FaviconSource::SendDefaultResponse( parsed.device_scale_factor, parsed.force_light_mode ? false @@ -1172,7 +1182,7 @@ diff --git a/chrome/browser/ui/webui/favicon_source.cc b/chrome/browser/ui/webui return; } int icon_size = std::ceil(parsed.size_in_dip * parsed.device_scale_factor); -@@ -268,7 +280,11 @@ void FaviconSource::SendDefaultResponse( +@@ -277,7 +285,11 @@ void FaviconSource::SendDefaultResponse( SendDefaultResponse(std::move(callback), 16, 1.0f, force_light_mode ? false @@ -1184,7 +1194,7 @@ diff --git a/chrome/browser/ui/webui/favicon_source.cc b/chrome/browser/ui/webui } void FaviconSource::SendDefaultResponse( -@@ -278,6 +294,7 @@ void FaviconSource::SendDefaultResponse( +@@ -287,6 +299,7 @@ void FaviconSource::SendDefaultResponse( bool dark_mode) { int resource_id; switch (size_in_dip) { @@ -1192,7 +1202,7 @@ diff --git a/chrome/browser/ui/webui/favicon_source.cc b/chrome/browser/ui/webui case 64: resource_id = dark_mode ? IDR_DEFAULT_FAVICON_DARK_64 : IDR_DEFAULT_FAVICON_64; -@@ -286,6 +303,7 @@ void FaviconSource::SendDefaultResponse( +@@ -295,6 +308,7 @@ void FaviconSource::SendDefaultResponse( resource_id = dark_mode ? IDR_DEFAULT_FAVICON_DARK_32 : IDR_DEFAULT_FAVICON_32; break; @@ -1218,7 +1228,7 @@ diff --git a/chrome/browser/ui/webui/favicon_source.h b/chrome/browser/ui/webui/ diff --git a/chrome/browser/ui/webui/settings/search_engines_handler.cc b/chrome/browser/ui/webui/settings/search_engines_handler.cc --- a/chrome/browser/ui/webui/settings/search_engines_handler.cc +++ b/chrome/browser/ui/webui/settings/search_engines_handler.cc -@@ -33,10 +33,12 @@ +@@ -35,10 +35,12 @@ #include "components/search_engines/template_url.h" #include "components/search_engines/template_url_service.h" #include "content/public/browser/web_ui.h" @@ -1231,7 +1241,7 @@ diff --git a/chrome/browser/ui/webui/settings/search_engines_handler.cc b/chrome #if BUILDFLAG(IS_CHROMEOS) #include "ash/public/cpp/new_window_delegate.h" -@@ -48,6 +50,7 @@ namespace { +@@ -50,6 +52,7 @@ namespace { const char kSearchEngineField[] = "searchEngine"; const char kKeywordField[] = "keyword"; const char kQueryUrlField[] = "queryUrl"; @@ -1239,7 +1249,7 @@ diff --git a/chrome/browser/ui/webui/settings/search_engines_handler.cc b/chrome // Dummy number used for indicating that a new search engine is added. const int kNewSearchEngineIndex = -1; -@@ -223,9 +226,10 @@ base::Value::Dict SearchEnginesHandler::CreateDictionaryForEngine( +@@ -225,9 +228,10 @@ base::Value::Dict SearchEnginesHandler::CreateDictionaryForEngine( table_model->GetText(index, IDS_SEARCH_ENGINES_EDITOR_DESCRIPTION_COLUMN)); dict.Set("keyword", table_model->GetKeywordToDisplay(index)); @@ -1251,7 +1261,7 @@ diff --git a/chrome/browser/ui/webui/settings/search_engines_handler.cc b/chrome dict.Set("urlLocked", ((template_url->prepopulate_id() > 0) || (template_url->starter_pack_id() > 0))); GURL icon_url = template_url->favicon_url(); -@@ -233,6 +237,8 @@ base::Value::Dict SearchEnginesHandler::CreateDictionaryForEngine( +@@ -235,6 +239,8 @@ base::Value::Dict SearchEnginesHandler::CreateDictionaryForEngine( dict.Set("iconURL", icon_url.spec()); } @@ -1260,7 +1270,7 @@ diff --git a/chrome/browser/ui/webui/settings/search_engines_handler.cc b/chrome // The icons that are used for search engines in the EEA region are bundled // with Chrome. We use the favicon service for countries outside the EEA // region to guarantee having icons for all search engines. -@@ -251,6 +257,7 @@ base::Value::Dict SearchEnginesHandler::CreateDictionaryForEngine( +@@ -253,6 +259,7 @@ base::Value::Dict SearchEnginesHandler::CreateDictionaryForEngine( dict.Set("iconPath", base::StrCat({icon_path, "@2x"})); } } @@ -1268,7 +1278,7 @@ diff --git a/chrome/browser/ui/webui/settings/search_engines_handler.cc b/chrome dict.Set("modelIndex", base::checked_cast(index)); -@@ -267,6 +274,7 @@ base::Value::Dict SearchEnginesHandler::CreateDictionaryForEngine( +@@ -269,6 +276,7 @@ base::Value::Dict SearchEnginesHandler::CreateDictionaryForEngine( dict.Set("isOmniboxExtension", type == TemplateURL::OMNIBOX_API_EXTENSION); dict.Set("isPrepopulated", template_url->prepopulate_id() > 0); dict.Set("isStarterPack", template_url->starter_pack_id() > 0); @@ -1276,7 +1286,7 @@ diff --git a/chrome/browser/ui/webui/settings/search_engines_handler.cc b/chrome if (type == TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION || type == TemplateURL::OMNIBOX_API_EXTENSION) { const extensions::Extension* extension = -@@ -283,6 +291,7 @@ base::Value::Dict SearchEnginesHandler::CreateDictionaryForEngine( +@@ -285,6 +293,7 @@ base::Value::Dict SearchEnginesHandler::CreateDictionaryForEngine( dict.Set("extension", std::move(ext_info)); } } @@ -1284,7 +1294,7 @@ diff --git a/chrome/browser/ui/webui/settings/search_engines_handler.cc b/chrome return dict; } -@@ -401,12 +410,13 @@ void SearchEnginesHandler::HandleSearchEngineEditStarted( +@@ -403,12 +412,13 @@ void SearchEnginesHandler::HandleSearchEngineEditStarted( void SearchEnginesHandler::OnEditedKeyword(TemplateURL* template_url, const std::u16string& title, const std::u16string& keyword, @@ -1301,7 +1311,7 @@ diff --git a/chrome/browser/ui/webui/settings/search_engines_handler.cc b/chrome } edit_controller_.reset(); -@@ -436,6 +446,8 @@ bool SearchEnginesHandler::CheckFieldValidity(const std::string& field_name, +@@ -438,6 +448,8 @@ bool SearchEnginesHandler::CheckFieldValidity(const std::string& field_name, is_valid = edit_controller_->IsKeywordValid(base::UTF8ToUTF16(field_value)); } else if (field_name.compare(kQueryUrlField) == 0) { is_valid = edit_controller_->IsURLValid(field_value); @@ -1310,7 +1320,7 @@ diff --git a/chrome/browser/ui/webui/settings/search_engines_handler.cc b/chrome } else { NOTREACHED(); } -@@ -458,18 +470,20 @@ void SearchEnginesHandler::HandleSearchEngineEditCompleted( +@@ -460,18 +472,20 @@ void SearchEnginesHandler::HandleSearchEngineEditCompleted( return; } @@ -1350,7 +1360,7 @@ diff --git a/chrome/browser/ui/webui/settings/search_engines_handler.h b/chrome/ 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 -@@ -2455,6 +2455,8 @@ void AddSearchEnginesStrings(content::WebUIDataSource* html_source) { +@@ -2461,6 +2461,8 @@ void AddSearchEnginesStrings(content::WebUIDataSource* html_source) { {"searchEnginesQueryURL", IDS_SETTINGS_SEARCH_ENGINES_QUERY_URL}, {"searchEnginesQueryURLExplanation", IDS_SETTINGS_SEARCH_ENGINES_QUERY_URL_EXPLANATION}, @@ -1359,7 +1369,7 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provide {"searchEnginesMakeDefault", IDS_SETTINGS_SEARCH_ENGINES_MAKE_DEFAULT}, {"searchEnginesActivate", IDS_SETTINGS_SEARCH_ENGINES_ACTIVATE}, {"searchEnginesDeactivate", IDS_SETTINGS_SEARCH_ENGINES_DEACTIVATE}, -@@ -3799,6 +3801,12 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, +@@ -3809,6 +3811,12 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, AddSystemStrings(html_source); #endif @@ -1919,7 +1929,7 @@ diff --git a/components/search_engines/search_engines_switches.cc b/components/s diff --git a/components/search_engines/template_url.cc b/components/search_engines/template_url.cc --- a/components/search_engines/template_url.cc +++ b/components/search_engines/template_url.cc -@@ -2043,6 +2043,10 @@ void TemplateURL::SetURL(const std::string& url) { +@@ -2047,6 +2047,10 @@ void TemplateURL::SetURL(const std::string& url) { url_ref().InvalidateCachedValues(); } @@ -1933,8 +1943,8 @@ diff --git a/components/search_engines/template_url.cc b/components/search_engin diff --git a/components/search_engines/template_url.h b/components/search_engines/template_url.h --- a/components/search_engines/template_url.h +++ b/components/search_engines/template_url.h -@@ -967,6 +967,7 @@ class TemplateURL { - bool CreatedByNonDefaultSearchProviderPolicy() const; +@@ -970,6 +970,7 @@ class TemplateURL { + bool CreatedByEnterpriseSearchAggregatorPolicy() const; void SetURL(const std::string& url); + void set_suggestions_url(const std::string& url); @@ -1944,7 +1954,7 @@ diff --git a/components/search_engines/template_url.h b/components/search_engine diff --git a/components/search_engines/template_url_service.cc b/components/search_engines/template_url_service.cc --- a/components/search_engines/template_url_service.cc +++ b/components/search_engines/template_url_service.cc -@@ -695,13 +695,15 @@ TemplateURL* TemplateURLService::AddWithOverrides( +@@ -747,13 +747,15 @@ TemplateURL* TemplateURLService::AddWithOverrides( std::unique_ptr template_url, const std::u16string& short_name, const std::u16string& keyword, @@ -1961,7 +1971,7 @@ diff --git a/components/search_engines/template_url_service.cc b/components/sear return Add(std::move(template_url)); } -@@ -917,7 +919,8 @@ void TemplateURLService::IncrementUsageCount(TemplateURL* url) { +@@ -968,7 +970,8 @@ void TemplateURLService::IncrementUsageCount(TemplateURL* url) { void TemplateURLService::ResetTemplateURL(TemplateURL* url, const std::u16string& title, const std::u16string& keyword, @@ -1971,7 +1981,7 @@ diff --git a/components/search_engines/template_url_service.cc b/components/sear DCHECK(!IsCreatedByExtension(url)); DCHECK(!keyword.empty()); DCHECK(!search_url.empty()); -@@ -929,6 +932,7 @@ void TemplateURLService::ResetTemplateURL(TemplateURL* url, +@@ -980,6 +983,7 @@ void TemplateURLService::ResetTemplateURL(TemplateURL* url, // The urls have changed, reset the favicon url. data.favicon_url = GURL(); } @@ -1982,7 +1992,7 @@ diff --git a/components/search_engines/template_url_service.cc b/components/sear diff --git a/components/search_engines/template_url_service.h b/components/search_engines/template_url_service.h --- a/components/search_engines/template_url_service.h +++ b/components/search_engines/template_url_service.h -@@ -249,7 +249,8 @@ class TemplateURLService final : public WebDataServiceConsumer, +@@ -255,7 +255,8 @@ class TemplateURLService final : public WebDataServiceConsumer, TemplateURL* AddWithOverrides(std::unique_ptr template_url, const std::u16string& short_name, const std::u16string& keyword, @@ -1992,7 +2002,7 @@ diff --git a/components/search_engines/template_url_service.h b/components/searc // Removes the keyword from the model. This deletes the supplied TemplateURL. // This fails if the supplied template_url is the default search provider. -@@ -326,7 +327,8 @@ class TemplateURLService final : public WebDataServiceConsumer, +@@ -341,7 +342,8 @@ class TemplateURLService final : public WebDataServiceConsumer, void ResetTemplateURL(TemplateURL* url, const std::u16string& title, const std::u16string& keyword, @@ -2181,9 +2191,9 @@ diff --git a/ui/webui/resources/BUILD.gn b/ui/webui/resources/BUILD.gn + "$root_gen_dir/third_party/polymer/v3_0/polymer_3_0_resources.grdp", + ] + } - if (!is_android && !is_ios) { + if ((!is_android && !is_ios) || is_desktop_android) { public_deps += [ - "cr_components/app_management:build_grdp", + "cr_components/cr_shortcut_input:build_grdp", diff --git a/ui/webui/resources/cr_components/cr_shortcut_input/BUILD.gn b/ui/webui/resources/cr_components/cr_shortcut_input/BUILD.gn --- a/ui/webui/resources/cr_components/cr_shortcut_input/BUILD.gn +++ b/ui/webui/resources/cr_components/cr_shortcut_input/BUILD.gn @@ -2191,8 +2201,8 @@ diff --git a/ui/webui/resources/cr_components/cr_shortcut_input/BUILD.gn b/ui/we import("//ui/webui/resources/tools/build_webui.gni") --assert(!is_android && !is_ios) -+#assert(!is_android && !is_ios) +-assert((!is_android && !is_ios) || is_desktop_android) ++#assert((!is_android && !is_ios) || is_desktop_android) build_webui("build") { grd_prefix = "cr_components_cr_shortcut_input" @@ -2251,8 +2261,8 @@ diff --git a/ui/webui/resources/cr_components/managed_footnote/BUILD.gn b/ui/web import("//ui/webui/resources/tools/build_webui.gni") --assert(!is_android && !is_ios) -+#assert(!is_android && !is_ios) +-assert((!is_android && !is_ios) || is_desktop_android) ++#assert((!is_android && !is_ios) || is_desktop_android) build_webui("build") { grd_prefix = "cr_components_managed_footnote" @@ -2275,12 +2285,21 @@ diff --git a/ui/webui/resources/cr_elements/BUILD.gn b/ui/webui/resources/cr_ele "cr_tabs/cr_tabs.css", ] -- if (!is_android && !is_ios) { -+ if (!is_ios) { +- if ((!is_android && !is_ios) || is_desktop_android) { ++ if ((!is_ios) || is_desktop_android) { web_component_files += [ "cr_a11y_announcer/cr_a11y_announcer.ts" ] non_web_component_files += [ -@@ -226,7 +226,7 @@ build_webui("build") { +@@ -144,7 +144,7 @@ build_webui("build") { + ] + } + +- if (!is_android && !is_ios) { ++ if (!is_ios) { + non_web_component_files += [ + "cr_container_shadow_mixin.ts", + "cr_radio_button/cr_radio_button_mixin.ts", +@@ -240,7 +240,7 @@ build_webui("build") { "../js:build_ts", "//third_party/lit/v3_0:build_ts", ] @@ -2292,7 +2311,7 @@ diff --git a/ui/webui/resources/cr_elements/BUILD.gn b/ui/webui/resources/cr_ele diff --git a/ui/webui/resources/cr_elements/cr_dialog/cr_dialog.css b/ui/webui/resources/cr_elements/cr_dialog/cr_dialog.css --- a/ui/webui/resources/cr_elements/cr_dialog/cr_dialog.css +++ b/ui/webui/resources/cr_elements/cr_dialog/cr_dialog.css -@@ -23,7 +23,7 @@ dialog { +@@ -21,7 +21,7 @@ dialog { color: inherit; line-height: 20px; max-height: initial; diff --git a/build/patches/Enable-share-intent.patch b/build/patches/Enable-share-intent.patch index e5e4c1c8..0b3ab32c 100644 --- a/build/patches/Enable-share-intent.patch +++ b/build/patches/Enable-share-intent.patch @@ -34,8 +34,8 @@ 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 -@@ -577,6 +577,7 @@ chrome_java_resources = [ - "java/res/layout/signin_settings_card_view.xml", +@@ -582,6 +582,7 @@ chrome_java_resources = [ + "java/res/layout/signin_activity.xml", "java/res/layout/status_indicator_container.xml", "java/res/layout/suggestions_tile_view_condensed.xml", + "java/res/layout/sharing_intent_content.xml", @@ -45,9 +45,9 @@ 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 -@@ -1029,6 +1029,7 @@ chrome_java_sources = [ +@@ -960,6 +960,7 @@ chrome_java_sources = [ + "java/src/org/chromium/chrome/browser/signin/SigninManagerImpl.java", "java/src/org/chromium/chrome/browser/signin/SyncConsentActivity.java", - "java/src/org/chromium/chrome/browser/signin/SyncConsentActivityLauncherImpl.java", "java/src/org/chromium/chrome/browser/signin/SyncConsentFragment.java", + "java/src/org/chromium/chrome/browser/sharing/shared_intent/SharedIntentShareActivity.java", "java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java", @@ -201,7 +201,7 @@ new file mode 100644 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java --- a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java -@@ -184,6 +184,9 @@ public class IntentHandler { +@@ -185,6 +185,9 @@ public class IntentHandler { private static final String EXTRA_TAB_LAUNCH_TYPE = "org.chromium.chrome.browser.tab_launch_type"; @@ -211,8 +211,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.j /** A hash code for the URL to verify intent data hasn't been modified. */ public static final String EXTRA_DATA_HASH_CODE = "org.chromium.chrome.browser.data_hash"; -@@ -1376,6 +1379,17 @@ public class IntentHandler { - return IntentUtils.safeGetSerializableExtra(intent, EXTRA_TAB_LAUNCH_TYPE); +@@ -1408,6 +1411,17 @@ public class IntentHandler { + return TabGroupMetadata.maybeCreateFromBundle(bundle); } + public static void setForceIncognitoMode(Intent intent) { @@ -229,7 +229,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.j /** * Creates an Intent that will launch a ChromeTabbedActivity on the new tab page. The Intent * will be trusted and therefore able to launch Incognito tabs. -@@ -1505,7 +1519,7 @@ public class IntentHandler { +@@ -1538,7 +1552,7 @@ public class IntentHandler { String headers = getExtraHeadersFromIntent(intent); headers = maybeAddAdditionalContentHeaders(intent, url, headers); @@ -293,8 +293,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessIni import org.chromium.chrome.browser.usb.UsbNotificationManager; import org.chromium.chrome.browser.util.AfterStartupTaskUtils; import org.chromium.chrome.browser.webapps.ChromeWebApkHost; -@@ -673,6 +674,7 @@ public class ProcessInitializationHandler { - tasks.add(ClearDataDialogResultRecorder::makeDeferredRecordings); +@@ -677,6 +678,7 @@ public class ProcessInitializationHandler { + tasks.add(WebApkUninstallTracker::runDeferredTasks); + tasks.add(SharedIntentShareActivity::updateComponentEnabledState); @@ -479,7 +479,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 -@@ -474,6 +474,7 @@ public abstract class ChromeFeatureList { +@@ -484,6 +484,7 @@ public abstract class ChromeFeatureList { public static final String READALOUD_TAP_TO_SEEK = "ReadAloudTapToSeek"; public static final String READALOUD_IPH_MENU_BUTTON_HIGHLIGHT_CCT = "ReadAloudIPHMenuButtonHighlightCCT"; @@ -490,7 +490,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f 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 -@@ -5861,6 +5861,19 @@ To change this setting, BEGIN_LINKdelete the Chrome d +@@ -5923,6 +5923,19 @@ To change this setting, BEGIN_LINKdelete the Chrome d Make sure a phone app is enabled on this device diff --git a/build/patches/Enables-deactivation-of-the-js-debugger-statement.patch b/build/patches/Enables-deactivation-of-the-js-debugger-statement.patch index 22b279b2..5cc66463 100644 --- a/build/patches/Enables-deactivation-of-the-js-debugger-statement.patch +++ b/build/patches/Enables-deactivation-of-the-js-debugger-statement.patch @@ -101,7 +101,7 @@ diff --git a/third_party/devtools-frontend/src/front_end/core/sdk/sdk-meta.ts b/ diff --git a/third_party/devtools-frontend/src/front_end/generated/InspectorBackendCommands.js b/third_party/devtools-frontend/src/front_end/generated/InspectorBackendCommands.js --- a/third_party/devtools-frontend/src/front_end/generated/InspectorBackendCommands.js +++ b/third_party/devtools-frontend/src/front_end/generated/InspectorBackendCommands.js -@@ -1396,6 +1396,10 @@ inspectorBackend.registerCommand("Debugger.resume", [{"name": "terminateOnResume +@@ -1406,6 +1406,10 @@ inspectorBackend.registerCommand("Debugger.resume", [{"name": "terminateOnResume inspectorBackend.registerCommand("Debugger.searchInContent", [{"name": "scriptId", "type": "string", "optional": false, "description": "Id of the script to search in.", "typeRef": "Runtime.ScriptId"}, {"name": "query", "type": "string", "optional": false, "description": "String to search for.", "typeRef": null}, {"name": "caseSensitive", "type": "boolean", "optional": true, "description": "If true, search is case sensitive.", "typeRef": null}, {"name": "isRegex", "type": "boolean", "optional": true, "description": "If true, treats string parameter as regex.", "typeRef": null}], ["result"], "Searches for given string in script content."); inspectorBackend.registerCommand("Debugger.setAsyncCallStackDepth", [{"name": "maxDepth", "type": "number", "optional": false, "description": "Maximum depth of async call stacks. Setting to `0` will effectively disable collecting async call stacks (default).", "typeRef": null}], [], "Enables or disables async call stacks tracking."); inspectorBackend.registerCommand("Debugger.setBlackboxExecutionContexts", [{"name": "uniqueIds", "type": "array", "optional": false, "description": "Array of execution context unique ids for the debugger to ignore.", "typeRef": "string"}], [], "Replace previous blackbox execution contexts with passed ones. Forces backend to skip stepping/pausing in scripts in these execution contexts. VM will try to leave blackboxed script by performing 'step in' several times, finally resorting to 'step out' if unsuccessful."); @@ -115,7 +115,7 @@ diff --git a/third_party/devtools-frontend/src/front_end/generated/InspectorBack diff --git a/third_party/devtools-frontend/src/front_end/generated/protocol-mapping.d.ts b/third_party/devtools-frontend/src/front_end/generated/protocol-mapping.d.ts --- a/third_party/devtools-frontend/src/front_end/generated/protocol-mapping.d.ts +++ b/third_party/devtools-frontend/src/front_end/generated/protocol-mapping.d.ts -@@ -4800,6 +4800,10 @@ export namespace ProtocolMapping { +@@ -4809,6 +4809,10 @@ export namespace ProtocolMapping { paramsType: [Protocol.Debugger.SetBlackboxExecutionContextsRequest]; returnType: void; }; @@ -129,7 +129,7 @@ diff --git a/third_party/devtools-frontend/src/front_end/generated/protocol-mapp diff --git a/third_party/devtools-frontend/src/front_end/generated/protocol-proxy-api.d.ts b/third_party/devtools-frontend/src/front_end/generated/protocol-proxy-api.d.ts --- a/third_party/devtools-frontend/src/front_end/generated/protocol-proxy-api.d.ts +++ b/third_party/devtools-frontend/src/front_end/generated/protocol-proxy-api.d.ts -@@ -4259,6 +4259,8 @@ declare namespace ProtocolProxyApi { +@@ -4266,6 +4266,8 @@ declare namespace ProtocolProxyApi { */ invoke_setBlackboxExecutionContexts(params: Protocol.Debugger.SetBlackboxExecutionContextsRequest): Promise; @@ -141,7 +141,7 @@ diff --git a/third_party/devtools-frontend/src/front_end/generated/protocol-prox diff --git a/third_party/devtools-frontend/src/front_end/generated/protocol.ts b/third_party/devtools-frontend/src/front_end/generated/protocol.ts --- a/third_party/devtools-frontend/src/front_end/generated/protocol.ts +++ b/third_party/devtools-frontend/src/front_end/generated/protocol.ts -@@ -18526,6 +18526,10 @@ export namespace Debugger { +@@ -18699,6 +18699,10 @@ export namespace Debugger { uniqueIds: string[]; } @@ -155,7 +155,7 @@ diff --git a/third_party/devtools-frontend/src/front_end/generated/protocol.ts b diff --git a/third_party/devtools-frontend/src/third_party/blink/public/devtools_protocol/browser_protocol.json b/third_party/devtools-frontend/src/third_party/blink/public/devtools_protocol/browser_protocol.json --- a/third_party/devtools-frontend/src/third_party/blink/public/devtools_protocol/browser_protocol.json +++ b/third_party/devtools-frontend/src/third_party/blink/public/devtools_protocol/browser_protocol.json -@@ -28019,8 +28019,17 @@ +@@ -28269,8 +28269,17 @@ "$ref": "WasmDisassemblyChunk" } ] @@ -175,7 +175,7 @@ diff --git a/third_party/devtools-frontend/src/third_party/blink/public/devtools "name": "nextWasmDisassemblyChunk", "description": "Disassemble the next chunk of lines for the module corresponding to the\nstream. If disassembly is complete, this API will invalidate the streamId\nand return an empty chunk. Any subsequent calls for the now invalid stream\nwill return errors.", "experimental": true, -@@ -31201,4 +31210,4 @@ +@@ -31451,4 +31460,4 @@ ] } ] @@ -199,7 +199,7 @@ diff --git a/v8/include/js_protocol.pdl b/v8/include/js_protocol.pdl diff --git a/v8/src/common/message-template.h b/v8/src/common/message-template.h --- a/v8/src/common/message-template.h +++ b/v8/src/common/message-template.h -@@ -753,6 +753,7 @@ namespace internal { +@@ -754,6 +754,7 @@ namespace internal { /* AggregateError */ \ T(AllPromisesRejected, "All promises were rejected") \ T(CannotDeepFreezeObject, "Cannot DeepFreeze object of type %") \ @@ -210,7 +210,7 @@ diff --git a/v8/src/common/message-template.h b/v8/src/common/message-template.h diff --git a/v8/src/debug/debug-interface.cc b/v8/src/debug/debug-interface.cc --- a/v8/src/debug/debug-interface.cc +++ b/v8/src/debug/debug-interface.cc -@@ -1042,6 +1042,11 @@ void SetAsyncEventDelegate(Isolate* v8_isolate, AsyncEventDelegate* delegate) { +@@ -1040,6 +1040,11 @@ void SetAsyncEventDelegate(Isolate* v8_isolate, AsyncEventDelegate* delegate) { reinterpret_cast(v8_isolate)->set_async_event_delegate(delegate); } @@ -260,7 +260,7 @@ diff --git a/v8/src/debug/debug.h b/v8/src/debug/debug.h diff --git a/v8/src/execution/messages.cc b/v8/src/execution/messages.cc --- a/v8/src/execution/messages.cc +++ b/v8/src/execution/messages.cc -@@ -485,6 +485,7 @@ MaybeHandle MessageFormatter::TryFormat( +@@ -486,6 +486,7 @@ MaybeHandle MessageFormatter::TryFormat( MessageTemplate::kUndefinedOrNullToObject, MessageTemplate::kUnexpectedStrictReserved, MessageTemplate::kUnexpectedTokenIdentifier, diff --git a/build/patches/Experimental-user-scripts-support.patch b/build/patches/Experimental-user-scripts-support.patch index 509b9079..a67fe711 100644 --- a/build/patches/Experimental-user-scripts-support.patch +++ b/build/patches/Experimental-user-scripts-support.patch @@ -226,7 +226,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 -@@ -195,7 +195,11 @@ if (current_toolchain == default_toolchain) { +@@ -193,7 +193,11 @@ if (current_toolchain == default_toolchain) { sources = chrome_java_resources sources += [ "//chrome/android/java/res_app/layout/main.xml" ] @@ -239,7 +239,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn ":chrome_base_module_resources", ":ui_locale_string_resources", "//chrome/android/webapk/libs/common:splash_resources", -@@ -676,6 +680,7 @@ if (current_toolchain == default_toolchain) { +@@ -677,6 +681,7 @@ if (current_toolchain == default_toolchain) { "//components/ukm/android:java", "//components/url_formatter/android:url_formatter_java", "//components/user_prefs/android:java", @@ -250,7 +250,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml --- a/chrome/android/java/res/xml/main_preferences.xml +++ b/chrome/android/java/res/xml/main_preferences.xml -@@ -149,6 +149,11 @@ for the previous order (main_preferences_legacy). --> +@@ -154,6 +154,11 @@ for the previous order (main_preferences_legacy). --> android:key="useragent_settings" android:order="20" android:title="@string/prefs_useragent_settings"/> @@ -273,7 +273,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/Downlo import java.io.File; -@@ -430,6 +431,11 @@ public class DownloadUtils { +@@ -429,6 +430,11 @@ public class DownloadUtils { String referrer, @DownloadOpenSource int source, Context context) { @@ -297,7 +297,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessIni /** * Handles the initialization dependences of the browser process. This is meant to handle the * initialization that is not tied to any particular Activity, and the logic that should only be -@@ -615,6 +617,8 @@ public class ProcessInitializationHandler { +@@ -620,6 +622,8 @@ public class ProcessInitializationHandler { DefaultBrowserInfo.initBrowserFetcher(); @@ -326,7 +326,7 @@ diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -3480,6 +3480,13 @@ static_library("browser") { +@@ -3511,6 +3511,13 @@ static_library("browser") { ] deps += [ "//chrome/android/modules/dev_ui/provider:native" ] } @@ -343,7 +343,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn 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 -@@ -187,6 +187,7 @@ +@@ -182,6 +182,7 @@ #include "components/ui_devtools/switches.h" #include "components/variations/variations_switches.h" #include "components/version_info/channel.h" @@ -354,7 +354,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc 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 -@@ -273,6 +273,7 @@ +@@ -268,6 +268,7 @@ #include "components/ntp_tiles/popular_sites_impl.h" #include "components/permissions/contexts/geolocation_permission_context_android.h" #include "components/webapps/browser/android/install_prompt_prefs.h" @@ -362,7 +362,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse #else // BUILDFLAG(IS_ANDROID) #include "chrome/browser/device_api/device_service_impl.h" #include "chrome/browser/gcm/gcm_product_util.h" -@@ -2050,6 +2051,9 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -1958,6 +1959,9 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, translate::TranslatePrefs::RegisterProfilePrefs(registry); omnibox::RegisterProfilePrefs(registry); ZeroSuggestProvider::RegisterProfilePrefs(registry); @@ -375,7 +375,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse diff --git a/chrome/browser/profiles/BUILD.gn b/chrome/browser/profiles/BUILD.gn --- a/chrome/browser/profiles/BUILD.gn +++ b/chrome/browser/profiles/BUILD.gn -@@ -79,6 +79,9 @@ source_set("profile") { +@@ -80,6 +80,9 @@ source_set("profile") { "//content/public/browser", "//extensions/buildflags", ] @@ -388,9 +388,9 @@ diff --git a/chrome/browser/profiles/BUILD.gn b/chrome/browser/profiles/BUILD.gn 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 -@@ -570,6 +570,10 @@ - #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || - // BUILDFLAG(IS_WIN) +@@ -560,6 +560,10 @@ + #include "chrome/browser/net/nss_service_factory.h" + #endif +#if BUILDFLAG(IS_ANDROID) +#include "components/user_scripts/browser/userscripts_browser_client.h" @@ -399,10 +399,10 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc void AddProfilesExtraParts(ChromeBrowserMainParts* main_parts) { main_parts->AddParts(std::make_unique()); } -@@ -1374,6 +1378,9 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1359,6 +1363,9 @@ void ChromeBrowserMainExtraPartsProfiles:: + tab_groups::CollaborationMessagingObserverFactory::GetInstance(); } - #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || - // BUILDFLAG(IS_WIN) + #endif +#if BUILDFLAG(IS_ANDROID) + user_scripts::UserScriptsBrowserClient::GetInstance(); +#endif @@ -412,7 +412,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc -@@ -123,6 +123,10 @@ +@@ -122,6 +122,10 @@ #include "extensions/common/manifest.h" #endif @@ -423,7 +423,7 @@ diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profile #if BUILDFLAG(ENABLE_SESSION_SERVICE) #include "chrome/browser/sessions/app_session_service_factory.h" #include "chrome/browser/sessions/session_service_factory.h" -@@ -1484,6 +1488,13 @@ void ProfileManager::DoFinalInitForServices(Profile* profile, +@@ -1494,6 +1498,13 @@ void ProfileManager::DoFinalInitForServices(Profile* profile, ChildAccountServiceFactory::GetForProfile(profile)->Init(); SupervisedUserServiceFactory::GetForProfile(profile)->Init(); ListFamilyMembersServiceFactory::GetForProfile(profile)->Init(); @@ -501,7 +501,7 @@ diff --git a/chrome/browser/profiles/renderer_updater.h b/chrome/browser/profile 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 -@@ -57,6 +57,9 @@ +@@ -56,6 +56,9 @@ #include "chrome/browser/ui/webui/proxy_config_ui.h" @@ -511,10 +511,10 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_configs.cc b/chrome/browser/u #if BUILDFLAG(ENABLE_NACL) #include "chrome/browser/ui/webui/nacl_ui.h" -@@ -392,4 +395,7 @@ void RegisterChromeWebUIConfigs() { - map.AddWebUIConfig(std::make_unique()); +@@ -399,4 +402,7 @@ void RegisterChromeWebUIConfigs() { + map.AddWebUIConfig( + std::make_unique()); #endif - map.AddWebUIConfig(std::make_unique()); +#if BUILDFLAG(IS_ANDROID) + map.AddWebUIConfig(std::make_unique()); +#endif @@ -2578,7 +2578,7 @@ new file mode 100644 --- /dev/null +++ b/components/user_scripts/browser/resources/browser_resources.grd @@ -0,0 +1,14 @@ -+ ++ + + + @@ -2592,7 +2592,6 @@ new file mode 100644 + + + -\ No newline at end of file diff --git a/components/user_scripts/browser/resources/user-script-ui/BUILD.gn b/components/user_scripts/browser/resources/user-script-ui/BUILD.gn new file mode 100644 --- /dev/null @@ -7587,7 +7586,7 @@ new file mode 100755 +++ b/components/user_scripts/renderer/resources/user_scripts_renderer_resources.grd @@ -0,0 +1,14 @@ + -+ ++ + + + @@ -10338,7 +10337,7 @@ diff --git a/ipc/ipc_message_start.h b/ipc/ipc_message_start.h diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec --- a/tools/gritsettings/resource_ids.spec +++ b/tools/gritsettings/resource_ids.spec -@@ -1099,6 +1099,12 @@ +@@ -1103,6 +1103,12 @@ "META": {"sizes": {"includes": [30],}}, "includes": [7480], }, diff --git a/build/patches/Eyeo-Adblock-for-Cromite.patch b/build/patches/Eyeo-Adblock-for-Cromite.patch index 1aab28f6..84b75420 100644 --- a/build/patches/Eyeo-Adblock-for-Cromite.patch +++ b/build/patches/Eyeo-Adblock-for-Cromite.patch @@ -9,7 +9,7 @@ suit Cromite logic. .../adblock_chrome_content_browser_client.cc | 6 + .../adblock_chrome_content_browser_client.h | 4 + chrome/browser/adblock/android/BUILD.gn | 2 +- - .../adblock/android/adblock_strings.grd | 54 +- + .../adblock/android/adblock_strings.grd | 56 +- .../java/res/layout/adblock_custom_item.xml | 14 +- .../layout/adblock_filter_lists_list_item.xml | 15 + ...ences.xml => eyeo_adblock_preferences.xml} | 42 +- @@ -80,10 +80,10 @@ suit Cromite logic. .../converter/parser/url_filter_options.cc | 21 +- .../serializer/flatbuffer_serializer.cc | 102 +- components/adblock/core/features.cc | 6 +- - .../core/net/adblock_resource_request_impl.cc | 21 +- + .../core/net/adblock_resource_request_impl.cc | 26 +- components/adblock/core/resources/.gitignore | 2 +- components/adblock/core/resources/BUILD.gn | 5 +- - .../core/resources/adblock_resources.grd | 3 - + .../core/resources/adblock_resources.grd | 5 +- .../core/resources/elemhide_for_selector.jst | 4 +- .../adblock/core/resources/elemhideemu.jst | 2 + .../resources/snippets/dist/dependencies.jst | 1690 ++++++ @@ -125,7 +125,7 @@ suit Cromite logic. .../renderer/core/exported/web_document.cc | 13 +- .../blink/renderer/core/html/html_element.cc | 8 +- .../definitions/adblock_private.d.ts | 14 + - 120 files changed, 9154 insertions(+), 610 deletions(-) + 120 files changed, 9157 insertions(+), 616 deletions(-) rename chrome/browser/adblock/android/java/res/xml/{adblock_preferences.xml => eyeo_adblock_preferences.xml} (59%) create mode 100644 chrome/browser/resources/settings/adblock_page/adblock_page.html create mode 100644 chrome/browser/resources/settings/adblock_page/adblock_page.ts @@ -226,6 +226,15 @@ diff --git a/chrome/browser/adblock/android/BUILD.gn b/chrome/browser/adblock/an diff --git a/chrome/browser/adblock/android/adblock_strings.grd b/chrome/browser/adblock/android/adblock_strings.grd --- a/chrome/browser/adblock/android/adblock_strings.grd +++ b/chrome/browser/adblock/android/adblock_strings.grd +@@ -15,7 +15,7 @@ + You should have received a copy of the GNU General Public License + along with eyeo Chromium SDK. If not, see . + --> +- ++ + + + @@ -186,10 +186,52 @@ @@ -797,7 +806,7 @@ diff --git a/chrome/browser/adblock/android/java/src/org/chromium/chrome/browser 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 -@@ -6621,7 +6621,9 @@ ChromeContentBrowserClient:: +@@ -6631,7 +6631,9 @@ ChromeContentBrowserClient:: } bool ChromeContentBrowserClient::WillInterceptWebSocket( @@ -808,7 +817,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch #if BUILDFLAG(ENABLE_EXTENSIONS) if (!frame) { return false; -@@ -6643,9 +6645,11 @@ bool ChromeContentBrowserClient::WillInterceptWebSocket( +@@ -6653,9 +6655,11 @@ bool ChromeContentBrowserClient::WillInterceptWebSocket( } void ChromeContentBrowserClient::CreateWebSocket( @@ -823,7 +832,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h --- a/chrome/browser/chrome_content_browser_client.h +++ b/chrome/browser/chrome_content_browser_client.h -@@ -696,11 +696,15 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { +@@ -697,11 +697,15 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { CreateURLLoaderHandlerForServiceWorkerNavigationPreload( content::FrameTreeNodeId frame_tree_node_id, const network::ResourceRequest& resource_request) override; @@ -1079,15 +1088,15 @@ diff --git a/chrome/browser/extensions/api/eyeo_filtering_private/eyeo_filtering 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 -@@ -32,6 +32,7 @@ - #include "chrome/browser/ui/toolbar/toolbar_pref_names.h" +@@ -33,6 +33,7 @@ #include "chrome/common/chrome_features.h" + #include "chrome/common/extensions/api/settings_private.h" #include "chrome/common/pref_names.h" +#include "components/adblock/core/common/adblock_prefs.h" #include "components/autofill/core/common/autofill_prefs.h" #include "components/bookmarks/common/bookmark_pref_names.h" #include "components/browsing_data/core/pref_names.h" -@@ -175,6 +176,19 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() { +@@ -176,6 +177,19 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() { } s_allowlist = new PrefsUtil::TypedPrefMap(); @@ -1110,7 +1119,7 @@ diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chro 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 -@@ -250,7 +250,6 @@ +@@ -235,7 +235,6 @@ #include "chrome/common/buildflags.h" #include "chrome/common/chrome_features.h" #include "components/adblock/content/browser/factories/adblock_request_throttle_factory.h" @@ -1118,7 +1127,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc #include "components/adblock/content/browser/factories/content_security_policy_injector_factory.h" #include "components/adblock/content/browser/factories/element_hider_factory.h" #include "components/adblock/content/browser/factories/resource_classification_runner_factory.h" -@@ -899,7 +898,6 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -887,7 +886,6 @@ void ChromeBrowserMainExtraPartsProfiles:: // Makes manual testing possible. FakeSmartCardDeviceServiceFactory::GetInstance(); #endif @@ -1137,7 +1146,7 @@ diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resourc "appearance_page/appearance_fonts_page.ts", "appearance_page/appearance_page.ts", "appearance_page/home_url_input.ts", -@@ -381,6 +382,7 @@ build_webui("build") { +@@ -379,6 +380,7 @@ build_webui("build") { ts_definitions = [ "//tools/typescript/definitions/autofill_private.d.ts", "//tools/typescript/definitions/chrome_event.d.ts", @@ -1656,7 +1665,7 @@ new file mode 100644 diff --git a/chrome/browser/resources/settings/basic_page/basic_page.html b/chrome/browser/resources/settings/basic_page/basic_page.html --- a/chrome/browser/resources/settings/basic_page/basic_page.html +++ b/chrome/browser/resources/settings/basic_page/basic_page.html -@@ -53,6 +53,13 @@ +@@ -55,6 +55,13 @@ @@ -1673,10 +1682,10 @@ diff --git a/chrome/browser/resources/settings/basic_page/basic_page.html b/chro diff --git a/chrome/browser/resources/settings/basic_page/basic_page.ts b/chrome/browser/resources/settings/basic_page/basic_page.ts --- a/chrome/browser/resources/settings/basic_page/basic_page.ts +++ b/chrome/browser/resources/settings/basic_page/basic_page.ts -@@ -12,6 +12,7 @@ import 'chrome://resources/cr_elements/cr_icon/cr_icon.js'; - import 'chrome://resources/cr_elements/cr_shared_style.css.js'; - import 'chrome://resources/cr_elements/cr_shared_vars.css.js'; - import '../ai_page/ai_page.js'; +@@ -15,6 +15,7 @@ import '../ai_page/ai_page.js'; + // + import '../glic_page/glic_page.js'; + // +import '../adblock_page/adblock_page.js'; import '../appearance_page/appearance_page.js'; import '../privacy_page/privacy_guide/privacy_guide_promo.js'; @@ -1695,7 +1704,7 @@ diff --git a/chrome/browser/resources/settings/page_visibility.ts b/chrome/brows 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 -@@ -237,6 +237,10 @@ function createRoutes(): SettingsRoutes { +@@ -245,6 +245,10 @@ function createRoutes(): SettingsRoutes { r.FONTS = r.APPEARANCE.createChild('/fonts'); } @@ -1731,7 +1740,7 @@ diff --git a/chrome/browser/resources/settings/settings.ts b/chrome/browser/reso diff --git a/chrome/browser/resources/settings/settings_menu/settings_menu.html b/chrome/browser/resources/settings/settings_menu/settings_menu.html --- a/chrome/browser/resources/settings/settings_menu/settings_menu.html +++ b/chrome/browser/resources/settings/settings_menu/settings_menu.html -@@ -157,6 +157,11 @@ +@@ -149,6 +149,11 @@ $i18n{a11yPageTitle} @@ -1746,7 +1755,7 @@ diff --git a/chrome/browser/resources/settings/settings_menu/settings_menu.html diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc -@@ -342,7 +342,8 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { +@@ -346,7 +346,8 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { auto* original_profile = profile->GetOriginalProfile(); adblock::EnsureBackgroundServicesStarted(original_profile); adblock::RegisterAdblockWebContentObserver< @@ -4382,6 +4391,19 @@ diff --git a/components/adblock/core/net/adblock_resource_request_impl.cc b/comp auto request = std::make_unique(); request->url = url_; request->method = MethodToString(); +@@ -181,11 +166,8 @@ void AdblockResourceRequestImpl::OnDownloadFinished( + return; + } + +- GURL::Replacements strip_query; +- strip_query.ClearQuery(); +- GURL url = url_.ReplaceComponents(strip_query); + response_callback_.Run( +- url, std::move(downloaded_file), ++ url_, std::move(downloaded_file), + loader_->ResponseInfo() ? loader_->ResponseInfo()->headers : nullptr); + // response_callback_ may delete this, do not call any member variables now. + } diff --git a/components/adblock/core/resources/.gitignore b/components/adblock/core/resources/.gitignore --- a/components/adblock/core/resources/.gitignore +++ b/components/adblock/core/resources/.gitignore @@ -4413,6 +4435,15 @@ diff --git a/components/adblock/core/resources/BUILD.gn b/components/adblock/cor diff --git a/components/adblock/core/resources/adblock_resources.grd b/components/adblock/core/resources/adblock_resources.grd --- a/components/adblock/core/resources/adblock_resources.grd +++ b/components/adblock/core/resources/adblock_resources.grd +@@ -15,7 +15,7 @@ + You should have received a copy of the GNU General Public License + along with eyeo Chromium SDK. If not, see . + --> +- ++ + + + @@ -30,9 +30,6 @@ @@ -12214,7 +12245,7 @@ new file mode 100644 diff --git a/components/error_page_strings.grdp b/components/error_page_strings.grdp --- a/components/error_page_strings.grdp +++ b/components/error_page_strings.grdp -@@ -263,6 +263,22 @@ +@@ -266,6 +266,22 @@ Your organization doesn’t allow you to view this site @@ -12261,7 +12292,7 @@ diff --git a/content/browser/websockets/websocket_connector_impl.cc b/content/br diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc --- a/content/public/browser/content_browser_client.cc +++ b/content/public/browser/content_browser_client.cc -@@ -1108,7 +1108,7 @@ void ContentBrowserClient::WillCreateURLLoaderFactory( +@@ -1104,7 +1104,7 @@ void ContentBrowserClient::WillCreateURLLoaderFactory( DCHECK(browser_context); } @@ -12270,7 +12301,7 @@ diff --git a/content/public/browser/content_browser_client.cc b/content/public/b return false; } -@@ -1117,9 +1117,11 @@ uint32_t ContentBrowserClient::GetWebSocketOptions(RenderFrameHost* frame) { +@@ -1113,9 +1113,11 @@ uint32_t ContentBrowserClient::GetWebSocketOptions(RenderFrameHost* frame) { } void ContentBrowserClient::CreateWebSocket( @@ -12285,7 +12316,7 @@ diff --git a/content/public/browser/content_browser_client.cc b/content/public/b diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h -@@ -2070,7 +2070,7 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -2061,7 +2061,7 @@ class CONTENT_EXPORT ContentBrowserClient { scoped_refptr navigation_response_task_runner); // Returns true when the embedder wants to intercept a websocket connection. @@ -12294,7 +12325,7 @@ diff --git a/content/public/browser/content_browser_client.h b/content/public/br // Returns the WebSocket creation options. virtual uint32_t GetWebSocketOptions(RenderFrameHost* frame); -@@ -2092,9 +2092,11 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -2083,9 +2083,11 @@ class CONTENT_EXPORT ContentBrowserClient { // Always called on the UI thread and only when the Network Service is // enabled. virtual void CreateWebSocket( @@ -12340,7 +12371,7 @@ new file mode 100644 diff --git a/third_party/blink/renderer/core/css/style_engine.cc b/third_party/blink/renderer/core/css/style_engine.cc --- a/third_party/blink/renderer/core/css/style_engine.cc +++ b/third_party/blink/renderer/core/css/style_engine.cc -@@ -647,6 +647,14 @@ void StyleEngine::UpdateActiveStyleSheetsInShadow( +@@ -653,6 +653,14 @@ void StyleEngine::UpdateActiveStyleSheetsInShadow( } } @@ -12358,7 +12389,7 @@ diff --git a/third_party/blink/renderer/core/css/style_engine.cc b/third_party/b diff --git a/third_party/blink/renderer/core/css/style_engine.h b/third_party/blink/renderer/core/css/style_engine.h --- a/third_party/blink/renderer/core/css/style_engine.h +++ b/third_party/blink/renderer/core/css/style_engine.h -@@ -280,6 +280,7 @@ class CORE_EXPORT StyleEngine final : public GarbageCollected, +@@ -281,6 +281,7 @@ class CORE_EXPORT StyleEngine final : public GarbageCollected, const ComputedStyle* embedder_style) const; void ViewportStyleSettingChanged(); @@ -12369,7 +12400,7 @@ diff --git a/third_party/blink/renderer/core/css/style_engine.h b/third_party/bl diff --git a/third_party/blink/renderer/core/dom/events/event_target.cc b/third_party/blink/renderer/core/dom/events/event_target.cc --- a/third_party/blink/renderer/core/dom/events/event_target.cc +++ b/third_party/blink/renderer/core/dom/events/event_target.cc -@@ -894,10 +894,7 @@ bool EventTarget::dispatchEventForBindings(Event* event, +@@ -871,10 +871,7 @@ bool EventTarget::dispatchEventForBindings(Event* event, if (!GetExecutionContext()) return false; @@ -12414,7 +12445,7 @@ diff --git a/third_party/blink/renderer/core/exported/web_document.cc b/third_pa diff --git a/third_party/blink/renderer/core/html/html_element.cc b/third_party/blink/renderer/core/html/html_element.cc --- a/third_party/blink/renderer/core/html/html_element.cc +++ b/third_party/blink/renderer/core/html/html_element.cc -@@ -2444,13 +2444,7 @@ void HTMLElement::setSpellcheck(bool enable) { +@@ -2418,13 +2418,7 @@ void HTMLElement::setSpellcheck(bool enable) { } void HTMLElement::click() { diff --git a/build/patches/Fix-chromium-build-bugs.patch b/build/patches/Fix-chromium-build-bugs.patch index d7921db6..56d1ed2a 100644 --- a/build/patches/Fix-chromium-build-bugs.patch +++ b/build/patches/Fix-chromium-build-bugs.patch @@ -21,7 +21,7 @@ https://bugs.chromium.org/p/chromium/issues/detail?id=1491776#c10 diff --git a/BUILD.gn b/BUILD.gn --- a/BUILD.gn +++ b/BUILD.gn -@@ -427,7 +427,6 @@ group("gn_all") { +@@ -429,7 +429,6 @@ group("gn_all") { "//android_webview:empty_group", "//android_webview/test", "//android_webview/tools/automated_ui_tests:webview_ui_test_app_test_apk", @@ -44,7 +44,7 @@ diff --git a/chrome/browser/navigation_predictor/navigation_predictor_metrics_do 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 -@@ -231,6 +231,7 @@ static_library("safe_browsing") { +@@ -264,6 +264,7 @@ static_library("safe_browsing") { "//components/webdata/common", "//content/public/browser", "//services/preferences/public/mojom:mojom", @@ -55,7 +55,7 @@ diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsin diff --git a/components/component_updater/installer_policies/BUILD.gn b/components/component_updater/installer_policies/BUILD.gn --- a/components/component_updater/installer_policies/BUILD.gn +++ b/components/component_updater/installer_policies/BUILD.gn -@@ -54,6 +54,7 @@ static_library("installer_policies_no_content_deps") { +@@ -56,6 +56,7 @@ static_library("installer_policies_no_content_deps") { "//components/update_client", "//mojo/public/cpp/base:protobuf_support", "//services/network/public/cpp", @@ -80,7 +80,7 @@ diff --git a/components/omnibox/browser/autocomplete_classifier.cc b/components/ diff --git a/components/omnibox/browser/omnibox_field_trial.cc b/components/omnibox/browser/omnibox_field_trial.cc --- a/components/omnibox/browser/omnibox_field_trial.cc +++ b/components/omnibox/browser/omnibox_field_trial.cc -@@ -1030,11 +1030,11 @@ MLConfig& MLConfig::operator=(const MLConfig& other) = default; +@@ -1040,11 +1040,11 @@ MLConfig& MLConfig::operator=(const MLConfig& other) = default; ScopedMLConfigForTesting::ScopedMLConfigForTesting() : original_config_(std::make_unique(GetMLConfig())) { @@ -108,7 +108,7 @@ diff --git a/components/plus_addresses/BUILD.gn b/components/plus_addresses/BUIL diff --git a/components/safe_browsing/content/renderer/phishing_classifier/phishing_image_embedder.cc b/components/safe_browsing/content/renderer/phishing_classifier/phishing_image_embedder.cc --- a/components/safe_browsing/content/renderer/phishing_classifier/phishing_image_embedder.cc +++ b/components/safe_browsing/content/renderer/phishing_classifier/phishing_image_embedder.cc -@@ -53,17 +53,9 @@ void PhishingImageEmbedder::BeginImageEmbedding(DoneCallback done_callback) { +@@ -49,17 +49,9 @@ void PhishingImageEmbedder::BeginImageEmbedding(DoneCallback done_callback) { void PhishingImageEmbedder::OnPlaybackDone(std::unique_ptr bitmap) { #if BUILDFLAG(BUILD_WITH_TFLITE_LIB) @@ -132,7 +132,7 @@ diff --git a/components/safe_browsing/content/renderer/phishing_classifier/phish diff --git a/content/browser/browser_interface_binders.cc b/content/browser/browser_interface_binders.cc --- a/content/browser/browser_interface_binders.cc +++ b/content/browser/browser_interface_binders.cc -@@ -365,6 +365,7 @@ void BindDateTimeChooserForFrame( +@@ -379,6 +379,7 @@ void BindDateTimeChooserForFrame( void BindTextSuggestionHostForFrame( RenderFrameHost* host, mojo::PendingReceiver receiver) { @@ -143,7 +143,7 @@ diff --git a/content/browser/browser_interface_binders.cc b/content/browser/brow diff --git a/net/BUILD.gn b/net/BUILD.gn --- a/net/BUILD.gn +++ b/net/BUILD.gn -@@ -1746,6 +1746,7 @@ component("net") { +@@ -1750,6 +1750,7 @@ component("net") { if (!is_cronet_build) { deps += [ "//mojo/public/cpp/bindings:default_construct_tag" ] } diff --git a/build/patches/Fonts-fingerprinting-mitigation.patch b/build/patches/Fonts-fingerprinting-mitigation.patch index b65979c7..cec1947f 100644 --- a/build/patches/Fonts-fingerprinting-mitigation.patch +++ b/build/patches/Fonts-fingerprinting-mitigation.patch @@ -120,7 +120,7 @@ diff --git a/skia/ext/skia_utils_win.h b/skia/ext/skia_utils_win.h 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 -@@ -260,6 +260,9 @@ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE_PARAM(int, +@@ -246,6 +246,9 @@ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE_PARAM(int, kMaxDiskDataAllocatorCapacityMB); BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kLessAggressiveParkableString); @@ -133,7 +133,7 @@ diff --git a/third_party/blink/public/common/features.h b/third_party/blink/publ diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -786,6 +786,7 @@ component("platform") { +@@ -790,6 +790,7 @@ component("platform") { "fonts/simple_font_data.cc", "fonts/simple_font_data.h", "fonts/skia/font_cache_skia.cc", diff --git a/build/patches/Guard-for-user-agent-reduction.patch b/build/patches/Guard-for-user-agent-reduction.patch index 1c371c04..ef5bc30d 100644 --- a/build/patches/Guard-for-user-agent-reduction.patch +++ b/build/patches/Guard-for-user-agent-reduction.patch @@ -12,7 +12,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 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 -@@ -1595,7 +1595,7 @@ void ChromeContentBrowserClient::RegisterProfilePrefs( +@@ -1602,7 +1602,7 @@ void ChromeContentBrowserClient::RegisterProfilePrefs( registry->RegisterIntegerPref( prefs::kUserAgentReduction, static_cast( @@ -24,7 +24,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc --- a/content/common/user_agent.cc +++ b/content/common/user_agent.cc -@@ -352,14 +352,7 @@ std::string BuildUserAgentFromProduct(const std::string& product) { +@@ -354,14 +354,7 @@ std::string BuildUserAgentFromProduct(const std::string& product) { } std::string BuildModelInfo() { @@ -40,7 +40,7 @@ diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc } #if BUILDFLAG(IS_ANDROID) -@@ -388,6 +381,10 @@ std::string GetAndroidOSInfo( +@@ -390,6 +383,10 @@ std::string GetAndroidOSInfo( IncludeAndroidModel include_android_model) { std::string android_info_str; @@ -54,7 +54,7 @@ diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc 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 -@@ -3525,23 +3525,23 @@ +@@ -3569,23 +3569,23 @@ // If enabled, the deviceModel will be reduced to "K" and the // androidVersion will be reduced to a static "10" string in android // User-Agent string. diff --git a/build/patches/History-number-of-days-privacy-setting.patch b/build/patches/History-number-of-days-privacy-setting.patch index 60597ea7..738ef20c 100644 --- a/build/patches/History-number-of-days-privacy-setting.patch +++ b/build/patches/History-number-of-days-privacy-setting.patch @@ -157,7 +157,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting 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 -@@ -41,6 +41,7 @@ +@@ -42,6 +42,7 @@ #include "components/content_settings/core/common/pref_names.h" #include "components/dom_distiller/core/pref_names.h" #include "components/drive/drive_pref_names.h" @@ -165,7 +165,7 @@ diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chro #include "components/embedder_support/pref_names.h" #include "components/language/core/browser/pref_names.h" #include "components/live_caption/pref_names.h" -@@ -218,6 +219,9 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() { +@@ -219,6 +220,9 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() { (*s_allowlist)[::prefs::kShowForwardButton] = settings_api::PrefType::kBoolean; @@ -201,7 +201,7 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/p 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 -@@ -85,6 +85,15 @@ +@@ -92,6 +92,15 @@ sub-label="$i18n{permissionsPageDescription}" on-click="onPermissionsPageClick_" role-description="$i18n{subpageArrowRoleDescription}"> @@ -247,7 +247,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 -@@ -1400,6 +1400,18 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1414,6 +1414,18 @@ Your Google account may have other forms of browsing history like searches and a Browsing history @@ -269,7 +269,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro 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 -@@ -1948,6 +1948,11 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source, +@@ -1956,6 +1956,11 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source, IDS_SETTINGS_SAFEBROWSING_ENHANCED_THINGS_TO_CONSIDER_BULLET_THREE}, {"safeBrowsingStandard", IDS_SETTINGS_SAFEBROWSING_STANDARD}, {"safeBrowsingStandardDesc", IDS_SETTINGS_SAFEBROWSING_STANDARD_DESC}, @@ -457,7 +457,7 @@ diff --git a/components/history/core/browser/expire_history_backend.h b/componen diff --git a/components/history/core/browser/history_backend.cc b/components/history/core/browser/history_backend.cc --- a/components/history/core/browser/history_backend.cc +++ b/components/history/core/browser/history_backend.cc -@@ -163,6 +163,10 @@ const int kCommitIntervalSeconds = 10; +@@ -164,6 +164,10 @@ const int kCommitIntervalSeconds = 10; // deleting some. const int kMaxRedirectCount = 32; @@ -468,7 +468,7 @@ diff --git a/components/history/core/browser/history_backend.cc b/components/his // The maximum number of days for which domain visit metrics are computed // each time HistoryBackend::GetDomainDiversity() is called. constexpr int kDomainDiversityMaxBacktrackedDays = 7; -@@ -1360,6 +1364,19 @@ void HistoryBackend::InitImpl( +@@ -1361,6 +1365,19 @@ void HistoryBackend::InitImpl( expirer_.StartExpiringOldStuff(base::Days(kExpireDaysThreshold)); } @@ -558,7 +558,7 @@ diff --git a/components/history/core/browser/history_service.cc b/components/his void HistoryService::ScheduleDBTaskForUI( base::OnceCallback callback) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -@@ -1512,6 +1542,9 @@ void HistoryService::Cleanup() { +@@ -1487,6 +1517,9 @@ void HistoryService::Cleanup() { return; } @@ -589,7 +589,7 @@ diff --git a/components/history/core/browser/history_service.h b/components/hist // Triggers the backend to load if it hasn't already, and then returns whether // it's finished loading. // Note: Virtual needed for mocking. -@@ -1215,6 +1219,10 @@ class HistoryService : public KeyedService, +@@ -1194,6 +1198,10 @@ class HistoryService : public KeyedService, raw_ptr local_device_info_provider_ = nullptr; diff --git a/build/patches/Improve-the-browser-sandbox.patch b/build/patches/Improve-the-browser-sandbox.patch index 9a582bab..5ff24b48 100644 --- a/build/patches/Improve-the-browser-sandbox.patch +++ b/build/patches/Improve-the-browser-sandbox.patch @@ -30,7 +30,7 @@ new file mode 100644 diff --git a/sandbox/policy/features.cc b/sandbox/policy/features.cc --- a/sandbox/policy/features.cc +++ b/sandbox/policy/features.cc -@@ -221,4 +221,13 @@ bool IsParallelLaunchEnabled() { +@@ -220,4 +220,13 @@ bool IsParallelLaunchEnabled() { return base::FeatureList::IsEnabled(kWinSboxParallelProcessLaunch); } #endif // BUILDFLAG(IS_WIN) diff --git a/build/patches/Increase-number-of-autocomplete-matches-to-10.patch b/build/patches/Increase-number-of-autocomplete-matches-to-10.patch index 13ac7020..ee2cb75e 100644 --- a/build/patches/Increase-number-of-autocomplete-matches-to-10.patch +++ b/build/patches/Increase-number-of-autocomplete-matches-to-10.patch @@ -13,7 +13,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/components/omnibox/browser/autocomplete_result.cc b/components/omnibox/browser/autocomplete_result.cc --- a/components/omnibox/browser/autocomplete_result.cc +++ b/components/omnibox/browser/autocomplete_result.cc -@@ -92,10 +92,11 @@ constexpr size_t kMaxPedalMatchIndex = +@@ -97,10 +97,11 @@ constexpr size_t kMaxPedalMatchIndex = size_t AutocompleteResult::GetMaxMatches( bool is_zero_suggest, AutocompleteInput::FeaturedKeywordMode featured_keyword_mode) { diff --git a/build/patches/Internal-firewall.patch b/build/patches/Internal-firewall.patch index 27236944..4aa6a522 100644 --- a/build/patches/Internal-firewall.patch +++ b/build/patches/Internal-firewall.patch @@ -59,7 +59,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2444,6 +2444,7 @@ static_library("browser") { +@@ -2465,6 +2465,7 @@ static_library("browser") { "//third_party/ungoogled:switches", "//services/device/public/mojom", "//services/device/public/mojom:usb", @@ -70,7 +70,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn 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 -@@ -226,6 +226,7 @@ +@@ -228,6 +228,7 @@ #include "sandbox/policy/features.h" #include "sandbox/policy/switches.h" #include "services/device/public/cpp/device_features.h" @@ -289,7 +289,7 @@ new file mode 100644 diff --git a/net/BUILD.gn b/net/BUILD.gn --- a/net/BUILD.gn +++ b/net/BUILD.gn -@@ -1122,6 +1122,7 @@ component("net") { +@@ -1123,6 +1123,7 @@ component("net") { "//components/network_time/time_tracker", "//components/network_session_configurator/common", "//net/http:transport_security_state_generated_files", @@ -300,7 +300,7 @@ diff --git a/net/BUILD.gn b/net/BUILD.gn diff --git a/net/traffic_annotation/network_traffic_annotation.h b/net/traffic_annotation/network_traffic_annotation.h --- a/net/traffic_annotation/network_traffic_annotation.h +++ b/net/traffic_annotation/network_traffic_annotation.h -@@ -375,10 +375,6 @@ struct MutablePartialNetworkTrafficAnnotationTag { +@@ -374,10 +374,6 @@ struct MutablePartialNetworkTrafficAnnotationTag { } // namespace net // Placeholder for unannotated usages. @@ -314,7 +314,7 @@ diff --git a/net/traffic_annotation/network_traffic_annotation.h b/net/traffic_a diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc --- a/net/url_request/url_request_http_job.cc +++ b/net/url_request/url_request_http_job.cc -@@ -403,6 +403,9 @@ URLRequestHttpJob::URLRequestHttpJob( +@@ -418,6 +418,9 @@ URLRequestHttpJob::URLRequestHttpJob( : URLRequestJob(request), http_user_agent_settings_(http_user_agent_settings) { ResetTimer(); @@ -324,7 +324,7 @@ diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_reque } URLRequestHttpJob::~URLRequestHttpJob() { -@@ -691,6 +694,18 @@ void URLRequestHttpJob::MaybeStartTransactionInternal(int result) { +@@ -706,6 +709,18 @@ void URLRequestHttpJob::MaybeStartTransactionInternal(int result) { void URLRequestHttpJob::StartTransactionInternal() { DCHECK(!override_response_headers_); @@ -1662,7 +1662,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont #include "services/network/brokered_client_socket_factory.h" #include "services/network/cookie_manager.h" #include "services/network/data_remover_util.h" -@@ -1794,6 +1795,9 @@ void NetworkContext::OnNewSCTAuditingReportSent() { +@@ -1817,6 +1818,9 @@ void NetworkContext::OnNewSCTAuditingReportSent() { void NetworkContext::CreateUDPSocket( mojo::PendingReceiver receiver, mojo::PendingRemote listener) { @@ -1672,7 +1672,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont socket_factory_->CreateUDPSocket(std::move(receiver), std::move(listener)); } -@@ -1806,6 +1810,17 @@ void NetworkContext::CreateRestrictedUDPSocket( +@@ -1829,6 +1833,17 @@ void NetworkContext::CreateRestrictedUDPSocket( mojo::PendingRemote listener, CreateRestrictedUDPSocketCallback callback) { // SimpleHostResolver is transitively owned by |this|. @@ -1690,7 +1690,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont socket_factory_->CreateRestrictedUDPSocket( addr, mode, traffic_annotation, std::move(params), std::move(receiver), std::move(listener), SimpleHostResolver::Create(this), -@@ -1818,6 +1833,17 @@ void NetworkContext::CreateTCPServerSocket( +@@ -1841,6 +1856,17 @@ void NetworkContext::CreateTCPServerSocket( const net::MutableNetworkTrafficAnnotationTag& traffic_annotation, mojo::PendingReceiver receiver, CreateTCPServerSocketCallback callback) { @@ -1708,7 +1708,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont socket_factory_->CreateTCPServerSocket( local_addr, std::move(options), static_cast(traffic_annotation), -@@ -1832,6 +1858,21 @@ void NetworkContext::CreateTCPConnectedSocket( +@@ -1855,6 +1881,21 @@ void NetworkContext::CreateTCPConnectedSocket( mojo::PendingReceiver receiver, mojo::PendingRemote observer, CreateTCPConnectedSocketCallback callback) { @@ -1730,7 +1730,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont socket_factory_->CreateTCPConnectedSocket( local_addr, remote_addr_list, std::move(tcp_connected_socket_options), static_cast(traffic_annotation), -@@ -1843,6 +1884,20 @@ void NetworkContext::CreateTCPBoundSocket( +@@ -1866,6 +1907,20 @@ void NetworkContext::CreateTCPBoundSocket( const net::MutableNetworkTrafficAnnotationTag& traffic_annotation, mojo::PendingReceiver receiver, CreateTCPBoundSocketCallback callback) { @@ -1751,7 +1751,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont socket_factory_->CreateTCPBoundSocket( local_addr, static_cast(traffic_annotation), -@@ -1909,6 +1964,24 @@ void NetworkContext::CreateWebSocket( +@@ -1932,6 +1987,24 @@ void NetworkContext::CreateWebSocket( mojo::PendingRemote auth_handler, mojo::PendingRemote header_client, const std::optional& throttling_profile_id) { @@ -2086,7 +2086,7 @@ diff --git a/tools/traffic_annotation/scripts/auditor/auditor.py b/tools/traffic diff --git a/tools/traffic_annotation/scripts/auditor/util.py b/tools/traffic_annotation/scripts/auditor/util.py --- a/tools/traffic_annotation/scripts/auditor/util.py +++ b/tools/traffic_annotation/scripts/auditor/util.py -@@ -73,6 +73,7 @@ def get_current_platform(build_path: Optional[Path] = None) -> str: +@@ -75,6 +75,7 @@ def get_current_platform(build_path: Optional[Path] = None) -> str: # It's probably not Android/ChromeOS in that case. pass diff --git a/build/patches/JIT-site-settings.patch b/build/patches/JIT-site-settings.patch index ca133c15..67c665b0 100644 --- a/build/patches/JIT-site-settings.patch +++ b/build/patches/JIT-site-settings.patch @@ -279,7 +279,7 @@ new file mode 100644 diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc --- a/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc -@@ -611,7 +611,7 @@ void ContentSettingsRegistry::Init() { +@@ -612,7 +612,7 @@ void ContentSettingsRegistry::Init() { ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY); Register(ContentSettingsType::JAVASCRIPT_JIT, "javascript-jit", @@ -291,7 +291,7 @@ diff --git a/components/content_settings/core/browser/content_settings_registry. diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -4059,12 +4059,17 @@ UrlInfo NavigationRequest::GetUrlInfo() { +@@ -4091,12 +4091,17 @@ UrlInfo NavigationRequest::GetUrlInfo() { // Compute the WebExposedIsolationInfo that will be bundled into UrlInfo. auto web_exposed_isolation_info = ComputeWebExposedIsolationInfo(); @@ -313,7 +313,7 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/brows 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 -@@ -3295,6 +3295,9 @@ void RenderProcessHostImpl::AppendRendererCommandLine( +@@ -3299,6 +3299,9 @@ void RenderProcessHostImpl::AppendRendererCommandLine( if (IsJitDisabled()) { command_line->AppendSwitchASCII(blink::switches::kJavaScriptFlags, "--jitless"); diff --git a/build/patches/Keep-ComputePressure-disabled.patch b/build/patches/Keep-ComputePressure-disabled.patch index 6fd2ba2c..94126ae8 100644 --- a/build/patches/Keep-ComputePressure-disabled.patch +++ b/build/patches/Keep-ComputePressure-disabled.patch @@ -10,7 +10,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -895,11 +895,9 @@ +@@ -909,11 +909,9 @@ status: "stable", }, { @@ -24,5 +24,5 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 + public: true, }, { - name: "ConcurrentViewTransitionsSPA", + name: "ConsiderFullChildNodeContentForListify", -- diff --git a/build/patches/Keep-Manta-Service-Disabled.patch b/build/patches/Keep-Manta-Service-Disabled.patch index f029a185..995292b9 100644 --- a/build/patches/Keep-Manta-Service-Disabled.patch +++ b/build/patches/Keep-Manta-Service-Disabled.patch @@ -3,13 +3,13 @@ Date: Tue, 31 Oct 2023 16:20:12 +0000 Subject: Keep Manta Service Disabled --- - components/manta/features.cc | 2 ++ - 1 file changed, 2 insertions(+) + components/manta/features.cc | 7 +++++++ + 1 file changed, 7 insertions(+) diff --git a/components/manta/features.cc b/components/manta/features.cc --- a/components/manta/features.cc +++ b/components/manta/features.cc -@@ -9,6 +9,7 @@ +@@ -9,36 +9,43 @@ namespace manta::features { BASE_FEATURE(kMantaService, "MantaService", base::FEATURE_ENABLED_BY_DEFAULT); @@ -17,7 +17,11 @@ diff --git a/components/manta/features.cc b/components/manta/features.cc // Enables Anchovy Prod Server BASE_FEATURE(kAnchovyUseProdServer, -@@ -19,6 +20,7 @@ BASE_FEATURE(kAnchovyUseProdServer, + "AnchovyUseProdServer", + base::FEATURE_ENABLED_BY_DEFAULT); ++SET_CROMITE_FEATURE_DISABLED(kAnchovyUseProdServer); + + // Enables Orca Prod Server BASE_FEATURE(kOrcaUseProdServer, "OrcaUseProdServer", base::FEATURE_ENABLED_BY_DEFAULT); @@ -25,4 +29,28 @@ diff --git a/components/manta/features.cc b/components/manta/features.cc // Enables Scanner Prod Server BASE_FEATURE(kScannerUseProdServer, + "ScannerUseProdServer", + base::FEATURE_ENABLED_BY_DEFAULT); ++SET_CROMITE_FEATURE_DISABLED(kScannerUseProdServer); + + // Enables SeaPen Prod Server + BASE_FEATURE(kSeaPenUseProdServer, + "SeaPenUseProdServer", + base::FEATURE_ENABLED_BY_DEFAULT); ++SET_CROMITE_FEATURE_DISABLED(kSeaPenUseProdServer); + + // Enables Mahi Prod Server + BASE_FEATURE(kMahiUseProdServer, + "MahiUseProdServer", + base::FEATURE_ENABLED_BY_DEFAULT); ++SET_CROMITE_FEATURE_DISABLED(kMahiUseProdServer); + + // Enables Walrus Prod Server + BASE_FEATURE(kWalrusUseProdServer, + "WalrusUseProdServer", + base::FEATURE_ENABLED_BY_DEFAULT); ++SET_CROMITE_FEATURE_DISABLED(kWalrusUseProdServer); + + bool IsMantaServiceEnabled() { + return base::FeatureList::IsEnabled(kMantaService); -- diff --git a/build/patches/Keep-disabled-FetchLaterAPI.patch b/build/patches/Keep-disabled-FetchLaterAPI.patch index 1f153466..641ad198 100644 --- a/build/patches/Keep-disabled-FetchLaterAPI.patch +++ b/build/patches/Keep-disabled-FetchLaterAPI.patch @@ -15,8 +15,8 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html .../renderer/core/fetch/fetch_manager.cc | 21 ++++++++++-- .../loader/child_url_loader_factory_bundle.cc | 14 ++++---- .../platform/loader/fetch/resource_fetcher.cc | 2 +- - .../platform/runtime_enabled_features.json5 | 5 ++- - 7 files changed, 63 insertions(+), 17 deletions(-) + .../platform/runtime_enabled_features.json5 | 4 +-- + 7 files changed, 63 insertions(+), 16 deletions(-) create mode 100644 cromite_flags/third_party/blink/common/features_cc/Keep-disabled-FetchLaterAPI.inc diff --git a/content/browser/loader/keep_alive_url_loader.cc b/content/browser/loader/keep_alive_url_loader.cc @@ -120,7 +120,7 @@ diff --git a/third_party/blink/renderer/core/fetch/fetch_manager.cc b/third_part void ResponseResolver::RejectBecauseFailed( std::optional devtools_request_id, std::optional issue_id, -@@ -1282,10 +1289,20 @@ void FetchManager::Loader::Failed( +@@ -1286,10 +1293,20 @@ void FetchManager::Loader::Failed( if (response_resolver_) { ScriptState::Scope scope(GetScriptState()); if (dom_exception) { @@ -177,7 +177,7 @@ diff --git a/third_party/blink/renderer/platform/loader/child_url_loader_factory 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 -@@ -3069,7 +3069,7 @@ void ResourceFetcher::PrepareForLeakDetection() { +@@ -3093,7 +3093,7 @@ void ResourceFetcher::PrepareForLeakDetection() { void ResourceFetcher::StopFetchingInternal(StopFetchingTarget target) { // TODO(toyoshim): May want to suspend scheduler while canceling loaders so // that the cancellations below do not awake unnecessary scheduling. @@ -189,17 +189,15 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.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 -@@ -1969,10 +1969,9 @@ - }, +@@ -2007,8 +2007,8 @@ { // The Blink runtime-enabled feature name for the API's IDL. + // https://chromestatus.com/feature/4654499737632768 - name: "FetchLaterAPI", -- status: "experimental", +- status: "stable", + name: "FetchLaterAPI", // disable + status: "experimental", // by default - origin_trial_feature_name: "FetchLaterAPI", -- origin_trial_allows_third_party: true, - base_feature: "FetchLaterAPI", - // base_feature is meant as kill-switch. This runtime-enabled feature - // should follow the Origin Trial unless explicitly overriden by Finch or + }, + { + name: "FetchUploadStreaming", -- diff --git a/build/patches/Keep-empty-tabs-between-sessions.patch b/build/patches/Keep-empty-tabs-between-sessions.patch index cd680b23..1d437500 100644 --- a/build/patches/Keep-empty-tabs-between-sessions.patch +++ b/build/patches/Keep-empty-tabs-between-sessions.patch @@ -5,13 +5,26 @@ Subject: Keep empty tabs between sessions 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 --- + .../browser/multiwindow/MultiWindowUtils.java | 2 +- .../browser/tabmodel/TabPersistentStore.java | 15 --------------- - 1 file changed, 15 deletions(-) + 2 files changed, 1 insertion(+), 16 deletions(-) +diff --git a/chrome/android/java/src/org/chromium/chrome/browser/multiwindow/MultiWindowUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/multiwindow/MultiWindowUtils.java +--- a/chrome/android/java/src/org/chromium/chrome/browser/multiwindow/MultiWindowUtils.java ++++ b/chrome/android/java/src/org/chromium/chrome/browser/multiwindow/MultiWindowUtils.java +@@ -915,7 +915,7 @@ public class MultiWindowUtils implements ActivityStateListener { + for (TabModel model : models) { + for (int i = 0; i < model.getCount(); i++) { + Tab tab = model.getTabAt(i); +- if (!TabPersistentStore.shouldSkipTab(tab)) { ++ if ((true)) { + totalCount++; + } + } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java -@@ -1229,27 +1229,12 @@ public class TabPersistentStore { +@@ -1248,27 +1248,12 @@ public class TabPersistentStore { continue; } @@ -28,7 +41,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPer return modelInfo; } -- private static boolean shouldSkipTab(@NonNull Tab tab) { +- public static boolean shouldSkipTab(@NonNull Tab tab) { - boolean isNtp = tab.isNativePage() && UrlUtilities.isNtpUrl(tab.getUrl()); - if (!isNtp) return false; - diff --git a/build/patches/Keep-flag-to-allow-screenshots-in-Incognito-mode.patch b/build/patches/Keep-flag-to-allow-screenshots-in-Incognito-mode.patch index ca9c1761..3d7bd359 100644 --- a/build/patches/Keep-flag-to-allow-screenshots-in-Incognito-mode.patch +++ b/build/patches/Keep-flag-to-allow-screenshots-in-Incognito-mode.patch @@ -28,7 +28,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/incognito/Incog 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 -@@ -5223,9 +5223,9 @@ +@@ -5234,9 +5234,9 @@ "expiry_milestone": 136 }, { diff --git a/build/patches/Keyboard-protection-flag.patch b/build/patches/Keyboard-protection-flag.patch index 78d78410..3b605f56 100644 --- a/build/patches/Keyboard-protection-flag.patch +++ b/build/patches/Keyboard-protection-flag.patch @@ -23,10 +23,10 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java b/android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java --- a/android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java +++ b/android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java -@@ -1050,6 +1050,11 @@ public final class ProductionSupportedFlagList { - AwFeatures.WEBVIEW_PARTITIONED_COOKIES_EXCLUDED, - "When enabled, WebView records if a site with partitioned cookies has any cookies" - + " excluded due to a different cookie partition key than the current site's."), +@@ -1051,6 +1051,11 @@ public final class ProductionSupportedFlagList { + ContentFeatures.WEB_PAYMENTS, + "Enable the JavaScript PaymentRequest API for launching payment apps through" + + " Android intents."), + Flag.baseFeature( + "SystemKeyboardProtection", + "Hides user preference on the system keyboard by setting the standard " @@ -233,7 +233,7 @@ diff --git a/third_party/blink/renderer/core/events/keyboard_event.h b/third_par 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 -@@ -179,6 +179,14 @@ BASE_FEATURE(kSystemKeyboardLock, +@@ -184,6 +184,14 @@ BASE_FEATURE(kSystemKeyboardLock, "SystemKeyboardLock", base::FEATURE_ENABLED_BY_DEFAULT); @@ -293,7 +293,7 @@ diff --git a/ui/events/keycodes/dom/dom_keyboard_layout_map_win.cc b/ui/events/k diff --git a/ui/events/keycodes/keyboard_code_conversion.cc b/ui/events/keycodes/keyboard_code_conversion.cc --- a/ui/events/keycodes/keyboard_code_conversion.cc +++ b/ui/events/keycodes/keyboard_code_conversion.cc -@@ -301,16 +301,22 @@ int ModifierDomKeyToEventFlag(DomKey key) { +@@ -297,16 +297,22 @@ int ModifierDomKeyToEventFlag(DomKey key) { // DomKey::SYMBOL_LOCK } diff --git a/build/patches/Lock-Profile-Cookie-Database.patch b/build/patches/Lock-Profile-Cookie-Database.patch index 0b58ceed..1ce6d239 100644 --- a/build/patches/Lock-Profile-Cookie-Database.patch +++ b/build/patches/Lock-Profile-Cookie-Database.patch @@ -16,7 +16,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/chrome/browser/net/profile_network_context_service.cc b/chrome/browser/net/profile_network_context_service.cc --- a/chrome/browser/net/profile_network_context_service.cc +++ b/chrome/browser/net/profile_network_context_service.cc -@@ -1361,6 +1361,14 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal( +@@ -1343,6 +1343,14 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal( network_context_params->file_paths->cookie_database_name = base::FilePath(chrome::kCookieFilename); @@ -56,7 +56,7 @@ new file mode 100644 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 -@@ -3070,7 +3070,7 @@ NetworkContext::MakeSessionCleanupCookieStore() const { +@@ -3122,7 +3122,7 @@ NetworkContext::MakeSessionCleanupCookieStore() const { #if BUILDFLAG(IS_WIN) const bool enable_exclusive_access = diff --git a/build/patches/Log-dangling-attributes-in-some-html-elements.patch b/build/patches/Log-dangling-attributes-in-some-html-elements.patch index 87526fdc..9e899aca 100644 --- a/build/patches/Log-dangling-attributes-in-some-html-elements.patch +++ b/build/patches/Log-dangling-attributes-in-some-html-elements.patch @@ -42,7 +42,7 @@ new file mode 100644 diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc --- a/third_party/blink/renderer/core/dom/document.cc +++ b/third_party/blink/renderer/core/dom/document.cc -@@ -4684,6 +4684,14 @@ void Document::ProcessBaseElement() { +@@ -4685,6 +4685,14 @@ void Document::ProcessBaseElement() { KURL base_element_url; if (href) { String stripped_href = StripLeadingAndTrailingHTMLSpaces(*href); @@ -57,7 +57,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink if (!stripped_href.empty()) base_element_url = KURL(FallbackBaseURL(), stripped_href); } -@@ -4701,6 +4709,14 @@ void Document::ProcessBaseElement() { +@@ -4702,6 +4710,14 @@ void Document::ProcessBaseElement() { !GetExecutionContext()->GetSecurityOrigin()->CanRequest( base_element_url)) { UseCounter::Count(*this, WebFeature::kBaseWithCrossOriginHref); @@ -72,7 +72,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink } } -@@ -4731,6 +4747,8 @@ void Document::ProcessBaseElement() { +@@ -4732,6 +4748,8 @@ void Document::ProcessBaseElement() { if (target->Contains('<')) UseCounter::Count(*this, WebFeature::kBaseWithOpenBracketInTarget); base_target_ = *target; @@ -84,7 +84,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/renderer/core/dom/element.cc --- a/third_party/blink/renderer/core/dom/element.cc +++ b/third_party/blink/renderer/core/dom/element.cc -@@ -3194,8 +3194,26 @@ void Element::StripScriptingAttributes( +@@ -3111,8 +3111,26 @@ void Element::StripScriptingAttributes( attribute_vector.Shrink(destination); } @@ -115,7 +115,7 @@ diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/ diff --git a/third_party/blink/renderer/core/dom/element.h b/third_party/blink/renderer/core/dom/element.h --- a/third_party/blink/renderer/core/dom/element.h +++ b/third_party/blink/renderer/core/dom/element.h -@@ -730,7 +730,8 @@ class CORE_EXPORT Element : public ContainerNode, public Animatable { +@@ -725,7 +725,8 @@ class CORE_EXPORT Element : public ContainerNode, public Animatable { virtual bool HasLegalLinkAttribute(const QualifiedName&) const; // Only called by the parser immediately after element construction. @@ -154,7 +154,7 @@ diff --git a/third_party/blink/renderer/core/editing/serializers/markup_formatte diff --git a/third_party/blink/renderer/core/html/forms/html_form_element.cc b/third_party/blink/renderer/core/html/forms/html_form_element.cc --- a/third_party/blink/renderer/core/html/forms/html_form_element.cc +++ b/third_party/blink/renderer/core/html/forms/html_form_element.cc -@@ -318,7 +318,7 @@ void HTMLFormElement::PrepareForSubmission( +@@ -319,7 +319,7 @@ void HTMLFormElement::PrepareForSubmission( if (form_control_element && form_control_element->BlocksFormSubmission()) { UseCounter::Count(GetDocument(), WebFeature::kFormSubmittedWithUnclosedFormControl); @@ -214,7 +214,7 @@ diff --git a/third_party/blink/renderer/core/html/html_frame_element_base.cc b/t diff --git a/third_party/blink/renderer/core/html/html_iframe_element.cc b/third_party/blink/renderer/core/html/html_iframe_element.cc --- a/third_party/blink/renderer/core/html/html_iframe_element.cc +++ b/third_party/blink/renderer/core/html/html_iframe_element.cc -@@ -163,6 +163,12 @@ void HTMLIFrameElement::CollectStyleForPresentationAttribute( +@@ -164,6 +164,12 @@ void HTMLIFrameElement::CollectStyleForPresentationAttribute( } } @@ -227,7 +227,7 @@ diff --git a/third_party/blink/renderer/core/html/html_iframe_element.cc b/third void HTMLIFrameElement::ParseAttribute( const AttributeModificationParams& params) { const QualifiedName& name = params.name; -@@ -177,6 +183,16 @@ void HTMLIFrameElement::ParseAttribute( +@@ -178,6 +184,16 @@ void HTMLIFrameElement::ParseAttribute( } AtomicString old_name = name_; name_ = value; @@ -331,7 +331,7 @@ diff --git a/third_party/blink/renderer/core/page/frame_tree.cc b/third_party/bl diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -1738,8 +1738,8 @@ +@@ -1827,8 +1827,8 @@ // Experiment with preventing some instances of mutation XSS // by escaping "<" and ">" in attribute values. // See: crbug.com/1175016 @@ -342,7 +342,7 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 }, { name: "EventTimingHandleKeyboardEventSimulatedClick", -@@ -2680,6 +2680,12 @@ +@@ -2721,6 +2721,12 @@ name: "LongTaskFromLongAnimationFrame", status: "test", }, diff --git a/build/patches/Logcat-crash-reports-UI.patch b/build/patches/Logcat-crash-reports-UI.patch index e32493bb..ab9a9fbc 100644 --- a/build/patches/Logcat-crash-reports-UI.patch +++ b/build/patches/Logcat-crash-reports-UI.patch @@ -153,7 +153,7 @@ diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/ 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 -@@ -663,6 +663,7 @@ static_library("ui") { +@@ -666,6 +666,7 @@ static_library("ui") { "//third_party/re2", "//third_party/webrtc_overrides:webrtc_component", "//third_party/zlib", diff --git a/build/patches/Media-fingerprinting-mitigations.patch b/build/patches/Media-fingerprinting-mitigations.patch index 3c0f78d9..022cf00e 100644 --- a/build/patches/Media-fingerprinting-mitigations.patch +++ b/build/patches/Media-fingerprinting-mitigations.patch @@ -13,7 +13,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/third_party/blink/renderer/modules/webcodecs/video_decoder.cc b/third_party/blink/renderer/modules/webcodecs/video_decoder.cc --- a/third_party/blink/renderer/modules/webcodecs/video_decoder.cc +++ b/third_party/blink/renderer/modules/webcodecs/video_decoder.cc -@@ -291,7 +291,7 @@ ScriptPromise VideoDecoder::isConfigSupported( +@@ -300,7 +300,7 @@ ScriptPromise VideoDecoder::isConfigSupported( auto* config_copy = CopyConfig(*config); // Run the "Check Configuration Support" algorithm. diff --git a/build/patches/Modify-default-preferences.patch b/build/patches/Modify-default-preferences.patch index 3531a420..5c63d286 100644 --- a/build/patches/Modify-default-preferences.patch +++ b/build/patches/Modify-default-preferences.patch @@ -5,7 +5,7 @@ Subject: Modify default preferences License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- chrome/browser/about_flags.cc | 1 + - .../background/background_mode_manager.cc | 2 +- + .../extensions/background_mode_manager.cc | 2 +- .../browser/chrome_content_browser_client.cc | 2 +- chrome/browser/preloading/preloading_prefs.h | 2 +- chrome/browser/profiles/profile.cc | 2 +- @@ -31,7 +31,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 -@@ -81,6 +81,7 @@ +@@ -82,6 +82,7 @@ #include "components/autofill/core/common/autofill_payments_features.h" #include "components/autofill/core/common/autofill_switches.h" #include "components/autofill/core/common/autofill_util.h" @@ -39,10 +39,10 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc #include "components/browser_sync/browser_sync_switches.h" #include "components/collaboration/public/features.h" #include "components/commerce/core/commerce_feature_list.h" -diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/browser/background/background_mode_manager.cc ---- a/chrome/browser/background/background_mode_manager.cc -+++ b/chrome/browser/background/background_mode_manager.cc -@@ -358,7 +358,7 @@ BackgroundModeManager::~BackgroundModeManager() { +diff --git a/chrome/browser/background/extensions/background_mode_manager.cc b/chrome/browser/background/extensions/background_mode_manager.cc +--- a/chrome/browser/background/extensions/background_mode_manager.cc ++++ b/chrome/browser/background/extensions/background_mode_manager.cc +@@ -364,7 +364,7 @@ BackgroundModeManager::~BackgroundModeManager() { // static void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) { @@ -54,7 +54,7 @@ diff --git a/chrome/browser/background/background_mode_manager.cc b/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 -@@ -1547,7 +1547,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs( +@@ -1554,7 +1554,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs( void ChromeContentBrowserClient::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false); @@ -154,7 +154,7 @@ diff --git a/components/bookmarks/browser/bookmark_utils.cc b/components/bookmar #include "components/bookmarks/browser/scoped_group_bookmark_actions.h" #include "components/bookmarks/common/bookmark_pref_names.h" #include "components/pref_registry/pref_registry_syncable.h" -@@ -462,11 +463,13 @@ bool DoesBookmarkContainWords(const std::u16string& title, +@@ -487,11 +488,13 @@ bool DoesBookmarkContainWords(const std::u16string& title, void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( @@ -291,7 +291,7 @@ diff --git a/components/safe_browsing/core/common/safe_browsing_prefs.cc b/compo diff --git a/components/signin/internal/identity_manager/primary_account_manager.cc b/components/signin/internal/identity_manager/primary_account_manager.cc --- a/components/signin/internal/identity_manager/primary_account_manager.cc +++ b/components/signin/internal/identity_manager/primary_account_manager.cc -@@ -297,7 +297,7 @@ void PrimaryAccountManager::RegisterProfilePrefs(PrefRegistrySimple* registry) { +@@ -341,7 +341,7 @@ void PrimaryAccountManager::RegisterProfilePrefs(PrefRegistrySimple* registry) { prefs::kGoogleServicesSyncingGaiaIdMigratedToSignedIn, std::string()); registry->RegisterStringPref( prefs::kGoogleServicesSyncingUsernameMigratedToSignedIn, std::string()); diff --git a/build/patches/Move-navigation-bar-to-bottom.patch b/build/patches/Move-navigation-bar-to-bottom.patch index b29824e3..c0d2f180 100644 --- a/build/patches/Move-navigation-bar-to-bottom.patch +++ b/build/patches/Move-navigation-bar-to-bottom.patch @@ -154,7 +154,7 @@ diff --git a/cc/input/browser_controls_offset_manager.cc b/cc/input/browser_cont diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc --- a/cc/trees/layer_tree_host_impl.cc +++ b/cc/trees/layer_tree_host_impl.cc -@@ -4819,6 +4819,9 @@ bool LayerTreeHostImpl::AnimateBrowserControls(base::TimeTicks time) { +@@ -4867,6 +4867,9 @@ bool LayerTreeHostImpl::AnimateBrowserControls(base::TimeTicks time) { if (scroll_delta.IsZero()) return false; @@ -167,7 +167,7 @@ diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiCoordinator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiCoordinator.java --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiCoordinator.java +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiCoordinator.java -@@ -50,6 +50,7 @@ import org.chromium.components.sensitive_content.SensitiveContentFeatures; +@@ -49,6 +49,7 @@ import org.chromium.components.sensitive_content.SensitiveContentFeatures; import org.chromium.ui.modaldialog.ModalDialogManager; import org.chromium.ui.modelutil.PropertyModel; import org.chromium.ui.modelutil.PropertyModelChangeProcessor; @@ -175,30 +175,30 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser import java.util.List; -@@ -174,7 +175,8 @@ public class TabGroupUiCoordinator implements TabGroupUiMediator.ResetHandler, T +@@ -171,7 +172,8 @@ public class TabGroupUiCoordinator implements TabGroupUiMediator.ResetHandler, T public void initializeWithNative( Activity activity, BottomControlsCoordinator.BottomControlsVisibilityController visibilityController, -- Callback onModelTokenChange) { -+ Callback onModelTokenChange, +- Callback onSnapshotTokenChange) { ++ Callback onSnapshotTokenChange, + TopUiThemeColorProvider topUiThemeColorProvider, ObservableSupplier tabSupplier) { + ObservableSupplierImpl tabStripTokenSupplier = new ObservableSupplierImpl<>(); + var currentTabGroupModelFilterSupplier = - mTabModelSelector - .getTabGroupModelFilterProvider() -@@ -257,7 +259,8 @@ public class TabGroupUiCoordinator implements TabGroupUiMediator.ResetHandler, T - mOmniboxFocusStateSupplier, +@@ -259,7 +261,8 @@ public class TabGroupUiCoordinator implements TabGroupUiMediator.ResetHandler, T sharedImageTilesCoordinator, mThemeColorProvider, -- mBackgroundColorSupplier); -+ mBackgroundColorSupplier, + onSnapshotTokenChange, +- tabStripTokenSupplier); ++ tabStripTokenSupplier, + topUiThemeColorProvider, tabSupplier); - Profile profile = mTabModelSelector.getModel(false).getProfile(); - CollaborationService collaborationService = + if (serviceStatus.isAllowedToJoin()) { + mTabBubbler = 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 -@@ -65,6 +65,12 @@ import org.chromium.url.GURL; +@@ -74,6 +74,12 @@ import org.chromium.url.GURL; import java.util.List; import java.util.Objects; @@ -211,9 +211,9 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser /** A mediator for the TabGroupUi. Responsible for managing the internal state of the component. */ public class TabGroupUiMediator implements BackPressHandler, ThemeColorObserver, TintObserver { -@@ -104,6 +110,11 @@ public class TabGroupUiMediator implements BackPressHandler, ThemeColorObserver, - private final ThemeColorProvider mThemeColorProvider; - private final ObservableSupplierImpl mBackgroundColorSupplier; +@@ -144,6 +150,11 @@ public class TabGroupUiMediator implements BackPressHandler, ThemeColorObserver, + private final Callback mOnSnapshotTokenChange; + private final ObservableSupplier mChildTokenSupplier; + private final TopUiThemeColorProvider mTopUiThemeColorProvider; + @@ -223,18 +223,18 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser // These should only be used when regular (non-incognito) tabs are set in the model. private final @Nullable SharedImageTilesCoordinator mSharedImageTilesCoordinator; private final @Nullable TransitiveSharedGroupObserver mTransitiveSharedGroupObserver; -@@ -134,7 +145,9 @@ public class TabGroupUiMediator implements BackPressHandler, ThemeColorObserver, - ObservableSupplier omniboxFocusStateSupplier, +@@ -174,7 +185,9 @@ public class TabGroupUiMediator implements BackPressHandler, ThemeColorObserver, SharedImageTilesCoordinator sharedImageTilesCoordinator, ThemeColorProvider themeColorProvider, -- ObservableSupplierImpl backgroundColorSupplier) { -+ ObservableSupplierImpl backgroundColorSupplier, + Callback onSnapshotTokenChange, +- ObservableSupplierImpl childTokenSupplier) { ++ ObservableSupplierImpl childTokenSupplier, + TopUiThemeColorProvider topUiThemeColorProvider, ObservableSupplier tabSupplier) { + mTopUiThemeColorProvider = topUiThemeColorProvider; mResetHandler = resetHandler; mModel = model; mTabModelSelector = tabModelSelector; -@@ -182,11 +195,30 @@ public class TabGroupUiMediator implements BackPressHandler, ThemeColorObserver, +@@ -227,11 +240,30 @@ public class TabGroupUiMediator implements BackPressHandler, ThemeColorObserver, mIsShowingHub = true; } @@ -256,7 +256,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser + } + }, activityTabCallback); + - // register for tab model + // Register for tab model. mTabModelObserver = new TabModelObserver() { @Override @@ -265,7 +265,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser resetTabStrip(); } -@@ -211,6 +243,8 @@ public class TabGroupUiMediator implements BackPressHandler, ThemeColorObserver, +@@ -253,6 +285,8 @@ public class TabGroupUiMediator implements BackPressHandler, ThemeColorObserver, @Override public void restoreCompleted() { resetTabStrip(); @@ -274,8 +274,8 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser } @Override -@@ -309,6 +343,8 @@ public class TabGroupUiMediator implements BackPressHandler, ThemeColorObserver, - mModel.set(TabGroupUiProperties.IS_MAIN_CONTENT_VISIBLE, true); +@@ -346,6 +380,8 @@ public class TabGroupUiMediator implements BackPressHandler, ThemeColorObserver, + mModel.set(TabGroupUiProperties.WIDTH_PX_CALLBACK, mWidthPxSupplier::set); resetTabStrip(); + mTabObserver.triggerWithCurrentTab(); @@ -283,8 +283,8 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser mHandleBackPressChangedSupplier = handleBackPressChangedSupplier; if (mTabGridDialogControllerSupplier != null) { mTabGridDialogControllerSupplier.onAvailable( -@@ -337,6 +373,18 @@ public class TabGroupUiMediator implements BackPressHandler, ThemeColorObserver, - mModel.set(TabGroupUiProperties.TINT, mThemeColorProvider.getTint()); +@@ -374,6 +410,18 @@ public class TabGroupUiMediator implements BackPressHandler, ThemeColorObserver, + mModel.set(TINT, mThemeColorProvider.getTint()); } + /** @@ -302,7 +302,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser private void setupToolbarButtons() { View.OnClickListener showGroupDialogOnClickListener = view -> { -@@ -515,6 +563,7 @@ public class TabGroupUiMediator implements BackPressHandler, ThemeColorObserver, +@@ -561,6 +609,7 @@ public class TabGroupUiMediator implements BackPressHandler, ThemeColorObserver, } public void destroy() { @@ -313,35 +313,35 @@ 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/TabGroupUiProperties.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiProperties.java --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiProperties.java +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiProperties.java -@@ -9,6 +9,7 @@ import android.view.View.OnClickListener; - - import org.chromium.ui.modelutil.PropertyKey; - import org.chromium.ui.modelutil.PropertyModel; +@@ -12,6 +12,7 @@ import org.chromium.ui.modelutil.PropertyKey; + import org.chromium.ui.modelutil.PropertyModel.WritableBooleanPropertyKey; + import org.chromium.ui.modelutil.PropertyModel.WritableIntPropertyKey; + import org.chromium.ui.modelutil.PropertyModel.WritableObjectPropertyKey; +import android.content.res.ColorStateList; /** {@link PropertyKey} list for the TabGroupUi. */ class TabGroupUiProperties { -@@ -34,6 +35,9 @@ class TabGroupUiProperties { - public static final PropertyModel.WritableObjectPropertyKey INITIAL_SCROLL_INDEX = - new PropertyModel.WritableObjectPropertyKey<>(true); +@@ -39,6 +40,9 @@ class TabGroupUiProperties { + public static final WritableObjectPropertyKey> WIDTH_PX_CALLBACK = + new WritableObjectPropertyKey<>(); -+ public static final PropertyModel.WritableIntPropertyKey PRIMARY_COLOR = -+ new PropertyModel.WritableIntPropertyKey(); ++ public static final WritableObjectPropertyKey PRIMARY_COLOR = ++ new WritableObjectPropertyKey<>(); + public static final PropertyKey[] ALL_KEYS = new PropertyKey[] { SHOW_GROUP_DIALOG_ON_CLICK_LISTENER, -@@ -44,5 +48,6 @@ class TabGroupUiProperties { - IMAGE_TILES_CONTAINER_VISIBLE, - INITIAL_SCROLL_INDEX, +@@ -50,5 +54,6 @@ class TabGroupUiProperties { TINT, + INITIAL_SCROLL_INDEX, + WIDTH_PX_CALLBACK, + PRIMARY_COLOR }; } diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiToolbarView.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiToolbarView.java --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiToolbarView.java +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiToolbarView.java -@@ -21,6 +21,10 @@ import androidx.core.widget.ImageViewCompat; +@@ -19,6 +19,10 @@ import org.chromium.base.Callback; import org.chromium.chrome.tab_ui.R; import org.chromium.ui.widget.ChromeImageView; @@ -352,7 +352,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser /** Toolbar for the bottom tab strip see {@link TabGroupUiCoordinator}. */ public class TabGroupUiToolbarView extends FrameLayout { private ChromeImageView mNewTabButton; -@@ -96,6 +100,19 @@ public class TabGroupUiToolbarView extends FrameLayout { +@@ -93,6 +97,19 @@ public class TabGroupUiToolbarView extends FrameLayout { mFadingEdgeEnd.setColorFilter(color, PorterDuff.Mode.SRC_IN); } @@ -369,21 +369,21 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser + setTint(tint); + } + - void setTint(ColorStateList tint) { + /* package */ void setTint(ColorStateList tint) { ImageViewCompat.setImageTintList(mShowGroupDialogButton, tint); ImageViewCompat.setImageTintList(mNewTabButton, tint); diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiViewBinder.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiViewBinder.java --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiViewBinder.java +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiViewBinder.java -@@ -12,6 +12,7 @@ import static org.chromium.chrome.browser.tasks.tab_management.TabGroupUiPropert - import static org.chromium.chrome.browser.tasks.tab_management.TabGroupUiProperties.SHOW_GROUP_DIALOG_BUTTON_VISIBLE; +@@ -13,6 +13,7 @@ import static org.chromium.chrome.browser.tasks.tab_management.TabGroupUiPropert import static org.chromium.chrome.browser.tasks.tab_management.TabGroupUiProperties.SHOW_GROUP_DIALOG_ON_CLICK_LISTENER; import static org.chromium.chrome.browser.tasks.tab_management.TabGroupUiProperties.TINT; + import static org.chromium.chrome.browser.tasks.tab_management.TabGroupUiProperties.WIDTH_PX_CALLBACK; +import static org.chromium.chrome.browser.tasks.tab_management.TabGroupUiProperties.PRIMARY_COLOR; import android.view.View; -@@ -50,6 +51,8 @@ class TabGroupUiViewBinder { +@@ -51,6 +52,8 @@ class TabGroupUiViewBinder { } else if (NEW_TAB_BUTTON_ON_CLICK_LISTENER == propertyKey) { viewHolder.toolbarView.setNewTabButtonOnClickListener( model.get(NEW_TAB_BUTTON_ON_CLICK_LISTENER)); @@ -425,7 +425,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.List; -@@ -132,6 +140,128 @@ public class TabListCoordinator +@@ -131,6 +139,128 @@ public class TabListCoordinator private int mAwaitingTabId = Tab.INVALID_TAB_ID; private @TabActionState int mTabActionState; @@ -554,7 +554,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser /** * Construct a coordinator for UI that shows a list of tabs. * -@@ -353,6 +483,12 @@ public class TabListCoordinator +@@ -348,6 +478,12 @@ public class TabListCoordinator checkAwaitingLayout(); } }; @@ -567,7 +567,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser mRecyclerView.setLayoutManager(gridLayoutManager); mMediator.registerOrientationListener(gridLayoutManager); mMediator.updateSpanCount( -@@ -362,7 +498,7 @@ public class TabListCoordinator +@@ -357,7 +493,7 @@ public class TabListCoordinator Rect frame = new Rect(); mActivity.getWindow().getDecorView().getWindowVisibleDisplayFrame(frame); updateGridCardLayout(frame.width()); @@ -576,7 +576,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser LinearLayoutManager layoutManager = new LinearLayoutManager( activity, -@@ -377,6 +513,25 @@ public class TabListCoordinator +@@ -372,6 +508,25 @@ public class TabListCoordinator } }; mRecyclerView.setLayoutManager(layoutManager); @@ -602,7 +602,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser } mMediator.setRecyclerViewItemAnimationToggle(mRecyclerView::setDisableItemAnimations); } -@@ -398,7 +553,7 @@ public class TabListCoordinator +@@ -392,7 +547,7 @@ public class TabListCoordinator if (hasEmptyView) { mTabListEmptyCoordinator = new TabListEmptyCoordinator( @@ -611,7 +611,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser } configureRecyclerViewTouchHelpers(); -@@ -691,6 +846,9 @@ public class TabListCoordinator +@@ -680,6 +835,9 @@ public class TabListCoordinator void prepareTabSwitcherPaneView() { registerLayoutChangeListener(); mRecyclerView.setupCustomItemAnimator(); @@ -853,15 +853,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/Comp diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChrome.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChrome.java --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChrome.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChrome.java -@@ -39,6 +39,7 @@ import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateMa - import org.chromium.components.browser_ui.widget.gesture.SwipeGestureListener.ScrollDirection; +@@ -41,6 +41,7 @@ import org.chromium.components.browser_ui.widget.gesture.SwipeGestureListener.Sc import org.chromium.components.browser_ui.widget.gesture.SwipeGestureListener.SwipeHandler; import org.chromium.ui.resources.dynamics.DynamicResourceLoader; + import org.chromium.ui.util.XrUtils; +import org.chromium.chrome.browser.flags.ChromeFeatureList; import java.util.List; -@@ -154,7 +155,9 @@ public class LayoutManagerChrome extends LayoutManagerImpl +@@ -157,7 +158,9 @@ public class LayoutManagerChrome extends LayoutManagerImpl @Override public SwipeHandler createToolbarSwipeHandler(boolean supportsSwipeToShowTabSwitcher) { @@ -872,7 +872,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo } @Override -@@ -364,9 +367,11 @@ public class LayoutManagerChrome extends LayoutManagerImpl +@@ -372,9 +375,11 @@ public class LayoutManagerChrome extends LayoutManagerImpl private static final float SWIPE_RANGE_DEG = 25; private final boolean mSupportsSwipeToShowTabSwitcher; @@ -885,7 +885,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo } @Override -@@ -473,7 +478,8 @@ public class LayoutManagerChrome extends LayoutManagerImpl +@@ -481,7 +486,8 @@ public class LayoutManagerChrome extends LayoutManagerImpl return direction == showTabSwitcherScrollDirection || direction == ScrollDirection.LEFT @@ -957,7 +957,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/ScrollDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/ScrollDelegate.java --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/ScrollDelegate.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/ScrollDelegate.java -@@ -258,7 +258,7 @@ public class ScrollDelegate { +@@ -260,7 +260,7 @@ public class ScrollDelegate { boolean useUnadjustedScrollOffset = isRtl != isLeft; float scrollOffset = mScrollOffset; @@ -969,15 +969,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 -@@ -33,6 +33,7 @@ import androidx.appcompat.content.res.AppCompatResources; +@@ -32,6 +32,7 @@ import androidx.appcompat.content.res.AppCompatResources; + import org.chromium.base.Callback; - import org.chromium.base.Log; import org.chromium.base.metrics.RecordUserAction; +import org.chromium.base.supplier.Supplier; import org.chromium.base.supplier.ObservableSupplier; import org.chromium.base.supplier.ObservableSupplierImpl; import org.chromium.cc.input.BrowserControlsState; -@@ -105,6 +106,8 @@ import org.chromium.ui.modaldialog.ModalDialogManager; +@@ -104,6 +105,8 @@ import org.chromium.ui.modaldialog.ModalDialogManager; import org.chromium.ui.resources.ResourceManager; import org.chromium.ui.util.ColorUtils; import org.chromium.url.GURL; @@ -986,7 +986,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over import java.util.ArrayList; import java.util.List; -@@ -257,12 +260,16 @@ public class StripLayoutHelperManager +@@ -254,12 +257,16 @@ public class StripLayoutHelperManager // Drag-Drop @Nullable private TabDragSource mTabDragSource; @@ -1003,7 +1003,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over if (mModelSelectorButton != null && mModelSelectorButton.onDown(x, y, fromMouse, buttons)) { return; -@@ -288,6 +295,7 @@ public class StripLayoutHelperManager +@@ -285,6 +292,7 @@ public class StripLayoutHelperManager if (DragDropGlobalState.hasValue()) { return; } @@ -1011,7 +1011,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over if (mModelSelectorButton != null) { mModelSelectorButton.drag(x, y); } -@@ -299,6 +307,7 @@ public class StripLayoutHelperManager +@@ -296,6 +304,7 @@ public class StripLayoutHelperManager if (DragDropGlobalState.hasValue()) { return; } @@ -1019,7 +1019,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over long time = time(); if (mModelSelectorButton != null && mModelSelectorButton.click(x, y, fromMouse, buttons)) { -@@ -313,6 +322,7 @@ public class StripLayoutHelperManager +@@ -310,6 +319,7 @@ public class StripLayoutHelperManager if (DragDropGlobalState.hasValue()) { return; } @@ -1027,7 +1027,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over getActiveStripLayoutHelper().fling(time(), x, y, velocityX, velocityY); } -@@ -321,6 +331,7 @@ public class StripLayoutHelperManager +@@ -318,6 +328,7 @@ public class StripLayoutHelperManager if (DragDropGlobalState.hasValue()) { return; } @@ -1035,7 +1035,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over getActiveStripLayoutHelper().onLongPress(time(), x, y); } -@@ -436,7 +447,8 @@ public class StripLayoutHelperManager +@@ -433,7 +444,8 @@ public class StripLayoutHelperManager @Nullable DesktopWindowStateManager desktopWindowStateManager, ActionConfirmationManager actionConfirmationManager, ModalDialogManager modalDialogManager, @@ -1045,7 +1045,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over Resources res = context.getResources(); mUpdateHost = updateHost; mLayerTitleCacheSupplier = layerTitleCacheSupplier; -@@ -533,6 +545,8 @@ public class StripLayoutHelperManager +@@ -530,6 +542,8 @@ public class StripLayoutHelperManager modalDialogManager, dataSharingTabManager, () -> getStripVisibilityState() == StripVisibilityState.VISIBLE); @@ -1054,7 +1054,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over tabHoverCardViewStub.setOnInflateListener( (viewStub, view) -> { -@@ -780,6 +794,10 @@ public class StripLayoutHelperManager +@@ -777,6 +791,10 @@ public class StripLayoutHelperManager // layer should be a negative value. yOffset -= getHeight(); } @@ -1065,7 +1065,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over mTabStripTreeProvider.pushAndUpdateStrip( this, mLayerTitleCacheSupplier.get(), -@@ -793,7 +811,9 @@ public class StripLayoutHelperManager +@@ -790,7 +808,9 @@ public class StripLayoutHelperManager mStripTransitionScrimOpacity, mLeftPadding, mRightPadding, @@ -1076,7 +1076,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over return mTabStripTreeProvider; } -@@ -859,11 +879,21 @@ public class StripLayoutHelperManager +@@ -856,11 +876,21 @@ public class StripLayoutHelperManager mRightPadding, mTopPadding); @@ -1226,7 +1226,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/Brow /** A class that manages browser control visibility and positioning. */ public class BrowserControlsManager implements ActivityStateListener, BrowserControlsSizer { // The amount of time to delay the control show request after returning to a once visible -@@ -485,6 +487,14 @@ public class BrowserControlsManager implements ActivityStateListener, BrowserCon +@@ -544,6 +546,14 @@ public class BrowserControlsManager implements ActivityStateListener, BrowserCon return mTopControlsHeight; } @@ -1241,7 +1241,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/Brow @Override public int getTopControlsMinHeight() { return mTopControlsMinHeight; -@@ -581,6 +591,8 @@ public class BrowserControlsManager implements ActivityStateListener, BrowserCon +@@ -645,6 +655,8 @@ public class BrowserControlsManager implements ActivityStateListener, BrowserCon @Override public float getTopVisibleContentOffset() { @@ -1293,7 +1293,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/messages/Messag diff --git a/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/ChromeTabModalPresenter.java b/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/ChromeTabModalPresenter.java --- a/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/ChromeTabModalPresenter.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/ChromeTabModalPresenter.java -@@ -283,7 +283,7 @@ public class ChromeTabModalPresenter extends TabModalPresenter +@@ -338,7 +338,7 @@ public class ChromeTabModalPresenter extends TabModalPresenter Resources resources, BrowserControlsStateProvider provider) { int scrimVerticalMargin = resources.getDimensionPixelSize(R.dimen.tab_modal_scrim_vertical_margin); @@ -1305,15 +1305,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/Chr diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java -@@ -115,6 +115,7 @@ import org.chromium.content_public.browser.NavigationController; +@@ -116,6 +116,7 @@ import org.chromium.content_public.browser.NavigationController; import org.chromium.ui.base.DeviceFormFactor; import org.chromium.ui.base.WindowAndroid; import org.chromium.url.GURL; +import org.chromium.chrome.browser.flags.ChromeFeatureList; - import java.util.List; - -@@ -761,11 +762,16 @@ public class NewTabPage + import androidx.annotation.NonNull; + import org.chromium.chrome.browser.bookmarks.BookmarkManagerOpener; +@@ -772,11 +773,16 @@ public class NewTabPage final int topControlsDistanceToRest = mBrowserControlsStateProvider.getContentOffset() - mBrowserControlsStateProvider.getTopControlsHeight(); @@ -1332,7 +1332,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage. if (topMargin != layoutParams.topMargin || bottomMargin != layoutParams.bottomMargin) { layoutParams.topMargin = topMargin; -@@ -781,9 +787,7 @@ public class NewTabPage +@@ -792,9 +798,7 @@ public class NewTabPage * strip. */ private int getToolbarExtraYOffset() { @@ -1448,7 +1448,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsP 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 -@@ -81,6 +81,11 @@ import org.chromium.url.GURL; +@@ -84,6 +84,11 @@ import org.chromium.url.GURL; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -1460,7 +1460,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se import java.lang.ref.WeakReference; /** Queries the user's default search engine and shows autocomplete suggestions. */ -@@ -286,6 +291,12 @@ public class SearchActivity extends AsyncInitializationActivity +@@ -294,6 +299,12 @@ public class SearchActivity extends AsyncInitializationActivity // Build the search box. mSearchBox = contentView.findViewById(R.id.search_location_bar); mAnchorView = contentView.findViewById(R.id.toolbar); @@ -1472,7 +1472,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se + } // Update the status bar's color based on the toolbar color. - Drawable anchorViewBackground = mAnchorView.getBackground(); + setStatusAndNavBarColors(); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/FragmentDependencyProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/FragmentDependencyProvider.java --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/FragmentDependencyProvider.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/FragmentDependencyProvider.java @@ -1540,9 +1540,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/status_indicato 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 -@@ -194,6 +194,9 @@ import org.chromium.url.GURL; +@@ -193,6 +193,9 @@ import org.chromium.url.GURL; + import java.util.List; - import java.util.Objects; +import org.chromium.chrome.browser.flags.ChromeFeatureList; +import android.view.Gravity; @@ -1550,7 +1550,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar /** * Contains logic for managing the toolbar visual component. This class manages the interactions * with the rest of the application to ensure the toolbar is always visually up to date. -@@ -756,6 +759,17 @@ public class ToolbarManager +@@ -752,6 +755,17 @@ public class ToolbarManager }, AlwaysIncognitoLinkInterceptor.isAlwaysIncognito()); mControlContainer = controlContainer; mToolbarHairline = mControlContainer.findViewById(R.id.toolbar_hairline); @@ -1568,7 +1568,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar mBookmarkModelSupplier = bookmarkModelSupplier; mBookmarkModelSupplier.addObserver(mBookmarkModelSupplierObserver); -@@ -1316,6 +1330,7 @@ public class ToolbarManager +@@ -1306,6 +1320,7 @@ public class ToolbarManager // the height won't be measured by the background image. if (mControlContainer.getBackground() == null) { setControlContainerTopMargin(getToolbarExtraYOffset()); @@ -1576,7 +1576,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar } else if (mLayoutChangeListener == null) { mLayoutChangeListener = (view, -@@ -1329,6 +1344,7 @@ public class ToolbarManager +@@ -1319,6 +1334,7 @@ public class ToolbarManager oldBottom) -> { if (mControlContainer.getBackground() == null) { setControlContainerTopMargin(getToolbarExtraYOffset()); @@ -1584,7 +1584,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar mControlContainer.removeOnLayoutChangeListener( mLayoutChangeListener); mLayoutChangeListener = null; -@@ -1766,9 +1782,21 @@ public class ToolbarManager +@@ -1761,9 +1777,21 @@ public class ToolbarManager return ((LocationBarCoordinator) mLocationBar).getUrlBarViewRectProvider(); } @@ -1607,7 +1607,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar assert mTabGroupUiOneshotSupplier == null; ThemeColorProvider bottomUiThemeColorProvider = new BottomUiThemeColorProvider( -@@ -1782,7 +1810,7 @@ public class ToolbarManager +@@ -1777,7 +1805,7 @@ public class ToolbarManager mActivityTabProvider, mTabModelSelector, mActivity, @@ -1616,7 +1616,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar mBrowserControlsSizer, mScrimManager, mOmniboxFocusStateSupplier, -@@ -1807,7 +1835,7 @@ public class ToolbarManager +@@ -1802,7 +1830,7 @@ public class ToolbarManager mControlsVisibilityDelegate, mFullscreenManager, mEdgeToEdgeControllerSupplier, @@ -1625,7 +1625,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar bottomControlsContentDelegateSupplier, mTabObscuringHandler, mOverlayPanelVisibilitySupplier, -@@ -1815,7 +1843,8 @@ public class ToolbarManager +@@ -1810,7 +1838,8 @@ public class ToolbarManager /* readAloudRestoringSupplier= */ () -> { final var readAloud = mReadAloudControllerSupplier.get(); return readAloud != null && readAloud.isRestoringPlayer(); @@ -1686,15 +1686,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/system/Statu import androidx.annotation.ColorInt; import androidx.annotation.Nullable; -@@ -17,6 +18,7 @@ import org.chromium.base.CallbackController; - import org.chromium.base.supplier.ObservableSupplier; +@@ -18,6 +19,7 @@ import org.chromium.base.supplier.ObservableSupplier; + import org.chromium.base.supplier.OneshotSupplier; import org.chromium.chrome.R; import org.chromium.chrome.browser.ActivityTabProvider; +import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.layouts.LayoutManager; import org.chromium.chrome.browser.layouts.LayoutStateProvider; import org.chromium.chrome.browser.layouts.LayoutStateProvider.LayoutStateObserver; -@@ -482,6 +484,12 @@ public class StatusBarColorController +@@ -509,6 +511,12 @@ public class StatusBarColorController UiUtils.setStatusBarIconColor(root, needsDarkStatusBarIcons); UiUtils.setStatusBarColor(window, color); } @@ -1784,7 +1784,7 @@ diff --git a/chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer diff --git a/chrome/browser/browser_controls/android/java/src/org/chromium/chrome/browser/browser_controls/BottomControlsStacker.java b/chrome/browser/browser_controls/android/java/src/org/chromium/chrome/browser/browser_controls/BottomControlsStacker.java --- a/chrome/browser/browser_controls/android/java/src/org/chromium/chrome/browser/browser_controls/BottomControlsStacker.java +++ b/chrome/browser/browser_controls/android/java/src/org/chromium/chrome/browser/browser_controls/BottomControlsStacker.java -@@ -271,7 +271,7 @@ public class BottomControlsStacker implements BrowserControlsStateProvider.Obser +@@ -273,7 +273,7 @@ public class BottomControlsStacker implements BrowserControlsStateProvider.Obser /** * @return {@link BrowserControlsStateProvider} instance in the current Activity. */ @@ -1796,15 +1796,15 @@ diff --git a/chrome/browser/browser_controls/android/java/src/org/chromium/chrom diff --git a/chrome/browser/browser_controls/android/java/src/org/chromium/chrome/browser/browser_controls/BrowserControlsMarginSupplier.java b/chrome/browser/browser_controls/android/java/src/org/chromium/chrome/browser/browser_controls/BrowserControlsMarginSupplier.java --- a/chrome/browser/browser_controls/android/java/src/org/chromium/chrome/browser/browser_controls/BrowserControlsMarginSupplier.java +++ b/chrome/browser/browser_controls/android/java/src/org/chromium/chrome/browser/browser_controls/BrowserControlsMarginSupplier.java -@@ -8,6 +8,7 @@ import android.graphics.Rect; - +@@ -9,6 +9,7 @@ import android.graphics.Rect; import org.chromium.base.supplier.DestroyableObservableSupplier; import org.chromium.base.supplier.ObservableSupplierImpl; + import org.chromium.build.annotations.NullMarked; +import org.chromium.chrome.browser.flags.ChromeFeatureList; /** * An implementation of {@link DestroyableObservableSupplier} that monitors changes to browser -@@ -61,6 +62,10 @@ public class BrowserControlsMarginSupplier extends ObservableSupplierImpl +@@ -63,6 +64,10 @@ public class BrowserControlsMarginSupplier extends ObservableSupplierImpl int bottomMargin = mBrowserControlsStateProvider.getBottomControlsHeight() - mBrowserControlsStateProvider.getBottomControlOffset(); @@ -1818,7 +1818,7 @@ diff --git a/chrome/browser/browser_controls/android/java/src/org/chromium/chrom diff --git a/chrome/browser/browser_controls/android/java/src/org/chromium/chrome/browser/browser_controls/BrowserControlsStateProvider.java b/chrome/browser/browser_controls/android/java/src/org/chromium/chrome/browser/browser_controls/BrowserControlsStateProvider.java --- a/chrome/browser/browser_controls/android/java/src/org/chromium/chrome/browser/browser_controls/BrowserControlsStateProvider.java +++ b/chrome/browser/browser_controls/android/java/src/org/chromium/chrome/browser/browser_controls/BrowserControlsStateProvider.java -@@ -115,6 +115,12 @@ public interface BrowserControlsStateProvider { +@@ -119,6 +119,12 @@ public interface BrowserControlsStateProvider { */ int getTopControlsHeight(); @@ -1877,7 +1877,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 -@@ -406,6 +406,10 @@ public abstract class ChromeFeatureList { +@@ -414,6 +414,10 @@ public abstract class ChromeFeatureList { public static final String NEW_TAB_PAGE_ANDROID_TRIGGER_FOR_PRERENDER2 = "NewTabPageAndroidTriggerForPrerender2"; public static final String NOTIFICATION_ONE_TAP_UNSUBSCRIBE = "NotificationOneTapUnsubscribe"; @@ -1888,7 +1888,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f public static final String NOTIFICATION_PERMISSION_VARIANT = "NotificationPermissionVariant"; public static final String NOTIFICATION_PERMISSION_BOTTOM_SHEET = "NotificationPermissionBottomSheet"; -@@ -765,6 +769,10 @@ public abstract class ChromeFeatureList { +@@ -801,6 +805,10 @@ public abstract class ChromeFeatureList { PRICE_INSIGHTS, /* defaultValue= */ false, /* defaultValueInTests= */ true); public static final CachedFlag sOptimizationGuidePushNotifications = newCachedFlag(OPTIMIZATION_GUIDE_PUSH_NOTIFICATIONS, true); @@ -1899,7 +1899,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f public static final CachedFlag sPaintPreviewDemo = newCachedFlag(PAINT_PREVIEW_DEMO, false); public static final CachedFlag sPostGetMyMemoryStateToBackground = newCachedFlag(POST_GET_MEMORY_PRESSURE_TO_BACKGROUND, true); -@@ -921,6 +929,8 @@ public abstract class ChromeFeatureList { +@@ -956,6 +964,8 @@ public abstract class ChromeFeatureList { sPriceChangeModule, sPriceInsights, sOptimizationGuidePushNotifications, @@ -2105,7 +2105,7 @@ diff --git a/chrome/browser/hub/internal/android/res/layout/hub_toolbar_layout.x 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 -@@ -2364,7 +2364,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -2258,7 +2258,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, #if BUILDFLAG(IS_ANDROID) registry->RegisterBooleanPref(prefs::kVirtualKeyboardResizesLayoutByDefault, @@ -2117,7 +2117,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java b/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java --- a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java +++ b/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java -@@ -12,6 +12,7 @@ import android.graphics.Color; +@@ -13,6 +13,7 @@ import android.graphics.PorterDuff; import android.graphics.Rect; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; @@ -2125,15 +2125,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; -@@ -42,6 +43,7 @@ import org.chromium.base.metrics.RecordHistogram; +@@ -44,6 +45,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; -@@ -264,6 +266,12 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler + import org.chromium.components.browser_ui.styles.SemanticColorUtils; +@@ -278,6 +280,12 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler } mListView = (ListView) contentView.findViewById(R.id.app_menu_list); @@ -2146,7 +2146,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); -@@ -301,7 +309,7 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler +@@ -315,7 +323,7 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler Math.min( Math.abs(mTempLocation[1] - visibleDisplayFrame.top), Math.abs(mTempLocation[1] - visibleDisplayFrame.bottom)); @@ -2155,7 +2155,7 @@ diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/ch menuItemIds, heightList, visibleDisplayFrame, -@@ -321,8 +329,14 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler +@@ -335,8 +343,14 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler sizingPadding, anchorView, popupWidth, @@ -2171,7 +2171,7 @@ diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/ch try { mPopup.showAtLocation( -@@ -383,11 +397,20 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler +@@ -397,11 +411,20 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler Rect padding, View anchorView, int popupWidth, @@ -2193,7 +2193,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. -@@ -561,7 +584,7 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler +@@ -575,7 +598,7 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler if (mAdapter != null) mAdapter.notifyDataSetChanged(); } @@ -2202,7 +2202,7 @@ diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/ch List menuItemIds, List heightList, Rect appDimensions, -@@ -580,7 +603,13 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler +@@ -594,7 +617,13 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler - footerHeight - headerHeight - anchorViewImpactHeight; @@ -2217,7 +2217,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 = -@@ -610,6 +639,7 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler +@@ -624,6 +653,7 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler menuItemIds, heightList, groupDividerResourceId, availableScreenSpace); menuHeight += footerHeight + headerHeight + padding.top + padding.bottom; mPopup.setHeight(menuHeight); @@ -2579,7 +2579,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 -@@ -1689,6 +1689,12 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1703,6 +1703,12 @@ Your Google account may have other forms of browsing history like searches and a Force Tablet Mode @@ -2595,7 +2595,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 -@@ -176,6 +176,7 @@ android_library("java") { +@@ -177,6 +177,7 @@ android_library("java") { "//content/public/android:content_java", "//third_party/android_deps:material_design_java", "//third_party/androidx:androidx_annotation_annotation_experimental_java", @@ -2729,7 +2729,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow // Method call routed to onBrowserControlsOffsetUpdate. if (BottomControlsStacker.isDispatchingYOffset()) return; -@@ -321,11 +329,13 @@ class BottomControlsMediator +@@ -314,11 +322,13 @@ class BottomControlsMediator && !mIsInSwipeLayout && getBrowserControls().getBottomControlOffset() == 0; if (visible) { @@ -2853,7 +2853,7 @@ 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, DesktopWindowStateManager.AppHeaderObserver { -@@ -163,6 +167,11 @@ public class ToolbarControlContainer extends OptimizedFrameLayout +@@ -164,6 +168,11 @@ public class ToolbarControlContainer extends OptimizedFrameLayout if (view != null) ((MarginLayoutParams)view.getLayoutParams()).topMargin = tab_strip_height; } @@ -3022,7 +3022,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c Preference captions = findPreference(PREF_CAPTIONS); captions.setOnPreferenceClickListener( preference -> { -@@ -187,6 +208,12 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment +@@ -185,6 +206,12 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment mDelegate.getBrowserContextHandle(), (Integer) newValue); } else if (PREF_PAGE_ZOOM_ALWAYS_SHOW.equals(preference.getKey())) { PageZoomUtils.setShouldAlwaysShowZoomMenuItem((Boolean) newValue); @@ -3072,7 +3072,7 @@ diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/ #include "cc/base/math_util.h" #include "cc/slim/layer.h" #include "components/input/events_helper.h" -@@ -863,6 +864,8 @@ void RenderWidgetHostViewAndroid::OnRenderFrameMetadataChangedBeforeActivation( +@@ -865,6 +866,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/patches/Multiple-fingerprinting-mitigations.patch b/build/patches/Multiple-fingerprinting-mitigations.patch index a7ed867a..f7038e7e 100644 --- a/build/patches/Multiple-fingerprinting-mitigations.patch +++ b/build/patches/Multiple-fingerprinting-mitigations.patch @@ -63,8 +63,8 @@ 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 -@@ -2424,6 +2424,7 @@ static_library("browser") { - "//services/device/public/cpp:device_features", +@@ -2445,6 +2445,7 @@ static_library("browser") { + "//services/device/public/cpp/bluetooth", "//services/device/public/cpp/geolocation", "//services/device/public/cpp/usb", + "//third_party/ungoogled:switches", @@ -74,7 +74,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn 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 -@@ -253,6 +253,8 @@ +@@ -255,6 +255,8 @@ #include "ui/ui_features.h" #include "url/url_features.h" @@ -86,7 +86,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn -@@ -283,6 +283,7 @@ source_set("browser") { +@@ -290,6 +290,7 @@ source_set("browser") { "//third_party/re2", "//third_party/snappy", "//third_party/sqlite", @@ -97,7 +97,7 @@ diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn 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 -@@ -213,6 +213,7 @@ +@@ -216,6 +216,7 @@ #include "url/gurl.h" #include "url/origin.h" @@ -118,7 +118,7 @@ diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content diff --git a/content/child/BUILD.gn b/content/child/BUILD.gn --- a/content/child/BUILD.gn +++ b/content/child/BUILD.gn -@@ -109,6 +109,7 @@ target(link_target_type, "child") { +@@ -110,6 +110,7 @@ target(link_target_type, "child") { "//third_party/blink/public/common:buildflags", "//third_party/blink/public/strings", "//third_party/ced", @@ -138,7 +138,7 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features. #if BUILDFLAG(IS_ANDROID) #include "base/android/build_info.h" #endif -@@ -514,6 +516,12 @@ void SetRuntimeFeaturesFromCommandLine(const base::CommandLine& command_line) { +@@ -521,6 +523,12 @@ void SetRuntimeFeaturesFromCommandLine(const base::CommandLine& command_line) { // as a last resort. void SetCustomizedRuntimeFeaturesFromCombinedArgs( const base::CommandLine& command_line) { @@ -196,7 +196,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink #include "base/task/single_thread_task_runner.h" #include "base/time/time.h" #include "base/trace_event/trace_event.h" -@@ -866,6 +867,17 @@ Document::Document(const DocumentInit& initializer, +@@ -867,6 +868,17 @@ Document::Document(const DocumentInit& initializer, TRACE_EVENT_WITH_FLOW0("blink", "Document::Document", TRACE_ID_LOCAL(this), TRACE_EVENT_FLAG_FLOW_OUT); DCHECK(agent_); @@ -214,7 +214,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink if (base::FeatureList::IsEnabled(features::kDelayAsyncScriptExecution) && features::kDelayAsyncScriptExecutionDelayByDefaultParam.Get()) { script_runner_delayer_->Activate(); -@@ -2492,6 +2504,14 @@ void Document::UpdateStyleAndLayoutTreeForThisDocument() { +@@ -2493,6 +2505,14 @@ void Document::UpdateStyleAndLayoutTreeForThisDocument() { #endif } @@ -232,7 +232,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/renderer/core/dom/document.h --- a/third_party/blink/renderer/core/dom/document.h +++ b/third_party/blink/renderer/core/dom/document.h -@@ -550,6 +550,10 @@ class CORE_EXPORT Document : public ContainerNode, +@@ -555,6 +555,10 @@ class CORE_EXPORT Document : public ContainerNode, has_xml_declaration_ = has_xml_declaration ? 1 : 0; } @@ -243,7 +243,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/ V8VisibilityState visibilityState() const; String visibilityStateAsString() const; bool IsPageVisible() const; -@@ -2641,6 +2645,9 @@ class CORE_EXPORT Document : public ContainerNode, +@@ -2644,6 +2648,9 @@ class CORE_EXPORT Document : public ContainerNode, base::ElapsedTimer start_time_; @@ -256,7 +256,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/ diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/renderer/core/dom/element.cc --- a/third_party/blink/renderer/core/dom/element.cc +++ b/third_party/blink/renderer/core/dom/element.cc -@@ -2723,6 +2723,7 @@ void Element::ClientQuads(Vector& quads) const { +@@ -2640,6 +2640,7 @@ void Element::ClientQuads(Vector& quads) const { quads.push_back(element_layout_object->LocalToAbsoluteQuad( gfx::QuadF(element_layout_object->ObjectBoundingBox()))); } @@ -264,7 +264,7 @@ diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/ return; } -@@ -2731,6 +2732,10 @@ void Element::ClientQuads(Vector& quads) const { +@@ -2648,6 +2649,10 @@ void Element::ClientQuads(Vector& quads) const { element_layout_object->IsBR()) { element_layout_object->AbsoluteQuads(quads); } @@ -275,7 +275,7 @@ diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/ } DOMRectList* Element::getClientRects() { -@@ -2776,6 +2781,9 @@ gfx::RectF Element::GetBoundingClientRectNoLifecycleUpdate() const { +@@ -2693,6 +2698,9 @@ gfx::RectF Element::GetBoundingClientRectNoLifecycleUpdate() const { DCHECK(element_layout_object); GetDocument().AdjustRectForScrollAndAbsoluteZoom(result, *element_layout_object); @@ -317,7 +317,7 @@ diff --git a/third_party/blink/renderer/core/dom/range.cc b/third_party/blink/re diff --git a/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc b/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc --- a/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc +++ b/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc -@@ -26,6 +26,7 @@ +@@ -21,6 +21,7 @@ #include "third_party/blink/renderer/core/fileapi/blob.h" #include "third_party/blink/renderer/core/html/canvas/canvas_rendering_context.h" #include "third_party/blink/renderer/platform/graphics/image_data_buffer.h" @@ -325,7 +325,7 @@ diff --git a/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creat #include "third_party/blink/renderer/platform/graphics/skia/skia_utils.h" #include "third_party/blink/renderer/platform/graphics/unaccelerated_static_bitmap_image.h" #include "third_party/blink/renderer/platform/heap/garbage_collected.h" -@@ -219,6 +220,9 @@ CanvasAsyncBlobCreator::CanvasAsyncBlobCreator( +@@ -214,6 +215,9 @@ CanvasAsyncBlobCreator::CanvasAsyncBlobCreator( std::min(info.height(), max_dimension)); src_data_.reset(info, src_data_.addr(), src_data_.rowBytes()); } @@ -338,7 +338,7 @@ diff --git a/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creat diff --git a/third_party/blink/renderer/core/html/canvas/text_metrics.cc b/third_party/blink/renderer/core/html/canvas/text_metrics.cc --- a/third_party/blink/renderer/core/html/canvas/text_metrics.cc +++ b/third_party/blink/renderer/core/html/canvas/text_metrics.cc -@@ -102,6 +102,24 @@ const ShapeResult* ShapeWord(const TextRun& word_run, const Font& font) { +@@ -107,6 +107,24 @@ const ShapeResult* ShapeWord(const TextRun& word_run, const Font& font) { } } // namespace @@ -360,21 +360,21 @@ diff --git a/third_party/blink/renderer/core/html/canvas/text_metrics.cc b/third + baselines_->setIdeographic(baselines_->ideographic() * factor); +} + - void TextMetrics::Update(const Font& font, + void TextMetrics::Update(const Font* font, const TextDirection& direction, - const TextBaseline& baseline, + const V8CanvasTextBaseline::Enum 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 --- a/third_party/blink/renderer/core/html/canvas/text_metrics.h +++ b/third_party/blink/renderer/core/html/canvas/text_metrics.h -@@ -103,6 +103,8 @@ class CORE_EXPORT TextMetrics final : public ScriptWrappable { +@@ -112,6 +112,8 @@ class CORE_EXPORT TextMetrics final : public ScriptWrappable { float x_position_; }; + void Shuffle(const double factor); + private: - void Update(const Font&, - const TextDirection&, + void Update(const Font*, + const TextDirection& direction, diff --git a/third_party/blink/renderer/core/svg/svg_graphics_element.cc b/third_party/blink/renderer/core/svg/svg_graphics_element.cc --- a/third_party/blink/renderer/core/svg/svg_graphics_element.cc +++ b/third_party/blink/renderer/core/svg/svg_graphics_element.cc @@ -469,7 +469,7 @@ diff --git a/third_party/blink/renderer/core/svg/svg_text_content_element.cc b/t 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 --- 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 -@@ -197,6 +197,11 @@ +@@ -205,6 +205,11 @@ #include "ui/gfx/geometry/size.h" #include "ui/gfx/geometry/size_f.h" #include "ui/gfx/geometry/skia_conversions.h" @@ -481,7 +481,7 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_c #include "ui/gfx/geometry/vector2d.h" #include "ui/gfx/geometry/vector2d_f.h" #include "v8/include/v8-local-handle.h" -@@ -2970,6 +2975,10 @@ ImageData* BaseRenderingContext2D::getImageDataInternal( +@@ -2964,6 +2969,10 @@ ImageData* BaseRenderingContext2D::getImageDataInternal( snapshot->PaintImageForCurrentFrame().GetSkImageInfo().bounds(); DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh))); } @@ -492,13 +492,17 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_c } return image_data; -@@ -3705,8 +3714,22 @@ TextMetrics* BaseRenderingContext2D::measureText(const String& text) { +@@ -3763,12 +3772,26 @@ TextMetrics* BaseRenderingContext2D::measureText(const String& text) { TextDirection direction = ToTextDirection( state.GetDirection(), GetCanvasRenderingContextHost(), computed_style); - return MakeGarbageCollected( + auto* text_metrics = MakeGarbageCollected( - font, direction, state.GetTextBaseline(), state.GetTextAlign(), text); + font, direction, state.GetTextBaseline().AsEnum(), + state.GetTextAlign().AsEnum(), text, + RuntimeEnabledFeatures::CanvasTextNgEnabled() + ? &GetCanvasRenderingContextHost()->GetPlainTextPainter() + : nullptr); + // Scale text metrics if enabled + if (RuntimeEnabledFeatures::FingerprintingCanvasMeasureTextNoiseEnabled()) { + OffscreenCanvas* offscreen_canvas = HostAsOffscreenCanvas(); @@ -519,7 +523,7 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_c diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -1706,7 +1706,9 @@ component("platform") { +@@ -1717,7 +1717,9 @@ component("platform") { "//third_party/blink/renderer:non_test_config", ] @@ -530,7 +534,7 @@ diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/re allow_circular_includes_from = [ "//third_party/blink/renderer/platform/blob", -@@ -1791,6 +1793,7 @@ component("platform") { +@@ -1801,6 +1803,7 @@ component("platform") { "//third_party/blink/public/strings", "//third_party/blink/renderer/platform/wtf", "//third_party/ced", @@ -562,19 +566,18 @@ diff --git a/third_party/blink/renderer/platform/exported/web_runtime_features.c diff --git a/third_party/blink/renderer/platform/graphics/image_data_buffer.cc b/third_party/blink/renderer/platform/graphics/image_data_buffer.cc --- a/third_party/blink/renderer/platform/graphics/image_data_buffer.cc +++ b/third_party/blink/renderer/platform/graphics/image_data_buffer.cc -@@ -36,8 +36,11 @@ +@@ -34,7 +34,10 @@ #include "base/compiler_specific.h" #include "base/memory/ptr_util.h" +#include "base/rand_util.h" +#include "base/logging.h" - #include "third_party/blink/renderer/platform/graphics/static_bitmap_image.h" #include "third_party/blink/renderer/platform/image-encoders/image_encoder.h" +#include "third_party/blink/renderer/platform/runtime_enabled_features.h" #include "third_party/blink/renderer/platform/wtf/text/base64.h" - #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h" - #include "third_party/blink/renderer/platform/wtf/vector.h" -@@ -146,6 +149,11 @@ bool ImageDataBuffer::EncodeImageInternal(const ImageEncodingMimeType mime_type, + #include "third_party/skia/include/core/SkImage.h" + #include "third_party/skia/include/core/SkSurface.h" +@@ -140,6 +143,11 @@ bool ImageDataBuffer::EncodeImageInternal(const ImageEncodingMimeType mime_type, const SkPixmap& pixmap) const { DCHECK(is_valid_); @@ -598,12 +601,12 @@ diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc #include "base/numerics/checked_math.h" #include "gpu/command_buffer/client/gles2_interface.h" #include "third_party/blink/renderer/platform/graphics/accelerated_static_bitmap_image.h" -@@ -18,6 +20,9 @@ +@@ -19,6 +21,9 @@ #include "ui/gfx/geometry/skia_conversions.h" #include "v8/include/v8.h" +#include "third_party/blink/renderer/platform/runtime_enabled_features.h" -+#include "third_party/skia/include/private/SkColorData.h" ++#include "third_party/skia/src/core/SkColorData.h" + namespace blink { @@ -765,7 +768,7 @@ diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h b/third_party/blink/renderer/platform/graphics/static_bitmap_image.h --- a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h +++ b/third_party/blink/renderer/platform/graphics/static_bitmap_image.h -@@ -38,6 +38,8 @@ class PLATFORM_EXPORT StaticBitmapImage : public Image { +@@ -39,6 +39,8 @@ class PLATFORM_EXPORT StaticBitmapImage : public Image { StaticBitmapImage(ImageOrientation orientation) : orientation_(orientation) {} @@ -777,7 +780,7 @@ diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h 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 -@@ -2981,6 +2981,15 @@ +@@ -3021,6 +3021,15 @@ status: {"Mac": "test", "default": "stable"}, base_feature: "none", }, diff --git a/build/patches/Never-treat-Proguard-warnings-as-errors.patch b/build/patches/Never-treat-Proguard-warnings-as-errors.patch index c5592ba2..5d33d0ce 100644 --- a/build/patches/Never-treat-Proguard-warnings-as-errors.patch +++ b/build/patches/Never-treat-Proguard-warnings-as-errors.patch @@ -9,7 +9,7 @@ Subject: Never treat Proguard warnings as errors diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni --- a/build/config/android/internal_rules.gni +++ b/build/config/android/internal_rules.gni -@@ -1317,9 +1317,9 @@ if (enable_java_templates) { +@@ -1326,9 +1326,9 @@ if (enable_java_templates) { _source_file_template, "--proguard-configs=@FileArg($_rebased_build_config:deps_info:proguard_all_configs)", ] diff --git a/build/patches/OpenSearch-miscellaneous.patch b/build/patches/OpenSearch-miscellaneous.patch index d2a1c3b2..ac72290a 100644 --- a/build/patches/OpenSearch-miscellaneous.patch +++ b/build/patches/OpenSearch-miscellaneous.patch @@ -234,7 +234,7 @@ diff --git a/components/search_engines/template_url_parser.cc b/components/searc diff --git a/components/search_engines/template_url_service.h b/components/search_engines/template_url_service.h --- a/components/search_engines/template_url_service.h +++ b/components/search_engines/template_url_service.h -@@ -364,7 +364,10 @@ class TemplateURLService final : public WebDataServiceConsumer, +@@ -379,7 +379,10 @@ class TemplateURLService final : public WebDataServiceConsumer, void UpdateProviderFavicons(const GURL& potential_search_url, const GURL& favicon_url); @@ -246,7 +246,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; -@@ -747,9 +750,6 @@ class TemplateURLService final : public WebDataServiceConsumer, +@@ -763,9 +766,6 @@ class TemplateURLService final : public WebDataServiceConsumer, // SetKeywordSearchTermsForURL is invoked. void UpdateKeywordSearchTermsForURL(const URLVisitedDetails& details); diff --git a/build/patches/Override-Navigator-Language.patch b/build/patches/Override-Navigator-Language.patch index 427d97ae..d01044ec 100644 --- a/build/patches/Override-Navigator-Language.patch +++ b/build/patches/Override-Navigator-Language.patch @@ -61,15 +61,15 @@ diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browse 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 -@@ -71,6 +71,7 @@ - #include "cc/base/switches.h" +@@ -72,6 +72,7 @@ + #include "components/embedder_support/switches.h" #include "components/input/utils.h" #include "components/metrics/histogram_controller.h" +#include "components/language/core/browser/language_prefs.h" #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" -@@ -3277,8 +3278,11 @@ void RenderProcessHostImpl::AppendRendererCommandLine( +@@ -3281,8 +3282,11 @@ void RenderProcessHostImpl::AppendRendererCommandLine( PropagateBrowserCommandLineToRenderer(browser_command_line, command_line); // Pass on the browser locale. diff --git a/build/patches/Partition-Blink-memory-cache.patch b/build/patches/Partition-Blink-memory-cache.patch index 8b5bf19b..219ef17a 100644 --- a/build/patches/Partition-Blink-memory-cache.patch +++ b/build/patches/Partition-Blink-memory-cache.patch @@ -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 -@@ -2432,7 +2432,7 @@ bool InspectorNetworkAgent::FetchResourceContent(Document* document, +@@ -2436,7 +2436,7 @@ bool InspectorNetworkAgent::FetchResourceContent(Document* document, if (!cached_resource) { cached_resource = MemoryCache::Get()->ResourceForURL( url, document->Fetcher()->GetCacheIdentifier( @@ -54,19 +54,19 @@ diff --git a/third_party/blink/renderer/core/inspector/inspector_network_agent.c diff --git a/third_party/blink/renderer/core/inspector/inspector_page_agent.cc b/third_party/blink/renderer/core/inspector/inspector_page_agent.cc --- a/third_party/blink/renderer/core/inspector/inspector_page_agent.cc +++ b/third_party/blink/renderer/core/inspector/inspector_page_agent.cc -@@ -174,7 +174,7 @@ Resource* CachedResource(LocalFrame* frame, +@@ -176,7 +176,7 @@ Resource* CachedResource(LocalFrame* frame, if (!cached_resource) { cached_resource = MemoryCache::Get()->ResourceForURL( url, document->Fetcher()->GetCacheIdentifier( - url, /*skip_service_worker=*/false)); + url, /*skip_service_worker=*/false, document->TopFrameOrigin())); } - if (!cached_resource) + if (!cached_resource) { cached_resource = loader->ResourceForURL(url); diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/third_party/blink/renderer/core/loader/frame_fetch_context.cc --- a/third_party/blink/renderer/core/loader/frame_fetch_context.cc +++ b/third_party/blink/renderer/core/loader/frame_fetch_context.cc -@@ -852,6 +852,8 @@ void FrameFetchContext::PopulateResourceRequestBeforeCacheAccess( +@@ -851,6 +851,8 @@ void FrameFetchContext::PopulateResourceRequestBeforeCacheAccess( if (document_loader_->ForceFetchCacheMode()) { request.SetCacheMode(*document_loader_->ForceFetchCacheMode()); } @@ -78,7 +78,7 @@ diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/thi diff --git a/third_party/blink/renderer/core/loader/image_loader.cc b/third_party/blink/renderer/core/loader/image_loader.cc --- a/third_party/blink/renderer/core/loader/image_loader.cc +++ b/third_party/blink/renderer/core/loader/image_loader.cc -@@ -716,7 +716,8 @@ bool ImageLoader::ShouldLoadImmediately(const KURL& url) const { +@@ -717,7 +717,8 @@ bool ImageLoader::ShouldLoadImmediately(const KURL& url) const { if (!url.IsNull()) { Resource* resource = MemoryCache::Get()->ResourceForURL( url, element_->GetDocument().Fetcher()->GetCacheIdentifier( @@ -91,16 +91,16 @@ diff --git a/third_party/blink/renderer/core/loader/image_loader.cc b/third_part diff --git a/third_party/blink/renderer/core/loader/worker_fetch_context.cc b/third_party/blink/renderer/core/loader/worker_fetch_context.cc --- a/third_party/blink/renderer/core/loader/worker_fetch_context.cc +++ b/third_party/blink/renderer/core/loader/worker_fetch_context.cc -@@ -268,6 +268,9 @@ void WorkerFetchContext::PopulateResourceRequestBeforeCacheAccess( - DCHECK(RuntimeEnabledFeatures:: - MinimimalResourceRequestPrepBeforeCacheLookupEnabled()); +@@ -260,6 +260,9 @@ void WorkerFetchContext::AddResourceTiming( + void WorkerFetchContext::ModifyRequestForMixedContentUpgrade( + ResourceRequest& request) { + if (!request.TopFrameOrigin()) + request.SetTopFrameOrigin(GetTopFrameOrigin()); + MixedContentChecker::UpgradeInsecureRequest( request, &GetResourceFetcherProperties().GetFetchClientSettingsObject(), - global_scope_, mojom::RequestContextFrameType::kNone, + global_scope_, mojom::blink::RequestContextFrameType::kNone, diff --git a/third_party/blink/renderer/platform/loader/fetch/memory_cache.cc b/third_party/blink/renderer/platform/loader/fetch/memory_cache.cc --- a/third_party/blink/renderer/platform/loader/fetch/memory_cache.cc +++ b/third_party/blink/renderer/platform/loader/fetch/memory_cache.cc @@ -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()) { -@@ -1462,7 +1463,8 @@ Resource* ResourceFetcher::RequestResource(FetchParameters& params, +@@ -1482,7 +1483,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); -@@ -1794,7 +1796,8 @@ Resource* ResourceFetcher::CreateResourceForLoading( +@@ -1814,7 +1816,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)); -@@ -2903,11 +2906,47 @@ void ResourceFetcher::UpdateImagePrioritiesAndSpeculativeDecodes() { +@@ -2927,11 +2930,47 @@ void ResourceFetcher::UpdateImagePrioritiesAndSpeculativeDecodes() { } String ResourceFetcher::GetCacheIdentifier(const KURL& url, @@ -237,7 +237,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.c } // Requests that can be satisfied via `archive_` (i.e. MHTML) or -@@ -2922,7 +2961,7 @@ String ResourceFetcher::GetCacheIdentifier(const KURL& url, +@@ -2946,7 +2985,7 @@ String ResourceFetcher::GetCacheIdentifier(const KURL& url, return bundle->GetCacheIdentifier(); } diff --git a/build/patches/Partition-HSTS-cache-by-NAK.patch b/build/patches/Partition-HSTS-cache-by-NAK.patch index 778e6822..f813766e 100644 --- a/build/patches/Partition-HSTS-cache-by-NAK.patch +++ b/build/patches/Partition-HSTS-cache-by-NAK.patch @@ -13,6 +13,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html .../web_package/signed_exchange_loader.h | 2 + .../signed_exchange_prefetch_handler.cc | 2 +- .../signed_exchange_request_handler.cc | 1 + + .../Partition-HSTS-cache-by-NAK.inc | 1 + net/http/transport_security_state.cc | 103 ++++++++++++------ net/http/transport_security_state.h | 39 ++++--- net/quic/crypto/proof_verifier_chromium.cc | 5 +- @@ -22,10 +23,11 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html net/spdy/spdy_session.h | 3 +- .../url_request_context_builder.cc | 14 --- net/url_request/url_request_http_job.cc | 5 +- - services/network/network_context.cc | 31 ++++-- - services/network/network_context.h | 13 ++- - .../public/mojom/network_context.mojom | 9 +- - 21 files changed, 173 insertions(+), 102 deletions(-) + services/network/network_context.cc | 37 ++++--- + services/network/network_context.h | 15 ++- + .../public/mojom/network_context.mojom | 10 +- + 22 files changed, 181 insertions(+), 104 deletions(-) + create mode 100644 cromite_flags/net/base/features_cc/Partition-HSTS-cache-by-NAK.inc diff --git a/chrome/browser/ssl/https_upgrades_interceptor.cc b/chrome/browser/ssl/https_upgrades_interceptor.cc --- a/chrome/browser/ssl/https_upgrades_interceptor.cc @@ -37,7 +39,7 @@ diff --git a/chrome/browser/ssl/https_upgrades_interceptor.cc b/chrome/browser/s + tentative_resource_request.trusted_params->isolation_info.network_anonymization_key(), tentative_resource_request.url.host(), tentative_resource_request.trusted_params->isolation_info - .IsMainFrameRequest(), + .IsOutermostMainFrameRequest(), diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc --- a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc +++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc @@ -92,7 +94,7 @@ diff --git a/components/password_manager/core/browser/hsts_query.cc b/components diff --git a/content/browser/web_package/signed_exchange_handler.cc b/content/browser/web_package/signed_exchange_handler.cc --- a/content/browser/web_package/signed_exchange_handler.cc +++ b/content/browser/web_package/signed_exchange_handler.cc -@@ -95,6 +95,7 @@ using VerifyCallback = +@@ -96,6 +96,7 @@ using VerifyCallback = void VerifyCert(const scoped_refptr& certificate, const GURL& url, @@ -100,16 +102,16 @@ diff --git a/content/browser/web_package/signed_exchange_handler.cc b/content/br const std::string& ocsp_result, const std::string& sct_list, FrameTreeNodeId frame_tree_node_id, -@@ -116,7 +117,7 @@ void VerifyCert(const scoped_refptr& certificate, +@@ -117,7 +118,7 @@ void VerifyCert(const scoped_refptr& certificate, } network_context->VerifyCertForSignedExchange( -- certificate, url, ocsp_result, sct_list, std::move(wrapped_callback)); -+ certificate, url, network_anonymization_key, ocsp_result, sct_list, std::move(wrapped_callback)); +- certificate, net::HostPortPair::FromURL(url), ocsp_result, sct_list, ++ certificate, net::HostPortPair::FromURL(url), network_anonymization_key, ocsp_result, sct_list, + std::move(wrapped_callback)); } - std::string OCSPErrorToString(const bssl::OCSPVerifyResult& ocsp_result) { -@@ -177,6 +178,7 @@ SignedExchangeHandler::SignedExchangeHandler( +@@ -179,6 +180,7 @@ SignedExchangeHandler::SignedExchangeHandler( std::unique_ptr body, ExchangeHeadersCallback headers_callback, std::unique_ptr cert_fetcher_factory, @@ -117,7 +119,7 @@ diff --git a/content/browser/web_package/signed_exchange_handler.cc b/content/br std::optional outer_request_isolation_info, int load_flags, const net::IPEndPoint& remote_endpoint, -@@ -190,6 +192,7 @@ SignedExchangeHandler::SignedExchangeHandler( +@@ -192,6 +194,7 @@ SignedExchangeHandler::SignedExchangeHandler( source_(std::move(body)), cert_fetcher_factory_(std::move(cert_fetcher_factory)), devtools_proxy_(std::move(devtools_proxy)), @@ -125,7 +127,7 @@ diff --git a/content/browser/web_package/signed_exchange_handler.cc b/content/br outer_request_isolation_info_(std::move(outer_request_isolation_info)), load_flags_(load_flags), remote_endpoint_(remote_endpoint), -@@ -531,7 +534,7 @@ void SignedExchangeHandler::OnCertReceived( +@@ -533,7 +536,7 @@ void SignedExchangeHandler::OnCertReceived( // property, or const std::string& stapled_ocsp_response = unverified_cert_chain_->ocsp(); @@ -217,6 +219,12 @@ diff --git a/content/browser/web_package/signed_exchange_request_handler.cc b/co frame_tree_node_id_, accept_langs_, false /* keep_entry_for_prefetch_cache */); +diff --git a/cromite_flags/net/base/features_cc/Partition-HSTS-cache-by-NAK.inc b/cromite_flags/net/base/features_cc/Partition-HSTS-cache-by-NAK.inc +new file mode 100644 +--- /dev/null ++++ b/cromite_flags/net/base/features_cc/Partition-HSTS-cache-by-NAK.inc +@@ -0,0 +1 @@ ++SET_CROMITE_FEATURE_DISABLED(kHstsTopLevelNavigationsOnly); diff --git a/net/http/transport_security_state.cc b/net/http/transport_security_state.cc --- a/net/http/transport_security_state.cc +++ b/net/http/transport_security_state.cc @@ -733,7 +741,7 @@ diff --git a/net/spdy/spdy_session.h b/net/spdy/spdy_session.h diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc --- a/net/url_request/url_request_context_builder.cc +++ b/net/url_request/url_request_context_builder.cc -@@ -407,20 +407,6 @@ std::unique_ptr URLRequestContextBuilder::Build() { +@@ -400,20 +400,6 @@ std::unique_ptr URLRequestContextBuilder::Build() { context->set_transport_security_state( std::make_unique(hsts_policy_bypass_list_)); @@ -757,15 +765,15 @@ diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/ur 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 -@@ -343,6 +343,7 @@ std::unique_ptr URLRequestHttpJob::Create(URLRequest* request) { +@@ -357,6 +357,7 @@ std::unique_ptr URLRequestHttpJob::Create(URLRequest* request) { if (TransportSecurityState* hsts = request->context()->transport_security_state()) { upgrade_decision = hsts->GetSSLUpgradeDecision( + request->isolation_info().network_anonymization_key(), url.host(), - /*is_top_level_nav=*/request->isolation_info().IsMainFrameRequest(), - request->net_log()); -@@ -1207,7 +1208,7 @@ void URLRequestHttpJob::ProcessStrictTransportSecurityHeader() { + /*is_top_level_nav=*/ + request->isolation_info().IsOutermostMainFrameRequest(), +@@ -1246,7 +1247,7 @@ void URLRequestHttpJob::ProcessStrictTransportSecurityHeader() { std::optional value; if ((value = headers->EnumerateHeader(nullptr, "Strict-Transport-Security"))) { @@ -774,7 +782,7 @@ diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_reque } } -@@ -1278,7 +1279,7 @@ void URLRequestHttpJob::OnStartCompleted(int result) { +@@ -1317,7 +1318,7 @@ void URLRequestHttpJob::OnStartCompleted(int result) { TransportSecurityState* state = context->transport_security_state(); NotifySSLCertificateError( result, transaction_->GetResponseInfo()->ssl_info, @@ -786,23 +794,48 @@ diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_reque 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 -@@ -2023,6 +2023,7 @@ void NetworkContext::CreateHostResolver( - void NetworkContext::VerifyCertForSignedExchange( +@@ -2046,6 +2046,7 @@ void NetworkContext::CreateHostResolver( + void NetworkContext::VerifyCertInternal( const scoped_refptr& certificate, - const GURL& url, + const net::HostPortPair& host_port, + const net::NetworkAnonymizationKey& network_anonymization_key, const std::string& ocsp_result, const std::string& sct_list, - VerifyCertForSignedExchangeCallback callback) { -@@ -2033,6 +2034,7 @@ void NetworkContext::VerifyCertForSignedExchange( + CTVerificationMode ct_verification_mode, +@@ -2057,6 +2058,7 @@ void NetworkContext::VerifyCertInternal( pending_cert_verify->result = std::make_unique(); pending_cert_verify->certificate = certificate; - pending_cert_verify->url = url; + pending_cert_verify->host_port = host_port; + pending_cert_verify->network_anonymization_key = network_anonymization_key; pending_cert_verify->ocsp_result = ocsp_result; pending_cert_verify->sct_list = sct_list; - net::CertVerifier* cert_verifier = -@@ -2077,17 +2079,19 @@ void NetworkContext::SetCorsOriginAccessListsForOrigin( + pending_cert_verify->ct_verification_mode = ct_verification_mode; +@@ -2082,20 +2084,22 @@ void NetworkContext::VerifyCertInternal( + void NetworkContext::VerifyCert( + const scoped_refptr& certificate, + const net::HostPortPair& host_port, ++ const net::NetworkAnonymizationKey& network_anonymization_key, + const std::string& ocsp_result, + const std::string& sct_list, + VerifyCertCallback callback) { +- VerifyCertInternal(certificate, host_port, ocsp_result, sct_list, ++ VerifyCertInternal(certificate, host_port, network_anonymization_key, ocsp_result, sct_list, + CTVerificationMode::kTlsCertificate, std::move(callback)); + } + + void NetworkContext::VerifyCertForSignedExchange( + const scoped_refptr& certificate, + const net::HostPortPair& host_port, ++ const net::NetworkAnonymizationKey& network_anonymization_key, + const std::string& ocsp_result, + const std::string& sct_list, + VerifyCertCallback callback) { +- VerifyCertInternal(certificate, host_port, ocsp_result, sct_list, ++ VerifyCertInternal(certificate, host_port, network_anonymization_key, ocsp_result, sct_list, + CTVerificationMode::kSignedExchange, std::move(callback)); + } + +@@ -2121,17 +2125,19 @@ void NetworkContext::SetCorsOriginAccessListsForOrigin( std::move(callback).Run(); } @@ -825,7 +858,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont bool is_top_level_nav, IsHSTSActiveForHostCallback callback) { net::TransportSecurityState* security_state = -@@ -2099,10 +2103,10 @@ void NetworkContext::IsHSTSActiveForHost(const std::string& host, +@@ -2143,10 +2149,10 @@ void NetworkContext::IsHSTSActiveForHost(const std::string& host, } std::move(callback).Run( @@ -838,7 +871,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont GetHSTSStateCallback callback) { base::Value::Dict result; -@@ -2140,10 +2144,10 @@ void NetworkContext::GetHSTSState(const std::string& domain, +@@ -2184,10 +2190,10 @@ void NetworkContext::GetHSTSState(const std::string& domain, net::TransportSecurityState::STSState dynamic_sts_state; net::TransportSecurityState::PKPState dynamic_pkp_state; bool found_sts_dynamic = transport_security_state->GetDynamicSTSState( @@ -851,7 +884,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont if (found_sts_dynamic) { result.Set("dynamic_upgrade_mode", static_cast(dynamic_sts_state.upgrade_mode)); -@@ -2181,6 +2185,7 @@ void NetworkContext::GetHSTSState(const std::string& domain, +@@ -2225,6 +2231,7 @@ void NetworkContext::GetHSTSState(const std::string& domain, } void NetworkContext::DeleteDynamicDataForHost( @@ -859,7 +892,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont const std::string& host, DeleteDynamicDataForHostCallback callback) { net::TransportSecurityState* transport_security_state = -@@ -2191,7 +2196,7 @@ void NetworkContext::DeleteDynamicDataForHost( +@@ -2235,7 +2242,7 @@ void NetworkContext::DeleteDynamicDataForHost( } std::move(callback).Run( @@ -868,7 +901,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont } void NetworkContext::EnableStaticKeyPinningForTesting( -@@ -2235,7 +2240,7 @@ void NetworkContext::PreconnectSockets( +@@ -2279,7 +2286,7 @@ void NetworkContext::PreconnectSockets( DCHECK(!require_network_anonymization_key_ || !network_anonymization_key.IsEmpty()); @@ -877,7 +910,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont // |PreconnectSockets| may receive arguments from the renderer, which is not // guaranteed to validate them. -@@ -3042,7 +3047,9 @@ void NetworkContext::OnConnectionError() { +@@ -3092,7 +3099,9 @@ void NetworkContext::OnConnectionError() { } } @@ -888,7 +921,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont // TODO(lilyhoughton) This needs to be gotten rid of once explicit // construction with a URLRequestContext is no longer supported. -@@ -3068,6 +3075,7 @@ GURL NetworkContext::GetHSTSRedirectForPreconnect(const GURL& original_url) { +@@ -3118,6 +3127,7 @@ GURL NetworkContext::GetHSTSRedirectForPreconnect(const GURL& original_url) { // top-level navigation so we need to disallow HSTS upgrades for every // preconnect. if (!url_request_context_->transport_security_state()->ShouldUpgradeToSSL( @@ -896,9 +929,9 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont original_url.host(), /*is_top_level_nav=*/false)) { RecordHSTSPreconnectUpgradeReason( HSTSRedirectUpgradeReason::kNotUpgradedNoHSTSPin); -@@ -3119,7 +3127,8 @@ void NetworkContext::OnVerifyCertForSignedExchangeComplete( +@@ -3167,7 +3177,8 @@ void NetworkContext::OnVerifyCertComplete(uint64_t cert_verify_id, int result) { url_request_context_->transport_security_state()->CheckPublicKeyPins( - pending_cert_verify->url.host(), + pending_cert_verify->host_port.host(), pending_cert_verify->result->is_issued_by_known_root, - pending_cert_verify->result->public_key_hashes); + pending_cert_verify->result->public_key_hashes, @@ -909,14 +942,21 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont 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 -@@ -409,19 +409,22 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext +@@ -408,25 +408,29 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext + mojo::PendingReceiver receiver) override; + void VerifyCert(const scoped_refptr& certificate, + const net::HostPortPair& host_port, ++ const net::NetworkAnonymizationKey& network_anonymization_key, + const std::string& ocsp_result, + const std::string& sct_list, + VerifyCertCallback callback) override; void VerifyCertForSignedExchange( const scoped_refptr& certificate, - const GURL& url, + const net::HostPortPair& host_port, + const net::NetworkAnonymizationKey& network_anonymization_key, const std::string& ocsp_result, const std::string& sct_list, - VerifyCertForSignedExchangeCallback callback) override; + VerifyCertCallback callback) override; - void AddHSTS(const std::string& host, + void AddHSTS(const net::NetworkAnonymizationKey& nak, + const std::string& host, @@ -935,7 +975,7 @@ diff --git a/services/network/network_context.h b/services/network/network_conte const std::string& host, DeleteDynamicDataForHostCallback callback) override; void SetCorsOriginAccessListsForOrigin( -@@ -755,7 +758,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext +@@ -769,7 +773,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext mojo::PendingRemote cookie_observer, net::FirstPartySetMetadata first_party_set_metadata); @@ -945,21 +985,37 @@ diff --git a/services/network/network_context.h b/services/network/network_conte #if BUILDFLAG(IS_P2P_ENABLED) void DestroySocketManager(P2PSocketManager* socket_manager); -@@ -954,6 +958,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext - VerifyCertForSignedExchangeCallback callback; +@@ -781,6 +786,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext + void VerifyCertInternal( + const scoped_refptr& certificate, + const net::HostPortPair& host_port, ++ const net::NetworkAnonymizationKey& network_anonymization_key, + const std::string& ocsp_result, + const std::string& sct_list, + CTVerificationMode ct_verification_mode, +@@ -975,6 +981,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext + VerifyCertCallback callback; scoped_refptr certificate; - GURL url; + net::HostPortPair host_port; + net::NetworkAnonymizationKey network_anonymization_key; std::string ocsp_result; std::string sct_list; - }; + CTVerificationMode ct_verification_mode; 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 -@@ -1520,24 +1520,25 @@ interface NetworkContext { - // implementation is currently specific for use by Signed Exchange. +@@ -1522,6 +1522,7 @@ interface NetworkContext { + // Checks the given certificate against the CertVerifier and CTVerifier. + VerifyCert(X509Certificate certificate, + HostPortPair host_port, ++ NetworkAnonymizationKey network_anonymization_key, + string ocsp_response, + string sct_list) + => (int32 error_code, CertVerifyResult cv_result, bool pkp_bypassed); +@@ -1530,24 +1531,25 @@ interface NetworkContext { + // This implementation is specific for use by Signed Exchange. VerifyCertForSignedExchange(X509Certificate certificate, - url.mojom.Url url, + HostPortPair host_port, + NetworkAnonymizationKey network_anonymization_key, string ocsp_response, string sct_list) @@ -985,7 +1041,7 @@ diff --git a/services/network/public/mojom/network_context.mojom b/services/netw // Sets allowed and blocked origins respectively for the URLLoaderFactory // consumers to access beyond the same-origin policy. The list is managed per -@@ -1556,7 +1557,7 @@ interface NetworkContext { +@@ -1566,7 +1568,7 @@ interface NetworkContext { // Deletes any dynamic data stored for |host| from the transport // security state. Returns true iff an entry was deleted. // See net::TransportSecurityState::DeleteDynamicDataForHost for more detail. diff --git a/build/patches/Partition-MediaDeviceId-by-default.patch b/build/patches/Partition-MediaDeviceId-by-default.patch index 33a3cbd5..562756a2 100644 --- a/build/patches/Partition-MediaDeviceId-by-default.patch +++ b/build/patches/Partition-MediaDeviceId-by-default.patch @@ -53,7 +53,7 @@ diff --git a/content/browser/media/media_devices_util.cc b/content/browser/media diff --git a/content/browser/renderer_host/media/media_devices_manager.cc b/content/browser/renderer_host/media/media_devices_manager.cc --- a/content/browser/renderer_host/media/media_devices_manager.cc +++ b/content/browser/renderer_host/media/media_devices_manager.cc -@@ -921,6 +921,11 @@ void MediaDevicesManager::OnDevicesEnumerated( +@@ -974,6 +974,11 @@ void MediaDevicesManager::OnDevicesEnumerated( } } } diff --git a/build/patches/Partition-blobs-by-top-frame-URL.patch b/build/patches/Partition-blobs-by-top-frame-URL.patch index d97cb778..db190a5c 100644 --- a/build/patches/Partition-blobs-by-top-frame-URL.patch +++ b/build/patches/Partition-blobs-by-top-frame-URL.patch @@ -26,7 +26,7 @@ new file mode 100644 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 -@@ -89,6 +89,30 @@ BlobURLStoreImpl::~BlobURLStoreImpl() { +@@ -91,6 +91,30 @@ BlobURLStoreImpl::~BlobURLStoreImpl() { } } @@ -57,7 +57,7 @@ diff --git a/storage/browser/blob/blob_url_store_impl.cc b/storage/browser/blob/ void BlobURLStoreImpl::Register( mojo::PendingRemote blob, const GURL& url, -@@ -103,6 +127,14 @@ void BlobURLStoreImpl::Register( +@@ -105,6 +129,14 @@ void BlobURLStoreImpl::Register( return; } @@ -72,7 +72,7 @@ diff --git a/storage/browser/blob/blob_url_store_impl.cc b/storage/browser/blob/ if (registry_) registry_->AddUrlMapping(url, std::move(blob), storage_key_, renderer_origin_, render_process_host_id_, -@@ -123,6 +155,8 @@ void BlobURLStoreImpl::Revoke(const GURL& url) { +@@ -125,6 +157,8 @@ void BlobURLStoreImpl::Revoke(const GURL& url) { void BlobURLStoreImpl::ResolveAsURLLoaderFactory( const GURL& url, mojo::PendingReceiver receiver, @@ -81,16 +81,16 @@ diff --git a/storage/browser/blob/blob_url_store_impl.cc b/storage/browser/blob/ ResolveAsURLLoaderFactoryCallback callback) { if (!registry_) { BlobURLLoaderFactory::Create(mojo::NullRemote(), url, std::move(receiver)); -@@ -135,6 +169,7 @@ void BlobURLStoreImpl::ResolveAsURLLoaderFactory( - if (base::FeatureList::IsEnabled( +@@ -140,6 +174,7 @@ void BlobURLStoreImpl::ResolveAsURLLoaderFactory( features::kBlockCrossPartitionBlobUrlFetching) && - !partitioning_disabled_by_policy_) { + !partitioning_disabled_by_policy_; + if (feature_and_policy_check) { + // LOG(INFO) << "---ResolveAsURLLoaderFactory blocked" << url; - BlobURLLoaderFactory::Create(mojo::NullRemote(), url, - std::move(receiver)); - std::move(callback).Run(std::nullopt, std::nullopt); -@@ -142,6 +177,13 @@ void BlobURLStoreImpl::ResolveAsURLLoaderFactory( - } + partitioning_blob_url_closure_.Run(url, + blink::mojom::PartitioningBlobURLInfo:: + kBlockedCrossPartitionFetching); +@@ -152,6 +187,13 @@ void BlobURLStoreImpl::ResolveAsURLLoaderFactory( + partitioning_blob_url_closure_.Run(url, std::nullopt); } + if (!IsSamePartition(url, unsafe_agent_cluster_id, unsafe_top_level_site)) { @@ -103,7 +103,7 @@ diff --git a/storage/browser/blob/blob_url_store_impl.cc b/storage/browser/blob/ BlobURLLoaderFactory::Create(registry_->GetBlobFromUrl(url), url, std::move(receiver)); // When a fragment URL is present, registry_->GetUnsafeAgentClusterID(url) and -@@ -156,12 +198,18 @@ void BlobURLStoreImpl::ResolveForNavigation( +@@ -166,12 +208,18 @@ void BlobURLStoreImpl::ResolveForNavigation( const GURL& url, mojo::PendingReceiver token, bool is_top_level_navigation, @@ -120,9 +120,9 @@ diff --git a/storage/browser/blob/blob_url_store_impl.cc b/storage/browser/blob/ + return; + } if (!is_top_level_navigation && - !registry_->IsUrlMapped(BlobUrlUtils::ClearUrlFragment(url), - storage_key_)) { -@@ -187,12 +235,15 @@ void BlobURLStoreImpl::ResolveForNavigation( + (registry_->IsUrlMapped(BlobUrlUtils::ClearUrlFragment(url), + storage_key_) == +@@ -203,12 +251,15 @@ void BlobURLStoreImpl::ResolveForNavigation( void BlobURLStoreImpl::ResolveForWorkerScriptFetch( const GURL& url, mojo::PendingReceiver token, @@ -141,7 +141,7 @@ diff --git a/storage/browser/blob/blob_url_store_impl.cc b/storage/browser/blob/ 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 -@@ -54,15 +54,21 @@ class COMPONENT_EXPORT(STORAGE_BROWSER) BlobURLStoreImpl +@@ -57,15 +57,21 @@ class COMPONENT_EXPORT(STORAGE_BROWSER) BlobURLStoreImpl void ResolveAsURLLoaderFactory( const GURL& url, mojo::PendingReceiver receiver, @@ -163,7 +163,7 @@ diff --git a/storage/browser/blob/blob_url_store_impl.h b/storage/browser/blob/b ResolveForNavigationCallback callback) override; private: -@@ -72,6 +78,11 @@ class COMPONENT_EXPORT(STORAGE_BROWSER) BlobURLStoreImpl +@@ -75,6 +81,11 @@ class COMPONENT_EXPORT(STORAGE_BROWSER) BlobURLStoreImpl // `Revoke()`. bool BlobUrlIsValid(const GURL& url, const char* method) const; diff --git a/build/patches/Partitioning-all-cookies-by-top-frame-domain.patch b/build/patches/Partitioning-all-cookies-by-top-frame-domain.patch index 02dfcbaf..8cdd6b80 100644 --- a/build/patches/Partitioning-all-cookies-by-top-frame-domain.patch +++ b/build/patches/Partitioning-all-cookies-by-top-frame-domain.patch @@ -47,7 +47,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html 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 -@@ -3690,7 +3690,7 @@ bool ChromeContentBrowserClient::IsFullCookieAccessAllowed( +@@ -3702,7 +3702,7 @@ bool ChromeContentBrowserClient::IsFullCookieAccessAllowed( scoped_refptr cookie_settings = CookieSettingsFactory::GetForProfile(profile); if (!cookie_settings) { @@ -152,7 +152,7 @@ diff --git a/components/browser_ui/strings/android/site_settings.grdp b/componen Third-party cookies are blocked in Incognito mode -@@ -578,7 +578,7 @@ +@@ -603,7 +603,7 @@ Allow third-party cookies @@ -185,7 +185,7 @@ diff --git a/components/content_settings/core/browser/cookie_settings.cc b/compo diff --git a/components/content_settings/core/common/cookie_settings_base.cc b/components/content_settings/core/common/cookie_settings_base.cc --- a/components/content_settings/core/common/cookie_settings_base.cc +++ b/components/content_settings/core/common/cookie_settings_base.cc -@@ -581,18 +581,6 @@ CookieSettingsBase::DecideAccess( +@@ -591,18 +591,6 @@ CookieSettingsBase::DecideAccess(const GURL& url, ThirdPartyCookieAllowMechanism::kAllowByGlobalSetting}; } @@ -204,7 +204,7 @@ diff --git a/components/content_settings/core/common/cookie_settings_base.cc b/c if (IsAllowedByStorageAccessGrant(url, first_party_url, overrides)) { return AllowAllCookies{ ThirdPartyCookieAllowMechanism::kAllowByStorageAccess, -@@ -603,54 +591,11 @@ CookieSettingsBase::DecideAccess( +@@ -613,54 +601,11 @@ CookieSettingsBase::DecideAccess(const GURL& url, ThirdPartyCookieAllowMechanism::kAllowBySandboxValue}; } @@ -259,7 +259,7 @@ diff --git a/components/content_settings/core/common/cookie_settings_base.cc b/c return AllowPartitionedCookies{}; } -@@ -679,7 +624,7 @@ CookieSettingsBase::GetCookieSettingInternal( +@@ -690,7 +635,7 @@ CookieSettingsBase::GetCookieSettingInternal( } return CookieSettingWithMetadata{/*cookie_setting=*/CONTENT_SETTING_ALLOW, /*allow_partitioned_cookies=*/true, @@ -345,7 +345,7 @@ diff --git a/net/cookies/cookie_deletion_info.cc b/net/cookies/cookie_deletion_i diff --git a/net/cookies/cookie_monster.cc b/net/cookies/cookie_monster.cc --- a/net/cookies/cookie_monster.cc +++ b/net/cookies/cookie_monster.cc -@@ -2193,6 +2193,7 @@ size_t CookieMonster::GarbageCollectPartitionedCookies( +@@ -2256,6 +2256,7 @@ size_t CookieMonster::GarbageCollectPartitionedCookies( if (cookie_partition_it == partitioned_cookies_.end()) return num_deleted; @@ -356,7 +356,7 @@ diff --git a/net/cookies/cookie_monster.cc b/net/cookies/cookie_monster.cc diff --git a/net/cookies/cookie_util.cc b/net/cookies/cookie_util.cc --- a/net/cookies/cookie_util.cc +++ b/net/cookies/cookie_util.cc -@@ -760,6 +760,7 @@ bool IsCookiePartitionedValid(const GURL& url, +@@ -767,6 +767,7 @@ bool IsCookiePartitionedValid(const GURL& url, bool secure, bool is_partitioned, bool partition_has_nonce) { @@ -408,7 +408,7 @@ diff --git a/net/extras/sqlite/sqlite_persistent_cookie_store.cc b/net/extras/sq diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc --- a/net/url_request/url_request_http_job.cc +++ b/net/url_request/url_request_http_job.cc -@@ -841,13 +841,9 @@ void URLRequestHttpJob::SetCookieHeaderAndStart( +@@ -856,13 +856,9 @@ void URLRequestHttpJob::SetCookieHeaderAndStart( AnnotateAndMoveUserBlockedCookies(maybe_included_cookies, excluded_cookies); } @@ -451,7 +451,7 @@ diff --git a/services/network/cookie_settings.cc b/services/network/cookie_setti diff --git a/services/network/restricted_cookie_manager.cc b/services/network/restricted_cookie_manager.cc --- a/services/network/restricted_cookie_manager.cc +++ b/services/network/restricted_cookie_manager.cc -@@ -887,6 +887,12 @@ void RestrictedCookieManager::SetCookieFromString( +@@ -913,6 +913,12 @@ void RestrictedCookieManager::SetCookieFromString( std::move(callback).Run(); diff --git a/build/patches/Private-network-access-content-settings.patch b/build/patches/Private-network-access-content-settings.patch index c1998748..f4a41e1d 100644 --- a/build/patches/Private-network-access-content-settings.patch +++ b/build/patches/Private-network-access-content-settings.patch @@ -21,7 +21,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html 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 -@@ -7783,7 +7783,7 @@ ChromeContentBrowserClient::ShouldOverridePrivateNetworkRequestPolicy( +@@ -7814,7 +7814,7 @@ ChromeContentBrowserClient::ShouldOverridePrivateNetworkRequestPolicy( } #if BUILDFLAG(IS_ANDROID) @@ -175,7 +175,7 @@ new file mode 100644 diff --git a/services/network/cors/cors_url_loader.cc b/services/network/cors/cors_url_loader.cc --- a/services/network/cors/cors_url_loader.cc +++ b/services/network/cors/cors_url_loader.cc -@@ -1064,7 +1064,7 @@ std::optional CorsURLLoader::ConvertPreflightResult( +@@ -1085,7 +1085,7 @@ std::optional CorsURLLoader::ConvertPreflightResult( } // Private Network Access warning: ignore net and CORS errors. @@ -184,7 +184,7 @@ diff --git a/services/network/cors/cors_url_loader.cc b/services/network/cors/co CHECK(ShouldIgnorePrivateNetworkAccessErrors( request_.required_ip_address_space)); CHECK_EQ(*reason, PreflightRequiredReason::kPrivateNetworkAccess); -@@ -1388,12 +1388,6 @@ bool CorsURLLoader::ShouldIgnorePrivateNetworkAccessErrors( +@@ -1409,12 +1409,6 @@ bool CorsURLLoader::ShouldIgnorePrivateNetworkAccessErrors( if (!state) { return false; } @@ -222,7 +222,7 @@ diff --git a/services/network/private_network_access_checker.cc b/services/netwo using Result = PrivateNetworkAccessCheckResult; using Policy = mojom::PrivateNetworkRequestPolicy; -@@ -288,11 +296,17 @@ bool PrivateNetworkAccessChecker::NeedPermission( +@@ -290,11 +298,17 @@ bool PrivateNetworkAccessChecker::NeedPermission( const GURL& url, bool is_web_secure_context, mojom::IPAddressSpace target_address_space) { diff --git a/build/patches/PublicKeyCredential-fingerprinting-mitigations.patch b/build/patches/PublicKeyCredential-fingerprinting-mitigations.patch index 8436433e..217e09e3 100644 --- a/build/patches/PublicKeyCredential-fingerprinting-mitigations.patch +++ b/build/patches/PublicKeyCredential-fingerprinting-mitigations.patch @@ -13,7 +13,7 @@ the Windows platform diff --git a/content/browser/webauth/authenticator_common_impl.cc b/content/browser/webauth/authenticator_common_impl.cc --- a/content/browser/webauth/authenticator_common_impl.cc +++ b/content/browser/webauth/authenticator_common_impl.cc -@@ -1712,6 +1712,7 @@ void AuthenticatorCommonImpl::GetClientCapabilities( +@@ -1766,6 +1766,7 @@ void AuthenticatorCommonImpl::GetClientCapabilities( MakeCapability(client_capabilities::kRelatedOrigins, true)); IsHybridTransportSupported( @@ -21,15 +21,13 @@ diff --git a/content/browser/webauth/authenticator_common_impl.cc b/content/brow base::BindOnce(&MakeCapability, client_capabilities::kHybridTransport) .Then(barrier_callback)); -@@ -1728,6 +1729,7 @@ void AuthenticatorCommonImpl::GetClientCapabilities( +@@ -1782,11 +1783,25 @@ void AuthenticatorCommonImpl::GetClientCapabilities( } void AuthenticatorCommonImpl::IsHybridTransportSupported( + const url::Origin& caller_origin, base::OnceCallback callback) { - // Similar to Web Bluetooth API (`navigator.bluetooth.getAvailability()`) we - // want respect the policy and return `false` if the policy is enforced. -@@ -1736,6 +1738,19 @@ void AuthenticatorCommonImpl::IsHybridTransportSupported( + if (!device::BluetoothAdapterFactory::Get()->IsLowEnergySupported()) { std::move(callback).Run(false); return; } @@ -47,9 +45,9 @@ diff --git a/content/browser/webauth/authenticator_common_impl.cc b/content/brow + break; + } - if (!device::BluetoothAdapterFactory::Get()->IsLowEnergySupported()) { - std::move(callback).Run(false); -@@ -1786,6 +1801,13 @@ void AuthenticatorCommonImpl::ContinueIsUvpaaAfterOverrideCheck( + device::BluetoothAdapterFactory::Get()->GetAdapter( + base::BindOnce([](scoped_refptr adapter) { +@@ -1832,6 +1847,13 @@ void AuthenticatorCommonImpl::ContinueIsUvpaaAfterOverrideCheck( IsUserVerifyingPlatformAuthenticatorAvailableCallback callback, bool is_get_client_capabilities_call, std::optional is_uvpaa_override) { @@ -66,7 +64,7 @@ diff --git a/content/browser/webauth/authenticator_common_impl.cc b/content/brow diff --git a/content/browser/webauth/authenticator_common_impl.h b/content/browser/webauth/authenticator_common_impl.h --- a/content/browser/webauth/authenticator_common_impl.h +++ b/content/browser/webauth/authenticator_common_impl.h -@@ -254,7 +254,7 @@ class CONTENT_EXPORT AuthenticatorCommonImpl : public AuthenticatorCommon { +@@ -252,7 +252,7 @@ class CONTENT_EXPORT AuthenticatorCommonImpl : public AuthenticatorCommon { // Bluetooth adapter that supports BLE. If so, runs |callback| with `true`. // Otherwise, or if Bluetooth is disabled by Permissions Policy, runs // |callback| with `false`. diff --git a/build/patches/Re-introduce-modal-dialog-flag-to-close-all-tabs.patch b/build/patches/Re-introduce-modal-dialog-flag-to-close-all-tabs.patch index d6fb1bc0..c55f811f 100644 --- a/build/patches/Re-introduce-modal-dialog-flag-to-close-all-tabs.patch +++ b/build/patches/Re-introduce-modal-dialog-flag-to-close-all-tabs.patch @@ -45,7 +45,7 @@ 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 -@@ -202,6 +202,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -201,6 +201,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kAutomotiveFullscreenToolbarImprovements, &kAuxiliarySearchDonation, &kAvoidSelectedTabFocusOnLayoutDoneShowing, @@ -56,7 +56,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 -@@ -293,6 +293,7 @@ public abstract class ChromeFeatureList { +@@ -297,6 +297,7 @@ public abstract class ChromeFeatureList { public static final String CLANK_WHATS_NEW = "ClankWhatsNew"; public static final String CLEAR_BROWSING_DATA_ANDROID_SURVEY = "ClearBrowsingDataAndroidSurvey"; diff --git a/build/patches/Re-introduce-override_build_timestamp.patch b/build/patches/Re-introduce-override_build_timestamp.patch index 80f70f0a..63a9afce 100644 --- a/build/patches/Re-introduce-override_build_timestamp.patch +++ b/build/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 -@@ -4203,8 +4203,13 @@ action("build_date") { +@@ -4232,8 +4232,13 @@ action("build_date") { args = [ rebase_path("$target_gen_dir/generated_build_date.h", root_build_dir), diff --git a/build/patches/Reduce-HTTP-headers-in-DoH-requests-to-bare-minimum.patch b/build/patches/Reduce-HTTP-headers-in-DoH-requests-to-bare-minimum.patch index f518ef4d..38524350 100644 --- a/build/patches/Reduce-HTTP-headers-in-DoH-requests-to-bare-minimum.patch +++ b/build/patches/Reduce-HTTP-headers-in-DoH-requests-to-bare-minimum.patch @@ -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 -@@ -500,6 +500,7 @@ void URLRequestHttpJob::OnGotFirstPartySetMetadata( +@@ -515,6 +515,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()) { -@@ -507,11 +508,14 @@ void URLRequestHttpJob::OnGotFirstPartySetMetadata( +@@ -522,11 +523,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(); -@@ -756,10 +760,10 @@ void URLRequestHttpJob::StartTransactionInternal() { +@@ -771,10 +775,10 @@ void URLRequestHttpJob::StartTransactionInternal() { void URLRequestHttpJob::AddExtraHeaders() { request_info_.extra_headers.SetAcceptEncodingIfMissing( request()->url(), request()->accepted_stream_types(), diff --git a/build/patches/Remove-HTTP-referrals-in-cross-origin-navigation.patch b/build/patches/Remove-HTTP-referrals-in-cross-origin-navigation.patch index 47e50c84..1d5d4179 100644 --- a/build/patches/Remove-HTTP-referrals-in-cross-origin-navigation.patch +++ b/build/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 -@@ -643,6 +643,8 @@ chrome_java_resources = [ +@@ -650,6 +650,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 -@@ -961,6 +961,8 @@ chrome_java_sources = [ +@@ -894,6 +894,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", @@ -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 -@@ -222,6 +222,11 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() { +@@ -223,6 +223,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 -@@ -604,6 +604,9 @@ SystemNetworkContextManager::SystemNetworkContextManager( +@@ -603,6 +603,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( -@@ -679,6 +682,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) { +@@ -678,6 +681,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); @@ -426,7 +426,7 @@ diff --git a/chrome/browser/renderer_preferences_util.cc b/chrome/browser/render 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 -@@ -94,6 +94,16 @@ +@@ -101,6 +101,16 @@ menu-options="[[historyExpireDaysThresholdOptions_]]"> @@ -464,7 +464,7 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.ts b/ch /** * Preferences state. */ -@@ -493,6 +504,12 @@ export class SettingsPrivacyPageElement extends SettingsPrivacyPageElementBase { +@@ -506,6 +517,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 -@@ -1213,6 +1213,30 @@ For more settings that use data to improve your Chrome experience, go to @@ -538,7 +538,7 @@ diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/pre 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 -@@ -1953,6 +1953,10 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source, +@@ -1961,6 +1961,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,7 +552,7 @@ 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 -@@ -1566,6 +1566,9 @@ inline constexpr char kEnableReferrers[] = "enable_referrers"; +@@ -1551,6 +1551,9 @@ inline constexpr char kEnableReferrers[] = "enable_referrers"; inline constexpr char kEnableEncryptedMedia[] = "webkit.webprefs.encrypted_media_enabled"; @@ -615,7 +615,7 @@ diff --git a/components/download/content/internal/context_menu_download.cc b/com diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -392,6 +392,15 @@ void AddAdditionalRequestHeaders( +@@ -388,6 +388,15 @@ void AddAdditionalRequestHeaders( blink::mojom::Referrer(GURL(), network::mojom::ReferrerPolicy::kNever); } diff --git a/build/patches/Remove-auth-header-upon-cross-origin-redirect.patch b/build/patches/Remove-auth-header-upon-cross-origin-redirect.patch index affbe8a2..1757a024 100644 --- a/build/patches/Remove-auth-header-upon-cross-origin-redirect.patch +++ b/build/patches/Remove-auth-header-upon-cross-origin-redirect.patch @@ -11,7 +11,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_loader.cc b/third_party/blink/renderer/platform/loader/fetch/resource_loader.cc --- a/third_party/blink/renderer/platform/loader/fetch/resource_loader.cc +++ b/third_party/blink/renderer/platform/loader/fetch/resource_loader.cc -@@ -589,6 +589,9 @@ bool ResourceLoader::WillFollowRedirect( +@@ -588,6 +588,9 @@ bool ResourceLoader::WillFollowRedirect( new_url)) { fetcher_->GetUseCounter().CountUse( mojom::WebFeature::kAuthorizationCrossOrigin); diff --git a/build/patches/Remove-binary-blob-integrations.patch b/build/patches/Remove-binary-blob-integrations.patch index 67bee4e9..1fb6a20a 100644 --- a/build/patches/Remove-binary-blob-integrations.patch +++ b/build/patches/Remove-binary-blob-integrations.patch @@ -30,13 +30,11 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html chrome/android/BUILD.gn | 32 +- chrome/android/chrome_java_sources.gni | 5 - chrome/android/java/AndroidManifest.xml | 50 -- - .../org/chromium/chrome/browser/AppHooks.java | 1 - - .../browser/ChromeBackgroundService.java | 11 +- + .../browser/ChromeBackgroundService.java | 10 +- .../browser/PlayServicesVersionInfo.java | 11 +- .../ChromeBackgroundTaskFactory.java | 3 - .../gcore/ChromeGoogleApiClientImpl.java | 25 +- .../browser/gcore/GoogleApiClientHelper.java | 89 +-- - .../instantapps/InstantAppsHandler.java | 6 +- .../settings/PasswordSettings.java | 9 - chrome/android/javatests/BUILD.gn | 7 - chrome/android/junit/BUILD.gn | 6 - @@ -67,6 +65,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html components/gcm_driver/gcm_client_impl.cc | 4 + .../gcm_driver/instance_id/android/BUILD.gn | 3 - .../instance_id/InstanceIDBridge.java | 56 +- + .../InstalledAppProviderImpl.java | 2 +- .../media_router/browser/android/BUILD.gn | 11 - .../media_router/BrowserMediaRouter.java | 21 +- .../components/media_router/MediaSink.java | 44 +- @@ -91,7 +90,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../components/omnibox/OmniboxFeatures.java | 8 - components/signin/public/android/BUILD.gn | 3 - components/webauthn/android/BUILD.gn | 15 +- - .../webauthn/AuthenticatorImpl.java | 80 +- + .../webauthn/AuthenticatorImpl.java | 81 +- .../webauthn/ConditionalUiState.java | 15 + .../components/webauthn/GmsCoreUtils.java | 28 +- .../webauthn/WebauthnModeProvider.java | 15 - @@ -106,12 +105,12 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html services/BUILD.gn | 9 - services/device/geolocation/BUILD.gn | 4 - services/shape_detection/BUILD.gn | 2 - - third_party/android_deps/BUILD.gn | 705 +----------------- + third_party/android_deps/BUILD.gn | 704 +----------------- .../preconditions/javatests/BUILD.gn | 1 - .../gms/ChromiumPlayServicesAvailability.java | 10 +- - third_party/androidx/customizations.gni | 13 +- + third_party/androidx/customizations.gni | 14 +- third_party/cardboard/BUILD.gn | 4 - - 87 files changed, 128 insertions(+), 2295 deletions(-) + 86 files changed, 127 insertions(+), 2291 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 @@ -146,12 +145,12 @@ diff --git a/build/android/gyp/proguard.py b/build/android/gyp/proguard.py + # com.google.android.gms.cast is stripped down from the build + r'class com\.google\.android\.gms\.', ]) + ')', - # TODO(agrieve): Remove once we update to U SDK. - r'OnBackAnimationCallback', + # We enforce that this class is removed via -checkdiscard. + r'FastServiceLoader\.class:.*Could not inline ServiceLoader\.load', diff --git a/build/config/android/config.gni b/build/config/android/config.gni --- a/build/config/android/config.gni +++ b/build/config/android/config.gni -@@ -170,9 +170,7 @@ if (is_android) { +@@ -166,9 +166,7 @@ if (is_android) { # google_play_services_package contains the path where individual client # targets (e.g. google_play_services_base_java) are located. @@ -165,7 +164,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 -@@ -311,14 +311,6 @@ if (current_toolchain == default_toolchain) { +@@ -309,14 +309,6 @@ if (current_toolchain == default_toolchain) { ":java_overlay_resources", ":system_ai_service_proto_java", ":usage_stats_proto_java", @@ -180,7 +179,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", -@@ -718,11 +710,20 @@ if (current_toolchain == default_toolchain) { +@@ -719,11 +711,20 @@ if (current_toolchain == default_toolchain) { "//services/shape_detection:shape_detection_java", "//services/shape_detection/public/mojom:mojom_java", "//skia/public/mojom:mojom_java", @@ -203,7 +202,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", -@@ -1884,7 +1885,6 @@ if (current_toolchain == default_toolchain) { +@@ -1897,7 +1898,6 @@ if (current_toolchain == default_toolchain) { ] deps = [ ":chrome_java", @@ -211,7 +210,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", -@@ -1986,7 +1986,6 @@ if (current_toolchain == default_toolchain) { +@@ -2001,7 +2001,6 @@ if (current_toolchain == default_toolchain) { # is in a DFM. android_library("base_module_java") { sources = [ @@ -219,7 +218,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", -@@ -2003,8 +2002,6 @@ if (current_toolchain == default_toolchain) { +@@ -2018,8 +2017,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", @@ -228,7 +227,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", -@@ -2030,15 +2027,10 @@ if (current_toolchain == default_toolchain) { +@@ -2045,15 +2042,10 @@ if (current_toolchain == default_toolchain) { "java/src/org/chromium/chrome/browser/photo_picker/DecoderService.java", "java/src/org/chromium/chrome/browser/provider/ChromeBrowserProvider.java", "java/src/org/chromium/chrome/browser/provider/PageContentProvider.java", @@ -244,7 +243,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//base:base_java", "//chrome/browser/autofill/android:third_party_provider_java", "//chrome/browser/download/android:file_provider_java", -@@ -2053,7 +2045,6 @@ if (current_toolchain == default_toolchain) { +@@ -2068,7 +2060,6 @@ if (current_toolchain == default_toolchain) { "//components/media_router/browser/android:cast_options_provider_java", "//components/minidump_uploader:minidump_uploader_java", "//components/module_installer/android:module_installer_java", @@ -252,7 +251,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//third_party/androidx:androidx_annotation_annotation_java", "//third_party/androidx:androidx_collection_collection_java", "//third_party/jni_zero:jni_zero_java", -@@ -2073,7 +2064,6 @@ if (current_toolchain == default_toolchain) { +@@ -2088,7 +2079,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. @@ -271,7 +270,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", -@@ -989,10 +988,6 @@ chrome_java_sources = [ +@@ -921,10 +920,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", @@ -378,28 +377,17 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro ()); map.AddWebUIConfig(std::make_unique()); map.AddWebUIConfig(std::make_unique()); @@ -1208,7 +1181,7 @@ diff --git a/chrome/browser/webauthn/android/java/src/org/chromium/chrome/browse /** * Provides linking information to the native side. -@@ -85,37 +82,7 @@ public class CableAuthenticatorModuleProvider { +@@ -74,37 +71,7 @@ public class CableAuthenticatorModuleProvider { ok = false; } @@ -1263,7 +1236,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 -@@ -379,8 +379,6 @@ android_library("chrome_java_integration_test_support") { +@@ -382,8 +382,6 @@ android_library("chrome_java_integration_test_support") { deps = [ ":chrome_java_test_support_common", @@ -1275,7 +1248,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 -@@ -2552,14 +2552,6 @@ public class ExternalNavigationHandler { +@@ -2554,14 +2554,6 @@ public class ExternalNavigationHandler { * @return Whether the given intent is going to open an Instant App. */ private static boolean isIntentToInstantApp(Intent intent) { @@ -1313,7 +1286,7 @@ diff --git a/components/externalauth/android/BUILD.gn b/components/externalauth/ diff --git a/components/externalauth/android/java/src/org/chromium/components/externalauth/ExternalAuthUtils.java b/components/externalauth/android/java/src/org/chromium/components/externalauth/ExternalAuthUtils.java --- a/components/externalauth/android/java/src/org/chromium/components/externalauth/ExternalAuthUtils.java +++ b/components/externalauth/android/java/src/org/chromium/components/externalauth/ExternalAuthUtils.java -@@ -16,9 +16,6 @@ import androidx.annotation.Nullable; +@@ -17,9 +17,6 @@ import android.text.TextUtils; import androidx.annotation.VisibleForTesting; import androidx.annotation.WorkerThread; @@ -1323,15 +1296,15 @@ diff --git a/components/externalauth/android/java/src/org/chromium/components/ex import org.chromium.base.ContextUtils; import org.chromium.base.Log; import org.chromium.base.ResettersForTesting; -@@ -28,7 +25,6 @@ import org.chromium.base.TraceEvent; - import org.chromium.base.task.PostTask; - import org.chromium.base.task.TaskTraits; +@@ -31,7 +28,6 @@ import org.chromium.base.task.TaskTraits; + import org.chromium.build.annotations.NullMarked; + import org.chromium.build.annotations.Nullable; import org.chromium.components.embedder_support.util.Origin; -import org.chromium.gms.ChromiumPlayServicesAvailability; /** * Utility class for external authentication tools. -@@ -172,9 +168,7 @@ public class ExternalAuthUtils { +@@ -176,9 +172,7 @@ public class ExternalAuthUtils { * when it is updating. */ public boolean isGooglePlayServicesMissing(final Context context) { @@ -1342,7 +1315,7 @@ diff --git a/components/externalauth/android/java/src/org/chromium/components/ex } /** -@@ -189,21 +183,6 @@ public class ExternalAuthUtils { +@@ -193,21 +187,6 @@ public class ExternalAuthUtils { * @return true if and only if Google Play Services can be used */ public boolean canUseGooglePlayServices(final UserRecoverableErrorHandler errorHandler) { @@ -1364,7 +1337,7 @@ diff --git a/components/externalauth/android/java/src/org/chromium/components/ex return false; } -@@ -256,12 +235,7 @@ public class ExternalAuthUtils { +@@ -260,12 +239,7 @@ public class ExternalAuthUtils { * @return The code produced by calling the external code */ protected int checkGooglePlayServicesAvailable(final Context context) { @@ -1378,7 +1351,7 @@ diff --git a/components/externalauth/android/java/src/org/chromium/components/ex } /** -@@ -272,7 +246,7 @@ public class ExternalAuthUtils { +@@ -276,7 +250,7 @@ public class ExternalAuthUtils { * @return true If the code represents a user-recoverable error */ protected boolean isUserRecoverableError(final int errorCode) { @@ -1387,7 +1360,7 @@ diff --git a/components/externalauth/android/java/src/org/chromium/components/ex } /** -@@ -282,7 +256,7 @@ public class ExternalAuthUtils { +@@ -286,7 +260,7 @@ public class ExternalAuthUtils { * @return a textual description of the error code */ protected String describeError(final int errorCode) { @@ -1407,8 +1380,8 @@ diff --git a/components/externalauth/android/java/src/org/chromium/components/ex - import org.chromium.base.ThreadUtils; import org.chromium.base.metrics.RecordUserAction; - -@@ -87,7 +85,6 @@ public abstract class UserRecoverableErrorHandler { + import org.chromium.build.annotations.NullMarked; +@@ -90,7 +88,6 @@ public abstract class UserRecoverableErrorHandler { if (!sNotificationShown.getAndSet(true)) { return; } @@ -1416,19 +1389,21 @@ diff --git a/components/externalauth/android/java/src/org/chromium/components/ex } } -@@ -174,12 +171,7 @@ public abstract class UserRecoverableErrorHandler { - cancelDialog(); +@@ -178,14 +175,9 @@ public abstract class UserRecoverableErrorHandler { } - if (mDialog == null) { -- mDialog = + Dialog dialog = mDialog; + if (dialog == null) { +- dialog = - GoogleApiAvailability.getInstance() - .getErrorDialog(mActivity, errorCode, NO_RESPONSE_REQUIRED); + assert dialog != null : "code was " + errorCode; + mDialog = dialog; mErrorCode = errorCode; - -- DialogUserActionRecorder.createAndAttachToDialog(mDialog); +- DialogUserActionRecorder.createAndAttachToDialog(dialog); } // This can happen if |errorCode| is ConnectionResult.SERVICE_INVALID. - if (mDialog != null && !mDialog.isShowing()) { + if (!dialog.isShowing()) { diff --git a/components/gcm_driver/android/java/src/org/chromium/components/gcm_driver/GoogleCloudMessagingV2.java b/components/gcm_driver/android/java/src/org/chromium/components/gcm_driver/GoogleCloudMessagingV2.java --- a/components/gcm_driver/android/java/src/org/chromium/components/gcm_driver/GoogleCloudMessagingV2.java +++ b/components/gcm_driver/android/java/src/org/chromium/components/gcm_driver/GoogleCloudMessagingV2.java @@ -1617,6 +1592,18 @@ diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/com return doBackgroundWork(); } +diff --git a/components/installedapp/android/java/src/org/chromium/components/installedapp/InstalledAppProviderImpl.java b/components/installedapp/android/java/src/org/chromium/components/installedapp/InstalledAppProviderImpl.java +--- a/components/installedapp/android/java/src/org/chromium/components/installedapp/InstalledAppProviderImpl.java ++++ b/components/installedapp/android/java/src/org/chromium/components/installedapp/InstalledAppProviderImpl.java +@@ -88,7 +88,7 @@ public class InstalledAppProviderImpl implements InstalledAppProvider { + + // The maximum number of related apps declared in the Web Manifest taken into account when + // determining whether the related app is installed and mutually related. +- @VisibleForTesting static final int MAX_ALLOWED_RELATED_APPS = 3; ++ @VisibleForTesting static final int MAX_ALLOWED_RELATED_APPS = 0; + + private static final String TAG = "InstalledAppProvider"; + diff --git a/components/media_router/browser/android/BUILD.gn b/components/media_router/browser/android/BUILD.gn --- a/components/media_router/browser/android/BUILD.gn +++ b/components/media_router/browser/android/BUILD.gn @@ -3105,8 +3092,8 @@ diff --git a/components/omnibox/common/BUILD.gn b/components/omnibox/common/BUIL deps = [ - "$google_play_services_package:google_play_services_location_java", "//base:base_java", + "//chrome/browser/feedback/android:java", "//components/cached_flags:java", - "//third_party/androidx:androidx_annotation_annotation_java", diff --git a/components/omnibox/common/android/java/src/org/chromium/components/omnibox/OmniboxFeatures.java b/components/omnibox/common/android/java/src/org/chromium/components/omnibox/OmniboxFeatures.java --- a/components/omnibox/common/android/java/src/org/chromium/components/omnibox/OmniboxFeatures.java +++ b/components/omnibox/common/android/java/src/org/chromium/components/omnibox/OmniboxFeatures.java @@ -3208,11 +3195,11 @@ diff --git a/components/webauthn/android/BUILD.gn b/components/webauthn/android/ diff --git a/components/webauthn/android/java/src/org/chromium/components/webauthn/AuthenticatorImpl.java b/components/webauthn/android/java/src/org/chromium/components/webauthn/AuthenticatorImpl.java --- a/components/webauthn/android/java/src/org/chromium/components/webauthn/AuthenticatorImpl.java +++ b/components/webauthn/android/java/src/org/chromium/components/webauthn/AuthenticatorImpl.java -@@ -63,18 +63,10 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon +@@ -69,18 +69,10 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon - private MakeCredential_Response mMakeCredentialCallback; - private GetAssertion_Response mGetAssertionCallback; -- private Fido2CredentialRequest mPendingFido2CredentialRequest; + private @Nullable MakeCredential_Response mMakeCredentialCallback; + private @Nullable GetCredential_Response mGetCredentialCallback; +- private @Nullable Fido2CredentialRequest mPendingFido2CredentialRequest; - private Set mUnclosedFido2CredentialRequests = new HashSet<>(); - // Information about the request cached here for metric reporting purposes. @@ -3223,11 +3210,11 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut - // `Fido2CredentialRequest` contains a `Context`. But this field is only - // used in tests so a memory leak is irrelevent. - @SuppressLint("StaticFieldLeak") -- private static Fido2CredentialRequest sFido2CredentialRequestOverrideForTesting; +- private static @Nullable Fido2CredentialRequest sFido2CredentialRequestOverrideForTesting; /** * Builds the Authenticator service implementation. -@@ -106,19 +98,6 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon +@@ -112,19 +104,6 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon mCreateConfirmationUiDelegate = createConfirmationUiDelegate; } @@ -3247,7 +3234,7 @@ 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 +@@ -175,16 +154,6 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon } private void continueMakeCredential(PublicKeyCredentialCreationOptions options) { @@ -3255,7 +3242,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut - mPendingFido2CredentialRequest.handleMakeCredentialRequest( - options, - maybeCreateBrowserOptions(), -- mOrigin, +- assertNonNull(mOrigin), - mTopOrigin, - mPayment, - this::onRegisterResponse, @@ -3264,7 +3251,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut } private @Nullable Bundle maybeCreateBrowserOptions() { -@@ -209,16 +178,6 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon +@@ -221,16 +190,6 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon onError(AuthenticatorStatus.NOT_IMPLEMENTED); return; } @@ -3272,7 +3259,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut - mPendingFido2CredentialRequest = getFido2CredentialRequest(); - mPendingFido2CredentialRequest.handleGetAssertionRequest( - options, -- mOrigin, +- assertNonNull(mOrigin), - mTopOrigin, - mPayment, - this::onSignResponse, @@ -3281,7 +3268,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut } @Override -@@ -251,10 +210,6 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon +@@ -263,10 +222,6 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon decoratedCallback.call(false); return; } @@ -3292,7 +3279,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut } @Override -@@ -284,19 +239,7 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon +@@ -296,19 +251,7 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon return; } @@ -3313,7 +3300,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut } // Helper function to create WebAuthnClientCapability instances -@@ -326,14 +269,6 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon +@@ -338,14 +281,6 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon callback.onResponse(new ArrayList()); return; } @@ -3328,7 +3315,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut } @Override -@@ -343,13 +278,6 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon +@@ -355,13 +290,6 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon callback.call(false); return; } @@ -3342,27 +3329,28 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut } @Override -@@ -361,8 +289,6 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon - if (!mIsOperationPending || mGetAssertionCallback == null) { +@@ -373,9 +301,6 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon + if (!mIsOperationPending || mGetCredentialCallback == null) { return; } - +- assumeNonNull(mPendingFido2CredentialRequest); - mPendingFido2CredentialRequest.cancelConditionalGetAssertion(); } /** Callbacks for receiving responses from the internal handlers. */ -@@ -397,7 +323,6 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon - } else if (mGetAssertionCallback != null) { - mGetAssertionCallback.call(status, null, null); +@@ -410,7 +335,6 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon + } else if (mGetCredentialCallback != null) { + mGetCredentialCallback.call(getCredentialResponseForAssertion(status, null)); } - if (mPendingFido2CredentialRequest != null) mPendingFido2CredentialRequest.destroyBridge(); cleanupRequest(); } -@@ -435,13 +360,10 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon +@@ -448,13 +372,10 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon mIsOperationPending = false; mMakeCredentialCallback = null; - mGetAssertionCallback = null; + mGetCredentialCallback = null; - mPendingFido2CredentialRequest = null; } @@ -3396,9 +3384,9 @@ 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,27 +7,13 @@ package org.chromium.components.webauthn; - import org.chromium.base.PackageUtils; +@@ -9,27 +9,13 @@ import org.chromium.build.annotations.NullMarked; + @NullMarked public class GmsCoreUtils { - private static final String GMSCORE_PACKAGE_NAME = "com.google.android.gms"; - private static final int GMSCORE_MIN_VERSION_GET_MATCHING_CRED_IDS = 223300000; @@ -3426,7 +3414,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut } /** -@@ -36,20 +22,16 @@ public class GmsCoreUtils { +@@ -38,20 +24,16 @@ public class GmsCoreUtils { * version. */ public static boolean isGetMatchingCredentialIdsSupported() { @@ -3453,19 +3441,19 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut diff --git a/components/webauthn/android/java/src/org/chromium/components/webauthn/WebauthnModeProvider.java b/components/webauthn/android/java/src/org/chromium/components/webauthn/WebauthnModeProvider.java --- a/components/webauthn/android/java/src/org/chromium/components/webauthn/WebauthnModeProvider.java +++ b/components/webauthn/android/java/src/org/chromium/components/webauthn/WebauthnModeProvider.java -@@ -7,7 +7,6 @@ package org.chromium.components.webauthn; - import org.jni_zero.JNINamespace; - import org.jni_zero.NativeMethods; +@@ -9,7 +9,6 @@ import org.jni_zero.NativeMethods; + import org.chromium.build.annotations.NullMarked; + import org.chromium.build.annotations.Nullable; -import org.chromium.components.webauthn.Fido2ApiCall.Fido2ApiCallParams; import org.chromium.components.webauthn.cred_man.AppCredManRequestDecorator; import org.chromium.components.webauthn.cred_man.BrowserCredManRequestDecorator; import org.chromium.components.webauthn.cred_man.CredManRequestDecorator; -@@ -47,20 +46,6 @@ public class WebauthnModeProvider { +@@ -51,20 +50,6 @@ public class WebauthnModeProvider { return null; } -- public Fido2ApiCallParams getFido2ApiCallParams(WebContents webContents) { +- public @Nullable Fido2ApiCallParams getFido2ApiCallParams(@Nullable WebContents webContents) { - int mode = getWebauthnMode(webContents); - if (mode == WebauthnMode.APP) { - return Fido2ApiCall.APP_API; @@ -3479,14 +3467,14 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut - return null; - } - - public @WebauthnMode int getWebauthnMode(WebContents webContents) { + public @WebauthnMode int getWebauthnMode(@Nullable WebContents webContents) { if (mGlobalMode != WebauthnMode.NONE) return mGlobalMode; return WebauthnModeProviderJni.get().getWebauthnModeForWebContents(webContents); diff --git a/components/webauthn/android/java/src/org/chromium/components/webauthn/cred_man/CredManHelper.java b/components/webauthn/android/java/src/org/chromium/components/webauthn/cred_man/CredManHelper.java --- a/components/webauthn/android/java/src/org/chromium/components/webauthn/cred_man/CredManHelper.java +++ b/components/webauthn/android/java/src/org/chromium/components/webauthn/cred_man/CredManHelper.java -@@ -32,8 +32,7 @@ import org.chromium.blink.mojom.PublicKeyCredentialCreationOptions; - import org.chromium.blink.mojom.PublicKeyCredentialRequestOptions; +@@ -36,8 +36,7 @@ import org.chromium.build.annotations.NullMarked; + import org.chromium.build.annotations.Nullable; import org.chromium.components.webauthn.AuthenticationContextProvider; import org.chromium.components.webauthn.Barrier; -import org.chromium.components.webauthn.Fido2CredentialRequest.ConditionalUiState; @@ -3495,8 +3483,8 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut import org.chromium.components.webauthn.GetAssertionOutcome; import org.chromium.components.webauthn.GetAssertionResponseCallback; import org.chromium.components.webauthn.MakeCredentialOutcome; -@@ -101,8 +100,7 @@ public class CredManHelper { - MakeCredentialResponseCallback makeCallback, +@@ -105,8 +104,7 @@ public class CredManHelper { + @Nullable MakeCredentialResponseCallback makeCallback, ErrorCallback errorCallback) { mClientDataJson = clientDataJson; - final String requestAsJson = @@ -3505,10 +3493,10 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut OutcomeReceiver receiver = new OutcomeReceiver<>() { -@@ -145,9 +143,7 @@ public class CredManHelper { - String json = +@@ -150,9 +148,7 @@ public class CredManHelper { data.getString( CRED_MAN_PREFIX + "BUNDLE_KEY_REGISTRATION_RESPONSE_JSON"); + assertNonNull(json); - byte[] responseSerialized = - Fido2CredentialRequestJni.get() - .makeCredentialResponseFromJson(json); @@ -3516,17 +3504,17 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut if (responseSerialized == null) { Log.e( TAG, -@@ -416,8 +412,7 @@ public class CredManHelper { - data.getString( +@@ -423,8 +419,7 @@ public class CredManHelper { CRED_MAN_PREFIX + "BUNDLE_KEY_AUTHENTICATION_RESPONSE_JSON"); + assertNonNull(json); - byte[] responseSerialized = - Fido2CredentialRequestJni.get().getCredentialResponseFromJson(json); + byte[] responseSerialized = null; if (responseSerialized == null) { Log.e( TAG, -@@ -568,8 +563,7 @@ public class CredManHelper { +@@ -580,8 +575,7 @@ public class CredManHelper { boolean requestPasswords, boolean preferImmediatelyAvailable, boolean ignoreGpm) { @@ -3539,10 +3527,10 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut diff --git a/components/webauthn/android/java/src/org/chromium/components/webauthn/cred_man/CredManMetricsHelper.java b/components/webauthn/android/java/src/org/chromium/components/webauthn/cred_man/CredManMetricsHelper.java --- a/components/webauthn/android/java/src/org/chromium/components/webauthn/cred_man/CredManMetricsHelper.java +++ b/components/webauthn/android/java/src/org/chromium/components/webauthn/cred_man/CredManMetricsHelper.java -@@ -7,7 +7,7 @@ package org.chromium.components.webauthn.cred_man; - import androidx.annotation.IntDef; +@@ -8,7 +8,7 @@ import androidx.annotation.IntDef; import org.chromium.base.metrics.RecordHistogram; + import org.chromium.build.annotations.NullMarked; -import org.chromium.components.webauthn.Fido2CredentialRequest.ConditionalUiState; +import org.chromium.components.webauthn.ConditionalUiState; @@ -3679,7 +3667,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 -@@ -3625,10 +3625,6 @@ if (is_android) { +@@ -3653,10 +3653,6 @@ if (is_android) { testonly = true sources = content_java_sources_needing_jni deps = [ @@ -3693,7 +3681,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 -@@ -531,9 +531,6 @@ if (is_android) { +@@ -520,9 +520,6 @@ if (is_android) { "gamepad/android/junit/src/org/chromium/device/gamepad/GamepadMappingsTest.java", ] deps = [ @@ -3706,7 +3694,7 @@ diff --git a/device/BUILD.gn b/device/BUILD.gn diff --git a/device/fido/features.cc b/device/fido/features.cc --- a/device/fido/features.cc +++ b/device/fido/features.cc -@@ -123,6 +123,7 @@ BASE_FEATURE(kWebAuthniCloudKeychainPrf, +@@ -113,6 +113,7 @@ BASE_FEATURE(kWebAuthniCloudKeychainPrf, BASE_FEATURE(kWebAuthnHybridLinking, "WebAuthenticationHybridLinking", base::FEATURE_ENABLED_BY_DEFAULT); @@ -3717,7 +3705,7 @@ diff --git a/device/fido/features.cc b/device/fido/features.cc diff --git a/services/BUILD.gn b/services/BUILD.gn --- a/services/BUILD.gn +++ b/services/BUILD.gn -@@ -150,11 +150,6 @@ if (is_android) { +@@ -157,11 +157,6 @@ if (is_android) { "shape_detection/android/junit/src/org/chromium/shape_detection/BitmapUtilsTest.java", ] deps = [ @@ -3729,7 +3717,7 @@ diff --git a/services/BUILD.gn b/services/BUILD.gn "//base:base_java", "//base:base_java_test_support", "//base:base_junit_test_support", -@@ -184,10 +179,6 @@ if (is_android) { +@@ -191,10 +186,6 @@ if (is_android) { "shape_detection/android/javatests/src/org/chromium/shape_detection/TextDetectionImplTest.java", ] deps = [ @@ -3743,7 +3731,7 @@ diff --git a/services/BUILD.gn b/services/BUILD.gn diff --git a/services/device/geolocation/BUILD.gn b/services/device/geolocation/BUILD.gn --- a/services/device/geolocation/BUILD.gn +++ b/services/device/geolocation/BUILD.gn -@@ -158,10 +158,6 @@ if (is_android) { +@@ -156,10 +156,6 @@ if (is_android) { deps = [ ":geolocation_jni_headers", @@ -3793,7 +3781,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD. } # The section below is generated by running -@@ -321,295 +312,6 @@ if (!limit_android_deps) { +@@ -318,295 +309,6 @@ if (!limit_android_deps) { [ "local_modifications/accessibility_test_framework.pcfg" ] } @@ -3883,7 +3871,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD. - info_path = "libs/com_google_android_gms_play_services_basement/com_google_android_gms_play_services_basement.info" - enable_bytecode_checks = false - deps = [ -- "//third_party/androidx:androidx_collection_collection_jvm_java", +- "//third_party/androidx:androidx_collection_collection_java", - "//third_party/androidx:androidx_fragment_fragment_java", - ] - @@ -3946,7 +3934,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD. - 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", +- ":org_jetbrains_kotlinx_kotlinx_coroutines_core_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", @@ -3976,7 +3964,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_identity_credentials_java") { -- aar_path = "cipd/libs/com_google_android_gms_play_services_identity_credentials/play-services-identity-credentials-16.0.0-alpha04.aar" +- aar_path = "cipd/libs/com_google_android_gms_play_services_identity_credentials/play-services-identity-credentials-16.0.0-alpha05.aar" - info_path = "libs/com_google_android_gms_play_services_identity_credentials/com_google_android_gms_play_services_identity_credentials.info" - enable_bytecode_checks = false - deps = [ @@ -4089,7 +4077,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(material_design_target)) { android_aar_prebuilt("com_google_android_material_material_java") { -@@ -657,24 +359,6 @@ if (!limit_android_deps) { +@@ -655,24 +357,6 @@ if (!limit_android_deps) { } } @@ -4112,9 +4100,9 @@ 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") { -@@ -693,56 +377,6 @@ if (!limit_android_deps) { + android_aar_prebuilt("com_google_ar_impress_java") { + aar_path = "cipd/libs/com_google_ar_impress/impress-0.0.2.aar" +@@ -706,56 +390,6 @@ if (!limit_android_deps) { } } @@ -4171,7 +4159,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") { -@@ -1081,340 +715,6 @@ if (!limit_android_deps) { +@@ -1107,339 +741,6 @@ if (!limit_android_deps) { is_robolectric = true } @@ -4188,8 +4176,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD. - ":*", - "//third_party/androidx:*", - ] -- deps = -- [ "//third_party/androidx:androidx_annotation_annotation_jvm_java" ] +- deps = [ "//third_party/androidx:androidx_annotation_annotation_java" ] - } - } - @@ -4325,6 +4312,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD. - ":*", - "//third_party/androidx:*", - ] +- testonly = true - } - - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead. @@ -4380,7 +4368,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD. - ] - deps = [ - "$google_play_services_package:google_firebase_firebase_annotations_java", -- "//third_party/androidx:androidx_annotation_annotation_jvm_java", +- "//third_party/androidx:androidx_annotation_annotation_java", - ] - } - } @@ -4399,8 +4387,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD. - ":*", - "//third_party/androidx:*", - ] -- deps = -- [ "//third_party/androidx:androidx_annotation_annotation_jvm_java" ] +- deps = [ "//third_party/androidx:androidx_annotation_annotation_java" ] - - # https://crbug.com/1412551 - requires_android = true @@ -4422,7 +4409,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD. - ] - deps = [ - "$google_play_services_package:google_firebase_firebase_encoders_java", -- "//third_party/androidx:androidx_annotation_annotation_jvm_java", +- "//third_party/androidx:androidx_annotation_annotation_java", - ] - } - } @@ -4512,7 +4499,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_google_testparameterinjector_test_parameter_injector_java") { -@@ -1700,7 +1000,6 @@ if (!limit_android_deps) { +@@ -1835,7 +1136,6 @@ if (!limit_android_deps) { ] testonly = true deps = [ @@ -4520,7 +4507,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", -@@ -1722,7 +1021,6 @@ if (!limit_android_deps) { +@@ -1857,7 +1157,6 @@ if (!limit_android_deps) { ] testonly = true deps = [ @@ -4528,7 +4515,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", -@@ -1792,7 +1090,6 @@ if (!limit_android_deps) { +@@ -1927,7 +1226,6 @@ if (!limit_android_deps) { ] testonly = true deps = [ @@ -4583,7 +4570,7 @@ diff --git a/third_party/android_deps/util/org/chromium/gms/ChromiumPlayServices 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 -@@ -136,7 +136,7 @@ template("androidx_java_prebuilt") { +@@ -151,7 +151,7 @@ template("androidx_java_prebuilt") { } } @@ -4592,12 +4579,13 @@ diff --git a/third_party/androidx/customizations.gni b/third_party/androidx/cust _androidx_prebuilt(target_name) { forward_variables_from(invoker, "*") target_type = "android_aar_prebuilt" -@@ -157,6 +157,17 @@ template("androidx_android_aar_prebuilt") { +@@ -172,6 +172,18 @@ template("androidx_android_aar_prebuilt") { } } +template("androidx_android_aar_prebuilt") { -+ if (target_name == "androidx_credentials_credentials_play_services_auth_java") { ++ if (target_name == "androidx_credentials_credentials_play_services_auth_java" ++ || target_name == "androidx_credentials_registry_registry_provider_play_services_java") { + forward_variables_from(invoker, "*") + not_needed(["deps", "aar_path", "info_path", "enable_bytecode_checks"]) + } else { diff --git a/build/patches/Remove-blocklisted-URLs-upon-bookmark-creation.patch b/build/patches/Remove-blocklisted-URLs-upon-bookmark-creation.patch index 8053980c..d7b9c066 100644 --- a/build/patches/Remove-blocklisted-URLs-upon-bookmark-creation.patch +++ b/build/patches/Remove-blocklisted-URLs-upon-bookmark-creation.patch @@ -7,9 +7,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../chrome/browser/bookmarks/TabBookmarker.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/TabBookmarker.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/TabBookmarker.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/TabBookmarker.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/TabBookmarker.java +diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/TabBookmarker.java b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/TabBookmarker.java +--- a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/TabBookmarker.java ++++ b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/TabBookmarker.java @@ -19,6 +19,12 @@ import org.chromium.components.bookmarks.BookmarkItem; import org.chromium.components.bookmarks.BookmarkType; import org.chromium.components.browser_ui.bottomsheet.BottomSheetController; diff --git a/build/patches/Remove-detection-of-captive-portals.patch b/build/patches/Remove-detection-of-captive-portals.patch index ece64636..c1db53c5 100644 --- a/build/patches/Remove-detection-of-captive-portals.patch +++ b/build/patches/Remove-detection-of-captive-portals.patch @@ -24,7 +24,7 @@ diff --git a/chrome/browser/net/profile_network_context_service.cc b/chrome/brow diff --git a/chrome/browser/ssl/chrome_security_blocking_page_factory.cc b/chrome/browser/ssl/chrome_security_blocking_page_factory.cc --- a/chrome/browser/ssl/chrome_security_blocking_page_factory.cc +++ b/chrome/browser/ssl/chrome_security_blocking_page_factory.cc -@@ -82,20 +82,6 @@ EnterpriseManaged g_is_enterprise_managed_for_testing = +@@ -81,20 +81,6 @@ EnterpriseManaged g_is_enterprise_managed_for_testing = // CaptivePortalBlockingPage to be invoked when the user has pressed the // connect button. void OpenLoginPage(content::WebContents* web_contents) { diff --git a/build/patches/Remove-help-menu-item.patch b/build/patches/Remove-help-menu-item.patch index 8aacb96d..cdc7c5a7 100644 --- a/build/patches/Remove-help-menu-item.patch +++ b/build/patches/Remove-help-menu-item.patch @@ -30,10 +30,10 @@ 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 -@@ -158,9 +158,6 @@ found in the LICENSE file. - +@@ -167,9 +167,6 @@ found in the LICENSE file. + - @@ -67,7 +67,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 -@@ -2389,15 +2389,6 @@ public abstract class ChromeActivity extends AsyncInitializationActivity +@@ -2390,15 +2390,6 @@ public abstract class ChromeActivity extends AsyncInitializationActivity final Tab currentTab = getActivityTab(); @@ -152,7 +152,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java -@@ -420,6 +420,7 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity +@@ -419,6 +419,7 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity help.setIcon( TraceEventVectorDrawableCompat.create( getResources(), R.drawable.ic_help_and_feedback, getTheme())); diff --git a/build/patches/Remove-support-for-device-memory-and-cpu-recovery.patch b/build/patches/Remove-support-for-device-memory-and-cpu-recovery.patch index 3e8252f3..62bbc45c 100644 --- a/build/patches/Remove-support-for-device-memory-and-cpu-recovery.patch +++ b/build/patches/Remove-support-for-device-memory-and-cpu-recovery.patch @@ -4,7 +4,7 @@ Subject: Remove support for device memory and cpu recovery License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html --- - .../v8_memory/web_memory_impl.cc | 8 ++++++++ + .../v8_memory/web_memory_impl.cc | 6 ++++++ ...ort-for-device-memory-and-cpu-recovery.inc | 3 +++ ...ort-for-device-memory-and-cpu-recovery.inc | 2 ++ .../browser/blob/blob_memory_controller.cc | 20 ++++++++++--------- @@ -14,14 +14,14 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html .../measure_memory_controller.cc | 5 +++++ .../blink/renderer/core/timing/memory_info.cc | 14 ++++++++++--- .../core/timing/window_performance.cc | 2 +- - 10 files changed, 68 insertions(+), 18 deletions(-) + 10 files changed, 66 insertions(+), 18 deletions(-) create mode 100644 cromite_flags/third_party/blink/common/features_cc/Remove-support-for-device-memory-and-cpu-recovery.inc create mode 100644 cromite_flags/third_party/blink/common/features_h/Remove-support-for-device-memory-and-cpu-recovery.inc diff --git a/components/performance_manager/v8_memory/web_memory_impl.cc b/components/performance_manager/v8_memory/web_memory_impl.cc --- a/components/performance_manager/v8_memory/web_memory_impl.cc +++ b/components/performance_manager/v8_memory/web_memory_impl.cc -@@ -28,6 +28,7 @@ +@@ -26,6 +26,7 @@ #include "content/public/common/content_switches.h" #include "url/gurl.h" #include "url/origin.h" @@ -29,15 +29,13 @@ diff --git a/components/performance_manager/v8_memory/web_memory_impl.cc b/compo namespace performance_manager { -@@ -152,6 +153,13 @@ void WebMeasureMemorySecurityCheckerImpl::CheckMeasureMemoryIsAllowed( - DCHECK(frame); - DCHECK_ON_GRAPH_SEQUENCE(frame->GetGraph()); +@@ -111,6 +112,11 @@ WebMeasureMemorySecurityChecker::Create() { + bool WebMeasureMemorySecurityCheckerImpl::IsMeasureMemoryAllowed( + const FrameNode* frame) const { + if (!base::FeatureList::IsEnabled( + blink::features::kWebMeasureMemoryViaPerformanceManager)) { -+ std::move(bad_message_callback) -+ .Run("WebMeasureMemoryViaPerformanceManager feature is disabled"); -+ return; ++ return false; + } + // TODO(crbug.com/40132061): The frame may have navigated since it sent the diff --git a/build/patches/Remove-voice-recognition-integration.patch b/build/patches/Remove-voice-recognition-integration.patch index dbf39f1d..0fcf1f97 100644 --- a/build/patches/Remove-voice-recognition-integration.patch +++ b/build/patches/Remove-voice-recognition-integration.patch @@ -4,12 +4,15 @@ Subject: Remove voice recognition integration License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- + .../BaseCustomTabRootUiCoordinator.java | 2 +- .../chrome/browser/ntp/NewTabPage.java | 38 +---------- .../browser/ntp/search/SearchBoxMediator.java | 1 - .../browser/searchwidget/SearchActivity.java | 3 +- .../SearchActivityLocationBarLayout.java | 8 --- + .../tabbed_mode/TabbedRootUiCoordinator.java | 2 +- .../browser/toolbar/ToolbarManager.java | 5 -- - .../chrome/browser/ui/RootUiCoordinator.java | 43 ------------ + .../ui/AdaptiveToolbarUiCoordinator.java | 48 -------------- + .../chrome/browser/ui/RootUiCoordinator.java | 18 ----- chrome/browser/ui/android/omnibox/BUILD.gn | 1 - .../chrome/browser/omnibox/LocationBar.java | 6 -- .../omnibox/LocationBarCoordinator.java | 13 ---- @@ -21,12 +24,24 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../suggestions/AutocompleteMediator.java | 8 --- .../omnibox/voice/VoiceRecognitionUtil.java | 1 + chrome/browser/ui/android/toolbar/BUILD.gn | 1 - - 17 files changed, 7 insertions(+), 234 deletions(-) + 20 files changed, 9 insertions(+), 259 deletions(-) +diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabRootUiCoordinator.java +--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabRootUiCoordinator.java ++++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabRootUiCoordinator.java +@@ -419,7 +419,7 @@ public class BaseCustomTabRootUiCoordinator extends RootUiCoordinator { + protected AdaptiveToolbarBehavior createAdaptiveToolbarBehavior( + Supplier trackerSupplier) { + return new CustomTabAdaptiveToolbarBehavior( +- () -> addVoiceSearchAdaptiveButton(trackerSupplier)); ++ () -> {}); + } + + @Override diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java -@@ -69,7 +69,6 @@ import org.chromium.chrome.browser.magic_stack.ModuleRegistry; +@@ -70,7 +70,6 @@ import org.chromium.chrome.browser.metrics.StartupMetricsTracker; import org.chromium.chrome.browser.native_page.ContextMenuManager; import org.chromium.chrome.browser.omnibox.OmniboxFocusReason; import org.chromium.chrome.browser.omnibox.OmniboxStub; @@ -34,7 +49,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage. import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManagerImpl; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory; -@@ -126,7 +125,6 @@ public class NewTabPage +@@ -127,7 +126,6 @@ public class NewTabPage TemplateUrlServiceObserver, BrowserControlsStateProvider.Observer, FeedSurfaceDelegate, @@ -42,7 +57,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage. ModuleDelegateHost { private static final String TAG = "NewTabPage"; -@@ -156,7 +154,6 @@ public class NewTabPage +@@ -157,7 +155,6 @@ public class NewTabPage protected boolean mSearchProviderHasLogo; protected OmniboxStub mOmniboxStub; @@ -50,7 +65,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage. // The timestamp at which the constructor was called. protected final long mConstructedTimeNs; -@@ -361,8 +358,7 @@ public class NewTabPage +@@ -362,8 +359,7 @@ public class NewTabPage @Override public boolean isVoiceSearchEnabled() { @@ -60,7 +75,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage. } @Override -@@ -370,24 +366,6 @@ public class NewTabPage +@@ -371,24 +367,6 @@ public class NewTabPage if (mIsDestroyed) return; FeedReliabilityLogger feedReliabilityLogger = mFeedSurfaceProvider.getReliabilityLogger(); @@ -85,7 +100,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage. } @Override -@@ -943,12 +921,6 @@ public class NewTabPage +@@ -950,12 +928,6 @@ public class NewTabPage mOmniboxStub.addUrlFocusChangeListener(feedReliabilityLogger); } } @@ -98,7 +113,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage. } @Override -@@ -959,11 +931,6 @@ public class NewTabPage +@@ -966,11 +938,6 @@ public class NewTabPage } } @@ -110,7 +125,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage. /** Adds an observer to be notified on most visited tile clicks. */ public void addMostVisitedTileClickObserver(MostVisitedTileClickObserver observer) { mMostVisitedTileClickObservers.addObserver(observer); -@@ -1050,9 +1017,6 @@ public class NewTabPage +@@ -1057,9 +1024,6 @@ public class NewTabPage } mFeedSurfaceProvider.destroy(); mTab.getWindowAndroid().removeContextMenuCloseListener(mContextMenuManager); @@ -134,15 +149,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.profiles.ProfileProvider; - import org.chromium.chrome.browser.rlz.RevenueStats; +@@ -66,7 +66,6 @@ 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.tabmodel.TabModelSelector; -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 +@@ -323,7 +322,7 @@ public class SearchActivity extends AsyncInitializationActivity /*omniboxUma*/ (url, transition, isNtp) -> {}, TabWindowManagerSingleton::getInstance, /* bookmarkState= */ (url) -> false, @@ -176,6 +191,18 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se @Override public int getLensEntryPoint() { return mInteractionFromWidget +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 +@@ -886,7 +886,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { + mActivityLifecycleDispatcher, + mTabCreatorManagerSupplier, + mActivityTabProvider, +- () -> addVoiceSearchAdaptiveButton(trackerSupplier)); ++ () -> {}); + } + + @Override 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 @@ -187,7 +214,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; -@@ -2682,10 +2681,6 @@ public class ToolbarManager +@@ -2669,10 +2668,6 @@ public class ToolbarManager return mLocationBar.getOmniboxStub(); } @@ -198,27 +225,104 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar /** Returns the app menu coordinator. */ public @Nullable MenuButtonCoordinator getOverviewModeMenuButtonCoordinator() { return mOverviewModeMenuButtonCoordinator; +diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/AdaptiveToolbarUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/AdaptiveToolbarUiCoordinator.java +--- a/chrome/android/java/src/org/chromium/chrome/browser/ui/AdaptiveToolbarUiCoordinator.java ++++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/AdaptiveToolbarUiCoordinator.java +@@ -26,8 +26,6 @@ import org.chromium.chrome.browser.dom_distiller.ReaderModeToolbarButtonControll + import org.chromium.chrome.browser.flags.ChromeFeatureList; + import org.chromium.chrome.browser.identity_disc.IdentityDiscController; + import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher; +-import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler; +-import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler.VoiceInteractionSource; + import org.chromium.chrome.browser.price_insights.PriceInsightsButtonController; + import org.chromium.chrome.browser.price_tracking.CurrentTabPriceTrackingStateSupplier; + import org.chromium.chrome.browser.price_tracking.PriceTrackingBottomSheetContentCoordinator; +@@ -40,7 +38,6 @@ import org.chromium.chrome.browser.share.ShareButtonController; + import org.chromium.chrome.browser.share.ShareDelegate; + import org.chromium.chrome.browser.tabmodel.TabModelSelector; + import org.chromium.chrome.browser.toolbar.ButtonDataProvider; +-import org.chromium.chrome.browser.toolbar.VoiceToolbarButtonController; + import org.chromium.chrome.browser.toolbar.adaptive.AdaptiveButtonActionMenuCoordinator; + import org.chromium.chrome.browser.toolbar.adaptive.AdaptiveToolbarBehavior; + import org.chromium.chrome.browser.toolbar.adaptive.AdaptiveToolbarButtonController; +@@ -68,7 +65,6 @@ public class AdaptiveToolbarUiCoordinator { + private CurrentTabPriceTrackingStateSupplier mCurrentTabPriceTrackingStateSupplier; + private ContextualPageActionController mContextualPageActionController; + private AdaptiveToolbarButtonController mAdaptiveToolbarButtonController; +- private VoiceToolbarButtonController mVoiceToolbarButtonController; + private BottomSheetController mBottomSheetController; + private ObservableSupplier mProfileSupplier; + private Supplier mScrimSupplier; +@@ -232,45 +228,6 @@ public class AdaptiveToolbarUiCoordinator { + mButtonDataProviders = List.of(identityDiscController, adaptiveToolbarButtonController); + } + +- /** +- * Add voice search action button. +- * +- * @param Supplies {@link VoiceRecognitionHandler} object. +- * @param Supplies {@link Tracker} object. +- */ +- public void addVoiceSearchAdaptiveButton( +- Supplier voiceRecognitionHandler, +- Supplier trackerSupplier) { +- var voiceSearchDelegate = +- new VoiceToolbarButtonController.VoiceSearchDelegate() { +- @Override +- public boolean isVoiceSearchEnabled() { +- if (voiceRecognitionHandler.get() == null) return false; +- return voiceRecognitionHandler.get().isVoiceSearchEnabled(); +- } +- +- @Override +- public void startVoiceRecognition() { +- if (voiceRecognitionHandler.get() == null) return; +- voiceRecognitionHandler +- .get() +- .startVoiceRecognition(VoiceInteractionSource.TOOLBAR); +- } +- }; +- mVoiceToolbarButtonController = +- new VoiceToolbarButtonController( +- mContext, +- AppCompatResources.getDrawable(mContext, R.drawable.ic_mic_white_24dp), +- mActivityTabProvider, +- trackerSupplier, +- mModalDialogManagerSupplier.get(), +- voiceSearchDelegate); +- +- assert mAdaptiveToolbarButtonController != null; +- mAdaptiveToolbarButtonController.addButtonVariant( +- AdaptiveToolbarButtonVariant.VOICE, mVoiceToolbarButtonController); +- } +- + /** + * Returns the list of {@link ButtonDataProvider}. The order in which the providers determines + * which one will be shown first. +@@ -279,11 +236,6 @@ public class AdaptiveToolbarUiCoordinator { + return mButtonDataProviders; + } + +- /** Returns {@link VoiceToolbarButtonController} used for voice search button. */ +- public VoiceToolbarButtonController getVoiceToolbarButtonController() { +- return mVoiceToolbarButtonController; +- } +- + /** Destroy internally used objects. */ + public void destroy() { + if (mCurrentTabPriceTrackingStateSupplier != null) { 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 -@@ -106,8 +106,6 @@ import org.chromium.chrome.browser.metrics.UmaSessionStats; +@@ -97,7 +97,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; -import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler; --import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler.VoiceInteractionSource; import org.chromium.chrome.browser.paint_preview.DemoPaintPreview; import org.chromium.chrome.browser.password_manager.ManagePasswordsReferrer; import org.chromium.chrome.browser.password_manager.PasswordManagerLauncher; -@@ -148,7 +146,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; --import org.chromium.chrome.browser.toolbar.VoiceToolbarButtonController; - import org.chromium.chrome.browser.toolbar.adaptive.AdaptiveButtonActionMenuCoordinator; - import org.chromium.chrome.browser.toolbar.adaptive.AdaptiveToolbarButtonController; - import org.chromium.chrome.browser.toolbar.adaptive.AdaptiveToolbarButtonVariant; -@@ -310,7 +307,6 @@ public class RootUiCoordinator +@@ -285,7 +284,6 @@ public class RootUiCoordinator private LayoutManagerImpl mLayoutManager; protected OneshotSupplier mIntentMetadataOneshotSupplier; protected OneshotSupplierImpl mPromoShownOneshotSupplier = new OneshotSupplierImpl<>(); @@ -226,7 +330,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; -@@ -636,9 +632,6 @@ public class RootUiCoordinator +@@ -612,9 +610,6 @@ public class RootUiCoordinator } if (mToolbarManager != null) { @@ -236,69 +340,30 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi mToolbarManager.destroy(); mToolbarManager = null; } -@@ -1472,39 +1465,12 @@ public class RootUiCoordinator - () -> - mToolbarManager.setUrlBarFocus( - false, OmniboxFocusReason.UNFOCUS)); -- VoiceToolbarButtonController.VoiceSearchDelegate voiceSearchDelegate = -- new VoiceToolbarButtonController.VoiceSearchDelegate() { -- @Override -- public boolean isVoiceSearchEnabled() { -- VoiceRecognitionHandler voiceRecognitionHandler = -- mToolbarManager.getVoiceRecognitionHandler(); -- if (voiceRecognitionHandler == null) return false; -- return voiceRecognitionHandler.isVoiceSearchEnabled(); -- } -- -- @Override -- public void startVoiceRecognition() { -- VoiceRecognitionHandler voiceRecognitionHandler = -- mToolbarManager.getVoiceRecognitionHandler(); -- if (voiceRecognitionHandler == null) return; -- voiceRecognitionHandler.startVoiceRecognition( -- VoiceInteractionSource.TOOLBAR); -- } -- }; - TranslateToolbarButtonController translateToolbarButtonController = - new TranslateToolbarButtonController( - mActivityTabProvider, - AppCompatResources.getDrawable(mActivity, R.drawable.ic_translate), - mActivity.getString(R.string.menu_translate), - trackerSupplier); -- VoiceToolbarButtonController voiceToolbarButtonController = -- new VoiceToolbarButtonController( -- mActivity, -- AppCompatResources.getDrawable(mActivity, R.drawable.ic_mic_white_24dp), -- mActivityTabProvider, -- trackerSupplier, -- mModalDialogManagerSupplier.get(), -- voiceSearchDelegate); - OptionalNewTabButtonController newTabButtonController = - new OptionalNewTabButtonController( - mActivity, -@@ -1550,8 +1516,6 @@ public class RootUiCoordinator - AdaptiveToolbarButtonVariant.NEW_TAB, newTabButtonController); - adaptiveToolbarButtonController.addButtonVariant( - AdaptiveToolbarButtonVariant.SHARE, shareButtonController); -- adaptiveToolbarButtonController.addButtonVariant( -- AdaptiveToolbarButtonVariant.VOICE, voiceToolbarButtonController); - adaptiveToolbarButtonController.addButtonVariant( - AdaptiveToolbarButtonVariant.ADD_TO_BOOKMARKS, - addToBookmarksToolbarButtonController); -@@ -1669,13 +1633,6 @@ public class RootUiCoordinator +@@ -1488,23 +1483,10 @@ public class RootUiCoordinator if (!mSupportsAppMenuSupplier.getAsBoolean()) { mToolbarManager.getToolbar().disableMenuButton(); } - -- VoiceRecognitionHandler voiceRecognitionHandler = -- mToolbarManager.getVoiceRecognitionHandler(); -- if (voiceRecognitionHandler != null) { -- mMicStateObserver = voiceToolbarButtonController::updateMicButtonState; +- var voiceButtonController = +- mAdaptiveToolbarUiCoordinator.getVoiceToolbarButtonController(); +- var voiceRecognitionHandler = mToolbarManager.getVoiceRecognitionHandler(); +- if (voiceButtonController != null && voiceRecognitionHandler != null) { +- mMicStateObserver = voiceButtonController::updateMicButtonState; - voiceRecognitionHandler.addObserver(mMicStateObserver); - } mToolbarManagerOneshotSupplier.set(mToolbarManager); } } + +- protected void addVoiceSearchAdaptiveButton(Supplier trackerSupplier) { +- mAdaptiveToolbarUiCoordinator.addVoiceSearchAdaptiveButton( +- () -> mToolbarManager.getVoiceRecognitionHandler(), trackerSupplier); +- } +- + /** + * Constructs a {@link ScrimManager} and sets up observers. Lifetime of all these objects should + * match. diff --git a/chrome/browser/ui/android/omnibox/BUILD.gn b/chrome/browser/ui/android/omnibox/BUILD.gn --- a/chrome/browser/ui/android/omnibox/BUILD.gn +++ b/chrome/browser/ui/android/omnibox/BUILD.gn @@ -321,7 +386,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow import org.chromium.chrome.browser.tab.Tab; import java.util.Optional; -@@ -86,11 +85,6 @@ public interface LocationBar { +@@ -78,11 +77,6 @@ public interface LocationBar { */ View getSecurityIconView(); @@ -344,7 +409,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; -@@ -464,13 +463,6 @@ public class LocationBarCoordinator +@@ -455,13 +454,6 @@ public class LocationBarCoordinator return mLocationBarLayout.getSecurityIconView(); } @@ -358,7 +423,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow @Nullable @Override public OmniboxStub getOmniboxStub() { -@@ -792,11 +784,6 @@ public class LocationBarCoordinator +@@ -783,11 +775,6 @@ public class LocationBarCoordinator // End tablet-specific methods. @@ -678,7 +743,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/voice/VoiceRecognitionUtil.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/voice/VoiceRecognitionUtil.java --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/voice/VoiceRecognitionUtil.java +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/voice/VoiceRecognitionUtil.java -@@ -121,6 +121,7 @@ public class VoiceRecognitionUtil { +@@ -122,6 +122,7 @@ public class VoiceRecognitionUtil { * @return {@code true} if recognition is supported. {@code false} otherwise. */ public static boolean isRecognitionIntentPresent(boolean useCachedValue) { @@ -695,6 +760,6 @@ diff --git a/chrome/browser/ui/android/toolbar/BUILD.gn b/chrome/browser/ui/andr "java/src/org/chromium/chrome/browser/toolbar/ToolbarTabControllerImpl.java", - "java/src/org/chromium/chrome/browser/toolbar/VoiceToolbarButtonController.java", "java/src/org/chromium/chrome/browser/toolbar/adaptive/AdaptiveButtonActionMenuCoordinator.java", + "java/src/org/chromium/chrome/browser/toolbar/adaptive/AdaptiveToolbarBehavior.java", "java/src/org/chromium/chrome/browser/toolbar/adaptive/AdaptiveToolbarBridge.java", - "java/src/org/chromium/chrome/browser/toolbar/adaptive/AdaptiveToolbarButtonController.java", -- diff --git a/build/patches/Remove-window-name-on-cross-origin-navigation.patch b/build/patches/Remove-window-name-on-cross-origin-navigation.patch index d7846150..9531dc75 100644 --- a/build/patches/Remove-window-name-on-cross-origin-navigation.patch +++ b/build/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 -@@ -3004,7 +3004,7 @@ void DocumentLoader::CommitNavigation() { +@@ -3014,7 +3014,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(); } -@@ -3015,6 +3015,7 @@ void DocumentLoader::CommitNavigation() { +@@ -3025,6 +3025,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/patches/Restore-BookmarkToolbar-setCurrentFolder.patch b/build/patches/Restore-BookmarkToolbar-setCurrentFolder.patch index a2d63f95..ac22d56b 100644 --- a/build/patches/Restore-BookmarkToolbar-setCurrentFolder.patch +++ b/build/patches/Restore-BookmarkToolbar-setCurrentFolder.patch @@ -6,17 +6,17 @@ restore https://chromium-review.googlesource.com/c/chromium/src/+/5554182 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html --- - .../chrome/browser/bookmarks/BookmarkToolbar.java | 12 ++++++++++++ - .../bookmarks/BookmarkToolbarCoordinator.java | 1 + - .../browser/bookmarks/BookmarkToolbarMediator.java | 1 + - .../browser/bookmarks/BookmarkToolbarProperties.java | 9 +++++++++ - .../browser/bookmarks/BookmarkToolbarViewBinder.java | 4 ++++ - 5 files changed, 27 insertions(+) + .../chrome/browser/bookmarks/BookmarkToolbar.java | 13 +++++++++++++ + .../bookmarks/BookmarkToolbarCoordinator.java | 1 + + .../browser/bookmarks/BookmarkToolbarMediator.java | 1 + + .../bookmarks/BookmarkToolbarProperties.java | 9 +++++++++ + .../bookmarks/BookmarkToolbarViewBinder.java | 4 ++++ + 5 files changed, 28 insertions(+) -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 ---- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java -@@ -10,11 +10,13 @@ import android.view.MenuItem; +diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java +--- a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java ++++ b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java +@@ -10,10 +10,12 @@ import android.view.MenuItem; import android.view.View.OnClickListener; import androidx.annotation.IdRes; @@ -24,13 +24,12 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm import androidx.appcompat.widget.Toolbar.OnMenuItemClickListener; import androidx.core.view.MenuCompat; - import org.chromium.chrome.R; import org.chromium.chrome.browser.bookmarks.BookmarkUiState.BookmarkUiMode; +import org.chromium.components.bookmarks.BookmarkItem; import org.chromium.components.bookmarks.BookmarkId; import org.chromium.components.browser_ui.util.ToolbarUtils; import org.chromium.components.browser_ui.widget.selectable_list.SelectableListToolbar; -@@ -30,8 +32,10 @@ import java.util.function.Function; +@@ -29,8 +31,10 @@ import java.util.function.Function; */ public class BookmarkToolbar extends SelectableListToolbar implements OnMenuItemClickListener, OnClickListener { @@ -41,7 +40,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm private boolean mEditButtonVisible; private boolean mNewFolderButtonVisible; private boolean mNewFolderButtonEnabled; -@@ -59,6 +63,10 @@ public class BookmarkToolbar extends SelectableListToolbar +@@ -58,6 +62,11 @@ public class BookmarkToolbar extends SelectableListToolbar setOnMenuItemClickListener(this); } @@ -49,10 +48,11 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm + mBookmarkModel = bookmarkModel; + } + - void setBookmarkOpener(BookmarkOpener bookmarkOpener) {} - ++ void setSelectionDelegate(SelectionDelegate selectionDelegate) { -@@ -164,6 +172,10 @@ public class BookmarkToolbar extends SelectableListToolbar + mSelectionDelegate = selectionDelegate; + getMenu().setGroupEnabled(R.id.selection_mode_menu_group, true); +@@ -161,6 +170,10 @@ public class BookmarkToolbar extends SelectableListToolbar getMenu().findItem(id).setChecked(true); } @@ -63,10 +63,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm void setNavigateBackRunnable(Runnable navigateBackRunnable) { mNavigateBackRunnable = navigateBackRunnable; } -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 -@@ -54,6 +54,7 @@ public class BookmarkToolbarCoordinator { +diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarCoordinator.java b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarCoordinator.java +--- a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarCoordinator.java ++++ b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarCoordinator.java +@@ -55,6 +55,7 @@ public class BookmarkToolbarCoordinator { searchDelegate, R.string.bookmark_toolbar_search, R.id.search_menu_id); mModel = new PropertyModel.Builder(BookmarkToolbarProperties.ALL_KEYS).build(); @@ -74,10 +74,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm mModel.set(BookmarkToolbarProperties.SELECTION_DELEGATE, selectionDelegate); mModel.set(BookmarkToolbarProperties.BOOKMARK_UI_MODE, BookmarkUiMode.LOADING); mModel.set(BookmarkToolbarProperties.IS_DIALOG_UI, isDialogUi); -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarMediator.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarMediator.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarMediator.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarMediator.java -@@ -290,6 +290,7 @@ class BookmarkToolbarMediator +diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarMediator.java b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarMediator.java +--- a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarMediator.java ++++ b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarMediator.java +@@ -293,6 +293,7 @@ class BookmarkToolbarMediator @Override public void onFolderStateSet(BookmarkId folder) { mCurrentFolder = folder; @@ -85,18 +85,18 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm BookmarkItem folderItem = mCurrentFolder == null ? null : mBookmarkModel.getBookmarkById(mCurrentFolder); -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarProperties.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarProperties.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarProperties.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarProperties.java +diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarProperties.java b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarProperties.java +--- a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarProperties.java ++++ b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarProperties.java @@ -4,6 +4,7 @@ package org.chromium.chrome.browser.bookmarks; +import org.chromium.components.bookmarks.BookmarkId; + import org.chromium.chrome.browser.bookmarks.BookmarkUiState.BookmarkUiMode; import org.chromium.components.browser_ui.widget.selectable_list.SelectionDelegate; import org.chromium.ui.modelutil.PropertyKey; - import org.chromium.ui.modelutil.PropertyModel.WritableBooleanPropertyKey; -@@ -19,6 +20,8 @@ import java.util.function.Function; +@@ -20,6 +21,8 @@ import java.util.function.Function; */ class BookmarkToolbarProperties { /** Dependencies */ @@ -105,7 +105,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm static final WritableObjectPropertyKey SELECTION_DELEGATE = new WritableObjectPropertyKey<>(); -@@ -65,6 +68,10 @@ class BookmarkToolbarProperties { +@@ -66,6 +69,10 @@ class BookmarkToolbarProperties { static final WritableObjectPropertyKey FAKE_SELECTION_STATE_CHANGE = new WritableObjectPropertyKey<>(/* skipEquality= */ true); @@ -116,7 +116,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm /** Callables to delegate business logic back to the mediator */ static final WritableObjectPropertyKey> MENU_ID_CLICKED_FUNCTION = new WritableObjectPropertyKey<>(); -@@ -84,6 +91,8 @@ class BookmarkToolbarProperties { +@@ -85,6 +92,8 @@ class BookmarkToolbarProperties { NEW_FOLDER_BUTTON_VISIBLE, NEW_FOLDER_BUTTON_ENABLED, NAVIGATION_BUTTON_STATE, @@ -125,9 +125,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm SORT_MENU_IDS, SORT_MENU_IDS_ENABLED, CHECKED_SORT_MENU_ID, -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarViewBinder.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarViewBinder.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarViewBinder.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarViewBinder.java +diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarViewBinder.java b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarViewBinder.java +--- a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarViewBinder.java ++++ b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarViewBinder.java @@ -14,6 +14,8 @@ class BookmarkToolbarViewBinder { if (key == BookmarkToolbarProperties.SELECTION_DELEGATE) { bookmarkToolbar.setSelectionDelegate( diff --git a/build/patches/Restore-LastTabStandingTracker.patch b/build/patches/Restore-LastTabStandingTracker.patch index 217e7bb0..d30b1ef9 100644 --- a/build/patches/Restore-LastTabStandingTracker.patch +++ b/build/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 -@@ -1698,6 +1698,16 @@ static_library("browser") { +@@ -1713,6 +1713,16 @@ static_library("browser") { ] } @@ -55,7 +55,7 @@ diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.c #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_key.h" #include "chrome/browser/profiles/profiles_state.h" -@@ -58,6 +59,7 @@ HostContentSettingsMapFactory::HostContentSettingsMapFactory() +@@ -59,6 +60,7 @@ HostContentSettingsMapFactory::HostContentSettingsMapFactory() .WithAshInternals(ProfileSelection::kOwnInstance) .Build()) { DependsOn(SupervisedUserSettingsServiceFactory::GetInstance()); @@ -382,7 +382,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 -@@ -135,6 +135,7 @@ +@@ -124,6 +124,7 @@ #include "chrome/browser/password_manager/password_manager_settings_service_factory.h" #include "chrome/browser/password_manager/password_reuse_manager_factory.h" #include "chrome/browser/password_manager/profile_password_store_factory.h" @@ -390,7 +390,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" -@@ -1058,6 +1059,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1046,6 +1047,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #if BUILDFLAG(BUILD_WITH_TFLITE_LIB) OnDeviceTailModelServiceFactory::GetInstance(); #endif @@ -409,7 +409,7 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc #include "chrome/browser/permissions/one_time_permissions_tracker_helper.h" #include "chrome/browser/predictors/loading_predictor_factory.h" #include "chrome/browser/predictors/loading_predictor_tab_helper.h" -@@ -405,6 +406,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { +@@ -416,6 +417,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { HistoryEmbeddingsTabHelper::CreateForWebContents(web_contents); HttpsOnlyModeTabHelper::CreateForWebContents(web_contents); webapps::InstallableManager::CreateForWebContents(web_contents); diff --git a/build/patches/Restore-Search-Ready-Omnibox-flag.patch b/build/patches/Restore-Search-Ready-Omnibox-flag.patch index f62657ac..55d24f76 100644 --- a/build/patches/Restore-Search-Ready-Omnibox-flag.patch +++ b/build/patches/Restore-Search-Ready-Omnibox-flag.patch @@ -34,7 +34,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 -@@ -389,6 +389,7 @@ public abstract class ChromeFeatureList { +@@ -397,6 +397,7 @@ public abstract class ChromeFeatureList { public static final String MAYLAUNCHURL_USES_SEPARATE_STORAGE_PARTITION = "MayLaunchUrlUsesSeparateStoragePartition"; public static final String MOST_VISITED_TILES_CUSTOMIZATION = "MostVisitedTilesCustomization"; diff --git a/build/patches/Restore-Simplified-NTP-launch.patch b/build/patches/Restore-Simplified-NTP-launch.patch index 9012187a..1ccf717e 100644 --- a/build/patches/Restore-Simplified-NTP-launch.patch +++ b/build/patches/Restore-Simplified-NTP-launch.patch @@ -15,12 +15,16 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../android/java/res/layout/ntp_shortcuts.xml | 65 ++++++ chrome/android/java/res/values/attrs.xml | 4 + chrome/android/java/res/values/dimens.xml | 2 + + .../chrome/browser/ChromeTabbedActivity.java | 3 +- + .../browser/TabbedModeTabDelegateFactory.java | 9 +- .../feedback/ChromeFeedbackCollector.java | 1 + .../feedback/SimplifiedNtpFeedbackSource.java | 38 ++++ .../identity_disc/IdentityDiscController.java | 5 +- + .../native_page/NativePageFactory.java | 19 +- .../NativePageNavigationDelegateImpl.java | 2 +- + .../chrome/browser/ntp/NewTabPage.java | 8 +- .../chrome/browser/ntp/NewTabPageLayout.java | 25 ++- - .../SuggestionsNavigationDelegate.java | 17 ++ + .../SuggestionsNavigationDelegate.java | 27 ++- .../mostvisited/MostVisitedSitesBridge.java | 2 +- .../tile/MostVisitedTilesCoordinator.java | 7 +- .../tile/MostVisitedTilesGridLayout.java | 193 ++++++++++++++++++ @@ -33,7 +37,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 + - 27 files changed, 399 insertions(+), 31 deletions(-) + 31 files changed, 437 insertions(+), 42 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 @@ -44,7 +48,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 -@@ -547,6 +547,7 @@ chrome_java_resources = [ +@@ -553,6 +553,7 @@ chrome_java_resources = [ "java/res/layout/new_tab_page_tile_grid_placeholder.xml", "java/res/layout/one_line_list_item.xml", "java/res/layout/open_full_chrome_history_header.xml", @@ -55,7 +59,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 -@@ -640,6 +640,7 @@ chrome_java_sources = [ +@@ -573,6 +573,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", @@ -63,7 +67,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", -@@ -1053,6 +1054,7 @@ chrome_java_sources = [ +@@ -984,6 +985,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", @@ -253,12 +257,72 @@ diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res 20dp @dimen/signin_promo_lateral_paddings 17dp +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 +@@ -2780,7 +2780,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn + getToolbarManager().getTabStripHeightSupplier(), + mModuleRegistrySupplier, + mEdgeToEdgeControllerSupplier, +- getStartupMetricsTracker()); ++ getStartupMetricsTracker(), ++ mBookmarkManagerOpenerSupplier); + } + return mTabDelegateFactory; + } +diff --git a/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDelegateFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDelegateFactory.java +--- a/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDelegateFactory.java ++++ b/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDelegateFactory.java +@@ -15,6 +15,7 @@ import org.chromium.base.supplier.OneshotSupplier; + import org.chromium.base.supplier.Supplier; + import org.chromium.chrome.browser.app.ChromeActivity; + import org.chromium.chrome.browser.app.tab_activity_glue.ActivityTabWebContentsDelegateAndroid; ++import org.chromium.chrome.browser.bookmarks.BookmarkManagerOpener; + import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider; + import org.chromium.chrome.browser.compositor.CompositorViewHolder; + import org.chromium.chrome.browser.contextmenu.ChromeContextMenuPopulator; +@@ -82,6 +83,7 @@ public class TabbedModeTabDelegateFactory implements TabDelegateFactory { + private final OneshotSupplier mModuleRegistrySupplier; + private final ObservableSupplier mEdgeToEdgeControllerSupplier; + private final StartupMetricsTracker mStartupMetricsTracker; ++ private final ObservableSupplier mBookmarkManagerOpenerSupplier; + + private NativePageFactory mNativePageFactory; + +@@ -111,7 +113,8 @@ public class TabbedModeTabDelegateFactory implements TabDelegateFactory { + @NonNull ObservableSupplier tabStripHeightSupplier, + @NonNull OneshotSupplier moduleRegistrySupplier, + @NonNull ObservableSupplier edgeToEdgeControllerSupplier, +- StartupMetricsTracker startupMetricsTracker) { ++ StartupMetricsTracker startupMetricsTracker, ++ @NonNull ObservableSupplier bookmarkManagerOpenerSupplier) { + mActivity = activity; + mAppBrowserControlsVisibilityDelegate = appBrowserControlsVisibilityDelegate; + mShareDelegateSupplier = shareDelegateSupplier; +@@ -138,6 +141,7 @@ public class TabbedModeTabDelegateFactory implements TabDelegateFactory { + mModuleRegistrySupplier = moduleRegistrySupplier; + mEdgeToEdgeControllerSupplier = edgeToEdgeControllerSupplier; + mStartupMetricsTracker = startupMetricsTracker; ++ mBookmarkManagerOpenerSupplier = bookmarkManagerOpenerSupplier; + } + + @Override +@@ -204,7 +208,8 @@ public class TabbedModeTabDelegateFactory implements TabDelegateFactory { + mTabStripHeightSupplier, + mModuleRegistrySupplier, + mEdgeToEdgeControllerSupplier, +- mStartupMetricsTracker); ++ mStartupMetricsTracker, ++ mBookmarkManagerOpenerSupplier); + } + return mNativePageFactory.createNativePage(url, candidatePage, tab, pdfInfo); + } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/feedback/ChromeFeedbackCollector.java b/chrome/android/java/src/org/chromium/chrome/browser/feedback/ChromeFeedbackCollector.java --- a/chrome/android/java/src/org/chromium/chrome/browser/feedback/ChromeFeedbackCollector.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/feedback/ChromeFeedbackCollector.java -@@ -67,6 +67,7 @@ public class ChromeFeedbackCollector extends FeedbackCollector mModuleRegistrySupplier; + private final ObservableSupplier mEdgeToEdgeControllerSupplier; + private final StartupMetricsTracker mStartupMetricsTracker; ++ private final ObservableSupplier mBookmarkManagerOpenerSupplier; + private NewTabPageUma mNewTabPageUma; + + private NativePageBuilder mNativePageBuilder; +@@ -100,7 +102,8 @@ public class NativePageFactory { + @NonNull ObservableSupplier tabStripHeightSupplier, + @NonNull OneshotSupplier moduleRegistrySupplier, + @NonNull ObservableSupplier edgeToEdgeControllerSupplier, +- @NonNull StartupMetricsTracker startupMetricsTracker) { ++ @NonNull StartupMetricsTracker startupMetricsTracker, ++ @NonNull ObservableSupplier bookmarkManagerOpenerSupplier) { + mActivity = activity; + mBottomSheetController = sheetController; + mBrowserControlsManager = browserControlsManager; +@@ -118,6 +121,7 @@ public class NativePageFactory { + mModuleRegistrySupplier = moduleRegistrySupplier; + mEdgeToEdgeControllerSupplier = edgeToEdgeControllerSupplier; + mStartupMetricsTracker = startupMetricsTracker; ++ mBookmarkManagerOpenerSupplier = bookmarkManagerOpenerSupplier; + } + + private NativePageBuilder getBuilder() { +@@ -141,7 +145,8 @@ public class NativePageFactory { + mTabStripHeightSupplier, + mModuleRegistrySupplier, + mEdgeToEdgeControllerSupplier, +- mStartupMetricsTracker); ++ mStartupMetricsTracker, ++ mBookmarkManagerOpenerSupplier); + } + return mNativePageBuilder; + } +@@ -174,9 +179,10 @@ public class NativePageFactory { + private final OneshotSupplier mModuleRegistrySupplier; + private final ObservableSupplier mEdgeToEdgeControllerSupplier; + private final StartupMetricsTracker mStartupMetricsTracker; ++ private final ObservableSupplier mBookmarkManagerOpenerSupplier; + + public NativePageBuilder( +- Activity activity, ++ ChromeActivity activity, + Supplier uma, + BottomSheetController sheetController, + BrowserControlsManager browserControlsManager, +@@ -193,7 +199,8 @@ public class NativePageFactory { + ObservableSupplier tabStripHeightSupplier, + OneshotSupplier moduleRegistrySupplier, + ObservableSupplier edgeToEdgeControllerSupplier, +- StartupMetricsTracker startupMetricsTracker) { ++ StartupMetricsTracker startupMetricsTracker, ++ @NonNull ObservableSupplier bookmarkManagerOpenerSupplier) { + mActivity = activity; + mUma = uma; + mBottomSheetController = sheetController; +@@ -212,6 +219,7 @@ public class NativePageFactory { + mModuleRegistrySupplier = moduleRegistrySupplier; + mEdgeToEdgeControllerSupplier = edgeToEdgeControllerSupplier; + mStartupMetricsTracker = startupMetricsTracker; ++ mBookmarkManagerOpenerSupplier = bookmarkManagerOpenerSupplier; + } + + protected NativePage buildNewTabPage(Tab tab, String url) { +@@ -245,7 +253,8 @@ public class NativePageFactory { + mTabStripHeightSupplier, + mModuleRegistrySupplier, + mEdgeToEdgeControllerSupplier, +- mStartupMetricsTracker); ++ mStartupMetricsTracker, ++ mBookmarkManagerOpenerSupplier); + } + + protected NativePage buildBookmarksPage(Tab tab) { diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageNavigationDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageNavigationDelegateImpl.java --- a/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageNavigationDelegateImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageNavigationDelegateImpl.java @@ -334,6 +485,38 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat protected final TabModelSelector mTabModelSelector; protected final Tab mTab; +diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java +--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java ++++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java +@@ -117,6 +117,9 @@ import org.chromium.ui.base.DeviceFormFactor; + import org.chromium.ui.base.WindowAndroid; + import org.chromium.url.GURL; + ++import androidx.annotation.NonNull; ++import org.chromium.chrome.browser.bookmarks.BookmarkManagerOpener; ++ + import java.util.List; + + /** Provides functionality when the user interacts with the NTP. */ +@@ -475,7 +478,8 @@ public class NewTabPage + ObservableSupplier tabStripHeightSupplier, + OneshotSupplier moduleRegistrySupplier, + ObservableSupplier edgeToEdgeControllerSupplier, +- StartupMetricsTracker startupMetricsTracker) { ++ StartupMetricsTracker startupMetricsTracker, ++ @NonNull ObservableSupplier bookmarkManagerOpenerSupplier) { + mConstructedTimeNs = System.nanoTime(); + TraceEvent.begin(TAG); + +@@ -499,7 +503,7 @@ public class NewTabPage + + SuggestionsNavigationDelegate navigationDelegate = + new SuggestionsNavigationDelegate( +- activity, profile, nativePageHost, tabModelSelector, mTab); ++ activity, profile, nativePageHost, tabModelSelector, mTab, bookmarkManagerOpenerSupplier); + mNewTabPageManager = + new NewTabPageManagerImpl( + navigationDelegate, profile, nativePageHost, snackbarManager); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java @@ -414,24 +597,38 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL diff --git a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/SuggestionsNavigationDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/suggestions/SuggestionsNavigationDelegate.java --- a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/SuggestionsNavigationDelegate.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/suggestions/SuggestionsNavigationDelegate.java -@@ -22,6 +22,11 @@ import org.chromium.ui.base.PageTransition; +@@ -22,16 +22,41 @@ import org.chromium.ui.base.PageTransition; import org.chromium.ui.mojom.WindowOpenDisposition; import org.chromium.url.GURL; ++import androidx.annotation.NonNull; ++import org.chromium.base.supplier.ObservableSupplier; +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.bookmarks.BookmarkManagerOpener; + /** Extension of {@link NativePageNavigationDelegate} with suggestions-specific methods. */ public class SuggestionsNavigationDelegate extends NativePageNavigationDelegateImpl { -@@ -34,6 +39,18 @@ public class SuggestionsNavigationDelegate extends NativePageNavigationDelegateI ++ private final @NonNull ObservableSupplier mBookmarkManagerOpenerSupplier; ++ + public SuggestionsNavigationDelegate( + Activity activity, + Profile profile, + NativePageHost host, + TabModelSelector tabModelSelector, +- Tab tab) { ++ Tab tab, ++ @NonNull ObservableSupplier bookmarkManagerOpenerSupplier) { super(activity, profile, host, tabModelSelector, tab); - } - ++ mBookmarkManagerOpenerSupplier = bookmarkManagerOpenerSupplier; ++ } ++ + public void navigateToBookmarks() { -+ BookmarkUtils.showBookmarkManager(mActivity, mTab.isIncognito()); ++ mBookmarkManagerOpenerSupplier.get() ++ .showBookmarkManager(mActivity, mTab.getProfile()); + } + + public void navigateToDownloadManager() { @@ -440,11 +637,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/Sug + otrProfileID = mProfile.getOtrProfileId(); + } + DownloadUtils.showDownloadManager(mActivity, mTab, otrProfileID, DownloadOpenSource.NEW_TAB_PAGE); -+ } -+ + } + /** - * Opens the suggestions page without recording metrics. - * diff --git a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/mostvisited/MostVisitedSitesBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/suggestions/mostvisited/MostVisitedSitesBridge.java --- a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/mostvisited/MostVisitedSitesBridge.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/suggestions/mostvisited/MostVisitedSitesBridge.java @@ -739,7 +934,7 @@ 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 @@ -279,6 +279,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { - &kHistoryPaneAndroid, + &kLegacyTabStateDeprecation, &kLockBackPressHandlerAtStart, &kIncognitoScreenshot, + &kSimplifiedNTP, @@ -749,7 +944,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 -@@ -390,6 +390,7 @@ public abstract class ChromeFeatureList { +@@ -398,6 +398,7 @@ public abstract class ChromeFeatureList { public static final String MAYLAUNCHURL_USES_SEPARATE_STORAGE_PARTITION = "MayLaunchUrlUsesSeparateStoragePartition"; public static final String MOST_VISITED_TILES_CUSTOMIZATION = "MostVisitedTilesCustomization"; @@ -757,7 +952,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f 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 = -@@ -730,7 +731,7 @@ public abstract class ChromeFeatureList { +@@ -766,7 +767,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/patches/Restore-adaptive-button-in-top-toolbar-customization.patch b/build/patches/Restore-adaptive-button-in-top-toolbar-customization.patch index c0b0bbba..22fad924 100644 --- a/build/patches/Restore-adaptive-button-in-top-toolbar-customization.patch +++ b/build/patches/Restore-adaptive-button-in-top-toolbar-customization.patch @@ -7,36 +7,35 @@ Voice button and legacy share/voice functionality is not restored. License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - .../chrome/browser/settings/MainSettings.java | 10 +--------- + .../chrome/browser/settings/MainSettings.java | 9 +-------- .../segmentation_platform_config.cc | 1 + .../adaptive/AdaptiveToolbarButtonController.java | 2 +- .../toolbar/adaptive/AdaptiveToolbarPrefs.java | 2 +- .../adaptive/AdaptiveToolbarStatePredictor.java | 4 ++++ .../RadioButtonGroupAdaptiveToolbarPreference.java | 11 ++--------- ...e-adaptive-button-in-top-toolbar-customization.inc | 1 + - 7 files changed, 11 insertions(+), 20 deletions(-) + 7 files changed, 11 insertions(+), 19 deletions(-) create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Restore-adaptive-button-in-top-toolbar-customization.inc 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 --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java -@@ -264,15 +264,7 @@ public class MainSettings extends ChromeBaseSettingsFragment - templateUrlService.load(); - } +@@ -293,14 +293,7 @@ public class MainSettings extends ChromeBaseSettingsFragment + getContext(), + getProfile(), + /* androidPermissionDelegate= */ null, +- /* behavior= */ null) +- .recomputeUiState( +- uiState -> { +- // Don't show toolbar shortcut settings if disabled from finch. +- if (!uiState.canShowUi) { +- removePreferenceIfPresent(PREF_TOOLBAR_SHORTCUT); +- } +- }); ++ /* behavior= */ null); + // LINT.ThenChange(//chrome/android/java/src/org/chromium/chrome/browser/appearance/settings/AppearanceSettingsFragment.java:InitPrefToolbarShortcut) -- new AdaptiveToolbarStatePredictor(getContext(), getProfile(), null) -- .recomputeUiState( -- uiState -> { -- // We don't show the toolbar shortcut settings page if disabled from -- // finch. -- if (uiState.canShowUi) return; -- getPreferenceScreen() -- .removePreference(findPreference(PREF_TOOLBAR_SHORTCUT)); -- }); -+ new AdaptiveToolbarStatePredictor(getContext(), getProfile(), null); - - if (((true)) || BuildInfo.getInstance().isAutomotive) { - getPreferenceScreen().removePreference(findPreference(PREF_SAFETY_CHECK)); + // LINT.IfChange(InitPrefUiTheme) diff --git a/chrome/browser/segmentation_platform/segmentation_platform_config.cc b/chrome/browser/segmentation_platform/segmentation_platform_config.cc --- a/chrome/browser/segmentation_platform/segmentation_platform_config.cc +++ b/chrome/browser/segmentation_platform/segmentation_platform_config.cc @@ -51,7 +50,7 @@ diff --git a/chrome/browser/segmentation_platform/segmentation_platform_config.c diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/adaptive/AdaptiveToolbarButtonController.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/adaptive/AdaptiveToolbarButtonController.java --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/adaptive/AdaptiveToolbarButtonController.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/adaptive/AdaptiveToolbarButtonController.java -@@ -297,7 +297,7 @@ public class AdaptiveToolbarButtonController +@@ -301,7 +301,7 @@ public class AdaptiveToolbarButtonController } private boolean isScreenWideEnoughForButton() { @@ -75,7 +74,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/adaptive/AdaptiveToolbarStatePredictor.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/adaptive/AdaptiveToolbarStatePredictor.java --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/adaptive/AdaptiveToolbarStatePredictor.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/adaptive/AdaptiveToolbarStatePredictor.java -@@ -201,6 +201,10 @@ public class AdaptiveToolbarStatePredictor { +@@ -261,6 +261,10 @@ public class AdaptiveToolbarStatePredictor { * @param callback A callback for results. */ public void readFromSegmentationPlatform(Callback> callback) { diff --git a/build/patches/Restore-chrome-password-store.patch b/build/patches/Restore-chrome-password-store.patch index fa7ecc73..98fb3812 100644 --- a/build/patches/Restore-chrome-password-store.patch +++ b/build/patches/Restore-chrome-password-store.patch @@ -36,7 +36,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro diff --git a/chrome/browser/autofill/android/java/src/org/chromium/chrome/browser/autofill/AutofillClientProviderUtils.java b/chrome/browser/autofill/android/java/src/org/chromium/chrome/browser/autofill/AutofillClientProviderUtils.java --- a/chrome/browser/autofill/android/java/src/org/chromium/chrome/browser/autofill/AutofillClientProviderUtils.java +++ b/chrome/browser/autofill/android/java/src/org/chromium/chrome/browser/autofill/AutofillClientProviderUtils.java -@@ -119,6 +119,7 @@ public class AutofillClientProviderUtils { +@@ -110,6 +110,7 @@ public class AutofillClientProviderUtils { @CalledByNative public static void setAutofillOptionsDeepLinkPref(boolean featureOn) { @@ -59,7 +59,7 @@ diff --git a/chrome/browser/password_manager/android/login_db_deprecation_runner 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 -@@ -733,7 +733,7 @@ For more settings that use data to improve your Chrome experience, go to @@ -97,7 +97,7 @@ diff --git a/chrome/browser/ui/autofill/autofill_client_provider.cc b/chrome/bro 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 -@@ -741,6 +741,7 @@ BASE_FEATURE(kAutofillBetterLocalHeuristicPlaceholderSupport, +@@ -772,6 +772,7 @@ BASE_FEATURE(kUseSettingsAddressEditorInPaymentsRequest, BASE_FEATURE(kAutofillDeepLinkAutofillOptions, "AutofillDeepLinkAutofillOptions", base::FEATURE_ENABLED_BY_DEFAULT); @@ -131,9 +131,9 @@ diff --git a/components/password_manager/core/browser/features/password_manager_ 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 -@@ -726,7 +726,7 @@ bool SyncPrefs::IsTypeSupportedInTransportMode(UserSelectableType type) { - return base::FeatureList::IsEnabled(kReplaceSyncPromosWithSignInPromos) && - base::FeatureList::IsEnabled(kEnablePreferencesAccountStorage); +@@ -752,7 +752,7 @@ bool SyncPrefs::IsTypeSupportedInTransportMode(UserSelectableType type) { + kSeparateLocalAndAccountSearchEngines); + #endif case UserSelectableType::kPasswords: - return true; + return false; diff --git a/build/patches/Restore-offline-indicator-v2-flag.patch b/build/patches/Restore-offline-indicator-v2-flag.patch index 4a2b168d..837c13fe 100644 --- a/build/patches/Restore-offline-indicator-v2-flag.patch +++ b/build/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 -@@ -1174,7 +1174,8 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -1244,7 +1244,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; } -@@ -1207,6 +1208,11 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -1277,6 +1278,11 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { hubManager.setStatusIndicatorHeight(mStatusIndicatorHeight); }); @@ -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 -@@ -410,6 +410,7 @@ public abstract class ChromeFeatureList { +@@ -418,6 +418,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/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch b/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch index 8f7f7562..473ea637 100644 --- a/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch +++ b/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch @@ -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 -@@ -2073,6 +2073,10 @@ +@@ -2095,6 +2095,10 @@ "yangsharon@google.com", "alexmos@google.com", "creis@google.com" ], "expiry_milestone": 140 }, diff --git a/build/patches/Revert-removal-of-execution-context-address-space.patch b/build/patches/Revert-removal-of-execution-context-address-space.patch index aaa1cd15..4a5d171f 100644 --- a/build/patches/Revert-removal-of-execution-context-address-space.patch +++ b/build/patches/Revert-removal-of-execution-context-address-space.patch @@ -117,7 +117,7 @@ diff --git a/third_party/blink/renderer/core/exported/web_shared_worker_impl.cc diff --git a/third_party/blink/renderer/core/frame/policy_container.cc b/third_party/blink/renderer/core/frame/policy_container.cc --- a/third_party/blink/renderer/core/frame/policy_container.cc +++ b/third_party/blink/renderer/core/frame/policy_container.cc -@@ -56,12 +56,22 @@ network::mojom::blink::ReferrerPolicy PolicyContainer::GetReferrerPolicy() +@@ -57,12 +57,22 @@ network::mojom::blink::ReferrerPolicy PolicyContainer::GetReferrerPolicy() return policies_->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 -@@ -8066,6 +8066,40 @@ TEST_F(WebFrameTest, PushStateStartsAndStops) { +@@ -8067,6 +8067,40 @@ TEST_F(WebFrameTest, PushStateStartsAndStops) { EXPECT_EQ(client.StopLoadingCount(), 2); } @@ -436,7 +436,7 @@ diff --git a/third_party/blink/renderer/core/workers/dedicated_worker_global_sco diff --git a/third_party/blink/renderer/core/workers/global_scope_creation_params.cc b/third_party/blink/renderer/core/workers/global_scope_creation_params.cc --- a/third_party/blink/renderer/core/workers/global_scope_creation_params.cc +++ b/third_party/blink/renderer/core/workers/global_scope_creation_params.cc -@@ -32,6 +32,7 @@ GlobalScopeCreationParams::GlobalScopeCreationParams( +@@ -33,6 +33,7 @@ GlobalScopeCreationParams::GlobalScopeCreationParams( HttpsState starter_https_state, WorkerClients* worker_clients, std::unique_ptr content_settings_client, @@ -444,7 +444,7 @@ diff --git a/third_party/blink/renderer/core/workers/global_scope_creation_param const Vector* inherited_trial_features, const base::UnguessableToken& parent_devtools_token, std::unique_ptr worker_settings, -@@ -76,6 +77,7 @@ GlobalScopeCreationParams::GlobalScopeCreationParams( +@@ -77,6 +78,7 @@ GlobalScopeCreationParams::GlobalScopeCreationParams( starter_https_state(starter_https_state), worker_clients(worker_clients), content_settings_client(std::move(content_settings_client)), @@ -455,14 +455,14 @@ diff --git a/third_party/blink/renderer/core/workers/global_scope_creation_param diff --git a/third_party/blink/renderer/core/workers/global_scope_creation_params.h b/third_party/blink/renderer/core/workers/global_scope_creation_params.h --- a/third_party/blink/renderer/core/workers/global_scope_creation_params.h +++ b/third_party/blink/renderer/core/workers/global_scope_creation_params.h -@@ -13,6 +13,7 @@ - #include "mojo/public/cpp/bindings/pending_remote.h" +@@ -14,6 +14,7 @@ #include "net/storage_access_api/status.h" #include "services/metrics/public/cpp/ukm_source_id.h" + #include "services/network/public/cpp/permissions_policy/permissions_policy.h" +#include "services/network/public/mojom/ip_address_space.mojom-blink-forward.h" #include "services/network/public/mojom/referrer_policy.mojom-blink-forward.h" - #include "third_party/blink/public/common/permissions_policy/permissions_policy.h" #include "third_party/blink/public/common/tokens/tokens.h" + #include "third_party/blink/public/common/user_agent/user_agent_metadata.h" @@ -63,6 +64,7 @@ struct CORE_EXPORT GlobalScopeCreationParams final { HttpsState starter_https_state, WorkerClients*, @@ -799,7 +799,7 @@ diff --git a/third_party/blink/renderer/modules/exported/web_embedded_worker_imp diff --git a/third_party/blink/renderer/modules/service_worker/service_worker_global_scope.cc b/third_party/blink/renderer/modules/service_worker/service_worker_global_scope.cc --- a/third_party/blink/renderer/modules/service_worker/service_worker_global_scope.cc +++ b/third_party/blink/renderer/modules/service_worker/service_worker_global_scope.cc -@@ -477,6 +477,7 @@ void ServiceWorkerGlobalScope::DidFetchClassicScript( +@@ -475,6 +475,7 @@ void ServiceWorkerGlobalScope::DidFetchClassicScript( // is set, and with the following callback steps given evaluationStatus:" RunClassicScript( classic_script_loader->ResponseURL(), referrer_policy, @@ -807,7 +807,7 @@ diff --git a/third_party/blink/renderer/modules/service_worker/service_worker_gl classic_script_loader->GetContentSecurityPolicy() ? mojo::Clone(classic_script_loader->GetContentSecurityPolicy() ->GetParsedPolicies()) -@@ -490,6 +491,7 @@ void ServiceWorkerGlobalScope::DidFetchClassicScript( +@@ -488,6 +489,7 @@ void ServiceWorkerGlobalScope::DidFetchClassicScript( void ServiceWorkerGlobalScope::Initialize( const KURL& response_url, network::mojom::ReferrerPolicy response_referrer_policy, @@ -815,7 +815,7 @@ diff --git a/third_party/blink/renderer/modules/service_worker/service_worker_gl Vector response_csp, const Vector* response_origin_trial_tokens) { // Step 4.5. "Set workerGlobalScope's url to serviceWorker's script url." -@@ -503,6 +505,9 @@ void ServiceWorkerGlobalScope::Initialize( +@@ -501,6 +503,9 @@ void ServiceWorkerGlobalScope::Initialize( // script resource's referrer policy." SetReferrerPolicy(response_referrer_policy); @@ -825,7 +825,7 @@ diff --git a/third_party/blink/renderer/modules/service_worker/service_worker_gl // This is quoted from the "Content Security Policy" algorithm in the service // workers spec: // "Whenever a user agent invokes Run Service Worker algorithm with a service -@@ -513,6 +518,9 @@ void ServiceWorkerGlobalScope::Initialize( +@@ -511,6 +516,9 @@ void ServiceWorkerGlobalScope::Initialize( // - If serviceWorker's script resource was delivered with a // Content-Security-Policy-Report-Only HTTP header containing the value // policy, the user agent must monitor policy for serviceWorker." @@ -835,7 +835,7 @@ diff --git a/third_party/blink/renderer/modules/service_worker/service_worker_gl InitContentSecurityPolicyFromVector(std::move(response_csp)); BindContentSecurityPolicyToExecutionContext(); -@@ -553,26 +561,27 @@ void ServiceWorkerGlobalScope::LoadAndRunInstalledClassicScript( +@@ -551,26 +559,27 @@ void ServiceWorkerGlobalScope::LoadAndRunInstalledClassicScript( kDoNotSupportReferrerPolicyLegacyKeywords, &referrer_policy); } diff --git a/build/patches/Revert-remove-allowscript-content-setting-secondary-url.patch b/build/patches/Revert-remove-allowscript-content-setting-secondary-url.patch index 14e3330f..3dfb7876 100644 --- a/build/patches/Revert-remove-allowscript-content-setting-secondary-url.patch +++ b/build/patches/Revert-remove-allowscript-content-setting-secondary-url.patch @@ -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 -@@ -4065,19 +4065,6 @@ bool LocalFrame::IsSameOrigin() { +@@ -4021,19 +4021,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 -@@ -928,12 +928,6 @@ class CORE_EXPORT LocalFrame final +@@ -919,12 +919,6 @@ class CORE_EXPORT LocalFrame final return *v8_local_compile_hints_producer_; } @@ -250,7 +250,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/b 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 -@@ -780,7 +780,9 @@ void HTMLMetaElement::ProcessMetaCH(Document& document, +@@ -781,7 +781,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 -@@ -255,7 +255,7 @@ BaseFetchContext::CanRequestInternal( +@@ -258,7 +258,7 @@ BaseFetchContext::CanRequestInternal( } if (type == ResourceType::kScript) { @@ -276,7 +276,7 @@ diff --git a/third_party/blink/renderer/core/loader/base_fetch_context.cc b/thir diff --git a/third_party/blink/renderer/core/loader/base_fetch_context.h b/third_party/blink/renderer/core/loader/base_fetch_context.h --- a/third_party/blink/renderer/core/loader/base_fetch_context.h +++ b/third_party/blink/renderer/core/loader/base_fetch_context.h -@@ -103,7 +103,7 @@ class CORE_EXPORT BaseFetchContext : public FetchContext { +@@ -105,7 +105,7 @@ class CORE_EXPORT BaseFetchContext : public FetchContext { : fetcher_properties_(properties), console_logger_(logger) {} // Used for security checks. @@ -288,7 +288,7 @@ diff --git a/third_party/blink/renderer/core/loader/base_fetch_context.h b/third diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/third_party/blink/renderer/core/loader/frame_fetch_context.cc --- a/third_party/blink/renderer/core/loader/frame_fetch_context.cc +++ b/third_party/blink/renderer/core/loader/frame_fetch_context.cc -@@ -518,7 +518,8 @@ void FrameFetchContext::AddClientHintsIfNecessary( +@@ -514,7 +514,8 @@ void FrameFetchContext::AddClientHintsIfNecessary( // Check if |url| is allowed to run JavaScript. If not, client hints are not // attached to the requests that initiate on the render side. @@ -298,8 +298,8 @@ diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/thi return; } -@@ -964,15 +965,26 @@ void FrameFetchContext::SetFirstPartyCookie(ResourceRequest& request) { - request.SetSiteForCookies(GetSiteForCookies()); +@@ -968,15 +969,26 @@ void FrameFetchContext::SetFirstPartyCookie(ResourceRequest& request) { + } } -bool FrameFetchContext::AllowScript() const { @@ -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, -@@ -168,7 +179,7 @@ class CORE_EXPORT FrameFetchContext final : public BaseFetchContext, +@@ -169,7 +180,7 @@ class CORE_EXPORT FrameFetchContext final : public BaseFetchContext, // BaseFetchContext overrides: net::SiteForCookies GetSiteForCookies() const override; SubresourceFilter* GetSubresourceFilter() const override; diff --git a/build/patches/Samsung-Note-9-SDK27-crazylinker-workaround.patch b/build/patches/Samsung-Note-9-SDK27-crazylinker-workaround.patch index 1eceb81b..7bf0b3d1 100644 --- a/build/patches/Samsung-Note-9-SDK27-crazylinker-workaround.patch +++ b/build/patches/Samsung-Note-9-SDK27-crazylinker-workaround.patch @@ -11,7 +11,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java b/base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java --- a/base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java +++ b/base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java -@@ -39,6 +39,7 @@ import org.chromium.build.annotations.Nullable; +@@ -37,6 +37,7 @@ import org.chromium.build.annotations.Nullable; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -19,7 +19,7 @@ diff --git a/base/android/java/src/org/chromium/base/library_loader/LibraryLoade import javax.annotation.concurrent.GuardedBy; -@@ -278,7 +279,21 @@ public class LibraryLoader { +@@ -276,7 +277,21 @@ public class LibraryLoader { */ public void initInAppZygote() { assert !mInitDone; diff --git a/build/patches/Show-NTP-at-startup.patch b/build/patches/Show-NTP-at-startup.patch index a90232b7..f7046898 100644 --- a/build/patches/Show-NTP-at-startup.patch +++ b/build/patches/Show-NTP-at-startup.patch @@ -94,7 +94,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeInactivit 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 -@@ -2416,6 +2416,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn +@@ -2460,6 +2460,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn mInactivityTracker = new ChromeInactivityTracker( ChromePreferenceKeys.TABBED_ACTIVITY_LAST_BACKGROUNDED_TIME_MS_PREF); @@ -198,7 +198,7 @@ new file mode 100644 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 -@@ -797,6 +797,8 @@ public final class ChromePreferenceKeys { +@@ -813,6 +813,8 @@ public final class ChromePreferenceKeys { public static final String TABBED_ACTIVITY_LAST_BACKGROUNDED_TIME_MS_PREF = "ChromeTabbedActivity.BackgroundTimeMs"; diff --git a/build/patches/Show-site-settings-for-cookies-javascript-and-ads.patch b/build/patches/Show-site-settings-for-cookies-javascript-and-ads.patch index 2d001b04..423b8b1a 100644 --- a/build/patches/Show-site-settings-for-cookies-javascript-and-ads.patch +++ b/build/patches/Show-site-settings-for-cookies-javascript-and-ads.patch @@ -6,16 +6,16 @@ Avoid displaying info about intrusive ads License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - .../site_settings/SingleWebsiteSettings.java | 51 ++++++++++++------- + .../site_settings/SingleWebsiteSettings.java | 52 ++++++++++++------- .../browser_ui/site_settings/Website.java | 14 ++++- .../bromite_content_settings/javascript.inc | 4 ++ - 3 files changed, 50 insertions(+), 19 deletions(-) + 3 files changed, 50 insertions(+), 20 deletions(-) create mode 100644 components/content_settings/core/browser/bromite_content_settings/javascript.inc 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 -@@ -590,6 +590,8 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment +@@ -601,6 +601,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) { -@@ -1072,17 +1074,8 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment +@@ -1105,18 +1107,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. @@ -33,7 +33,8 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c - && WebsitePreferenceBridge.getAdBlockingActivated( - getSiteSettingsDelegate().getBrowserContextHandle(), - mSite.getAddress().getOrigin()) -- && findPreference(getPreferenceKey(ContentSettingsType.ADS)) != null; +- && findPreference(assumeNonNull(getPreferenceKey(ContentSettingsType.ADS))) +- != null; - - if (!adBlockingActivated) { removePreferenceSafely(PREF_INTRUSIVE_ADS_INFO); @@ -41,10 +42,10 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c - } } - private SiteSettingsCategory getWarningCategory() { -@@ -1284,12 +1277,13 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment - @Nullable - Integer currentValue = + @RequiresNonNull({"mSite"}) +@@ -1323,12 +1315,13 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment + @ContentSettingValues + @Nullable Integer currentValue = mSite.getContentSetting(browserContextHandle, ContentSettingsType.JAVASCRIPT); - // If Javascript is blocked by default, then always show a Javascript permission. - // To do this, set it to the default value (blocked). @@ -62,7 +63,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c } // Not possible to embargo JAVASCRIPT. setupContentSettingsPreference( -@@ -1299,6 +1293,29 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment +@@ -1338,6 +1331,29 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment isOneTime(ContentSettingsType.JAVASCRIPT)); } @@ -92,7 +93,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. -@@ -1317,9 +1334,7 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment +@@ -1357,9 +1373,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. @@ -101,12 +102,12 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c - browserContextHandle, mSite.getAddress().getOrigin()); + boolean activated = true; @ContentSettingValues - @Nullable - Integer permission = mSite.getContentSetting(browserContextHandle, ContentSettingsType.ADS); + @Nullable Integer permission = + mSite.getContentSetting(browserContextHandle, ContentSettingsType.ADS); 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 -@@ -282,7 +282,19 @@ public final class Website implements WebsiteEntry { +@@ -286,7 +286,19 @@ public final class Website implements WebsiteEntry { new ContentSettingException( ContentSettingsType.ADS, getAddress().getOrigin(), diff --git a/build/patches/Site-setting-for-images.patch b/build/patches/Site-setting-for-images.patch index debeeeb4..c2669e2e 100644 --- a/build/patches/Site-setting-for-images.patch +++ b/build/patches/Site-setting-for-images.patch @@ -21,13 +21,13 @@ Require: Content-settings-infrastructure.patch .../blink/renderer/core/frame/local_frame.cc | 13 --- .../blink/renderer/core/frame/local_frame.h | 6 -- .../renderer/core/html/image_document.cc | 9 +- - .../core/loader/frame_fetch_context.cc | 12 +-- + .../core/loader/frame_fetch_context.cc | 14 ++- .../core/loader/frame_fetch_context.h | 2 +- third_party/blink/renderer/core/page/page.cc | 5 +- .../platform/loader/fetch/fetch_context.h | 2 +- .../platform/loader/fetch/resource_fetcher.cc | 17 +++- .../platform/loader/fetch/resource_fetcher.h | 2 + - 21 files changed, 178 insertions(+), 36 deletions(-) + 21 files changed, 180 insertions(+), 36 deletions(-) create mode 100644 components/browser_ui/site_settings/android/java/res/drawable-hdpi/permission_images.png create mode 100644 components/browser_ui/site_settings/android/java/res/drawable-mdpi/permission_images.png create mode 100644 components/browser_ui/site_settings/android/java/res/drawable-xhdpi/permission_images.png @@ -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 -@@ -4052,19 +4052,6 @@ bool LocalFrame::IsSameOrigin() { +@@ -4008,19 +4008,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 -@@ -927,12 +927,6 @@ class CORE_EXPORT LocalFrame final +@@ -918,12 +918,6 @@ class CORE_EXPORT LocalFrame final return *v8_local_compile_hints_producer_; } @@ -381,7 +381,7 @@ diff --git a/third_party/blink/renderer/core/html/image_document.cc b/third_part diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/third_party/blink/renderer/core/loader/frame_fetch_context.cc --- a/third_party/blink/renderer/core/loader/frame_fetch_context.cc +++ b/third_party/blink/renderer/core/loader/frame_fetch_context.cc -@@ -304,6 +304,7 @@ ResourceFetcher* FrameFetchContext::CreateFetcherForCommittedDocument( +@@ -312,6 +312,7 @@ ResourceFetcher* FrameFetchContext::CreateFetcherForCommittedDocument( fetcher->SetResourceLoadObserver( MakeGarbageCollected( loader, document, fetcher->GetProperties())); @@ -389,26 +389,28 @@ diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/thi fetcher->SetAutoLoadImages( frame->GetSettings()->GetLoadsImagesAutomatically()); fetcher->SetEarlyHintsPreloadedResources( -@@ -485,16 +486,11 @@ void FrameFetchContext::AddResourceTiming( +@@ -475,16 +476,13 @@ void FrameFetchContext::AddResourceTiming( ->AddResourceTiming(std::move(info), initiator_type); } -bool FrameFetchContext::AllowImage() const { +bool FrameFetchContext::AllowImage(bool images_enabled, const KURL& url) const { - if (GetResourceFetcherProperties().IsDetached()) - return true; + if (GetResourceFetcherProperties().IsDetached()) { +- return true; ++ return images_enabled; + } - - bool images_enabled = GetFrame()->ImagesEnabled(); - if (!images_enabled) { - if (auto* settings_client = GetContentSettingsClient()) { - settings_client->DidNotAllowImage(); - } -- } -+ if (auto* settings_client = GetContentSettingsClient()) ++ if (auto* settings_client = GetContentSettingsClient()) { + images_enabled = settings_client->AllowImage(images_enabled, url); ++ if (!images_enabled) settings_client->DidNotAllowImage(); + } return images_enabled; } - diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.h b/third_party/blink/renderer/core/loader/frame_fetch_context.h --- a/third_party/blink/renderer/core/loader/frame_fetch_context.h +++ b/third_party/blink/renderer/core/loader/frame_fetch_context.h @@ -419,12 +421,12 @@ diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.h b/thir - bool AllowImage() const override; + bool AllowImage(bool images_enabled, const KURL&) const override; - void PopulateResourceRequestBeforeCacheAccess( - const ResourceLoaderOptions& options, + void ModifyRequestForMixedContentUpgrade(ResourceRequest&) override; + 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 -@@ -1034,9 +1034,8 @@ void Page::SettingsChanged(ChangeType change_type) { +@@ -1060,9 +1060,8 @@ void Page::SettingsChanged(ChangeType change_type) { for (Frame* frame = MainFrame(); frame; frame = frame->Tree().TraverseNext()) { if (auto* local_frame = DynamicTo(frame)) { @@ -439,7 +441,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 -@@ -107,7 +107,7 @@ class PLATFORM_EXPORT FetchContext : public GarbageCollected { +@@ -110,7 +110,7 @@ class PLATFORM_EXPORT FetchContext : public GarbageCollected { virtual void AddResourceTiming(mojom::blink::ResourceTimingInfoPtr, const AtomicString& initiator_type); @@ -459,7 +461,7 @@ 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( -@@ -2001,7 +2002,7 @@ bool ResourceFetcher::IsImageResourceDisallowedToBeReused( +@@ -2025,7 +2026,7 @@ bool ResourceFetcher::IsImageResourceDisallowedToBeReused( return false; } @@ -468,7 +470,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.c } ResourceFetcher::RevalidationPolicy -@@ -2246,8 +2247,20 @@ void ResourceFetcher::SetAutoLoadImages(bool enable) { +@@ -2270,8 +2271,20 @@ void ResourceFetcher::SetAutoLoadImages(bool enable) { ReloadImagesIfNotDeferred(); } @@ -501,7 +503,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.h FetchContext& Context() const; void ClearContext(); -@@ -697,6 +698,7 @@ class PLATFORM_EXPORT ResourceFetcher +@@ -700,6 +701,7 @@ class PLATFORM_EXPORT ResourceFetcher bool is_in_request_resource_ = false; bool auto_load_images_ : 1; diff --git a/build/patches/Temp-disable-experimental-web-platform-features.patch b/build/patches/Temp-disable-experimental-web-platform-features.patch index 8092056f..a182da29 100644 --- a/build/patches/Temp-disable-experimental-web-platform-features.patch +++ b/build/patches/Temp-disable-experimental-web-platform-features.patch @@ -9,7 +9,7 @@ Subject: Temp disable experimental-web-platform-features 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 -@@ -4624,10 +4624,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4668,10 +4668,10 @@ const FeatureEntry kFeatureEntries[] = { {"enable-fontations-backend", flag_descriptions::kFontationsFontBackendName, flag_descriptions::kFontationsFontBackendDescription, kOsAll, FEATURE_VALUE_TYPE(blink::features::kFontationsFontBackend)}, diff --git a/build/patches/Temp-guard-FileSystemAccessPersistentPermissions.patch b/build/patches/Temp-guard-FileSystemAccessPersistentPermissions.patch index 4ee014cd..6d370e0b 100644 --- a/build/patches/Temp-guard-FileSystemAccessPersistentPermissions.patch +++ b/build/patches/Temp-guard-FileSystemAccessPersistentPermissions.patch @@ -10,7 +10,7 @@ Subject: Temp guard FileSystemAccessPersistentPermissions diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc --- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc +++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc -@@ -463,7 +463,7 @@ bool ShouldBlockAccessToPath(const base::FilePath& path, +@@ -468,7 +468,7 @@ bool ShouldBlockAccessToPath(const base::FilePath& path, normalize_file_paths ? NormalizeFilePath(block.path) : block.path; if (check_path == blocked_path || check_path.IsParent(blocked_path)) { @@ -19,7 +19,7 @@ diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permiss << " because it is a parent of " << blocked_path; return true; } -@@ -490,7 +490,7 @@ bool ShouldBlockAccessToPath(const base::FilePath& path, +@@ -495,7 +495,7 @@ bool ShouldBlockAccessToPath(const base::FilePath& path, } // The nearest ancestor blocks access to its children, so block access. diff --git a/build/patches/Temporarily-disable-Tab-Group-Sync-Android.patch b/build/patches/Temporarily-disable-Tab-Group-Sync-Android.patch index adb37198..646ee036 100644 --- a/build/patches/Temporarily-disable-Tab-Group-Sync-Android.patch +++ b/build/patches/Temporarily-disable-Tab-Group-Sync-Android.patch @@ -10,9 +10,9 @@ Subject: Temporarily disable Tab Group Sync Android 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 -@@ -815,7 +815,7 @@ public abstract class ChromeFeatureList { - public static final CachedFlag sTabGroupCreationDialogAndroid = - newCachedFlag(TAB_GROUP_CREATION_DIALOG_ANDROID, true); +@@ -847,7 +847,7 @@ public abstract class ChromeFeatureList { + public static final CachedFlag sTabClosureMethodRefactor = + newCachedFlag(TAB_CLOSURE_METHOD_REFACTOR, false); public static final CachedFlag sTabGroupPaneAndroid = - newCachedFlag(TAB_GROUP_PANE_ANDROID, /* defaultValue= */ true); + newCachedFlag(TAB_GROUP_PANE_ANDROID, /* defaultValue= */ false); @@ -22,8 +22,8 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f diff --git a/components/saved_tab_groups/public/features.cc b/components/saved_tab_groups/public/features.cc --- a/components/saved_tab_groups/public/features.cc +++ b/components/saved_tab_groups/public/features.cc -@@ -135,4 +135,7 @@ bool IsUrlRestrictionEnabled() { - return base::FeatureList::IsEnabled(kEnableUrlRestriction); +@@ -170,4 +170,7 @@ base::TimeDelta GetOriginatingSavedGroupCleanUpTimeInterval() { + return base::Seconds(time_in_seconds); } +SET_CROMITE_FEATURE_DISABLED(kTabGroupSyncAndroid); diff --git a/build/patches/Timezone-customization.patch b/build/patches/Timezone-customization.patch index f8fcc180..b926200b 100644 --- a/build/patches/Timezone-customization.patch +++ b/build/patches/Timezone-customization.patch @@ -50,7 +50,7 @@ Require: Content-settings-infrastructure.patch 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 -@@ -99,6 +99,7 @@ android_library("java") { +@@ -100,6 +100,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", @@ -58,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" -@@ -283,6 +284,8 @@ android_resources("java_resources") { +@@ -287,6 +288,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", @@ -386,7 +386,7 @@ new file mode 100755 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java -@@ -471,6 +471,14 @@ public class WebsitePreferenceBridge { +@@ -501,6 +501,14 @@ public class WebsitePreferenceBridge { .toHostOnlyPattern(pattern); } @@ -401,7 +401,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c @NativeMethods public interface Natives { boolean isNotificationEmbargoedForOrigin( -@@ -622,5 +630,7 @@ public class WebsitePreferenceBridge { +@@ -650,5 +658,7 @@ public class WebsitePreferenceBridge { String toDomainWildcardPattern(String pattern); String toHostOnlyPattern(String pattern); @@ -565,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 -@@ -1131,3 +1131,19 @@ JNI_WebsitePreferenceBridge_ToHostOnlyPattern( +@@ -1123,3 +1123,19 @@ JNI_WebsitePreferenceBridge_ToHostOnlyPattern( ContentSettingsPattern::FromString(pattern_string)); return ConvertUTF8ToJavaString(env, host_only_pattern.ToString()); } @@ -735,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 -@@ -665,6 +665,14 @@ void HostContentSettingsMap::SetClockForTesting(const base::Clock* clock) { +@@ -648,6 +648,14 @@ void HostContentSettingsMap::SetClockForTesting(const base::Clock* clock) { } } diff --git a/build/patches/Use-browser-navigation-handler.patch b/build/patches/Use-browser-navigation-handler.patch index 9b75b3b3..5bf51238 100644 --- a/build/patches/Use-browser-navigation-handler.patch +++ b/build/patches/Use-browser-navigation-handler.patch @@ -14,7 +14,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html .../gesturenav/HistoryNavigationLayout.java | 6 ++-- .../browser/gesturenav/NavigationHandler.java | 12 +++++-- .../browser/gesturenav/SideSlideLayout.java | 25 +++++++++++--- - .../tabbed_mode/TabbedRootUiCoordinator.java | 3 ++ + .../tabbed_mode/TabbedRootUiCoordinator.java | 4 ++- .../cromite/sUseBrowserNavigationHandler.java | 33 +++++++++++++++++++ .../Use-browser-navigation-handler.grdp | 12 +++++++ .../res/xml/accessibility_preferences.xml | 9 +++++ @@ -22,7 +22,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html .../Use-browser-navigation-handler.inc | 12 +++++++ .../Use-browser-navigation-handler.inc | 3 ++ .../Use-browser-navigation-handler.inc | 1 + - 15 files changed, 135 insertions(+), 16 deletions(-) + 15 files changed, 135 insertions(+), 17 deletions(-) create mode 100644 chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/sUseBrowserNavigationHandler.java create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Use-browser-navigation-handler.grdp create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Use-browser-navigation-handler.inc @@ -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 -@@ -69,6 +69,7 @@ import org.chromium.chrome.browser.firstrun.FirstRunStatus; +@@ -73,6 +73,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,15 +235,16 @@ 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; -@@ -678,6 +679,8 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -722,7 +723,8 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { @Override public void onInflationComplete() { mCoordinator = mActivity.findViewById(R.id.coordinator); +- + ((CoordinatorLayoutForPointer)mCoordinator).setUseBrowserNavigationHandler( + sUseBrowserNavigationHandler.getInstance().isEnabled()); super.onInflationComplete(); - } + ViewStub loadingStub = mActivity.findViewById(R.id.loading_stub); diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/sUseBrowserNavigationHandler.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/sUseBrowserNavigationHandler.java new file mode 100644 --- /dev/null diff --git a/build/patches/Use-list-mode-for-tab-switcher.patch b/build/patches/Use-list-mode-for-tab-switcher.patch index a20aa019..2810598b 100644 --- a/build/patches/Use-list-mode-for-tab-switcher.patch +++ b/build/patches/Use-list-mode-for-tab-switcher.patch @@ -26,10 +26,10 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser import org.chromium.base.SysUtils; import org.chromium.chrome.browser.flags.ChromeFeatureList; +import org.chromium.chrome.browser.flags.cromite.sTabSwitcherListMode; + import org.chromium.ui.util.XrUtils; import java.util.Locale; - import java.util.Set; -@@ -34,11 +35,7 @@ public class TabUiFeatureUtilities { +@@ -35,11 +36,7 @@ public class TabUiFeatureUtilities { /** Returns whether the Grid Tab Switcher UI should use list mode. */ public static boolean shouldUseListMode() { @@ -116,12 +116,12 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow @@ -50,6 +50,7 @@ import org.chromium.base.MathUtils; import org.chromium.base.TraceEvent; import org.chromium.base.supplier.ObservableSupplier; - import org.chromium.chrome.browser.flags.ChromeFeatureList; -+import org.chromium.chrome.browser.flags.cromite.sTabSwitcherListMode; import org.chromium.chrome.browser.omnibox.LocationBar; ++import org.chromium.chrome.browser.flags.cromite.sTabSwitcherListMode; import org.chromium.chrome.browser.omnibox.LocationBarCoordinator; import org.chromium.chrome.browser.omnibox.NewTabPageDelegate; -@@ -1871,7 +1872,7 @@ public class ToolbarPhone extends ToolbarLayout + import org.chromium.chrome.browser.omnibox.SearchEngineUtils; +@@ -1811,7 +1812,7 @@ public class ToolbarPhone extends ToolbarLayout // On entering the tab switcher, set the focusability of the url bar to be false. This will // occur at the start of the enter event, and will later be reset to true upon finishing the // exit event. @@ -130,7 +130,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow mLocationBar.setUrlBarFocusable(false); } -@@ -2073,7 +2074,8 @@ public class ToolbarPhone extends ToolbarLayout +@@ -2004,7 +2005,8 @@ public class ToolbarPhone extends ToolbarLayout updateLocationBarForNtp(mVisualState, urlHasFocus()); diff --git a/build/patches/User-agent-customization.patch b/build/patches/User-agent-customization.patch index 7419ad0a..09b28b27 100644 --- a/build/patches/User-agent-customization.patch +++ b/build/patches/User-agent-customization.patch @@ -10,6 +10,7 @@ whereas the content setting is intended for use in a specific site. 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 --- + .../browser/aw_content_browser_client.cc | 2 +- base/base_switches.cc | 2 + base/base_switches.h | 2 + chrome/android/chrome_java_resources.gni | 2 + @@ -24,7 +25,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../browser/tab/RequestDesktopUtils.java | 1 + .../chromium/chrome/browser/tab/TabImpl.java | 64 +++++- .../chromium/chrome/browser/tab/TabUtils.java | 11 +- - .../browser/android/content/content_utils.cc | 30 +++ + .../browser/android/content/content_utils.cc | 32 ++- .../preferences/browser_prefs_android.cc | 7 + .../privacy_preferences_manager_impl.cc | 126 ++++++++++++ ...ktop_site_web_contents_observer_android.cc | 11 ++ @@ -39,24 +40,35 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html ...omiteRequestDesktopSiteContentSetting.java | 76 ++++++++ .../request_desktop_site.grdp | 18 ++ .../widget/RadioButtonWithEditText.java | 11 ++ - .../embedder_support/user_agent_utils.cc | 3 +- .../navigation_controller_android.cc | 4 + .../navigation_controller_android.h | 1 + .../renderer_host/render_process_host_impl.cc | 1 + .../browser/web_contents/web_contents_impl.cc | 6 +- .../framehost/NavigationControllerImpl.java | 3 +- content/renderer/render_thread_impl.cc | 1 - - 36 files changed, 799 insertions(+), 16 deletions(-) + 36 files changed, 799 insertions(+), 17 deletions(-) create mode 100644 chrome/android/java/res/layout/custom_useragent_preferences.xml create mode 100644 chrome/android/java/res/xml/useragent_preferences.xml create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/settings/UserAgentPreferences.java create mode 100644 components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/impl/BromiteRequestDesktopSiteContentSetting.java create mode 100644 components/browser_ui/strings/bromite_content_settings/request_desktop_site.grdp +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 +@@ -208,7 +208,7 @@ base::WeakPtr GetAsyncCheckTracker( + } // anonymous namespace + + std::string GetProduct() { +- return embedder_support::GetProductAndVersion(); ++ return embedder_support::GetProductAndVersion(embedder_support::UserAgentReductionEnterprisePolicyState::kForceEnabled); + } + + std::string GetUserAgent() { diff --git a/base/base_switches.cc b/base/base_switches.cc --- a/base/base_switches.cc +++ b/base/base_switches.cc -@@ -179,6 +179,8 @@ const char kPackageName[] = "package-name"; +@@ -178,6 +178,8 @@ const char kPackageName[] = "package-name"; const char kPackageVersionName[] = "package-version-name"; #endif @@ -68,7 +80,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 +92,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 -@@ -644,4 +644,6 @@ chrome_java_resources = [ +@@ -651,4 +651,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 +102,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 -@@ -932,6 +932,7 @@ chrome_java_sources = [ +@@ -865,6 +865,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", @@ -212,9 +224,9 @@ new file mode 100644 diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml --- a/chrome/android/java/res/xml/main_preferences.xml +++ b/chrome/android/java/res/xml/main_preferences.xml -@@ -144,6 +144,11 @@ for the previous order (main_preferences_legacy). --> +@@ -149,6 +149,11 @@ for the previous order (main_preferences_legacy). --> android:key="content_settings" - android:order="25" + android:order="26" android:title="@string/prefs_site_settings"/> + & jweb_contents, jboolean j_override_in_new_tabs) { @@ -731,9 +743,18 @@ diff --git a/chrome/browser/android/content/content_utils.cc b/chrome/browser/an + return; + } + - content::WebContents* web_contents = - content::WebContents::FromJavaWebContents(jweb_contents); - embedder_support::SetDesktopUserAgentOverride( + constexpr char kLinuxInfoStr[] = "X11; Linux x86_64"; + + const blink::UserAgentMetadata metadata = +@@ -27,7 +57,7 @@ static void JNI_ContentUtils_SetUserAgentOverride( + + blink::UserAgentOverride spoofed_ua; + spoofed_ua.ua_string_override = content::BuildUserAgentFromOSAndProduct( +- kLinuxInfoStr, embedder_support::GetProductAndVersion()); ++ kLinuxInfoStr, embedder_support::GetProductAndVersion(embedder_support::UserAgentReductionEnterprisePolicyState::kForceEnabled)); + spoofed_ua.ua_metadata_override = metadata; + spoofed_ua.ua_metadata_override->platform = "Linux"; + spoofed_ua.ua_metadata_override->platform_version = diff --git a/chrome/browser/android/preferences/browser_prefs_android.cc b/chrome/browser/android/preferences/browser_prefs_android.cc --- a/chrome/browser/android/preferences/browser_prefs_android.cc +++ b/chrome/browser/android/preferences/browser_prefs_android.cc @@ -958,7 +979,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 -@@ -1059,8 +1059,6 @@ public final class ChromePreferenceKeys { +@@ -1080,8 +1080,6 @@ public final class ChromePreferenceKeys { SIGNIN_PROMO_NTP_LAST_SHOWN_TIME, SYNC_PROMO_TOTAL_SHOW_COUNT, SEARCH_RESUMPTION_MODULE_COLLAPSE_ON_NTP, @@ -988,7 +1009,7 @@ diff --git a/chrome/browser/privacy/settings/java/src/org/chromium/chrome/browse diff --git a/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/Tab.java b/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/Tab.java --- a/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/Tab.java +++ b/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/Tab.java -@@ -331,6 +331,8 @@ public interface Tab extends TabLifecycle { +@@ -328,6 +328,8 @@ public interface Tab extends TabLifecycle { /** Goes to the navigation entry after the current one. */ void goForward(); @@ -1000,9 +1021,9 @@ 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 -@@ -121,6 +121,8 @@ public interface TabWindowManager { +@@ -139,6 +139,8 @@ public interface TabWindowManager { */ - Tab getTabById(int tabId); + List getGroupedTabsByWindow(int windowId, int rootId, boolean isIncognito); + void SetOverrideUserAgentForAllTabs(boolean usingDesktopUserAgent); + @@ -1012,15 +1033,15 @@ 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 -@@ -33,6 +33,7 @@ import org.chromium.ui.modaldialog.ModalDialogManager; +@@ -35,6 +35,7 @@ import org.chromium.ui.modaldialog.ModalDialogManager; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.util.List; import java.util.Collection; import java.util.HashMap; - import java.util.Map; -@@ -418,6 +419,24 @@ public class TabWindowManagerImpl implements ActivityStateListener, TabWindowMan + import java.util.List; +@@ -423,6 +424,24 @@ public class TabWindowManagerImpl implements ActivityStateListener, TabWindowMan return null; } @@ -1084,7 +1105,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 -@@ -1917,6 +1917,14 @@ inline constexpr char kNaviOnboardGroup[] = "browser.navi_onboard_group"; +@@ -1902,6 +1902,14 @@ inline constexpr char kNaviOnboardGroup[] = "browser.navi_onboard_group"; inline constexpr char kHadThreeConsecutiveNotificationPermissionDenies[] = "profile.content_settings.had_three_consecutive_denies.notifications"; @@ -1224,19 +1245,6 @@ 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 -@@ -521,7 +521,8 @@ void SetDesktopUserAgentOverride(content::WebContents* web_contents, - - blink::UserAgentOverride spoofed_ua; - spoofed_ua.ua_string_override = content::BuildUserAgentFromOSAndProduct( -- kLinuxInfoStr, GetProductAndVersion()); -+ kLinuxInfoStr, -+ GetProductAndVersion(UserAgentReductionEnterprisePolicyState::kForceEnabled)); - spoofed_ua.ua_metadata_override = metadata; - spoofed_ua.ua_metadata_override->platform = "Linux"; - spoofed_ua.ua_metadata_override->platform_version = diff --git a/content/browser/renderer_host/navigation_controller_android.cc b/content/browser/renderer_host/navigation_controller_android.cc --- a/content/browser/renderer_host/navigation_controller_android.cc +++ b/content/browser/renderer_host/navigation_controller_android.cc @@ -1272,7 +1280,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 -@@ -3534,6 +3534,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( +@@ -3535,6 +3535,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( #if BUILDFLAG(IS_CHROMEOS) switches::kSchedulerBoostUrgent, #endif @@ -1291,7 +1299,7 @@ diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser #include "base/check_op.h" #include "base/command_line.h" #include "base/containers/contains.h" -@@ -2320,8 +2321,6 @@ void WebContentsImpl::SetUserAgentOverride( +@@ -2339,8 +2340,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); @@ -1300,7 +1308,7 @@ diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser if (GetUserAgentOverride() == ua_override) { return; -@@ -3491,6 +3490,9 @@ const blink::web_pref::WebPreferences WebContentsImpl::ComputeWebPreferences( +@@ -3510,6 +3509,9 @@ const blink::web_pref::WebPreferences WebContentsImpl::ComputeWebPreferences( #else prefs.viewport_meta_enabled = false; #endif @@ -1333,7 +1341,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 -@@ -908,7 +908,6 @@ void RenderThreadImpl::InitializeRenderer( +@@ -909,7 +909,6 @@ void RenderThreadImpl::InitializeRenderer( uint64_t trace_id) { TRACE_EVENT("navigation", "RenderThreadImpl::InitializeRenderer", perfetto::TerminatingFlow::Global(trace_id)); diff --git a/build/patches/Viewport-Protection-flag.patch b/build/patches/Viewport-Protection-flag.patch index ced5538f..a7e810d8 100644 --- a/build/patches/Viewport-Protection-flag.patch +++ b/build/patches/Viewport-Protection-flag.patch @@ -282,7 +282,7 @@ diff --git a/third_party/blink/public/common/widget/device_emulation_params.h b/ diff --git a/third_party/blink/renderer/core/css/css_properties.json5 b/third_party/blink/renderer/core/css/css_properties.json5 --- a/third_party/blink/renderer/core/css/css_properties.json5 +++ b/third_party/blink/renderer/core/css/css_properties.json5 -@@ -4209,6 +4209,7 @@ +@@ -4292,6 +4292,7 @@ }, { name: "opacity", @@ -290,7 +290,7 @@ diff --git a/third_party/blink/renderer/core/css/css_properties.json5 b/third_pa property_methods: ["ParseSingleValue", "CSSValueFromComputedStyleInternal"], interpolable: true, compositable: true, -@@ -4216,7 +4217,6 @@ +@@ -4299,7 +4300,6 @@ field_template: "primitive", default_value: "1.0", type_name: "float", @@ -313,7 +313,7 @@ diff --git a/third_party/blink/renderer/core/css/media_values.cc b/third_party/b diff --git a/third_party/blink/renderer/core/css/resolver/style_resolver.cc b/third_party/blink/renderer/core/css/resolver/style_resolver.cc --- a/third_party/blink/renderer/core/css/resolver/style_resolver.cc +++ b/third_party/blink/renderer/core/css/resolver/style_resolver.cc -@@ -2218,7 +2218,12 @@ ComputedStyleBuilder StyleResolver::InitialStyleBuilderForElement() const { +@@ -2223,7 +2223,12 @@ ComputedStyleBuilder StyleResolver::InitialStyleBuilderForElement() const { ComputedStyleBuilder builder = CreateComputedStyleBuilder(); builder.SetRtlOrdering(GetDocument().VisuallyOrdered() ? EOrder::kVisual : EOrder::kLogical); @@ -399,7 +399,7 @@ diff --git a/third_party/blink/renderer/core/events/pointer_event.h b/third_part diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc --- a/third_party/blink/renderer/core/exported/web_view_impl.cc +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc -@@ -1083,7 +1083,7 @@ WebPagePopupImpl* WebViewImpl::OpenPagePopup(PagePopupClient* client) { +@@ -1081,7 +1081,7 @@ WebPagePopupImpl* WebViewImpl::OpenPagePopup(PagePopupClient* client) { page_popup_ = WebPagePopupImpl::Create( std::move(popup_widget_host), std::move(widget_host), std::move(widget_receiver), this, agent_group_scheduler, @@ -411,7 +411,7 @@ diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_p diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc --- a/third_party/blink/renderer/core/frame/local_dom_window.cc +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc -@@ -1557,7 +1557,12 @@ int LocalDOMWindow::outerHeight() const { +@@ -1558,7 +1558,12 @@ int LocalDOMWindow::outerHeight() const { if (frame->IsInFencedFrameTree()) { return innerHeight(); } @@ -425,7 +425,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_p Page* page = frame->GetPage(); if (!page) return 0; -@@ -1582,7 +1587,12 @@ int LocalDOMWindow::outerWidth() const { +@@ -1583,7 +1588,12 @@ int LocalDOMWindow::outerWidth() const { if (frame->IsInFencedFrameTree()) { return innerWidth(); } @@ -439,7 +439,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_p Page* page = frame->GetPage(); if (!page) return 0; -@@ -1776,7 +1786,8 @@ double LocalDOMWindow::devicePixelRatio() const { +@@ -1777,7 +1787,8 @@ double LocalDOMWindow::devicePixelRatio() const { if (!GetFrame()) return 0.0; @@ -449,7 +449,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_p } void LocalDOMWindow::scrollBy(double x, double y) const { -@@ -2391,6 +2402,23 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate, +@@ -2395,6 +2406,23 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate, if (!completed_url.IsEmpty() || result.new_window) result.frame->Navigate(frame_request, WebFrameLoadType::kStandard); @@ -473,7 +473,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_p // TODO(japhet): window-open-noopener.html?_top and several tests in // html/browsers/windows/browsing-context-names/ appear to require that // the special case target names (_top, _parent, _self) ignore opener -@@ -2442,6 +2470,15 @@ DOMWindow* LocalDOMWindow::openPictureInPictureWindow( +@@ -2446,6 +2474,15 @@ DOMWindow* LocalDOMWindow::openPictureInPictureWindow( DCHECK(result.new_window); result.frame->Navigate(frame_request, WebFrameLoadType::kStandard); @@ -492,7 +492,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 -@@ -1595,6 +1595,10 @@ void LocalFrame::RestoreScrollOffsets() { +@@ -1591,6 +1591,10 @@ void LocalFrame::RestoreScrollOffsets() { saved_scroll_offsets_ = nullptr; } @@ -503,7 +503,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/ void LocalFrame::SetLayoutZoomFactor(float factor) { SetLayoutAndTextZoomFactors(factor, text_zoom_factor_); } -@@ -1776,12 +1780,16 @@ mojom::blink::DevicePostureType LocalFrame::GetDevicePosture() { +@@ -1772,12 +1776,16 @@ mojom::blink::DevicePostureType LocalFrame::GetDevicePosture() { return mojo_handler_->GetDevicePosture(); } @@ -522,7 +522,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/ return ratio; } -@@ -3368,6 +3376,11 @@ void LocalFrame::SetScaleFactor(float scale_factor) { +@@ -3324,6 +3332,11 @@ void LocalFrame::SetScaleFactor(float scale_factor) { DCHECK(!GetDocument() || !GetDocument()->Printing()); DCHECK(IsMainFrame()); @@ -537,7 +537,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 -@@ -428,13 +428,14 @@ class CORE_EXPORT LocalFrame final +@@ -427,13 +427,14 @@ class CORE_EXPORT LocalFrame final void SetInViewSourceMode(bool = true); void SetLayoutZoomFactor(float); @@ -554,7 +554,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/b // Informs the local root's document and its local descendant subtree that a // media query value changed. -@@ -1087,6 +1088,7 @@ class CORE_EXPORT LocalFrame final +@@ -1078,6 +1079,7 @@ class CORE_EXPORT LocalFrame final unsigned did_run_detach_impl_ : 1 = false; float layout_zoom_factor_; @@ -600,7 +600,7 @@ diff --git a/third_party/blink/renderer/core/frame/screen_metrics_emulator.cc b/ } void ScreenMetricsEmulator::UpdateVisualProperties( -@@ -201,9 +214,8 @@ void ScreenMetricsEmulator::OnUpdateScreenRects( +@@ -202,9 +215,8 @@ void ScreenMetricsEmulator::OnUpdateScreenRects( const gfx::Rect& window_screen_rect) { original_view_screen_rect_ = view_screen_rect; original_window_screen_rect_ = window_screen_rect; @@ -660,7 +660,7 @@ diff --git a/third_party/blink/renderer/core/frame/screen_metrics_emulator.h b/t diff --git a/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc b/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc --- a/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc +++ b/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc -@@ -1995,6 +1995,14 @@ void WebFrameWidgetImpl::ApplyVisualPropertiesSizing( +@@ -1993,6 +1993,14 @@ void WebFrameWidgetImpl::ApplyVisualPropertiesSizing( if (auto* device_emulator = DeviceEmulator()) { device_emulator->UpdateVisualProperties(visual_properties); @@ -678,7 +678,7 @@ diff --git a/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc b/th diff --git a/third_party/blink/renderer/core/frame/web_remote_frame_impl.cc b/third_party/blink/renderer/core/frame/web_remote_frame_impl.cc --- a/third_party/blink/renderer/core/frame/web_remote_frame_impl.cc +++ b/third_party/blink/renderer/core/frame/web_remote_frame_impl.cc -@@ -362,7 +362,8 @@ void WebRemoteFrameImpl::InitializeFrameVisualProperties( +@@ -361,7 +361,8 @@ void WebRemoteFrameImpl::InitializeFrameVisualProperties( visual_properties.page_scale_factor = ancestor_widget->PageScaleInMainFrame(); visual_properties.is_pinch_gesture_active = ancestor_widget->PinchGestureActiveInMainFrame(); @@ -732,7 +732,7 @@ diff --git a/third_party/blink/renderer/core/input/touch.cc b/third_party/blink/ 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 -@@ -106,6 +106,12 @@ +@@ -107,6 +107,12 @@ #include "ui/color/color_provider_utils.h" #include "ui/gfx/geometry/insets_conversions.h" @@ -745,7 +745,7 @@ diff --git a/third_party/blink/renderer/core/page/page.cc b/third_party/blink/re namespace blink { namespace { -@@ -1251,7 +1257,94 @@ void Page::UpdateAcceleratedCompositingSettings() { +@@ -1294,7 +1300,94 @@ void Page::UpdateAcceleratedCompositingSettings() { } } @@ -843,7 +843,7 @@ diff --git a/third_party/blink/renderer/core/page/page.cc b/third_party/blink/re diff --git a/third_party/blink/renderer/core/page/page.h b/third_party/blink/renderer/core/page/page.h --- a/third_party/blink/renderer/core/page/page.h +++ b/third_party/blink/renderer/core/page/page.h -@@ -564,6 +564,10 @@ class CORE_EXPORT Page final : public GarbageCollected, +@@ -559,6 +559,10 @@ class CORE_EXPORT Page final : public GarbageCollected, const PartitionedPopinOpenerProperties& GetPartitionedPopinOpenerProperties() const; @@ -854,7 +854,7 @@ diff --git a/third_party/blink/renderer/core/page/page.h b/third_party/blink/ren private: friend class ScopedPagePauser; class CloseTaskHandler; -@@ -740,6 +744,11 @@ class CORE_EXPORT Page final : public GarbageCollected, +@@ -735,6 +739,11 @@ class CORE_EXPORT Page final : public GarbageCollected, // browser side FrameTree has the FrameTree::Type of kFencedFrame. bool is_fenced_frame_tree_ = false; @@ -869,7 +869,7 @@ diff --git a/third_party/blink/renderer/core/page/page.h b/third_party/blink/ren diff --git a/third_party/blink/renderer/core/style/computed_style.h b/third_party/blink/renderer/core/style/computed_style.h --- a/third_party/blink/renderer/core/style/computed_style.h +++ b/third_party/blink/renderer/core/style/computed_style.h -@@ -1924,6 +1924,12 @@ class ComputedStyle final : public ComputedStyleBase { +@@ -1931,6 +1931,12 @@ class ComputedStyle final : public ComputedStyleBase { IsRunningBackdropFilterAnimationOnCompositor(); } diff --git a/build/patches/WIN-Fix-log-to-file.patch b/build/patches/WIN-Fix-log-to-file.patch index 594a2425..8c345988 100644 --- a/build/patches/WIN-Fix-log-to-file.patch +++ b/build/patches/WIN-Fix-log-to-file.patch @@ -5,52 +5,53 @@ Subject: WIN Fix log to file Allows log activation without opening the console window. Log rotation enabled by default. --- - chrome/common/logging_chrome.cc | 11 +++++++---- - chrome/common/logging_chrome.h | 6 ++++-- + chrome/common/logging_chrome.cc | 11 ++++++++--- + chrome/common/logging_chrome.h | 6 +++++- content/app/content_main.cc | 9 ++++++--- - 3 files changed, 17 insertions(+), 9 deletions(-) + 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/chrome/common/logging_chrome.cc b/chrome/common/logging_chrome.cc --- a/chrome/common/logging_chrome.cc +++ b/chrome/common/logging_chrome.cc -@@ -55,7 +55,7 @@ +@@ -54,7 +54,7 @@ #include "content/public/common/content_switches.h" #include "ipc/ipc_logging.h" -#if BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) + #include "ash/constants/ash_switches.h" #include "base/i18n/time_formatting.h" #include "third_party/icu/source/i18n/unicode/timezone.h" - #endif -@@ -233,7 +233,7 @@ LoggingDestination DetermineLoggingDestination( +@@ -229,7 +229,7 @@ LoggingDestination DetermineLoggingDestination( return LoggingDestFromCommandLine(command_line, unused); } -#if BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) bool RotateLogFile(const base::FilePath& target_path) { DCHECK(!target_path.empty()); // If the old log file doesn't exist, do nothing. -@@ -278,7 +278,7 @@ bool RotateLogFile(const base::FilePath& target_path) { +@@ -274,7 +274,9 @@ bool RotateLogFile(const base::FilePath& target_path) { return true; } --#endif // BUILDFLAG(IS_CHROMEOS) +#endif // BUILDFLAG(IS_WIN) - #if BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_CHROMEOS) base::FilePath SetUpSymlinkIfNeeded(const base::FilePath& symlink_path, -@@ -457,6 +457,9 @@ void InitChromeLogging(const base::CommandLine& command_line, + bool new_log) { + DCHECK(!symlink_path.empty()); +@@ -447,6 +449,9 @@ void InitChromeLogging(const base::CommandLine& command_line, // since that will remove the newly created link instead. delete_old_log_file = APPEND_TO_OLD_LOG_FILE; - #endif // BUILDFLAG(IS_CHROMEOS_ASH) + #endif // BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_WIN) + RotateLogFile(log_path); +#endif } } else { log_locking_state = DONT_LOCK_LOG_FILE; -@@ -621,7 +624,7 @@ bool DialogsAreSuppressed() { +@@ -611,7 +616,7 @@ bool DialogsAreSuppressed() { return dialogs_are_suppressed_; } @@ -62,21 +63,22 @@ diff --git a/chrome/common/logging_chrome.cc b/chrome/common/logging_chrome.cc diff --git a/chrome/common/logging_chrome.h b/chrome/common/logging_chrome.h --- a/chrome/common/logging_chrome.h +++ b/chrome/common/logging_chrome.h -@@ -35,10 +35,12 @@ LoggingDestination DetermineLoggingDestination( +@@ -34,10 +34,14 @@ LoggingDestination DetermineLoggingDestination( // write new logs to the latest log file. Otherwise, we reuse the existing file // if exists. base::FilePath SetUpLogFile(const base::FilePath& target_path, bool new_log); +#endif // BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) // Allow external calls to the internal method for testing. bool RotateLogFile(const base::FilePath& target_path); --#endif // BUILDFLAG(IS_CHROMEOS) -+#endif // BUILDFLAG(IS_WIN) ++#endif - #if BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_CHROMEOS) #if defined(UNIT_TEST) -@@ -70,7 +72,7 @@ base::FilePath GetLogFileName(const base::CommandLine& command_line); + // Expose the following methods only for tests. + +@@ -67,7 +71,7 @@ base::FilePath GetLogFileName(const base::CommandLine& command_line); // otherwise. bool DialogsAreSuppressed(); @@ -88,7 +90,7 @@ diff --git a/chrome/common/logging_chrome.h b/chrome/common/logging_chrome.h diff --git a/content/app/content_main.cc b/content/app/content_main.cc --- a/content/app/content_main.cc +++ b/content/app/content_main.cc -@@ -331,9 +331,12 @@ NO_STACK_PROTECTOR int RunContentProcess( +@@ -337,9 +337,12 @@ NO_STACK_PROTECTOR int RunContentProcess( } else if (command_line->HasSwitch(switches::kEnableLogging)) { // Route stdio to parent console (if any) or create one, do not create a // console in children if handles are being passed. diff --git a/build/patches/WIN-enable-pdf-plugin.patch b/build/patches/WIN-enable-pdf-plugin.patch index e8ee15a1..dd6d00e9 100644 --- a/build/patches/WIN-enable-pdf-plugin.patch +++ b/build/patches/WIN-enable-pdf-plugin.patch @@ -10,7 +10,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/third_party/blink/renderer/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 -@@ -2293,7 +2293,9 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() { +@@ -2289,7 +2289,9 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() { } PluginData* LocalFrame::GetPluginData() const { diff --git a/build/patches/Warning-message-for-unsupported-hardware-aes.patch b/build/patches/Warning-message-for-unsupported-hardware-aes.patch index b378bd0f..3607b43a 100644 --- a/build/patches/Warning-message-for-unsupported-hardware-aes.patch +++ b/build/patches/Warning-message-for-unsupported-hardware-aes.patch @@ -28,7 +28,7 @@ you can remove the message by going to chrome://flags/#no-hw-aes-warning diff --git a/base/base_switches.cc b/base/base_switches.cc --- a/base/base_switches.cc +++ b/base/base_switches.cc -@@ -181,6 +181,8 @@ const char kPackageVersionName[] = "package-version-name"; +@@ -180,6 +180,8 @@ const char kPackageVersionName[] = "package-version-name"; const char kDesktopModeViewportMetaEnabled[] = "dm-viewport-meta-enabled"; @@ -40,7 +40,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 -@@ -35,6 +35,7 @@ extern const char kTraceToFileName[]; +@@ -34,6 +34,7 @@ extern const char kTraceToFileName[]; extern const char kV[]; extern const char kVModule[]; extern const char kWaitForDebugger[]; @@ -59,7 +59,7 @@ diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn "//headless:headless_non_renderer", "//headless:headless_shell_browser_lib", "//net:net_resources", -@@ -1646,6 +1647,8 @@ if (is_android) { +@@ -1644,6 +1645,8 @@ if (is_android) { "//chrome/common/profiler", "//chrome/gpu", "//chrome/renderer", @@ -71,7 +71,7 @@ diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc --- a/chrome/app/chrome_main_delegate.cc +++ b/chrome/app/chrome_main_delegate.cc -@@ -107,6 +107,9 @@ +@@ -106,6 +106,9 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/base/resource/scoped_startup_resource_bundle.h" #include "ui/base/ui_base_switches.h" @@ -81,8 +81,8 @@ diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegat #if BUILDFLAG(IS_WIN) #include -@@ -1097,6 +1100,12 @@ std::optional ChromeMainDelegate::BasicStartupComplete() { - return chrome::RESULT_CODE_INVALID_SANDBOX_STATE; +@@ -1108,6 +1111,12 @@ std::optional ChromeMainDelegate::BasicStartupComplete() { + } #endif +if (!command_line.HasSwitch(switches::kProcessType)) { @@ -130,7 +130,7 @@ diff --git a/chrome/browser/ui/startup/bad_flags_prompt.cc b/chrome/browser/ui/s 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 -@@ -3539,6 +3539,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( +@@ -3540,6 +3540,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( switches::kSchedulerBoostUrgent, #endif switches::kDesktopModeViewportMetaEnabled, diff --git a/build/patches/Welcome-screen.patch b/build/patches/Welcome-screen.patch index 5550b413..790859a9 100644 --- a/build/patches/Welcome-screen.patch +++ b/build/patches/Welcome-screen.patch @@ -30,7 +30,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 -@@ -508,6 +508,7 @@ chrome_java_resources = [ +@@ -514,6 +514,7 @@ chrome_java_resources = [ "java/res/layout/find_in_page.xml", "java/res/layout/find_toolbar.xml", "java/res/layout/fre_tos_privacy_disclaimer.xml", @@ -41,7 +41,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 -@@ -664,6 +664,8 @@ chrome_java_sources = [ +@@ -597,6 +597,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", @@ -239,7 +239,7 @@ diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res diff --git a/chrome/android/java/res/values/styles.xml b/chrome/android/java/res/values/styles.xml --- a/chrome/android/java/res/values/styles.xml +++ b/chrome/android/java/res/values/styles.xml -@@ -281,6 +281,30 @@ found in the LICENSE file. +@@ -276,6 +276,30 @@ found in the LICENSE file. 1 diff --git a/build/patches/add-browser-policy.patch b/build/patches/add-browser-policy.patch index d772d719..881e3e9d 100644 --- a/build/patches/add-browser-policy.patch +++ b/build/patches/add-browser-policy.patch @@ -173,16 +173,16 @@ diff --git a/chrome/browser/android/preferences/privacy_preferences_manager_impl diff --git a/chrome/browser/metrics/chrome_feature_list_creator.cc b/chrome/browser/metrics/chrome_feature_list_creator.cc --- a/chrome/browser/metrics/chrome_feature_list_creator.cc +++ b/chrome/browser/metrics/chrome_feature_list_creator.cc -@@ -58,6 +58,8 @@ +@@ -57,6 +57,8 @@ #include "content/public/common/content_switches.h" #include "services/network/public/cpp/network_switches.h" #include "ui/base/resource/resource_bundle.h" +#include "components/policy/core/common/policy_pref_names.h" +#include "components/policy/core/common/policy_switches.h" - #if BUILDFLAG(IS_CHROMEOS_ASH) + #if BUILDFLAG(IS_CHROMEOS) #include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h" -@@ -205,6 +207,16 @@ void ChromeFeatureListCreator::CreatePrefService() { +@@ -199,6 +201,16 @@ void ChromeFeatureListCreator::CreatePrefService() { // ManagementService's cache. if (local_state_pref_store->ReadPrefs() == JsonPrefStore::PREF_READ_ERROR_NONE) { @@ -214,10 +214,10 @@ diff --git a/chrome/browser/navigation_predictor/search_engine_preconnector.cc b diff --git a/chrome/browser/policy/chrome_browser_policy_connector.cc b/chrome/browser/policy/chrome_browser_policy_connector.cc --- a/chrome/browser/policy/chrome_browser_policy_connector.cc +++ b/chrome/browser/policy/chrome_browser_policy_connector.cc -@@ -138,9 +138,6 @@ bool ChromeBrowserPolicyConnector::HasMachineLevelPolicies() { +@@ -134,9 +134,6 @@ bool ChromeBrowserPolicyConnector::HasMachineLevelPolicies() { return true; } - #endif // !BUILDFLAG(IS_CHROMEOS_ASH) + #endif // !BUILDFLAG(IS_CHROMEOS) - if (ProviderHasPolicies(command_line_provider_)) { - return true; - } @@ -227,7 +227,7 @@ diff --git a/chrome/browser/policy/chrome_browser_policy_connector.cc b/chrome/b diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc b/chrome/browser/policy/configuration_policy_handler_list_factory.cc --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -2404,9 +2404,9 @@ bool AreFuturePoliciesEnabledByDefault() { +@@ -2403,9 +2403,9 @@ bool AreFuturePoliciesEnabledByDefault() { if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType)) { return true; } @@ -243,7 +243,7 @@ diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc diff --git a/chrome/browser/signin/account_consistency_mode_manager.cc b/chrome/browser/signin/account_consistency_mode_manager.cc --- a/chrome/browser/signin/account_consistency_mode_manager.cc +++ b/chrome/browser/signin/account_consistency_mode_manager.cc -@@ -166,7 +166,7 @@ void AccountConsistencyModeManager::SetIgnoreMissingOAuthClientForTesting() { +@@ -161,7 +161,7 @@ void AccountConsistencyModeManager::SetIgnoreMissingOAuthClientForTesting() { // static bool AccountConsistencyModeManager::ShouldBuildServiceForProfile( Profile* profile) { @@ -252,25 +252,25 @@ diff --git a/chrome/browser/signin/account_consistency_mode_manager.cc b/chrome/ } AccountConsistencyMethod -@@ -204,7 +204,8 @@ AccountConsistencyModeManager::ComputeAccountConsistencyMethod( +@@ -192,7 +192,8 @@ AccountConsistencyModeManager::ComputeAccountConsistencyMethod( #endif #if BUILDFLAG(ENABLE_MIRROR) - return AccountConsistencyMethod::kMirror; + // always disabled + return AccountConsistencyMethod::kDisabled; - #endif - - #if BUILDFLAG(ENABLE_DICE_SUPPORT) -@@ -214,7 +215,7 @@ AccountConsistencyModeManager::ComputeAccountConsistencyMethod( + #elif BUILDFLAG(ENABLE_DICE_SUPPORT) + if (!profile->GetPrefs()->GetBoolean(prefs::kSigninAllowed)) { + VLOG(1) << "Desktop Identity Consistency disabled as sign-in to Chrome " +@@ -200,7 +201,7 @@ AccountConsistencyModeManager::ComputeAccountConsistencyMethod( return AccountConsistencyMethod::kDisabled; } - return AccountConsistencyMethod::kDice; + return AccountConsistencyMethod::kDisabled; - #endif - + #else NOTREACHED(); + #endif diff --git a/chrome/browser/signin/account_consistency_mode_manager_factory.cc b/chrome/browser/signin/account_consistency_mode_manager_factory.cc --- a/chrome/browser/signin/account_consistency_mode_manager_factory.cc +++ b/chrome/browser/signin/account_consistency_mode_manager_factory.cc @@ -325,7 +325,7 @@ diff --git a/chrome/browser/signin/bound_session_credentials/throttled_gaia_auth diff --git a/chrome/browser/signin/chrome_signin_client.cc b/chrome/browser/signin/chrome_signin_client.cc --- a/chrome/browser/signin/chrome_signin_client.cc +++ b/chrome/browser/signin/chrome_signin_client.cc -@@ -235,7 +235,9 @@ void ChromeSigninClient::DoFinalInit() { +@@ -224,7 +224,9 @@ void ChromeSigninClient::DoFinalInit() { bool ChromeSigninClient::ProfileAllowsSigninCookies(Profile* profile) { scoped_refptr cookie_settings = CookieSettingsFactory::GetForProfile(profile); @@ -336,7 +336,7 @@ diff --git a/chrome/browser/signin/chrome_signin_client.cc b/chrome/browser/sign } PrefService* ChromeSigninClient::GetPrefs() { -@@ -358,6 +360,9 @@ bool ChromeSigninClient::AreNetworkCallsDelayed() { +@@ -347,6 +349,9 @@ bool ChromeSigninClient::AreNetworkCallsDelayed() { } void ChromeSigninClient::DelayNetworkCall(base::OnceClosure callback) { @@ -588,7 +588,7 @@ diff --git a/components/commerce/core/commerce_feature_list.cc b/components/comm } // namespace BASE_FEATURE(kCommerceAllowLocalImages, -@@ -387,16 +337,15 @@ const base::FeatureParam kRevertIconOnFailure{ +@@ -396,16 +346,15 @@ const base::FeatureParam kRevertIconOnFailure{ &kShoppingList, kRevertIconOnFailureParam, false}; bool IsPartnerMerchant(const GURL& url) { @@ -608,7 +608,7 @@ diff --git a/components/commerce/core/commerce_feature_list.cc b/components/comm } bool IsCartDiscountFeatureEnabled() { -@@ -449,6 +398,7 @@ bool IsRegionLockedFeatureEnabled(const base::Feature& feature, +@@ -458,6 +407,7 @@ bool IsRegionLockedFeatureEnabled(const base::Feature& feature, const base::Feature& feature_region_launched, const std::string& country_code, const std::string& locale) { @@ -616,7 +616,7 @@ diff --git a/components/commerce/core/commerce_feature_list.cc b/components/comm bool flag_enabled = base::FeatureList::IsEnabled(feature); bool region_launched = base::FeatureList::IsEnabled(feature_region_launched) && -@@ -471,6 +421,7 @@ base::TimeDelta GetDiscountFetchDelay() { +@@ -480,6 +430,7 @@ base::TimeDelta GetDiscountFetchDelay() { } bool IsNoDiscountMerchant(const GURL& url) { @@ -624,7 +624,7 @@ diff --git a/components/commerce/core/commerce_feature_list.cc b/components/comm auto* pattern_from_component = commerce_heuristics::CommerceHeuristicsData::GetInstance() .GetNoDiscountMerchantPattern(); -@@ -482,4 +433,12 @@ bool IsNoDiscountMerchant(const GURL& url) { +@@ -491,4 +442,12 @@ bool IsNoDiscountMerchant(const GURL& url) { return RE2::PartialMatch(url.host_piece(), *pattern_from_component); } #endif @@ -941,7 +941,7 @@ diff --git a/components/policy/resources/webui/policy_row.ts b/components/policy // Populate the remaining columns with policy scope, level and value if a // value has been set. Otherwise, leave them blank. if (!this.unset_) { -@@ -226,6 +233,11 @@ export class PolicyRowElement extends CustomElement { +@@ -224,6 +231,11 @@ export class PolicyRowElement extends CustomElement { } } @@ -1014,7 +1014,7 @@ diff --git a/components/signin/internal/identity_manager/gaia_cookie_manager_ser diff --git a/google_apis/gaia/gaia_auth_fetcher.cc b/google_apis/gaia/gaia_auth_fetcher.cc --- a/google_apis/gaia/gaia_auth_fetcher.cc +++ b/google_apis/gaia/gaia_auth_fetcher.cc -@@ -483,6 +483,7 @@ void GaiaAuthFetcher::StartListAccounts() { +@@ -479,6 +479,7 @@ void GaiaAuthFetcher::StartListAccounts() { } } })"); diff --git a/build/patches/allow-the-download-of-clang-for-windows-crossbuild.patch b/build/patches/allow-the-download-of-clang-for-windows-crossbuild.patch index 824c84e3..23fb0a13 100644 --- a/build/patches/allow-the-download-of-clang-for-windows-crossbuild.patch +++ b/build/patches/allow-the-download-of-clang-for-windows-crossbuild.patch @@ -23,7 +23,7 @@ diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py """ import sys -@@ -232,7 +234,7 @@ def DownloadAndUnpackClangWinRuntime(output_dir): +@@ -231,7 +233,7 @@ def DownloadAndUnpackClangWinRuntime(output_dir): sys.exit(1) @@ -32,7 +32,7 @@ diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py stamp_file = None package_file = None -@@ -264,6 +266,8 @@ def UpdatePackage(package_name, host_os, dir=LLVM_BUILD_DIR): +@@ -263,6 +265,8 @@ def UpdatePackage(package_name, host_os, dir=LLVM_BUILD_DIR): target_os = env.get('target_os', target_os) except: pass @@ -41,7 +41,7 @@ diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py if os.path.exists(OLD_STAMP_FILE): # Delete the old stamp file so it doesn't look like an old version of clang -@@ -281,7 +285,7 @@ def UpdatePackage(package_name, host_os, dir=LLVM_BUILD_DIR): +@@ -280,7 +284,7 @@ def UpdatePackage(package_name, host_os, dir=LLVM_BUILD_DIR): # Updating the main clang package nukes the output dir. Any other packages # need to be updated *after* the clang package. @@ -50,7 +50,7 @@ diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py RmTree(dir) DownloadAndUnpackPackage(package_file, dir, host_os) -@@ -331,6 +335,8 @@ def main(): +@@ -330,6 +334,8 @@ def main(): 'and exit.')) parser.add_argument('--verify-version', help='Verify that clang has the passed-in version.') @@ -58,8 +58,8 @@ diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py + help='Do not remove old file before extracting.') args = parser.parse_args() - # TODO(crbug.com/39292993): Remove in next Clang roll. -@@ -377,7 +383,7 @@ def main(): + if args.verify_version and args.verify_version != RELEASE_VERSION: +@@ -371,7 +377,7 @@ def main(): print('--llvm-force-head-revision can only be used for --print-revision') return 1 diff --git a/build/patches/autofill-miscellaneous.patch b/build/patches/autofill-miscellaneous.patch index a2f36fa8..9b16b243 100644 --- a/build/patches/autofill-miscellaneous.patch +++ b/build/patches/autofill-miscellaneous.patch @@ -28,7 +28,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b/chrome/browser/password_manager/chrome_password_manager_client.cc --- a/chrome/browser/password_manager/chrome_password_manager_client.cc +++ b/chrome/browser/password_manager/chrome_password_manager_client.cc -@@ -1053,10 +1053,6 @@ ChromePasswordManagerClient::GetHttpAuthManager() { +@@ -1058,10 +1058,6 @@ ChromePasswordManagerClient::GetHttpAuthManager() { autofill::AutofillCrowdsourcingManager* ChromePasswordManagerClient::GetAutofillCrowdsourcingManager() { @@ -61,7 +61,7 @@ diff --git a/chrome/browser/ui/autofill/chrome_autofill_client.cc b/chrome/brows diff --git a/chrome/browser/ui/autofill/chrome_autofill_client.h b/chrome/browser/ui/autofill/chrome_autofill_client.h --- a/chrome/browser/ui/autofill/chrome_autofill_client.h +++ b/chrome/browser/ui/autofill/chrome_autofill_client.h -@@ -107,7 +107,6 @@ class ChromeAutofillClient : public ContentAutofillClient, +@@ -106,7 +106,6 @@ class ChromeAutofillClient : public ContentAutofillClient, version_info::Channel GetChannel() const final; bool IsOffTheRecord() const final; scoped_refptr GetURLLoaderFactory() final; @@ -104,7 +104,7 @@ diff --git a/components/android_autofill/browser/android_autofill_client.h b/com diff --git a/components/autofill/core/browser/crowdsourcing/autofill_crowdsourcing_manager.cc b/components/autofill/core/browser/crowdsourcing/autofill_crowdsourcing_manager.cc --- a/components/autofill/core/browser/crowdsourcing/autofill_crowdsourcing_manager.cc +++ b/components/autofill/core/browser/crowdsourcing/autofill_crowdsourcing_manager.cc -@@ -475,33 +475,6 @@ std::optional GetUploadPayloadForApi( +@@ -487,33 +487,6 @@ std::optional GetUploadPayloadForApi( return std::move(payload); } @@ -138,7 +138,7 @@ diff --git a/components/autofill/core/browser/crowdsourcing/autofill_crowdsourci // Gets HTTP body payload for API POST request. std::optional GetAPIBodyPayload(std::string payload, RequestType type) { -@@ -533,15 +506,7 @@ std::optional GetAPIQueryPayload( +@@ -545,15 +518,7 @@ std::optional GetAPIQueryPayload( } std::string GetAPIKeyForUrl(version_info::Channel channel) { @@ -155,7 +155,7 @@ diff --git a/components/autofill/core/browser/crowdsourcing/autofill_crowdsourci } std::optional>& GetActiveExperiments() { -@@ -840,34 +805,13 @@ size_t AutofillCrowdsourcingManager::GetPayloadLength( +@@ -860,34 +825,13 @@ size_t AutofillCrowdsourcingManager::GetPayloadLength( std::tuple AutofillCrowdsourcingManager::GetRequestURLAndMethod( const FormRequestData& request_data) const { @@ -209,7 +209,7 @@ diff --git a/components/autofill/core/browser/crowdsourcing/autofill_crowdsourci diff --git a/components/autofill/core/browser/crowdsourcing/votes_uploader.cc b/components/autofill/core/browser/crowdsourcing/votes_uploader.cc --- a/components/autofill/core/browser/crowdsourcing/votes_uploader.cc +++ b/components/autofill/core/browser/crowdsourcing/votes_uploader.cc -@@ -383,12 +383,6 @@ void VotesUploader::UploadVote( +@@ -396,12 +396,6 @@ void VotesUploader::UploadVote( non_empty_types.contains(CREDIT_CARD_NUMBER)) { non_empty_types.insert(CREDIT_CARD_VERIFICATION_CODE); } @@ -260,7 +260,7 @@ diff --git a/components/autofill/core/browser/foundations/autofill_manager.cc b/ 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 -@@ -877,6 +877,8 @@ BASE_FEATURE(kAutofillUploadThrottling, +@@ -909,6 +909,8 @@ BASE_FEATURE(kAutofillUploadThrottling, "AutofillUploadThrottling", base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/build/patches/bromite-build-utils.patch b/build/patches/bromite-build-utils.patch index 374e53cc..f86be8bd 100644 --- a/build/patches/bromite-build-utils.patch +++ b/build/patches/bromite-build-utils.patch @@ -10,7 +10,7 @@ Subject: bromite build utils build/bromite/gyp/cpp_bromite_include.pydeps | 9 ++ build/bromite/gyp/java_bromite_impl.py | 107 ++++++++++++++++++ build/bromite/gyp/java_bromite_impl.pydeps | 9 ++ - build/config/BUILDCONFIG.gn | 1 + + build/config/BUILDCONFIG.gn | 2 + build/config/android/rules.gni | 6 +- .../ChromeAccessibilitySettingsDelegate.java | 5 + chrome/browser/flags/BUILD.gn | 10 +- @@ -20,7 +20,7 @@ Subject: bromite build utils mojo/public/tools/mojom/mojom_parser.py | 22 +++- tools/grit/grit/grd_reader.py | 27 ++++- tools/grit/preprocess_if_expr.py | 32 +++++- - 17 files changed, 501 insertions(+), 19 deletions(-) + 17 files changed, 502 insertions(+), 19 deletions(-) create mode 100644 build/bromite/bromite_utils.gni create mode 100644 build/bromite/gyp/cpp_bromite_include.py create mode 100644 build/bromite/gyp/cpp_bromite_include.pydeps @@ -107,7 +107,7 @@ diff --git a/build/android/gyp/java_cpp_enum.py b/build/android/gyp/java_cpp_enu def GenerateOutput(source_path, enum_definition): -@@ -493,6 +513,10 @@ def DoMain(argv): +@@ -496,6 +516,10 @@ def DoMain(argv): parser.add_option('--srcjar', help='When specified, a .srcjar at the given path is ' 'created instead of individual .java files.') @@ -118,7 +118,7 @@ diff --git a/build/android/gyp/java_cpp_enum.py b/build/android/gyp/java_cpp_enu options, args = parser.parse_args(argv) -@@ -502,7 +526,7 @@ def DoMain(argv): +@@ -505,7 +529,7 @@ def DoMain(argv): with action_helpers.atomic_output(options.srcjar) as f: with zipfile.ZipFile(f, 'w', zipfile.ZIP_STORED) as srcjar: @@ -426,14 +426,12 @@ 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 -@@ -734,6 +734,7 @@ set_defaults("component") { +@@ -764,3 +764,5 @@ if (is_component_build) { + set_defaults("component") { configs = default_component_configs } - ++ +import("//build/bromite/bromite_utils.gni") - # ============================================================================= - # ACTION OVERRIDE - # ============================================================================= 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 @@ -516,7 +514,7 @@ new file mode 100755 +#include "chrome/browser/browser_process.h" +#include "chrome/browser/about_flags.h" +#include "chrome/browser/flags/jni_headers/CromiteNativeUtils_jni.h" -+#include "components/flags_ui/pref_service_flags_storage.h" ++#include "components/webui/flags/pref_service_flags_storage.h" + +#include "base/android/jni_string.h" + diff --git a/build/patches/disable-WebView-variations-support.patch b/build/patches/disable-WebView-variations-support.patch index fb849abb..e8329174 100644 --- a/build/patches/disable-WebView-variations-support.patch +++ b/build/patches/disable-WebView-variations-support.patch @@ -12,7 +12,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumAwInit.java b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumAwInit.java --- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumAwInit.java +++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumAwInit.java -@@ -349,12 +349,6 @@ public class WebViewChromiumAwInit { +@@ -342,12 +342,6 @@ public class WebViewChromiumAwInit { AwBrowserProcess.configureChildProcessLauncher(); @@ -28,7 +28,7 @@ diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewC diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java --- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java +++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java -@@ -588,10 +588,6 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider { +@@ -591,10 +591,6 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider { } } diff --git a/build/patches/dns-send-IPv6-connectivity-probes-to-RIPE-DNS.patch b/build/patches/dns-send-IPv6-connectivity-probes-to-RIPE-DNS.patch index 773ecccf..94651c5b 100644 --- a/build/patches/dns-send-IPv6-connectivity-probes-to-RIPE-DNS.patch +++ b/build/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( -@@ -279,6 +281,9 @@ void HostResolverManager::RequestImpl::OnIOComplete(int rv) { +@@ -282,6 +284,9 @@ void HostResolverManager::RequestImpl::OnIOComplete(int rv) { int HostResolverManager::RequestImpl::DoIPv6Reachability() { next_state_ = STATE_GET_PARAMETERS; diff --git a/build/patches/do-not-block-build-incompatible-profiles.patch b/build/patches/do-not-block-build-incompatible-profiles.patch index 8b6dbc3c..3db85b51 100644 --- a/build/patches/do-not-block-build-incompatible-profiles.patch +++ b/build/patches/do-not-block-build-incompatible-profiles.patch @@ -10,7 +10,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/v8/BUILD.gn b/v8/BUILD.gn --- a/v8/BUILD.gn +++ b/v8/BUILD.gn -@@ -2459,7 +2459,7 @@ template("run_mksnapshot") { +@@ -2473,7 +2473,7 @@ template("run_mksnapshot") { # Replace this with --warn-about-builtin-profile-data to see the full # list of builtins with incompatible profiles. diff --git a/build/patches/eyeo-133.0.6943.49-android_api.patch b/build/patches/eyeo-133.0.6943.49-android_api.patch index 59953d08..42a94c03 100644 --- a/build/patches/eyeo-133.0.6943.49-android_api.patch +++ b/build/patches/eyeo-133.0.6943.49-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") -@@ -290,6 +293,7 @@ if (current_toolchain == default_toolchain) { +@@ -288,6 +291,7 @@ if (current_toolchain == default_toolchain) { if (enable_screen_capture) { deps += [ "//chrome/browser:screen_capture_java_resources" ] } @@ -105,7 +105,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn } android_resources("java_overlay_resources") { -@@ -531,6 +535,7 @@ if (current_toolchain == default_toolchain) { +@@ -532,6 +536,7 @@ if (current_toolchain == default_toolchain) { "//chrome/browser/xsurface:java", "//chrome/browser/xsurface_provider:dependency_provider_impl_java", "//chrome/browser/xsurface_provider:java", @@ -113,7 +113,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//components/android_autofill/browser:java", "//components/autofill/android:autofill_features_java", "//components/autofill/android:autofill_java", -@@ -1320,6 +1325,7 @@ if (current_toolchain == default_toolchain) { +@@ -1331,6 +1336,7 @@ if (current_toolchain == default_toolchain) { "javatests:chrome_test_java_org.chromium.chrome.browser.toolbar", "javatests:chrome_test_java_org.chromium.chrome.browser.webapps", "javatests:chrome_test_java_various", @@ -121,7 +121,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//chrome/browser/android/browserservices/verification:javatests", "//chrome/browser/android/httpclient:javatests", "//chrome/browser/android/metrics:ukm_javatests", -@@ -1386,6 +1392,7 @@ if (current_toolchain == default_toolchain) { +@@ -1399,6 +1405,7 @@ if (current_toolchain == default_toolchain) { "//chrome/test/data/translate/", "//chrome/test/data/webauthn/", "//chrome/test/media_router/resources/", @@ -129,7 +129,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//components/test/data/autofill/", "//components/test/data/payments/", "//content/test/data/browsing_data/", -@@ -3172,6 +3179,12 @@ generate_jni("chrome_jni_headers") { +@@ -3200,6 +3207,12 @@ generate_jni("chrome_jni_headers") { sources += [ "java/src/org/chromium/chrome/browser/media/MediaCapturePickerDialogBridge.java" ] } @@ -142,7 +142,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn # Used for testing only, should not be shipped to end users. if (enable_offline_pages_harness) { sources += [ "java/src/org/chromium/chrome/browser/offlinepages/evaluation/OfflinePageEvaluationBridge.java" ] -@@ -3261,6 +3274,7 @@ group("jni_headers") { +@@ -3290,6 +3303,7 @@ group("jni_headers") { "//chrome/browser/ui/messages/android:jni_headers", "//chrome/browser/util:jni_headers", "//chrome/browser/webauthn/android:jni_headers", @@ -215,7 +215,7 @@ new file mode 100644 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -3230,6 +3230,10 @@ static_library("browser") { +@@ -3251,6 +3251,10 @@ static_library("browser") { "touch_to_fill/password_manager/touch_to_fill_controller_webauthn_delegate.h", ] @@ -275,7 +275,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 -@@ -997,6 +997,12 @@ static_library("ui") { +@@ -1000,6 +1000,12 @@ static_library("ui") { "webui/favicon_source.cc", "webui/favicon_source.h", ] diff --git a/build/patches/eyeo-133.0.6943.49-android_settings.patch b/build/patches/eyeo-133.0.6943.49-android_settings.patch index ec60a38d..9d7ae27b 100644 --- a/build/patches/eyeo-133.0.6943.49-android_settings.patch +++ b/build/patches/eyeo-133.0.6943.49-android_settings.patch @@ -239,7 +239,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 -@@ -294,6 +294,10 @@ if (current_toolchain == default_toolchain) { +@@ -292,6 +292,10 @@ if (current_toolchain == default_toolchain) { deps += [ "//chrome/browser:screen_capture_java_resources" ] } @@ -250,7 +250,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn } android_resources("java_overlay_resources") { -@@ -774,6 +778,10 @@ if (current_toolchain == default_toolchain) { +@@ -776,6 +780,10 @@ if (current_toolchain == default_toolchain) { "//url/mojom:url_mojom_origin_java", ] @@ -299,9 +299,9 @@ diff --git a/chrome/android/java/res/xml/main_preferences_legacy.xml b/chrome/an --> +@@ -105,6 +108,11 @@ with the new order (main_preferences). --> android:key="ui_theme" - android:order="17" + android:order="18" android:title="@string/theme_settings" /> + -@@ -1208,7 +1212,7 @@ void NavigationURLLoaderImpl::OnReceiveRedirect( +@@ -1212,7 +1216,7 @@ void NavigationURLLoaderImpl::OnReceiveRedirect( LogQueueTimeHistogram("Navigation.QueueTime.OnReceiveRedirect", resource_request_->is_outermost_main_frame); net::Error error = net::OK; @@ -50325,7 +50325,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" -@@ -3459,6 +3463,12 @@ void RenderFrameHostImpl::ExecuteJavaScriptMethod( +@@ -3464,6 +3468,12 @@ void RenderFrameHostImpl::ExecuteJavaScriptMethod( std::move(callback)); } @@ -50352,7 +50352,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_ -@@ -494,6 +498,10 @@ class CONTENT_EXPORT RenderFrameHostImpl +@@ -495,6 +499,10 @@ class CONTENT_EXPORT RenderFrameHostImpl const std::u16string& method_name, base::Value::List arguments, JavaScriptResultCallback callback) override; @@ -50377,7 +50377,7 @@ diff --git a/content/public/browser/render_frame_host.h b/content/public/browser #ifndef CONTENT_PUBLIC_BROWSER_RENDER_FRAME_HOST_H_ #define CONTENT_PUBLIC_BROWSER_RENDER_FRAME_HOST_H_ -@@ -551,6 +555,9 @@ class CONTENT_EXPORT RenderFrameHost : public IPC::Listener, +@@ -552,6 +556,9 @@ class CONTENT_EXPORT RenderFrameHost : public IPC::Listener, virtual void AddMessageToConsole(blink::mojom::ConsoleMessageLevel level, const std::string& message) = 0; @@ -50499,7 +50499,7 @@ diff --git a/content/shell/BUILD.gn b/content/shell/BUILD.gn "//components/cdm/renderer", "//components/custom_handlers", "//components/custom_handlers:test_support", -@@ -331,6 +341,7 @@ static_library("content_shell_lib") { +@@ -332,6 +342,7 @@ static_library("content_shell_lib") { "//components/prefs", "//components/services/storage/test_api", "//components/url_formatter", @@ -50507,7 +50507,7 @@ diff --git a/content/shell/BUILD.gn b/content/shell/BUILD.gn "//components/variations", "//components/variations/service", "//components/web_cache/renderer", -@@ -423,6 +434,7 @@ static_library("content_shell_lib") { +@@ -424,6 +435,7 @@ static_library("content_shell_lib") { "//mojo/public/java/system:test_support", "//ui/android", ] @@ -50515,7 +50515,7 @@ diff --git a/content/shell/BUILD.gn b/content/shell/BUILD.gn } if (shell_use_toolkit_views) { -@@ -514,6 +526,8 @@ repack("pak") { +@@ -515,6 +527,8 @@ repack("pak") { sources = [ "$root_gen_dir/base/tracing/protos/tracing_proto_resources.pak", @@ -50524,7 +50524,7 @@ diff --git a/content/shell/BUILD.gn b/content/shell/BUILD.gn "$root_gen_dir/components/ukm_resources.pak", "$root_gen_dir/content/attribution_internals_resources.pak", "$root_gen_dir/content/browser/resources/media/media_internals_resources.pak", -@@ -546,6 +560,8 @@ repack("pak") { +@@ -547,6 +561,8 @@ repack("pak") { deps = [ ":resources", "//base/tracing/protos:chrome_track_event_resources", @@ -51006,7 +51006,7 @@ diff --git a/third_party/blink/renderer/core/dom/events/event_target.cc b/third_ #include "third_party/blink/renderer/core/dom/events/event_target.h" #include -@@ -890,7 +894,10 @@ bool EventTarget::dispatchEventForBindings(Event* event, +@@ -867,7 +871,10 @@ bool EventTarget::dispatchEventForBindings(Event* event, if (!GetExecutionContext()) return false; @@ -51143,7 +51143,7 @@ diff --git a/third_party/blink/renderer/core/html/html_element.cc b/third_party/ #include "third_party/blink/renderer/core/html/html_element.h" #include "base/containers/enum_set.h" -@@ -2440,7 +2444,13 @@ void HTMLElement::setSpellcheck(bool enable) { +@@ -2414,7 +2418,13 @@ void HTMLElement::setSpellcheck(bool enable) { } void HTMLElement::click() { @@ -51822,7 +51822,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 -@@ -1105,6 +1109,14 @@ +@@ -1109,6 +1113,14 @@ "components/user_scripts/browser/resources/browser_resources.grd": { "includes": [7620], }, @@ -51851,7 +51851,7 @@ diff --git a/tools/metrics/histograms/metadata/extensions/enums.xml b/tools/metr --> +@@ -180,7 +184,7 @@ Called by update_extension_histograms.py.--> @@ -51860,7 +51860,7 @@ diff --git a/tools/metrics/histograms/metadata/extensions/enums.xml b/tools/metr -@@ -3176,6 +3180,8 @@ Called by update_extension_permission.py.--> +@@ -3196,6 +3200,8 @@ Called by update_extension_permission.py.--> diff --git a/build/patches/eyeo-133.0.6943.49-chrome_integration.patch b/build/patches/eyeo-133.0.6943.49-chrome_integration.patch index 33ee7c69..a2b48a49 100644 --- a/build/patches/eyeo-133.0.6943.49-chrome_integration.patch +++ b/build/patches/eyeo-133.0.6943.49-chrome_integration.patch @@ -46,7 +46,7 @@ Pre-requisites: eyeo Browser Ad filtering Solution: Base Module ..._page_load_metrics_observer_browsertest.cc | 7 +- chrome/browser/preferences/BUILD.gn | 4 + .../prefs/chrome_pref_service_factory.cc | 11 + - ...hrome_browser_main_extra_parts_profiles.cc | 23 + + ...hrome_browser_main_extra_parts_profiles.cc | 22 + .../profile_keyed_service_browsertest.cc | 18 + chrome/browser/resources/BUILD.gn | 5 + .../safe_browsing_blocking_page_test.cc | 7 +- @@ -59,7 +59,7 @@ Pre-requisites: eyeo Browser Ad filtering Solution: Base Module chrome/common/BUILD.gn | 3 + chrome/test/BUILD.gn | 14 + chrome/test/base/in_process_browser_test.cc | 24 +- - 53 files changed, 3310 insertions(+), 7 deletions(-) + 53 files changed, 3309 insertions(+), 7 deletions(-) create mode 100644 chrome/browser/adblock/README.md create mode 100644 chrome/browser/adblock/adblock_chrome_content_browser_client.cc create mode 100644 chrome/browser/adblock/adblock_chrome_content_browser_client.h @@ -114,7 +114,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" -@@ -1619,7 +1624,7 @@ content::ContentClient* ChromeMainDelegate::CreateContentClient() { +@@ -1630,7 +1635,7 @@ content::ContentClient* ChromeMainDelegate::CreateContentClient() { content::ContentBrowserClient* ChromeMainDelegate::CreateContentBrowserClient() { chrome_content_browser_client_ = @@ -136,7 +136,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn import("//base/allocator/allocator.gni") import("//build/buildflag_header.gni") -@@ -168,6 +171,8 @@ static_library("browser") { +@@ -171,6 +174,8 @@ static_library("browser") { "accessibility/page_colors_factory.h", "accessibility/prefers_default_scrollbar_styles_prefs.cc", "accessibility/prefers_default_scrollbar_styles_prefs.h", @@ -145,15 +145,15 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "affiliations/affiliation_service_factory.cc", "affiliations/affiliation_service_factory.h", "after_startup_task_utils.cc", -@@ -2005,6 +2010,7 @@ static_library("browser") { +@@ -2024,6 +2029,7 @@ static_library("browser") { "//chrome/common/notifications", "//chrome/installer/util:with_no_strings", "//chrome/services/speech/buildflags", + "//components/adblock/content:browser", "//components/assist_ranker", - "//components/autofill/content/browser", "//components/autofill/core/browser", -@@ -3224,6 +3230,7 @@ static_library("browser") { + "//components/back_forward_cache", +@@ -3245,6 +3251,7 @@ static_library("browser") { "touch_to_fill/password_manager/touch_to_fill_controller_webauthn_delegate.h", ] @@ -161,10 +161,10 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn deps += [ ":delta_file_proto", ":profile_token", -@@ -8283,6 +8290,7 @@ static_library("browser_public_dependencies") { - "//chrome/common/compose:mojo_bindings", +@@ -8313,6 +8320,7 @@ static_library("browser_public_dependencies") { "//chrome/services/file_util/public/mojom", "//components/account_id", + "//components/autofill/content/browser", + "//components/adblock/content:browser", "//components/autofill/core/browser", "//components/commerce/core/product_specifications:product_specifications", @@ -3442,7 +3442,7 @@ diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_brows #include "chrome/browser/chrome_browser_main.h" -@@ -121,6 +125,7 @@ +@@ -76,6 +80,7 @@ #include "chrome/grit/branded_strings.h" #include "chrome/grit/generated_resources.h" #include "chrome/installer/util/google_update_settings.h" @@ -3450,7 +3450,7 @@ diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_brows #include "components/color/color_mixers.h" #include "components/device_event_log/device_event_log.h" #include "components/embedder_support/origin_trials/component_updater_utils.h" -@@ -1653,6 +1658,8 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { +@@ -1545,6 +1550,8 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { // called inside PostProfileInit. content::WebUIControllerFactory::RegisterFactory( ChromeWebUIControllerFactory::GetInstance()); @@ -3500,7 +3500,7 @@ diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUIL import("//build/config/chromebox_for_meetings/buildflags.gni") import("//build/config/chromeos/ui_mode.gni") -@@ -55,6 +58,7 @@ source_set("extensions") { +@@ -271,6 +274,7 @@ source_set("extensions") { "window_controller_list.h", "window_controller_list_observer.h", ] @@ -3508,9 +3508,9 @@ diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUIL configs += [ "//build/config:precompiled_headers", "//build/config/compiler:wexit_time_destructors", -@@ -651,6 +655,7 @@ source_set("extensions") { - "webstore_standalone_installer.h", - ] +@@ -725,6 +729,7 @@ source_set("extensions") { + ] + } + # Chrome OS does not support Native Messaging policies. @@ -3562,7 +3562,7 @@ diff --git a/chrome/browser/page_load_metrics/observers/ad_metrics/ads_page_load #include "components/page_load_metrics/browser/observers/ad_metrics/ads_page_load_metrics_observer.h" -@@ -22,6 +26,7 @@ +@@ -21,6 +25,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" @@ -3570,7 +3570,7 @@ diff --git a/chrome/browser/page_load_metrics/observers/ad_metrics/ads_page_load #include "components/heavy_ad_intervention/heavy_ad_features.h" #include "components/page_load_metrics/browser/ads_page_load_metrics_test_waiter.h" #include "components/page_load_metrics/browser/observers/ad_metrics/ad_intervention_browser_test_utils.h" -@@ -1510,7 +1515,7 @@ class AdsPageLoadMetricsObserverResourceBrowserTest +@@ -1499,7 +1504,7 @@ class AdsPageLoadMetricsObserverResourceBrowserTest {heavy_ad_intervention::features::kHeavyAdIntervention, {}}, {heavy_ad_intervention::features::kHeavyAdPrivacyMitigations, {{"host-threshold", "3"}}}}, @@ -3614,7 +3614,7 @@ diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browse #include "chrome/browser/prefs/chrome_pref_service_factory.h" -@@ -45,6 +49,7 @@ +@@ -44,6 +48,7 @@ #include "chrome/grit/branded_strings.h" #include "chrome/grit/browser_resources.h" #include "chrome/grit/generated_resources.h" @@ -3649,7 +3649,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc #include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h" -@@ -245,6 +249,15 @@ +@@ -230,6 +234,15 @@ #include "chrome/browser/webid/federated_identity_permission_context_factory.h" #include "chrome/common/buildflags.h" #include "chrome/common/chrome_features.h" @@ -3665,15 +3665,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc #include "components/autofill/content/browser/autofill_log_router_factory.h" #include "components/breadcrumbs/core/breadcrumbs_status.h" #include "components/captive_portal/core/buildflags.h" -@@ -296,6 +309,7 @@ - #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" -+ - #else - #include "chrome/browser/accessibility/live_caption/live_caption_controller_factory.h" - #include "chrome/browser/accessibility/live_translate_controller_factory.h" -@@ -885,6 +899,15 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -874,6 +887,15 @@ void ChromeBrowserMainExtraPartsProfiles:: // Makes manual testing possible. FakeSmartCardDeviceServiceFactory::GetInstance(); #endif @@ -3692,7 +3684,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc diff --git a/chrome/browser/profiles/profile_keyed_service_browsertest.cc b/chrome/browser/profiles/profile_keyed_service_browsertest.cc --- a/chrome/browser/profiles/profile_keyed_service_browsertest.cc +++ b/chrome/browser/profiles/profile_keyed_service_browsertest.cc -@@ -273,6 +273,17 @@ IN_PROC_BROWSER_TEST_F(ProfileKeyedServiceBrowserTest, +@@ -278,6 +278,17 @@ IN_PROC_BROWSER_TEST_F(ProfileKeyedServiceBrowserTest, "PermissionsUpdaterShutdownFactory", "PluginInfoHostImpl", "TurnSyncOnHelperShutdownNotifier", @@ -3710,7 +3702,7 @@ diff --git a/chrome/browser/profiles/profile_keyed_service_browsertest.cc b/chro }; // clang-format on -@@ -811,6 +822,13 @@ IN_PROC_BROWSER_TEST_F(ProfileKeyedServiceGuestBrowserTest, +@@ -829,6 +840,13 @@ IN_PROC_BROWSER_TEST_F(ProfileKeyedServiceGuestBrowserTest, "ZeroSuggestCacheServiceFactory", #endif // !BUILDFLAG(IS_CHROMEOS) @@ -3737,7 +3729,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") -@@ -267,6 +270,7 @@ group("dev_ui_resources") { +@@ -270,6 +273,7 @@ group("dev_ui_resources") { "predictors:resources", "privacy_sandbox/internals:resources", "usb_internals:resources", @@ -3745,7 +3737,7 @@ diff --git a/chrome/browser/resources/BUILD.gn b/chrome/browser/resources/BUILD. "//components/commerce/core/internals/resources", "//components/download/resources/download_internals:resources", "//components/history_clusters/history_clusters_internals/resources", -@@ -332,6 +336,7 @@ repack("dev_ui_paks") { +@@ -335,6 +339,7 @@ repack("dev_ui_paks") { "$root_gen_dir/chrome/predictors_resources.pak", "$root_gen_dir/chrome/privacy_sandbox_internals_resources.pak", "$root_gen_dir/chrome/usb_internals_resources.pak", @@ -3798,7 +3790,7 @@ diff --git a/chrome/browser/sessions/session_restore_browsertest.cc b/chrome/bro #ifdef UNSAFE_BUFFERS_BUILD // TODO(crbug.com/40285824): Remove this and convert code to safer constructs. -@@ -4452,8 +4456,10 @@ INSTANTIATE_TEST_SUITE_P( +@@ -4445,8 +4449,10 @@ INSTANTIATE_TEST_SUITE_P( SessionRestoreStaleSessionCookieDeletionTest, testing::Bool()); @@ -3855,7 +3847,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/compiler/compiler.gni") -@@ -429,6 +432,7 @@ static_library("ui") { +@@ -432,6 +435,7 @@ static_library("ui") { "//chrome/services/media_gallery_util/public/mojom", "//components/access_code_cast/common:metrics", "//components/account_id", @@ -3914,7 +3906,7 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc #include "chrome/browser/ui/tab_helpers.h" -@@ -111,6 +115,8 @@ +@@ -105,6 +109,8 @@ #include "chrome/common/chrome_features.h" #include "chrome/common/chrome_isolated_world_ids.h" #include "chrome/common/chrome_switches.h" @@ -3923,7 +3915,7 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc #include "components/autofill/content/browser/content_autofill_client.h" #include "components/autofill/content/browser/content_autofill_driver_factory.h" #include "components/autofill/core/browser/foundations/browser_autofill_manager.h" -@@ -332,6 +338,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { +@@ -336,6 +342,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { optimization_guide_decider); } } @@ -3936,8 +3928,8 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc autofill::AutofillClientProvider& autofill_client_provider = autofill::AutofillClientProviderFactory::GetForProfile(profile); autofill_client_provider.CreateClientForWebContents(web_contents); -@@ -357,6 +369,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { - profile->IsIncognitoProfile()); +@@ -366,6 +378,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { + ip_protection::IpProtectionStatus::CreateForWebContents(web_contents); } #endif // BUILDFLAG(IS_ANDROID) + @@ -3999,15 +3991,15 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn import("//build/cipd/cipd.gni") import("//build/config/buildflags_paint_preview.gni") -@@ -1552,6 +1555,7 @@ if (is_android) { - "//chrome/browser/ui/hats", - "//chrome/browser/ui/tabs:tab_enums", - "//chrome/browser/webaudio:browser_tests", +@@ -1641,6 +1644,7 @@ if (is_android) { + "//chrome/test/data/webui:browser_tests", + "//chrome/test/data/webui:interactive_ui_tests", + "//chrome/test/data/webui:resources", + "//components/adblock/content:browser", "//components/autofill/content/browser:test_support", "//components/autofill/content/renderer:test_support", "//components/autofill/core/common:common", -@@ -2173,6 +2177,7 @@ if (!is_android) { +@@ -2231,6 +2235,7 @@ if (!is_android) { "//chrome/test/media_router/access_code_cast:access_code_cast_integration_base", "//chrome/test/payments:test_support", "//chrome/test/supervised_user:test_support", @@ -4015,7 +4007,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn "//components/affiliations/core/browser:affiliation_proto", "//components/affiliations/core/browser:test_support", "//components/autofill/content/browser:autofill_shared_storage_proto", -@@ -2672,6 +2677,7 @@ if (!is_android) { +@@ -2734,6 +2739,7 @@ if (!is_android) { "//chrome/renderer/resources/extensions/", "//chrome/test/data/cart/", "//components/test/data/ad_tagging/", @@ -4023,7 +4015,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn "//components/test/data/ads_observer/", "//components/test/data/autofill/", "//components/test/data/custom_handlers", -@@ -2760,6 +2766,9 @@ if (!is_android) { +@@ -2822,6 +2828,9 @@ if (!is_android) { "../browser/accessibility/interstitial_accessibility_browsertest.cc", "../browser/accessibility/page_colors_browsertest.cc", "../browser/accessibility/phrase_segmentation/dependency_parser_model_loader_browsertest.cc", @@ -4033,7 +4025,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn "../browser/ai/ai_data_keyed_service_browsertest.cc", "../browser/attribution_reporting/chrome_attribution_browsertest.cc", "../browser/autocomplete/autocomplete_browsertest.cc", -@@ -4351,6 +4360,7 @@ if (!is_android) { +@@ -4373,6 +4382,7 @@ if (!is_android) { ] } @@ -4041,7 +4033,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn if (is_chromeos) { deps += [ "//chromeos/ash/components/network/portal_detector:test_support" ] -@@ -5823,6 +5833,7 @@ test("unit_tests") { +@@ -5855,6 +5865,7 @@ test("unit_tests") { sources = [ # All unittests in browser, common, renderer and service. "../browser/about_flags_unittest.cc", @@ -4049,7 +4041,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn "../browser/after_startup_task_utils_unittest.cc", "../browser/apps/icon_standardizer_unittest.cc", "../browser/apps/user_type_filter_unittest.cc", -@@ -6490,6 +6501,8 @@ test("unit_tests") { +@@ -6514,6 +6525,8 @@ test("unit_tests") { "//chrome/common/themes:unit_tests", "//chrome/services/file_util:unit_tests", "//components/account_id", @@ -4058,14 +4050,14 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn "//components/affiliations/core/browser:test_support", "//components/assist_ranker/proto", "//components/autofill/content/browser:test_support", -@@ -10286,6 +10299,7 @@ if (!is_android) { +@@ -10318,6 +10331,7 @@ if (!is_android) { "//chrome/browser:test_support_ui", "//chrome/browser/ui/exclusive_access", "//chrome/browser/ui/views/side_panel", + "//components/adblock/core:test_support", "//components/supervised_user/core/browser", + "//components/webui/chrome_urls", "//content/public/browser", - "//content/test:test_support", diff --git a/chrome/test/base/in_process_browser_test.cc b/chrome/test/base/in_process_browser_test.cc --- a/chrome/test/base/in_process_browser_test.cc +++ b/chrome/test/base/in_process_browser_test.cc @@ -4090,8 +4082,8 @@ diff --git a/chrome/test/base/in_process_browser_test.cc b/chrome/test/base/in_p + namespace { - #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -609,8 +617,22 @@ void InProcessBrowserTest::CreatedBrowserMainParts( + #if BUILDFLAG(IS_CHROMEOS) +@@ -615,8 +623,22 @@ void InProcessBrowserTest::CreatedBrowserMainParts( void InProcessBrowserTest::SelectFirstBrowser() { const BrowserList* browser_list = BrowserList::GetInstance(); diff --git a/build/patches/eyeo-133.0.6943.49-extension_api.patch b/build/patches/eyeo-133.0.6943.49-extension_api.patch index 3826d5a8..86b3ae2e 100644 --- a/build/patches/eyeo-133.0.6943.49-extension_api.patch +++ b/build/patches/eyeo-133.0.6943.49-extension_api.patch @@ -72,9 +72,9 @@ Pre-requisites: eyeo Browser Ad filtering Solution: Base Module 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 -@@ -655,6 +655,17 @@ source_set("extensions") { - "webstore_standalone_installer.h", - ] +@@ -729,6 +729,17 @@ source_set("extensions") { + ] + } + ### Extensions API module start + sources += [ @@ -103,7 +103,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") -@@ -134,6 +137,7 @@ function_registration("api_registration") { +@@ -133,6 +136,7 @@ function_registration("api_registration") { # include generated headers from these targets. # TODO(brettw) this should be made unnecessary if possible. "//chrome/common/extensions/api", @@ -2137,8 +2137,8 @@ diff --git a/chrome/browser/extensions/api/api_browser_context_keyed_service_fac +// components/adblock/LICENSE file. #include "chrome/browser/extensions/api/cookies/cookies_api.h" - #include "chrome/browser/extensions/api/notifications/extension_notification_display_helper_factory.h" -@@ -14,12 +18,14 @@ + #include "chrome/browser/extensions/api/developer_private/developer_private_api.h" +@@ -15,11 +19,13 @@ #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/extensions/api/activity_log_private/activity_log_private_api.h" @@ -2146,14 +2146,13 @@ diff --git a/chrome/browser/extensions/api/api_browser_context_keyed_service_fac #include "chrome/browser/extensions/api/autofill_private/autofill_private_event_router_factory.h" #include "chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h" #include "chrome/browser/extensions/api/bookmarks/bookmarks_api.h" - #include "chrome/browser/extensions/api/bookmarks/bookmarks_api_watcher.h" + #include "chrome/browser/extensions/api/bookmarks/bookmarks_api_watcher.h" // nogncheck #include "chrome/browser/extensions/api/braille_display_private/braille_display_private_api.h" - #include "chrome/browser/extensions/api/developer_private/developer_private_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" -@@ -76,6 +82,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt() { +@@ -83,6 +89,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt() { #if BUILDFLAG(ENABLE_EXTENSIONS) extensions::ActivityLogAPI::GetFactoryInstance(); @@ -2161,7 +2160,7 @@ diff --git a/chrome/browser/extensions/api/api_browser_context_keyed_service_fac extensions::AutofillPrivateEventRouterFactory::GetInstance(); extensions::BluetoothLowEnergyAPI::GetFactoryInstance(); extensions::BookmarksAPI::GetFactoryInstance(); -@@ -87,6 +94,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt() { +@@ -93,6 +100,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt() { #if BUILDFLAG(IS_CHROMEOS) extensions::DocumentScanAPIHandler::GetFactoryInstance(); #endif @@ -3626,7 +3625,7 @@ diff --git a/chrome/common/extensions/api/_api_features.json b/chrome/common/ext "app": { "blocklist": [ "2FC374607C2DF285634B67C64A2E356C607091C3", // Quickoffice -@@ -525,6 +539,14 @@ +@@ -526,6 +540,14 @@ "channel": "stable", "contexts": [] }, @@ -3879,9 +3878,9 @@ diff --git a/chrome/common/extensions/api/api_sources.gni b/chrome/common/extens +# 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. - import("//build/config/chromeos/ui_mode.gni") import("//build/config/features.gni") -@@ -91,6 +94,9 @@ if (enable_extensions) { + import("//chrome/common/features.gni") +@@ -90,6 +93,9 @@ if (enable_extensions) { "webstore_private.json", "windows.json", @@ -4149,7 +4148,7 @@ diff --git a/chrome/common/extensions/permissions/permission_set_unittest.cc b/c #include "extensions/common/permissions/permission_set.h" -@@ -876,6 +880,10 @@ TEST(PermissionsTest, PermissionMessages) { +@@ -874,6 +878,10 @@ TEST(PermissionsTest, PermissionMessages) { skip.insert(APIPermissionID::kSystemLog); skip.insert(APIPermissionID::kOdfsConfigPrivate); @@ -4163,7 +4162,7 @@ diff --git a/chrome/common/extensions/permissions/permission_set_unittest.cc b/c diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -3700,6 +3700,20 @@ if (!is_android) { +@@ -3762,6 +3762,20 @@ if (!is_android) { ] } @@ -5484,7 +5483,7 @@ diff --git a/extensions/browser/extension_event_histogram_value.h b/extensions/b #ifndef EXTENSIONS_BROWSER_EXTENSION_EVENT_HISTOGRAM_VALUE_H_ #define EXTENSIONS_BROWSER_EXTENSION_EVENT_HISTOGRAM_VALUE_H_ -@@ -40,7 +44,8 @@ enum HistogramValue { +@@ -42,7 +46,8 @@ enum HistogramValue { APP_WINDOW_ON_MAXIMIZED = 19, APP_WINDOW_ON_MINIMIZED = 20, APP_WINDOW_ON_RESTORED = 21, diff --git a/build/patches/kill-Auth.patch b/build/patches/kill-Auth.patch index cac3ae14..39d9ea1c 100644 --- a/build/patches/kill-Auth.patch +++ b/build/patches/kill-Auth.patch @@ -10,9 +10,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/components/signin/public/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java b/components/signin/public/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java --- a/components/signin/public/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java +++ b/components/signin/public/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java -@@ -24,9 +24,6 @@ import android.os.SystemClock; - - import androidx.annotation.Nullable; +@@ -24,9 +24,6 @@ import android.os.PatternMatcher; + import android.os.Process; + import android.os.SystemClock; -import com.google.android.gms.auth.GoogleAuthException; -import com.google.android.gms.auth.GoogleAuthUtil; @@ -20,7 +20,7 @@ diff --git a/components/signin/public/android/java/src/org/chromium/components/s import org.chromium.base.ApiCompatibilityUtils; import org.chromium.base.Callback; import org.chromium.base.ContextUtils; -@@ -88,18 +85,6 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { +@@ -92,18 +89,6 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { @Override public Account[] getAccountsSynchronous() throws AccountManagerDelegateException { @@ -39,7 +39,7 @@ diff --git a/components/signin/public/android/java/src/org/chromium/components/s // Don't report any accounts if we don't have permission. // TODO(crbug.com/40942462): Throw an exception if permission was denied. return new Account[] {}; -@@ -110,31 +95,12 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { +@@ -115,31 +100,12 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { throws AuthException { ThreadUtils.assertOnBackgroundThread(); assert AccountUtils.GOOGLE_ACCOUNT_TYPE.equals(account.type); @@ -73,10 +73,10 @@ diff --git a/components/signin/public/android/java/src/org/chromium/components/s } protected boolean hasFeatures(Account account, String[] features) { -@@ -166,24 +132,6 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { +@@ -171,24 +137,6 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { @SuppressLint("MissingPermission") @Override - public void createAddAccountIntent(Callback callback) { + public void createAddAccountIntent(Callback<@Nullable Intent> callback) { - AccountManagerCallback accountManagerCallback = - accountManagerFuture -> { - try { @@ -98,10 +98,10 @@ diff --git a/components/signin/public/android/java/src/org/chromium/components/s } // No permission is needed on 23+ and Chrome always has MANAGE_ACCOUNTS permission on lower APIs -@@ -218,14 +166,7 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { - @Nullable +@@ -222,14 +170,7 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { + @Override - public GaiaId getAccountGaiaId(String accountEmail) { + public @Nullable GaiaId getAccountGaiaId(String accountEmail) { - try { - return new GaiaId( - GoogleAuthUtil.getAccountId( diff --git a/build/patches/kill-Location-fall-back-to-system.patch b/build/patches/kill-Location-fall-back-to-system.patch index 2ff21489..49994eb8 100644 --- a/build/patches/kill-Location-fall-back-to-system.patch +++ b/build/patches/kill-Location-fall-back-to-system.patch @@ -12,7 +12,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/services/device/geolocation/BUILD.gn b/services/device/geolocation/BUILD.gn --- a/services/device/geolocation/BUILD.gn +++ b/services/device/geolocation/BUILD.gn -@@ -154,7 +154,6 @@ if (is_android) { +@@ -152,7 +152,6 @@ if (is_android) { "android/java/src/org/chromium/device/geolocation/LocationProviderAdapter.java", "android/java/src/org/chromium/device/geolocation/LocationProviderAndroid.java", "android/java/src/org/chromium/device/geolocation/LocationProviderFactory.java", @@ -48,7 +48,7 @@ diff --git a/services/device/geolocation/android/java/src/org/chromium/device/ge diff --git a/services/device/public/cpp/device_features.cc b/services/device/public/cpp/device_features.cc --- a/services/device/public/cpp/device_features.cc +++ b/services/device/public/cpp/device_features.cc -@@ -58,6 +58,7 @@ const base::FeatureParam kWinSystemLocationPermissionPollingParam{ +@@ -64,6 +64,7 @@ const base::FeatureParam kWinSystemLocationPermissionPollingParam{ BASE_FEATURE(kLocationProviderManager, "LocationProviderManager", base::FEATURE_DISABLED_BY_DEFAULT); @@ -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 -@@ -99,7 +100,7 @@ const base::FeatureParam::Option +@@ -105,7 +106,7 @@ const base::FeatureParam::Option const base::FeatureParam kLocationProviderManagerParam{ &kLocationProviderManager, "LocationProviderManagerMode", diff --git a/build/patches/kill-Vision.patch b/build/patches/kill-Vision.patch index 309dfa2a..bd059133 100644 --- a/build/patches/kill-Vision.patch +++ b/build/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 -@@ -319,8 +319,6 @@ if (current_toolchain == default_toolchain) { +@@ -317,8 +317,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/patches/prefs-always-prompt-for-download-directory.patch b/build/patches/prefs-always-prompt-for-download-directory.patch index 101810e9..e6097e21 100644 --- a/build/patches/prefs-always-prompt-for-download-directory.patch +++ b/build/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 -@@ -274,7 +274,7 @@ void DownloadPrefs::RegisterProfilePrefs( +@@ -283,7 +283,7 @@ void DownloadPrefs::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( prefs::kPromptForDownload, diff --git a/build/patches/ungoogled-chromium-Disable-profile-avatar.patch b/build/patches/ungoogled-chromium-Disable-profile-avatar.patch index 1c27d3a9..82648b0a 100644 --- a/build/patches/ungoogled-chromium-Disable-profile-avatar.patch +++ b/build/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 -@@ -1286,8 +1286,6 @@ static_library("browser") { +@@ -1295,8 +1295,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", diff --git a/build/patches/ungoogled-chromium-Disable-translate-integration.patch b/build/patches/ungoogled-chromium-Disable-translate-integration.patch index 15d26e99..d1023b7e 100644 --- a/build/patches/ungoogled-chromium-Disable-translate-integration.patch +++ b/build/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 -@@ -2059,9 +2059,6 @@ Your Google account may have other forms of browsing history like searches and a +@@ -2096,9 +2096,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/patches/ungoogled-chromium-no-special-hosts-domains.patch b/build/patches/ungoogled-chromium-no-special-hosts-domains.patch index d4caa215..12239500 100644 --- a/build/patches/ungoogled-chromium-no-special-hosts-domains.patch +++ b/build/patches/ungoogled-chromium-no-special-hosts-domains.patch @@ -71,7 +71,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/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 -@@ -104,7 +104,6 @@ import org.chromium.chrome.browser.messages.MessageContainerObserver; +@@ -95,7 +95,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; -@@ -1194,10 +1193,8 @@ public class RootUiCoordinator +@@ -1154,10 +1153,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 -@@ -887,10 +887,6 @@ static_library("browser") { +@@ -896,10 +896,6 @@ static_library("browser") { "page_info/privacy_policy_insights_service_factory.h", "page_load_metrics/observers/bookmark_bar_page_load_metrics_observer.cc", "page_load_metrics/observers/bookmark_bar_page_load_metrics_observer.h", @@ -104,7 +104,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "page_load_metrics/observers/core/amp_page_load_metrics_observer.cc", "page_load_metrics/observers/core/amp_page_load_metrics_observer.h", "page_load_metrics/observers/core/ukm_page_load_metrics_observer.cc", -@@ -899,10 +895,6 @@ static_library("browser") { +@@ -908,10 +904,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", -@@ -1548,8 +1540,6 @@ static_library("browser") { +@@ -1563,8 +1555,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", -@@ -1732,10 +1722,7 @@ static_library("browser") { +@@ -1747,10 +1737,7 @@ static_library("browser") { "//chrome/browser/content_settings:impl", "//chrome/browser/devtools", "//chrome/browser/favicon", @@ -135,7 +135,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "//chrome/browser/ip_protection", "//chrome/browser/media/webrtc", "//chrome/browser/navigation_predictor:impl", -@@ -1814,7 +1801,6 @@ static_library("browser") { +@@ -1829,7 +1816,6 @@ static_library("browser") { # New dependencies inside of //chrome/browser that generate header files # should be added to browser_generated_files. ":browser_public_dependencies", @@ -166,7 +166,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 -@@ -1231,7 +1231,6 @@ BrowserProcessImpl::component_updater() { +@@ -1227,7 +1227,6 @@ BrowserProcessImpl::component_updater() { std::make_unique(); std::string brand; @@ -177,7 +177,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( +@@ -462,11 +462,6 @@ void ProcessSingletonNotificationCallbackImpl( StartupBrowserCreator::ProcessCommandLineAlreadyRunning( command_line, current_directory, startup_profile_path_info); @@ -189,9 +189,9 @@ 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() { +@@ -1717,11 +1712,6 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { upgrade_util::SaveLastModifiedTimeOfExe(); - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) + #endif - // Record now as the last successful chrome start. - if constexpr (kShouldRecordActiveUse) { @@ -204,7 +204,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 -@@ -2967,7 +2967,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( +@@ -2979,7 +2979,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( switches::kForcePNaClSubzero, #endif switches::kForceUIDirection, @@ -212,7 +212,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch switches::kJavaScriptHarmony, switches::kEnableExperimentalWebAssemblyFeatures, embedder_support::kOriginTrialDisabledFeatures, -@@ -5356,9 +5355,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( +@@ -5358,9 +5357,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( &throttles); #endif @@ -222,7 +222,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch MaybeAddThrottle( supervised_user::MaybeCreateClassifyUrlNavigationThrottleFor(handle), -@@ -5963,7 +5959,8 @@ GetClientDataHeader(content::FrameTreeNodeId frame_tree_node_id) { +@@ -5973,7 +5969,8 @@ GetClientDataHeader(content::FrameTreeNodeId frame_tree_node_id) { } #endif @@ -232,7 +232,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 -@@ -6003,7 +6000,7 @@ std::unique_ptr CreateGoogleURLLoaderThrottle( +@@ -6013,7 +6010,7 @@ std::unique_ptr CreateGoogleURLLoaderThrottle( std::move(bound_session_request_throttled_handler), #endif std::move(dynamic_params)); @@ -241,7 +241,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch std::vector> ChromeContentBrowserClient::CreateURLLoaderThrottles( -@@ -6060,15 +6057,6 @@ ChromeContentBrowserClient::CreateURLLoaderThrottles( +@@ -6070,15 +6067,6 @@ ChromeContentBrowserClient::CreateURLLoaderThrottles( GetClientDataHeader(frame_tree_node_id); #endif @@ -257,7 +257,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch { auto* factory = ProtocolHandlerRegistryFactory::GetForBrowserContext(browser_context); -@@ -6123,20 +6111,6 @@ ChromeContentBrowserClient::CreateURLLoaderThrottlesForKeepAlive( +@@ -6133,20 +6121,6 @@ ChromeContentBrowserClient::CreateURLLoaderThrottlesForKeepAlive( } #endif @@ -327,14 +327,14 @@ 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 -@@ -780,7 +780,6 @@ source_set("extensions") { - "//chrome/browser/devtools", - "//chrome/browser/extensions:cws_item_service_proto", - "//chrome/browser/favicon", -- "//chrome/browser/google", - "//chrome/browser/image_decoder", - "//chrome/browser/media/router", - "//chrome/browser/media/router:media_router_feature", +@@ -284,7 +284,6 @@ source_set("extensions") { + "//chrome/browser/extensions:cws_item_service_proto", + "//chrome/browser/extensions/api:api_registration", + "//chrome/browser/favicon", +- "//chrome/browser/google", + "//chrome/browser/prefetch", + "//chrome/browser/prefs", + "//chrome/browser/preloading:prefs", diff --git a/chrome/browser/feedback/BUILD.gn b/chrome/browser/feedback/BUILD.gn --- a/chrome/browser/feedback/BUILD.gn +++ b/chrome/browser/feedback/BUILD.gn @@ -454,7 +454,7 @@ diff --git a/chrome/browser/long_screenshots/long_screenshots_tab_service.cc b/c diff --git a/chrome/browser/metrics/chrome_metrics_service_client.cc b/chrome/browser/metrics/chrome_metrics_service_client.cc --- a/chrome/browser/metrics/chrome_metrics_service_client.cc +++ b/chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -606,7 +606,7 @@ ChromeMetricsServiceClient::GetNetworkTimeTracker() { +@@ -601,7 +601,7 @@ ChromeMetricsServiceClient::GetNetworkTimeTracker() { } bool ChromeMetricsServiceClient::GetBrand(std::string* brand_code) { @@ -488,7 +488,7 @@ diff --git a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc b/ diff --git a/chrome/browser/metrics/metrics_reporting_state.cc b/chrome/browser/metrics/metrics_reporting_state.cc --- a/chrome/browser/metrics/metrics_reporting_state.cc +++ b/chrome/browser/metrics/metrics_reporting_state.cc -@@ -33,65 +33,6 @@ +@@ -32,65 +32,6 @@ #include "components/policy/core/common/features.h" #endif // BUILDFLAG(IS_ANDROID) @@ -554,7 +554,7 @@ diff --git a/chrome/browser/metrics/metrics_reporting_state.cc b/chrome/browser/ void ChangeMetricsReportingState( bool enabled, ChangeMetricsReportingStateCalledFrom called_from) { -@@ -127,11 +68,6 @@ void ChangeMetricsReportingStateWithReply( +@@ -126,11 +67,6 @@ void ChangeMetricsReportingStateWithReply( return; } #endif @@ -566,7 +566,7 @@ diff --git a/chrome/browser/metrics/metrics_reporting_state.cc b/chrome/browser/ } void UpdateMetricsPrefsOnPermissionChange( -@@ -197,13 +133,7 @@ void UpdateMetricsPrefsOnPermissionChange( +@@ -196,13 +132,7 @@ void UpdateMetricsPrefsOnPermissionChange( crash_keys::ClearMetricsClientId(); } @@ -580,11 +580,11 @@ diff --git a/chrome/browser/metrics/metrics_reporting_state.cc b/chrome/browser/ +void ApplyMetricsReportingPolicy() {} bool IsMetricsReportingPolicyManaged() { - #if BUILDFLAG(IS_CHROMEOS_ASH) + #if BUILDFLAG(IS_CHROMEOS) 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 -@@ -849,7 +849,6 @@ void SystemNetworkContextManager::AddSSLConfigToNetworkContextParams( +@@ -848,7 +848,6 @@ void SystemNetworkContextManager::AddSSLConfigToNetworkContextParams( void SystemNetworkContextManager::ConfigureDefaultNetworkContextParams( network::mojom::NetworkContextParams* network_context_params) { variations::UpdateCorsExemptHeaderForVariations(network_context_params); @@ -595,7 +595,7 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows diff --git a/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc b/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc --- a/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc +++ b/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc -@@ -327,10 +327,11 @@ bool OneGoogleBarLoaderImpl::SetAdditionalQueryParams( +@@ -344,10 +344,11 @@ bool OneGoogleBarLoaderImpl::SetAdditionalQueryParams( } GURL OneGoogleBarLoaderImpl::GetApiUrl() const { @@ -639,12 +639,14 @@ 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 -@@ -166,12 +166,7 @@ void PageLoadMetricsEmbedder::RegisterObservers( +@@ -168,14 +168,9 @@ void PageLoadMetricsEmbedder::RegisterObservers( tracker->AddObserver(std::make_unique()); tracker->AddObserver(std::make_unique()); tracker->AddObserver(std::make_unique()); - tracker->AddObserver(std::make_unique()); - tracker->AddObserver(std::make_unique()); + tracker->AddObserver( + std::make_unique()); tracker->AddObserver(std::make_unique()); - tracker->AddObserver( - std::make_unique()); @@ -679,7 +681,7 @@ diff --git a/chrome/browser/profile_resetter/profile_resetter.cc b/chrome/browse 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 -@@ -27,7 +27,6 @@ static_library("safe_browsing") { +@@ -25,7 +25,6 @@ static_library("safe_browsing") { "//build:branding_buildflags", "//chrome/app:generated_resources", "//chrome/browser:browser_process", @@ -690,14 +692,14 @@ diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsin diff --git a/chrome/browser/search_engines/BUILD.gn b/chrome/browser/search_engines/BUILD.gn --- a/chrome/browser/search_engines/BUILD.gn +++ b/chrome/browser/search_engines/BUILD.gn -@@ -32,7 +32,6 @@ source_set("search_engines") { +@@ -34,7 +34,6 @@ source_set("search_engines") { deps = [ "//chrome/browser:browser_process", - "//chrome/browser/google", + "//chrome/browser/regional_capabilities", + "//chrome/browser/search_engine_choice", "//chrome/common:channel_info", - "//chrome/common:non_code_constants", - "//components/google/core/common", diff --git a/chrome/browser/search_engines/ui_thread_search_terms_data.cc b/chrome/browser/search_engines/ui_thread_search_terms_data.cc --- a/chrome/browser/search_engines/ui_thread_search_terms_data.cc +++ b/chrome/browser/search_engines/ui_thread_search_terms_data.cc @@ -737,7 +739,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 -@@ -352,7 +352,6 @@ static_library("ui") { +@@ -354,7 +354,6 @@ static_library("ui") { "//chrome/browser/feedback:feedback_impl", "//chrome/browser/file_system_access", "//chrome/browser/fingerprinting_protection", @@ -849,7 +851,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 -@@ -476,12 +476,6 @@ content::WebUIDataSource* CreateAndAddNewTabPageUiHtmlSource(Profile* profile) { +@@ -483,12 +483,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. @@ -881,7 +883,7 @@ diff --git a/chrome/browser/upgrade_detector/upgrade_detector_impl.cc b/chrome/b diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn --- a/chrome/common/BUILD.gn +++ b/chrome/common/BUILD.gn -@@ -144,8 +144,6 @@ static_library("common_lib") { +@@ -140,8 +140,6 @@ static_library("common_lib") { "content_restriction.h", "crash_keys.cc", "crash_keys.h", @@ -927,7 +929,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 -@@ -6408,7 +6408,6 @@ test("unit_tests") { +@@ -6430,7 +6430,6 @@ test("unit_tests") { "//chrome/browser/file_system_access:unit_tests", "//chrome/browser/fingerprinting_protection", "//chrome/browser/first_party_sets", @@ -1841,7 +1843,7 @@ new file mode 100644 diff --git a/net/base/url_util.cc b/net/base/url_util.cc --- a/net/base/url_util.cc +++ b/net/base/url_util.cc -@@ -511,34 +511,11 @@ bool HasGoogleHost(const GURL& url) { +@@ -519,34 +519,11 @@ bool HasGoogleHost(const GURL& url) { } bool IsGoogleHost(std::string_view host) { @@ -1880,7 +1882,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 -@@ -2965,7 +2965,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( +@@ -3015,7 +3015,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( } #endif // BUILDFLAG(IS_CT_SUPPORTED)