diff --git a/Dockerfile b/Dockerfile index d273e7ae6b286adcc129a47247ad8f8ef3d9417d..f4acea2e278d54b7ec878d01b763aa3fc59ca775 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:20.04 ENV CHROMIUM_DIR "/srv/chromium" -ENV CHROMIUM_VER "133.0.6943.99" +ENV CHROMIUM_VER "134.0.6998.89" RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive \ diff --git a/build/cromite_patches/AImageReader-CFI-crash-mitigations.patch b/build/cromite_patches/AImageReader-CFI-crash-mitigations.patch index 9b19a981a77b94cde7fdba7bd90874e2e55a1846..d5cd9d4f4cb092756e24359eb3f96cdb7fa4a7e0 100644 --- a/build/cromite_patches/AImageReader-CFI-crash-mitigations.patch +++ b/build/cromite_patches/AImageReader-CFI-crash-mitigations.patch @@ -90,7 +90,7 @@ diff --git a/base/android/android_image_reader_compat.h b/base/android/android_i diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json --- a/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json -@@ -3219,6 +3219,10 @@ +@@ -3224,6 +3224,10 @@ "name": "enable-identity-in-auth-error", "owners": [ "jlebel@chromium.org", "chrome-signin-team@google.com" ], "expiry_milestone": 135 @@ -119,7 +119,7 @@ new file mode 100644 diff --git a/gpu/config/gpu_driver_bug_list.json b/gpu/config/gpu_driver_bug_list.json --- a/gpu/config/gpu_driver_bug_list.json +++ b/gpu/config/gpu_driver_bug_list.json -@@ -2605,6 +2605,22 @@ +@@ -2593,6 +2593,22 @@ "no_downscaled_overlay_promotion" ] }, @@ -181,7 +181,7 @@ diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc if (!gpu_preferences.enable_android_surface_control) return kGpuFeatureStatusDisabled; -@@ -379,6 +382,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info, +@@ -375,6 +378,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info, kGpuFeatureStatusSoftware; } } @@ -196,7 +196,7 @@ diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc diff --git a/gpu/config/gpu_workaround_list.txt b/gpu/config/gpu_workaround_list.txt --- a/gpu/config/gpu_workaround_list.txt +++ b/gpu/config/gpu_workaround_list.txt -@@ -7,6 +7,7 @@ check_egl_fence_before_wait +@@ -6,6 +6,7 @@ check_egl_fence_before_wait check_ycbcr_studio_g22_left_p709_for_nv12_support disable_2d_canvas_auto_flush disable_accelerated_av1_decode @@ -207,7 +207,7 @@ diff --git a/gpu/config/gpu_workaround_list.txt b/gpu/config/gpu_workaround_list diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc --- a/gpu/ipc/service/gpu_init.cc +++ b/gpu/ipc/service/gpu_init.cc -@@ -69,6 +69,7 @@ +@@ -70,6 +70,7 @@ #if BUILDFLAG(IS_ANDROID) #include "ui/gfx/android/android_surface_control_compat.h" @@ -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) -@@ -716,6 +717,13 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line, +@@ -715,6 +716,13 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line, } #endif // BUILDFLAG(IS_WIN) diff --git a/build/cromite_patches/Add-AllowUserCertificates-flag.patch b/build/cromite_patches/Add-AllowUserCertificates-flag.patch index ab204a7044e72ccbc456a961e2f23d902c03c852..255e9b510da96b1035d8abfb899977e535d20ea3 100644 --- a/build/cromite_patches/Add-AllowUserCertificates-flag.patch +++ b/build/cromite_patches/Add-AllowUserCertificates-flag.patch @@ -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; -@@ -963,6 +964,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity +@@ -968,6 +969,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 -@@ -169,6 +169,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -164,6 +164,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &feed::kFeedPerformanceStudy, &feed::kFeedShowSignInCommand, &feed::kFeedSignedOutViewDemotion, @@ -51,15 +51,15 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java -@@ -157,6 +157,7 @@ public abstract class ChromeFeatureList { - +@@ -158,6 +158,7 @@ public abstract class ChromeFeatureList { // Feature names. /* Alphabetical: */ + public static final String ACT_USER_BYPASS_UX = "ActUserBypassUx"; + public static final String ALLOW_USER_CERTIFICATES = "AllowUserCertificates"; public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_PAGE_SUMMARY = "AdaptiveButtonInTopToolbarPageSummary"; public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_CUSTOMIZATION_V2 = -@@ -616,6 +617,8 @@ public abstract class ChromeFeatureList { +@@ -624,6 +625,8 @@ public abstract class ChromeFeatureList { public static final CachedFlag sAndroidTabDeclutterDedupeTabIdsKillSwitch = newCachedFlag(ANDROID_TAB_DECLUTTER_DEDUPE_TAB_IDS_KILL_SWITCH, true); public static final CachedFlag sAppSpecificHistory = newCachedFlag(APP_SPECIFIC_HISTORY, true); @@ -68,14 +68,14 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f public static final CachedFlag sAsyncNotificationManager = newCachedFlag(ASYNC_NOTIFICATION_MANAGER, false, true); public static final CachedFlag sBlockIntentsWhileLocked = -@@ -832,6 +835,7 @@ public abstract class ChromeFeatureList { +@@ -845,6 +848,7 @@ public abstract class ChromeFeatureList { public static final List sFlagsCachedFullBrowserChromium = List.of( sAndroidAppIntegration, + sAllowUserCertificates, sAndroidAppIntegrationModule, sAndroidAppIntegrationV2, - sNewTabPageCustomization, + sAndroidAppIntegrationWithFavicon, diff --git a/cromite_flags/chrome/browser/about_flags_cc/Add-AllowUserCertificates-flag.inc b/cromite_flags/chrome/browser/about_flags_cc/Add-AllowUserCertificates-flag.inc new file mode 100644 --- /dev/null @@ -111,19 +111,19 @@ new file mode 100644 diff --git a/net/android/java/src/org/chromium/net/X509Util.java b/net/android/java/src/org/chromium/net/X509Util.java --- a/net/android/java/src/org/chromium/net/X509Util.java +++ b/net/android/java/src/org/chromium/net/X509Util.java -@@ -528,6 +528,8 @@ public class X509Util { +@@ -542,6 +542,8 @@ public class X509Util { return userRootBytes.toArray(new byte[0][]); } + public static boolean AllowUserCertificates = false; + public static AndroidCertVerifyResult verifyServerCertificates( - byte[][] certChain, String authType, String host) - throws KeyStoreException, NoSuchAlgorithmException { -@@ -616,6 +618,9 @@ public class X509Util { + byte[][] certChain, + String authType, +@@ -642,6 +644,9 @@ public class X509Util { + X509Certificate root = verifiedChain.get(verifiedChain.size() - 1); isIssuedByKnownRoot = isKnownRoot(root); } - + if (AllowUserCertificates == false && isIssuedByKnownRoot == false) + return new AndroidCertVerifyResult(CertVerifyStatusAndroid.NO_TRUSTED_ROOT); + diff --git a/build/cromite_patches/Add-a-proxy-configuration-page.patch b/build/cromite_patches/Add-a-proxy-configuration-page.patch index 1c0c491c37627bf7dcfd265eb87d24f007a695af..b248d175a3658032df6ae22b100faabe6250c901 100644 --- a/build/cromite_patches/Add-a-proxy-configuration-page.patch +++ b/build/cromite_patches/Add-a-proxy-configuration-page.patch @@ -77,7 +77,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java -@@ -82,6 +82,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment +@@ -81,6 +81,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment private static final String PREF_PASSWORD_LEAK_DETECTION = "password_leak_detection"; private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link"; private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox"; @@ -99,7 +99,7 @@ diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd --- a/chrome/browser/browser_resources.grd +++ b/chrome/browser/browser_resources.grd -@@ -231,6 +231,9 @@ +@@ -221,6 +221,9 @@ @@ -140,9 +140,9 @@ diff --git a/chrome/browser/net/proxy_service_factory.cc b/chrome/browser/net/pr +#include "components/prefs/pref_service.h" +#include "components/prefs/pref_registry_simple.h" - #if BUILDFLAG(IS_CHROMEOS_ASH) + #if BUILDFLAG(IS_CHROMEOS) #include "chromeos/ash/components/network/proxy/proxy_config_service_impl.h" -@@ -70,7 +74,20 @@ ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( +@@ -57,7 +61,20 @@ ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( return std::make_unique( profile_prefs, local_state_prefs, nullptr); #else @@ -161,12 +161,12 @@ diff --git a/chrome/browser/net/proxy_service_factory.cc b/chrome/browser/net/pr + local_state_prefs->CommitPendingWrite(); + } + return std::make_unique(local_state_prefs, nullptr); - #endif // BUILDFLAG(IS_CHROMEOS_ASH) + #endif // BUILDFLAG(IS_CHROMEOS) } -@@ -86,3 +103,8 @@ ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( +@@ -73,3 +90,8 @@ ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( nullptr); - #endif // BUILDFLAG(IS_CHROMEOS_ASH) + #endif // BUILDFLAG(IS_CHROMEOS) } + +// static @@ -196,7 +196,7 @@ diff --git a/chrome/browser/net/proxy_service_factory.h b/chrome/browser/net/pro diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -198,6 +198,8 @@ +@@ -200,6 +200,8 @@ #include "printing/buildflags/buildflags.h" #include "rlz/buildflags/buildflags.h" @@ -205,7 +205,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse #if BUILDFLAG(ENABLE_BACKGROUND_MODE) #include "chrome/browser/background/background_mode_manager.h" #endif -@@ -1714,6 +1716,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -1644,6 +1646,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 -@@ -156,7 +156,7 @@ void ChromeCommandLinePrefStore::ApplyProxyMode() { +@@ -157,7 +157,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 -@@ -226,6 +226,8 @@ static_library("ui") { +@@ -222,6 +222,8 @@ static_library("ui") { "webui/metrics_internals/metrics_internals_ui.h", "webui/net_export_ui.cc", "webui/net_export_ui.h", @@ -682,7 +682,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 -@@ -401,4 +404,5 @@ void RegisterChromeWebUIConfigs() { +@@ -388,4 +391,5 @@ void RegisterChromeWebUIConfigs() { #if BUILDFLAG(ENABLE_GLIC) map.AddWebUIConfig(std::make_unique()); #endif @@ -1150,7 +1150,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 -@@ -159,6 +159,8 @@ inline constexpr char kChromeUINetExportHost[] = "net-export"; +@@ -160,6 +160,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"; @@ -1316,7 +1316,7 @@ diff --git a/components/proxy_config/proxy_config_dictionary.h b/components/prox diff --git a/components/proxy_config/proxy_policy_handler.cc b/components/proxy_config/proxy_policy_handler.cc --- a/components/proxy_config/proxy_policy_handler.cc +++ b/components/proxy_config/proxy_policy_handler.cc -@@ -380,7 +380,7 @@ void ProxyPolicyHandler::ApplyPolicySettings(const PolicyMap& policies, +@@ -378,7 +378,7 @@ void ProxyPolicyHandler::ApplyPolicySettings(const PolicyMap& policies, set_proxy_pref_value(ProxyConfigDictionary::CreateFixedServers( server->GetString(), bypass_list && bypass_list->is_string() ? bypass_list->GetString() diff --git a/build/cromite_patches/Add-an-always-incognito-mode.patch b/build/cromite_patches/Add-an-always-incognito-mode.patch index 57a60d4656adccac46f109d26289749e8298cebf..86764e77e22ff6b525dad520140e26165d8c0b1f 100644 --- a/build/cromite_patches/Add-an-always-incognito-mode.patch +++ b/build/cromite_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 -@@ -633,6 +633,7 @@ chrome_java_resources = [ +@@ -636,6 +636,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", -@@ -933,6 +934,7 @@ chrome_java_sources = [ +@@ -946,6 +947,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", @@ -170,7 +170,7 @@ new file mode 100644 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml --- a/chrome/android/java/res/xml/privacy_preferences.xml +++ b/chrome/android/java/res/xml/privacy_preferences.xml -@@ -97,6 +97,11 @@ found in the LICENSE file. +@@ -91,6 +91,11 @@ found in the LICENSE file. android:key="secure_dns" android:title="@string/settings_secure_dns_title" android:fragment="org.chromium.chrome.browser.privacy.secure_dns.SecureDnsSettings" /> @@ -244,7 +244,7 @@ new file mode 100644 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -70,6 +70,10 @@ import org.chromium.base.task.TaskTraits; +@@ -71,6 +71,10 @@ import org.chromium.base.task.TaskTraits; import org.chromium.build.annotations.UsedByReflection; import org.chromium.cc.input.BrowserControlsState; import org.chromium.chrome.R; @@ -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; -@@ -711,14 +715,19 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn +@@ -715,14 +719,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( -@@ -2550,8 +2559,9 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn +@@ -2571,8 +2580,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 -@@ -93,6 +93,7 @@ import org.chromium.chrome.browser.compositor.layouts.SceneChangeObserver; +@@ -92,6 +92,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; @@ -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. -@@ -597,6 +603,13 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -599,6 +605,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; -@@ -660,7 +673,15 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -662,7 +675,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); -@@ -865,8 +886,9 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -867,8 +888,9 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate && !isNativePage && !isFileScheme && !isContentScheme @@ -392,7 +392,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr import org.chromium.chrome.browser.contextmenu.ChromeContextMenuItem.Item; import org.chromium.chrome.browser.contextmenu.ContextMenuCoordinator.ListItemType; import org.chromium.chrome.browser.download.DownloadUtils; -@@ -329,6 +330,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { +@@ -339,6 +340,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()) { -@@ -339,6 +343,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { +@@ -349,6 +353,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)); } -@@ -369,7 +374,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { +@@ -379,7 +384,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { } } if (FirstRunStatus.getFirstRunFlowComplete()) { @@ -519,7 +519,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/download/DownloadUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadUtils.java --- a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadUtils.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadUtils.java -@@ -35,6 +35,7 @@ import org.chromium.base.FileUtils; +@@ -36,6 +36,7 @@ import org.chromium.base.FileUtils; import org.chromium.base.IntentUtils; import org.chromium.base.Log; import org.chromium.chrome.R; @@ -527,7 +527,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/Downlo import org.chromium.chrome.browser.ChromeTabbedActivity; import org.chromium.chrome.browser.IntentHandler; import org.chromium.chrome.browser.app.download.home.DownloadActivityLauncher; -@@ -76,6 +77,10 @@ import org.chromium.url.GURL; +@@ -78,6 +79,10 @@ import org.chromium.url.GURL; import java.io.File; @@ -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"; -@@ -298,7 +303,16 @@ public class DownloadUtils { +@@ -299,7 +304,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. @@ -697,7 +697,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java -@@ -43,6 +43,15 @@ import org.chromium.components.signin.metrics.SigninAccessPoint; +@@ -40,6 +40,15 @@ import org.chromium.components.signin.metrics.SigninAccessPoint; import org.chromium.components.sync.SyncService; import org.chromium.url.GURL; @@ -713,7 +713,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsM import java.util.HashMap; import java.util.List; import java.util.Map; -@@ -111,7 +120,8 @@ public class RecentTabsManager +@@ -108,7 +117,8 @@ public class RecentTabsManager Profile profile, Context context, Runnable showHistoryManager) { @@ -723,7 +723,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsM mActiveTab = tab; mTabModelSelector = tabModelSelector; mShowHistoryManager = showHistoryManager; -@@ -295,6 +305,22 @@ public class RecentTabsManager +@@ -291,6 +301,22 @@ public class RecentTabsManager */ public void openRecentlyClosedTab(RecentlyClosedTab tab, int windowDisposition) { if (mIsDestroyed) return; @@ -916,7 +916,7 @@ new file mode 100644 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 -@@ -54,6 +54,7 @@ import org.chromium.chrome.browser.sync.settings.AccountManagementFragment; +@@ -53,6 +53,7 @@ import org.chromium.chrome.browser.sync.settings.AccountManagementFragment; import org.chromium.chrome.browser.sync.settings.GoogleServicesSettings; import org.chromium.chrome.browser.sync.settings.ManageSyncSettings; import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager; @@ -924,7 +924,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Fragme import org.chromium.components.browser_ui.accessibility.AccessibilitySettings; import org.chromium.components.browser_ui.bottomsheet.BottomSheetController; import org.chromium.components.browser_ui.settings.FragmentSettingsNavigation; -@@ -243,6 +244,9 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl +@@ -238,6 +239,9 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl mModalDialogManagerSupplier, SigninAndHistorySyncActivityLauncherImpl.get())); } @@ -937,7 +937,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Fragme diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabModelObserver.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabModelObserver.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabModelObserver.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabModelObserver.java -@@ -22,6 +22,8 @@ import java.util.HashMap; +@@ -29,6 +29,8 @@ import java.util.HashMap; import java.util.List; import java.util.Set; @@ -946,7 +946,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore /** A tab model observer for managing bulk closures. */ public class HistoricalTabModelObserver implements TabModelObserver { private final TabGroupModelFilter mTabGroupModelFilter; -@@ -70,9 +72,10 @@ public class HistoricalTabModelObserver implements TabModelObserver { +@@ -77,9 +79,10 @@ public class HistoricalTabModelObserver implements TabModelObserver { if (tabs.isEmpty() || !canRestore) return; if (tabs.size() == 1) { @@ -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 -@@ -169,6 +169,8 @@ import org.chromium.ui.InsetObserver; +@@ -180,6 +180,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; -@@ -1072,7 +1074,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -1078,7 +1080,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { () -> { mTabCreatorManagerSupplier .get() @@ -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; -@@ -820,6 +822,13 @@ public class TabPersistentStore { +@@ -821,6 +823,13 @@ public class TabPersistentStore { } } } @@ -1132,7 +1132,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPer 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 -@@ -43,6 +43,7 @@ import org.chromium.base.supplier.Supplier; +@@ -44,6 +44,7 @@ import org.chromium.base.supplier.Supplier; import org.chromium.cc.input.BrowserControlsState; import org.chromium.chrome.R; import org.chromium.chrome.browser.ActivityTabProvider; @@ -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; -@@ -702,7 +703,7 @@ public class ToolbarManager +@@ -752,7 +753,7 @@ public class ToolbarManager TraceEvent.end("isOfflinePage"); return ret; } @@ -1301,8 +1301,8 @@ diff --git a/chrome/browser/autocomplete/remote_suggestions_service_factory.cc b +#include "build/build_config.h" #include "base/no_destructor.h" #include "chrome/browser/autocomplete/document_suggestions_service_factory.h" - #include "chrome/browser/profiles/profile.h" -@@ -40,9 +41,13 @@ RemoteSuggestionsServiceFactory::RemoteSuggestionsServiceFactory() + #include "chrome/browser/autocomplete/enterprise_search_aggregator_suggestions_service_factory.h" +@@ -43,9 +44,13 @@ RemoteSuggestionsServiceFactory::RemoteSuggestionsServiceFactory() : ProfileKeyedServiceFactory( "RemoteSuggestionsService", ProfileSelections::Builder() @@ -1319,15 +1319,15 @@ diff --git a/chrome/browser/autocomplete/remote_suggestions_service_factory.cc b 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 -@@ -33,6 +33,7 @@ - #include "base/notreached.h" +@@ -35,6 +35,7 @@ + #include "base/numerics/safe_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/uuid.h" +#include "chrome/common/pref_names.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h" #include "chrome/browser/commerce/shopping_service_factory.h" -@@ -247,6 +248,12 @@ ScopedJavaLocalRef JNI_BookmarkBridge_NativeGetForProfile( +@@ -215,6 +216,12 @@ ScopedJavaLocalRef JNI_BookmarkBridge_NativeGetForProfile( if (!profile) return nullptr; @@ -1391,7 +1391,7 @@ diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.c diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/history/history_tab_helper.cc --- a/chrome/browser/history/history_tab_helper.cc +++ b/chrome/browser/history/history_tab_helper.cc -@@ -44,6 +44,9 @@ +@@ -45,6 +45,9 @@ #include "components/feed/core/v2/public/feed_api.h" // nogncheck #include "components/feed/core/v2/public/feed_service.h" // nogncheck #include "content/public/browser/web_contents.h" @@ -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" -@@ -489,6 +492,13 @@ void HistoryTabHelper::TitleWasSet(NavigationEntry* entry) { +@@ -492,6 +495,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; -@@ -496,6 +506,16 @@ history::HistoryService* HistoryTabHelper::GetHistoryService() { +@@ -499,6 +509,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 -@@ -247,6 +247,7 @@ +@@ -250,6 +250,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" -@@ -2177,6 +2178,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -2105,6 +2106,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, usage_stats::UsageStatsBridge::RegisterProfilePrefs(registry); variations::VariationsService::RegisterProfilePrefs(registry); webapps::InstallPromptPrefs::RegisterProfilePrefs(registry); @@ -1849,16 +1849,16 @@ diff --git a/chrome/browser/ui/android/native_page/BUILD.gn b/chrome/browser/ui/ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/browser/ui/native_page/NativePage.java b/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/browser/ui/native_page/NativePage.java --- a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/browser/ui/native_page/NativePage.java +++ b/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/browser/ui/native_page/NativePage.java -@@ -15,6 +15,8 @@ import org.chromium.url.GURL; +@@ -17,6 +17,8 @@ import org.chromium.url.GURL; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import org.chromium.base.ContextUtils; + /** An interface for pages that will be using Android views instead of html/rendered Web content. */ + @NullMarked public interface NativePage { - -@@ -176,7 +178,8 @@ public interface NativePage { +@@ -179,7 +181,8 @@ public interface NativePage { */ static boolean isNativePageUrl(GURL url, boolean isIncognito, boolean hasPdfDownload) { return url != null @@ -1868,7 +1868,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/ } /** -@@ -186,7 +189,7 @@ public interface NativePage { +@@ -189,7 +192,7 @@ public interface NativePage { * not have chrome or chrome-native scheme. */ static boolean isChromePageUrl(GURL url, boolean isIncognito) { @@ -1877,7 +1877,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/ } /** -@@ -198,11 +201,12 @@ public interface NativePage { +@@ -201,11 +204,12 @@ public interface NativePage { */ // TODO(crbug.com/40549331) - Convert to using GURL. static @NativePageType int nativePageType( @@ -1892,17 +1892,17 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/ } /** -@@ -213,7 +217,8 @@ public interface NativePage { - * @return Type of the native page defined in {@link NativePageType}. - */ - private static @NativePageType int nativePageType( -- GURL url, NativePage candidatePage, boolean isIncognito, boolean hasPdfDownload) { -+ GURL url, NativePage candidatePage, boolean isIncognito, boolean hasPdfDownload, +@@ -219,7 +223,8 @@ public interface NativePage { + GURL url, + @Nullable NativePage candidatePage, + boolean isIncognito, +- boolean hasPdfDownload) { ++ boolean hasPdfDownload, + boolean isAlwaysIncognito) { if (hasPdfDownload) { // For navigation with associated pdf download (e.g. open a pdf link), pdf page should // be created. -@@ -231,7 +236,7 @@ public interface NativePage { +@@ -237,7 +242,7 @@ public interface NativePage { // created after the pdf document is re-downloaded in other parts of the code. return NativePageType.NONE; } else { @@ -1911,16 +1911,16 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/ } } -@@ -243,7 +248,7 @@ public interface NativePage { +@@ -249,7 +254,7 @@ public interface NativePage { * which do not have chrome or chrome-native scheme. */ private static @NativePageType int chromePageType( -- GURL url, NativePage candidatePage, boolean isIncognito) { -+ GURL url, NativePage candidatePage, boolean isIncognito, boolean isAlwaysIncognito) { +- GURL url, @Nullable NativePage candidatePage, boolean isIncognito) { ++ GURL url, @Nullable NativePage candidatePage, boolean isIncognito, boolean isAlwaysIncognito) { String host = url.getHost(); String scheme = url.getScheme(); if (!UrlConstants.CHROME_NATIVE_SCHEME.equals(scheme) -@@ -263,7 +268,8 @@ public interface NativePage { +@@ -269,7 +274,8 @@ public interface NativePage { return NativePageType.DOWNLOADS; } else if (UrlConstants.HISTORY_HOST.equals(host)) { return NativePageType.HISTORY; @@ -1933,9 +1933,9 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -1419,6 +1419,31 @@ Your Google account may have other forms of browsing history like searches and a - - Deletes history from all synced devices +@@ -6460,6 +6460,31 @@ To change this setting, BEGIN_LINKdelete the Chrome d + + Cookies, cache, and other site data + + @@ -1962,8 +1962,8 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro + + Remember site settings changes in incognito mode + - - <link1>Search history</link1> and <link2>other forms of activity</link2> may be saved in your Google Account when you’re signed in. You can delete them anytime. + + <link1>Search history</link1> and <link2>other forms of activity</link2> may be saved in your Google Account diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/LocationBarModel.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/LocationBarModel.java --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/LocationBarModel.java @@ -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 -@@ -4138,6 +4138,12 @@ inline constexpr char kOutOfProcessSystemDnsResolutionEnabled[] = +@@ -4149,6 +4149,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 -@@ -265,6 +265,7 @@ struct ContentSettingEntry { +@@ -264,6 +264,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) -@@ -274,6 +275,7 @@ HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs, +@@ -273,6 +274,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()) { -@@ -287,7 +289,7 @@ HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs, +@@ -286,7 +288,7 @@ HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs, policy_provider->AddObserver(this); auto pref_provider_ptr = std::make_unique( @@ -2170,7 +2170,7 @@ diff --git a/components/omnibox/browser/autocomplete_provider_client.h b/compone diff --git a/components/omnibox/browser/base_search_provider.cc b/components/omnibox/browser/base_search_provider.cc --- a/components/omnibox/browser/base_search_provider.cc +++ b/components/omnibox/browser/base_search_provider.cc -@@ -395,7 +395,7 @@ bool BaseSearchProvider::CanSendSuggestRequest( +@@ -394,7 +394,7 @@ bool BaseSearchProvider::CanSendSuggestRequest( // Don't make a suggest request if in incognito mode; unless for the Lens // searchboxes. @@ -2182,7 +2182,7 @@ diff --git a/components/omnibox/browser/base_search_provider.cc b/components/omn diff --git a/components/omnibox/browser/search_provider.cc b/components/omnibox/browser/search_provider.cc --- a/components/omnibox/browser/search_provider.cc +++ b/components/omnibox/browser/search_provider.cc -@@ -912,7 +912,8 @@ std::unique_ptr SearchProvider::CreateSuggestLoader( +@@ -913,7 +913,8 @@ std::unique_ptr SearchProvider::CreateSuggestLoader( // is required. // Request for suggestions in OTR contexts is not allowed; except for the Lens // searchboxes. diff --git a/build/cromite_patches/Add-bookmark-import-export-actions.patch b/build/cromite_patches/Add-bookmark-import-export-actions.patch index 0413d3d9bb9905ecc781203026fa68df5b8b42a7..118bc8f4a2e3ed523c3689fe8f8cfea817f0fd23 100644 --- a/build/cromite_patches/Add-bookmark-import-export-actions.patch +++ b/build/cromite_patches/Add-bookmark-import-export-actions.patch @@ -26,9 +26,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../bookmarks/BookmarkToolbarViewBinder.java | 6 + .../native_page/NativePageFactory.java | 11 +- chrome/browser/BUILD.gn | 11 +- - .../bookmarks/android/bookmark_bridge.cc | 277 +++++++++++++++++ - .../bookmarks/android/bookmark_bridge.h | 29 +- - .../browser/bookmarks/bookmark_html_writer.cc | 3 + + .../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 + @@ -53,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 + - 42 files changed, 900 insertions(+), 30 deletions(-) + 41 files changed, 888 insertions(+), 30 deletions(-) create mode 100644 cromite_flags/chrome/browser/about_flags_cc/add-bookmark-import-export-actions.inc create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/add-bookmark-import-export-actions.inc create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/add-bookmark-import-export-actions.inc @@ -492,7 +491,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm /** * Synchronously gets a list of bookmarks that match the specified search query. * -@@ -1102,6 +1383,10 @@ class BookmarkBridge { +@@ -1108,6 +1389,10 @@ class BookmarkBridge { void getChildIds( long nativeBookmarkBridge, long id, int type, List bookmarksList); @@ -535,7 +534,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm import org.chromium.ui.modaldialog.ModalDialogManager; import org.chromium.ui.modaldialog.ModalDialogManager.ModalDialogType; import org.chromium.ui.modelutil.MVCListAdapter.ModelList; -@@ -334,6 +336,13 @@ public class BookmarkManagerCoordinator +@@ -326,6 +328,13 @@ public class BookmarkManagerCoordinator // Public API implementation. @@ -552,7 +551,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java -@@ -59,6 +59,8 @@ import org.chromium.components.commerce.core.SubscriptionsObserver; +@@ -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; @@ -571,7 +570,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm /** Keeps track of whether drag is enabled / active for bookmark lists. */ private class BookmarkDragStateDelegate implements DragStateDelegate { private BookmarkDelegate mBookmarkDelegate; -@@ -571,6 +576,14 @@ class BookmarkManagerMediator +@@ -574,6 +579,14 @@ class BookmarkManagerMediator mNativePage = nativePage; } @@ -586,7 +585,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm /** See BookmarkManager(Coordinator)#updateForUrl */ void updateForUrl(String url) { // Bookmark model is null if the manager has been destroyed. -@@ -752,6 +765,16 @@ class BookmarkManagerMediator +@@ -766,6 +779,16 @@ class BookmarkManagerMediator } } @@ -807,7 +806,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -207,6 +207,8 @@ static_library("browser") { +@@ -218,6 +218,8 @@ static_library("browser") { "bluetooth/chrome_bluetooth_delegate_impl_client.h", "bookmarks/bookmark_model_factory.cc", "bookmarks/bookmark_model_factory.h", @@ -816,9 +815,9 @@ 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", -@@ -1661,6 +1663,13 @@ static_library("browser") { - "webid/identity_provider_permission_request.h", - ] +@@ -1698,6 +1700,13 @@ static_library("browser") { + ] + } + if (is_android) { + sources += [ @@ -830,7 +829,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn configs += [ "//build/config/compiler:wexit_time_destructors", "//build/config:precompiled_headers", -@@ -3475,8 +3484,6 @@ static_library("browser") { +@@ -3507,8 +3516,6 @@ static_library("browser") { "bookmarks/bookmark_expanded_state_tracker.h", "bookmarks/bookmark_expanded_state_tracker_factory.cc", "bookmarks/bookmark_expanded_state_tracker_factory.h", @@ -842,7 +841,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn 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 -@@ -64,6 +64,28 @@ +@@ -66,6 +66,28 @@ #include "content/public/browser/web_contents.h" #include "url/gurl.h" @@ -871,7 +870,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse // Must come after all headers that specialize FromJniType() / ToJniType(). #include "chrome/android/chrome_jni_headers/BookmarkBridge_jni.h" -@@ -82,12 +104,97 @@ using bookmarks::android::JavaBookmarkIdGetType; +@@ -84,6 +106,57 @@ using bookmarks::android::JavaBookmarkIdGetType; using content::BrowserThread; using power_bookmarks::PowerBookmarkMeta; @@ -910,7 +909,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse + } + } + -+ if (base::Contains(chrome::ChromeDebugURLs(), fixed_url)) { ++ if (base::Contains(chrome::ChromeDebugURLs(), fixed_url.spec())) { + return true; + } + @@ -929,47 +928,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse namespace { // The key used to connect the instance of the bookmark bridge to the bookmark // model. - const char kBookmarkBridgeUserDataKey[] = "bookmark_bridge"; - - // Compares titles of different instance of BookmarkNode. -+class FileBookmarksExportObserver: public BookmarksExportObserver { -+ public: -+ FileBookmarksExportObserver( -+ const JavaParamRef& obj, -+ ui::WindowAndroid* window, -+ const std::string& export_path) : -+ obj_(ScopedJavaGlobalRef(obj)), -+ window_(window), -+ export_path_(export_path) {} -+ -+ void OnExportFinished(Result result) override { -+ if (result == Result::kSuccess) { -+ LOG(INFO) << "Bookmarks exported successfully to " << export_path_; -+ } else if (result == Result::kCouldNotCreateFile) { -+ LOG(ERROR) << "Bookmarks export: could not create file " << export_path_; -+ } else if (result == Result::kCouldNotWriteHeader) { -+ LOG(ERROR) << "Bookmarks export: could not write header"; -+ } else if (result == Result::kCouldNotWriteNodes) { -+ LOG(ERROR) << "Bookmarks export: could not write nodes"; -+ } -+ -+ JNIEnv* env = AttachCurrentThread(); -+ Java_BookmarkBridge_bookmarksExported(env, obj_, window_->GetJavaObject(), -+ ConvertUTF8ToJavaString(env, export_path_), -+ result == Result::kSuccess); -+ delete this; -+ } -+ -+ private: -+ const ScopedJavaGlobalRef obj_; -+ raw_ptr window_; -+ const std::string export_path_; -+}; -+ - class BookmarkTitleComparer { - public: - explicit BookmarkTitleComparer(BookmarkBridge* bookmark_bridge, -@@ -229,6 +336,10 @@ BookmarkBridge::~BookmarkBridge() { +@@ -231,6 +304,10 @@ BookmarkBridge::~BookmarkBridge() { partner_bookmarks_shim_observation_.Reset(); bookmark_model_observation_.Reset(); profile_observation_.Reset(); @@ -980,7 +939,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse } void BookmarkBridge::Destroy(JNIEnv* env) { -@@ -768,6 +879,172 @@ jint BookmarkBridge::GetTotalBookmarkCount( +@@ -765,6 +842,196 @@ jint BookmarkBridge::GetTotalBookmarkCount( return count; } @@ -1038,8 +997,32 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse + export_path_ = export_path_.Append(FILE_PATH_LITERAL("bookmarks.html")); + } + -+ observer_ = new FileBookmarksExportObserver(obj, window, export_path_.MaybeAsASCII()); -+ bookmark_html_writer::WriteBookmarks(profile_, export_path_, observer_); ++ bookmark_html_writer::WriteBookmarks(profile_, export_path_, ++ base::BindOnce(&BookmarkBridge::ExportBookmarksEnd, ++ weak_ptr_factory_.GetWeakPtr(), ++ base::android::ScopedJavaGlobalRef(obj), ++ window)); ++} ++ ++void BookmarkBridge::ExportBookmarksEnd(const ScopedJavaGlobalRef& obj, ++ ui::WindowAndroid* window, ++ bookmark_html_writer::Result result) const ++{ ++ auto export_path = export_path_.MaybeAsASCII(); ++ if (result == bookmark_html_writer::Result::kSuccess) { ++ LOG(INFO) << "Bookmarks exported successfully to " << export_path; ++ } else if (result == bookmark_html_writer::Result::kCouldNotCreateFile) { ++ LOG(ERROR) << "Bookmarks export: could not create file " << export_path; ++ } else if (result == bookmark_html_writer::Result::kCouldNotWriteHeader) { ++ LOG(ERROR) << "Bookmarks export: could not write header"; ++ } else if (result == bookmark_html_writer::Result::kCouldNotWriteNodes) { ++ LOG(ERROR) << "Bookmarks export: could not write nodes"; ++ } ++ ++ JNIEnv* env = AttachCurrentThread(); ++ Java_BookmarkBridge_bookmarksExported(env, obj, window->GetJavaObject(), ++ base::android::ConvertUTF8ToJavaString(env, export_path), ++ result == bookmark_html_writer::Result::kSuccess); +} + +// Attempts to create a TemplateURL from the provided data. |title| is optional. @@ -1196,7 +1179,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser jboolean IsEditBookmarksEnabled(JNIEnv* env); void LoadEmptyPartnerBookmarkShimForTesting(JNIEnv* env); -@@ -93,6 +103,15 @@ class BookmarkBridge : public ProfileObserver, +@@ -93,6 +103,17 @@ class BookmarkBridge : public ProfileObserver, jlong id, jint type); @@ -1208,21 +1191,22 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser + const base::android::JavaParamRef& obj, + const base::android::JavaParamRef& java_window, + const base::android::JavaParamRef& j_export_path); ++ void ExportBookmarksEnd(const base::android::ScopedJavaGlobalRef& obj, ++ ui::WindowAndroid* window, bookmark_html_writer::Result result) const; + void GetAllFoldersWithDepths( JNIEnv* env, const base::android::JavaParamRef& j_folders_obj, -@@ -363,6 +382,9 @@ class BookmarkBridge : public ProfileObserver, +@@ -362,6 +383,8 @@ class BookmarkBridge : public ProfileObserver, void CreateOrDestroyAccountReadingListManagerIfNeeded(); const raw_ptr profile_; // weak + base::FilePath export_path_; -+ raw_ptr observer_; // weak + base::android::ScopedJavaGlobalRef java_bookmark_model_; const raw_ptr bookmark_model_; // weak const raw_ptr -@@ -377,6 +399,7 @@ class BookmarkBridge : public ProfileObserver, +@@ -376,6 +399,7 @@ class BookmarkBridge : public ProfileObserver, std::unique_ptr grouped_bookmark_actions_; PrefChangeRegistrar pref_change_registrar_; @@ -1230,7 +1214,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser // Information about the Partner bookmarks (must check for IsLoaded()). // This is owned by profile. -@@ -408,6 +431,10 @@ class BookmarkBridge : public ProfileObserver, +@@ -407,6 +431,10 @@ class BookmarkBridge : public ProfileObserver, bool suppress_observer_notifications_ = false; @@ -1241,19 +1225,6 @@ 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/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 -@@ -33,6 +33,9 @@ - #include "base/task/thread_pool.h" - #include "base/time/time.h" - #include "base/values.h" -+#if BUILDFLAG(IS_ANDROID) -+#include "base/android/content_uri_utils.h" -+#endif - #include "chrome/browser/bookmarks/bookmark_model_factory.h" - #include "chrome/browser/favicon/favicon_service_factory.h" - #include "chrome/browser/profiles/profile.h" 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 @@ -1331,7 +1302,7 @@ 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 -@@ -216,6 +216,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -214,6 +214,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kCCTAuthTab, &kCCTAuthTabDisableAllExternalIntents, &kCCTAuthTabEnableHttpsRedirects, @@ -1342,7 +1313,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 -@@ -579,6 +579,7 @@ public abstract class ChromeFeatureList { +@@ -585,6 +585,7 @@ public abstract class ChromeFeatureList { public static final String USE_LIBUNWINDSTACK_NATIVE_UNWINDER_ANDROID = "UseLibunwindstackNativeUnwinderAndroid"; public static final String VISITED_URL_RANKING_SERVICE = "VisitedURLRankingService"; @@ -1353,7 +1324,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer/profile_writer.cc --- a/chrome/browser/importer/profile_writer.cc +++ b/chrome/browser/importer/profile_writer.cc -@@ -124,6 +124,16 @@ void ProfileWriter::AddBookmarks( +@@ -125,6 +125,16 @@ void ProfileWriter::AddBookmarks( return; BookmarkModel* model = BookmarkModelFactory::GetForBrowserContext(profile_); @@ -1396,7 +1367,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 -@@ -115,6 +115,8 @@ public final class ChromePreferenceKeys { +@@ -121,6 +121,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"; @@ -1405,7 +1376,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro /** Whether Chrome is set as the default browser. Default value is false. */ public static final String CHROME_DEFAULT_BROWSER = "applink.chrome_default_browser"; -@@ -935,6 +937,7 @@ public final class ChromePreferenceKeys { +@@ -938,6 +940,7 @@ public final class ChromePreferenceKeys { AUXILIARY_SEARCH_IS_SCHEMA_SET, APP_LAUNCH_LAST_KNOWN_ACTIVE_TAB_STATE, APP_LAUNCH_SEARCH_ENGINE_HAD_LOGO, @@ -1444,7 +1415,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 -@@ -360,6 +360,9 @@ static_library("common_lib") { +@@ -356,6 +356,9 @@ static_library("common_lib") { sources += [ "media/chrome_media_drm_bridge_client.cc", "media/chrome_media_drm_bridge_client.h", @@ -1628,15 +1599,15 @@ new file mode 100644 diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java --- a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java +++ b/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java -@@ -49,6 +49,7 @@ import org.chromium.build.annotations.NullMarked; - import org.chromium.build.annotations.NullUnmarked; +@@ -51,6 +51,7 @@ import org.chromium.build.annotations.Initializer; + import org.chromium.build.annotations.NullMarked; import org.chromium.build.annotations.Nullable; import org.chromium.ui.R; +import org.chromium.ui.widget.Toast; import org.chromium.ui.UiUtils; import java.io.File; -@@ -72,6 +73,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick +@@ -74,6 +75,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick private static final String TAG = "SelectFileDialog"; private static final String IMAGE_TYPE = "image"; private static final String VIDEO_TYPE = "video"; @@ -1644,7 +1615,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui private static final String AUDIO_TYPE = "audio"; private static final String ALL_TYPES = "*/*"; private static final String GENERIC_TYPE = "application/octet-stream"; -@@ -324,6 +326,11 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick +@@ -323,6 +325,11 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick mMimeTypes = convertToSupportedMimeTypes(mFileTypes); } @@ -1656,7 +1627,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui /** * Creates and starts an intent based on the passed fileTypes and capture value. * -@@ -399,7 +406,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick +@@ -407,7 +414,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick List missingPermissions = new ArrayList<>(); String storagePermission = Manifest.permission.READ_EXTERNAL_STORAGE; boolean shouldUsePhotoPicker = shouldUsePhotoPicker(); @@ -1665,7 +1636,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui // The permission scenario for accessing media has evolved a bit over the years: // Early on, READ_EXTERNAL_STORAGE was required to access media, but that permission was // later deprecated. In its place (starting with Android T) READ_MEDIA_IMAGES and -@@ -452,7 +459,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick +@@ -460,7 +467,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick // TODO(finnur): Remove once we figure out the cause of // crbug.com/950024. @@ -1674,7 +1645,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui if (permissions.length != requestPermissions.length) { throw new RuntimeException( String.format( -@@ -469,7 +476,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick +@@ -477,7 +484,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick } } @@ -1683,7 +1654,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui if (permissions[i].equals(storagePermission) || permissions[i].equals( Manifest.permission.READ_MEDIA_IMAGES) -@@ -775,6 +782,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick +@@ -783,6 +790,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick mimeTypes.add(mimeType); } } @@ -1691,7 +1662,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui return mimeTypes; } -@@ -1149,6 +1157,10 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick +@@ -1155,6 +1163,10 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick return countAcceptTypesFor(superType) == mMimeTypes.size(); } diff --git a/build/cromite_patches/Add-cromite-flags-support.patch b/build/cromite_patches/Add-cromite-flags-support.patch index 03c79c73afff8cd2ea4fd539624fbd0da782f4bb..6541dfe55e408114193f05af965b1c9b59f556c7 100644 --- a/build/cromite_patches/Add-cromite-flags-support.patch +++ b/build/cromite_patches/Add-cromite-flags-support.patch @@ -25,6 +25,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html .../privacy/settings/PrivacySettings.java | 2 +- .../settings/FragmentDependencyProvider.java | 10 +- .../browser/settings/SettingsActivity.java | 42 ++++- + .../tracing/settings/DeveloperSettings.java | 5 +- chrome/browser/about_flags.cc | 11 ++ chrome/browser/browser_features.cc | 1 + chrome/browser/browser_features.h | 1 + @@ -45,12 +46,12 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html .../res/xml/accessibility_preferences.xml | 3 +- .../accessibility/AccessibilitySettings.java | 6 +- .../android/java/res/values/attrs.xml | 4 + - .../settings/ChromeSwitchPreference.java | 20 ++ - .../components/cached_flags/CachedFlag.java | 9 +- + .../settings/ChromeSwitchPreference.java | 19 ++ + .../components/cached_flags/CachedFlag.java | 8 +- components/components_strings.grd | 1 + .../content_settings/core/common/features.cc | 1 + .../placeholder.txt | 1 + - components/flags_ui/flags_state.cc | 54 ++++++ + 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 +++ @@ -64,7 +65,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html components/permissions/features.cc | 1 + ...nthetic_trials_active_group_id_provider.cc | 4 +- ...ynthetic_trials_active_group_id_provider.h | 4 +- - .../version_ui/version_handler_helper.cc | 4 +- + .../webui/version/version_handler_helper.cc | 4 +- content/common/features.cc | 1 + content/public/common/content_features.cc | 1 + content/public/common/content_features.h | 1 + @@ -105,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 + - 92 files changed, 805 insertions(+), 28 deletions(-) + 93 files changed, 811 insertions(+), 30 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 @@ -151,7 +152,7 @@ diff --git a/base/BUILD.gn b/base/BUILD.gn sources = [ "allocator/allocator_check.cc", "allocator/allocator_check.h", -@@ -1017,7 +1019,7 @@ component("base") { +@@ -1016,7 +1018,7 @@ component("base") { "//build/config/compiler:wglobal_constructors", ] @@ -163,7 +164,7 @@ diff --git a/base/BUILD.gn b/base/BUILD.gn diff --git a/base/android/feature_map.cc b/base/android/feature_map.cc --- a/base/android/feature_map.cc +++ b/base/android/feature_map.cc -@@ -46,6 +46,11 @@ const Feature* FeatureMap::FindFeatureExposedToJava( +@@ -47,6 +47,11 @@ const Feature* FeatureMap::FindFeatureExposedToJava( static jboolean JNI_FeatureMap_IsEnabled(JNIEnv* env, jlong jfeature_map, std::string& feature_name) { @@ -435,7 +436,7 @@ diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml --- a/chrome/android/java/res/xml/privacy_preferences.xml +++ b/chrome/android/java/res/xml/privacy_preferences.xml -@@ -54,6 +54,10 @@ found in the LICENSE file. +@@ -48,6 +48,10 @@ found in the LICENSE file. android:key="do_not_track" android:title="@string/do_not_track_title" android:fragment="org.chromium.chrome.browser.privacy.settings.DoNotTrackSettings" /> @@ -461,7 +462,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settin diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java -@@ -89,7 +89,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment +@@ -84,7 +84,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment private final ObservableSupplierImpl mPageTitle = new ObservableSupplierImpl<>(); @Override @@ -481,7 +482,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Fragme import org.chromium.base.supplier.ObservableSupplier; import org.chromium.base.supplier.OneshotSupplier; import org.chromium.chrome.browser.LaunchIntentDispatcher; -@@ -76,18 +77,21 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl +@@ -75,18 +76,21 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl private final OneshotSupplier mSnackbarManagerSupplier; private final OneshotSupplier mBottomSheetControllerSupplier; private final ObservableSupplier mModalDialogManagerSupplier; @@ -504,7 +505,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Fragme } @Override -@@ -96,6 +100,10 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl +@@ -95,6 +99,10 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl @NonNull Fragment fragment, @NonNull Context unusedContext) { // Common dependencies attachments. @@ -602,10 +603,36 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin true /* recursive */); fragmentManager.registerFragmentLifecycleCallbacks( new WideDisplayPaddingApplier(), false /* recursive */); +diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java +--- a/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java ++++ b/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java +@@ -17,11 +17,12 @@ import org.chromium.base.version_info.VersionInfo; + import org.chromium.chrome.R; + import org.chromium.chrome.browser.preferences.ChromePreferenceKeys; + import org.chromium.chrome.browser.preferences.ChromeSharedPreferences; ++import org.chromium.chrome.browser.settings.ChromeBaseSettingsFragment; + import org.chromium.components.browser_ui.settings.EmbeddableSettingsPage; + import org.chromium.components.browser_ui.settings.SettingsUtils; + + /** Settings fragment containing preferences aimed at Chrome and web developers. */ +-public class DeveloperSettings extends PreferenceFragmentCompat implements EmbeddableSettingsPage { ++public class DeveloperSettings extends ChromeBaseSettingsFragment implements EmbeddableSettingsPage { + private static final String UI_PREF_BETA_STABLE_HINT = "beta_stable_hint"; + + // Non-translated strings: +@@ -52,7 +53,7 @@ public class DeveloperSettings extends PreferenceFragmentCompat implements Embed + } + + @Override +- public void onCreatePreferences(Bundle savedInstanceState, String s) { ++ public void onCreatePreferencesCromite(Bundle savedInstanceState, String s) { + SettingsUtils.addPreferencesFromResource(this, R.xml.developer_preferences); + + if (VersionInfo.isBetaBuild() || VersionInfo.isStableBuild()) { 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 -@@ -392,6 +392,10 @@ using flags_ui::kOsLinux; +@@ -394,6 +394,10 @@ using flags_ui::kOsLinux; using flags_ui::kOsMac; using flags_ui::kOsWin; @@ -616,9 +643,9 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc namespace about_flags { namespace { -@@ -4313,6 +4317,10 @@ const FeatureEntry::FeatureVariation kMerchantTrustVariations[] = { - std::size(kMerchantTrustEnabledWithSampleData), nullptr}}; - #endif // !BUILDFLAG(IS_ANDROID) +@@ -4383,6 +4387,10 @@ const FeatureEntry::FeatureVariation kTabSwitcherColorBlendAnimateVariations[] = + std::size(kTabSwitcherColorBlendAnimateVariation3), nullptr}}; + #endif // BUILDFLAG(IS_ANDROID) +#define FEATURE_PARAM_SECTION +#include "cromite_flags/chrome_browser_about_flags_cc.inc" @@ -627,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. -@@ -4339,6 +4347,9 @@ const FeatureEntry::FeatureVariation kMerchantTrustVariations[] = { +@@ -4409,6 +4417,9 @@ const FeatureEntry::FeatureVariation kTabSwitcherColorBlendAnimateVariations[] = const FeatureEntry kFeatureEntries[] = { // Include generated flags for flag unexpiry; see //docs/flag_expiry.md and // //tools/flags/generate_unexpire_flags.py. @@ -640,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 -@@ -352,4 +352,5 @@ BASE_FEATURE(kRemovalOfIWAsFromTabCapture, +@@ -367,4 +367,5 @@ BASE_FEATURE(kRemovalOfIWAsFromTabCapture, "RemovalOfIWAsFromTabCapture", base::FEATURE_ENABLED_BY_DEFAULT); @@ -699,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 -@@ -1133,5 +1133,6 @@ BASE_FEATURE(kWebOtpCrossDeviceSimpleString, +@@ -1182,5 +1182,6 @@ BASE_FEATURE(kWebOtpCrossDeviceSimpleString, "WebOtpCrossDeviceSimpleString", base::FEATURE_DISABLED_BY_DEFAULT); @@ -709,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 -@@ -225,6 +225,7 @@ constexpr base::FeatureParam kQuickDeleteAndroidSurveyTriggerId( +@@ -236,6 +236,7 @@ constexpr base::FeatureParam kQuickDeleteAndroidSurveyTriggerId( "trigger_id", /*default_value=*/""); @@ -720,7 +747,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java -@@ -20,6 +20,10 @@ import org.chromium.components.cached_flags.DoubleCachedFeatureParam; +@@ -19,6 +19,10 @@ import org.chromium.components.cached_flags.DoubleCachedFeatureParam; import org.chromium.components.cached_flags.IntCachedFeatureParam; import org.chromium.components.cached_flags.StringCachedFeatureParam; @@ -731,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; -@@ -818,7 +822,7 @@ public abstract class ChromeFeatureList { +@@ -830,7 +834,7 @@ public abstract class ChromeFeatureList { public static final CachedFlag sWebApkMinShellApkVersion = newCachedFlag(WEB_APK_MIN_SHELL_APK_VERSION, true); @@ -740,7 +767,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f List.of( sAndroidAppIntegration, sAndroidAppIntegrationModule, -@@ -916,6 +920,13 @@ public abstract class ChromeFeatureList { +@@ -933,6 +937,13 @@ public abstract class ChromeFeatureList { sUseLibunwindstackNativeUnwinderAndroid, sWebApkMinShellApkVersion); @@ -930,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 -@@ -440,4 +440,5 @@ BASE_FEATURE(kPageActionsMigration, - "PageActionsMigration", - base::FEATURE_DISABLED_BY_DEFAULT); +@@ -416,4 +416,5 @@ BASE_FEATURE(kFedCmContinueWithoutName, + "FedCmContinueWithoutName", + base::FEATURE_ENABLED_BY_DEFAULT); +#include "cromite_flags/chrome_browser_ui_ui_features_cc.inc" } // namespace features diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc --- a/chrome/common/chrome_features.cc +++ b/chrome/common/chrome_features.cc -@@ -1561,4 +1561,5 @@ BASE_FEATURE(kDisableShortcutsEnableDiy, +@@ -1569,4 +1569,5 @@ BASE_FEATURE(kDisableShortcutsEnableDiy, "DisableShortcutsEnableDiy", base::FEATURE_ENABLED_BY_DEFAULT); @@ -1010,17 +1037,16 @@ diff --git a/components/browser_ui/settings/android/java/res/values/attrs.xml b/ diff --git a/components/browser_ui/settings/android/widget/java/src/org/chromium/components/browser_ui/settings/ChromeSwitchPreference.java b/components/browser_ui/settings/android/widget/java/src/org/chromium/components/browser_ui/settings/ChromeSwitchPreference.java --- a/components/browser_ui/settings/android/widget/java/src/org/chromium/components/browser_ui/settings/ChromeSwitchPreference.java +++ b/components/browser_ui/settings/android/widget/java/src/org/chromium/components/browser_ui/settings/ChromeSwitchPreference.java -@@ -12,6 +12,9 @@ import android.view.accessibility.AccessibilityEvent; +@@ -15,6 +15,8 @@ import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityNodeInfo; import android.widget.TextView; -+import androidx.annotation.Nullable; +import android.content.res.TypedArray; + import androidx.annotation.ColorInt; - import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; -@@ -31,6 +34,11 @@ public class ChromeSwitchPreference extends SwitchPreferenceCompat { + import androidx.preference.PreferenceViewHolder; +@@ -40,6 +42,11 @@ public class ChromeSwitchPreference extends SwitchPreferenceCompat { /** Indicates if the preference uses a custom layout. */ private final boolean mHasCustomLayout; @@ -1032,7 +1058,7 @@ diff --git a/components/browser_ui/settings/android/widget/java/src/org/chromium // TOOD(crbug.com/1451550): This is an interim solution. In the long-term, we should migrate // away from a switch with dynamically changing summaries onto a radio group. /** -@@ -50,6 +58,18 @@ public class ChromeSwitchPreference extends SwitchPreferenceCompat { +@@ -59,6 +66,18 @@ public class ChromeSwitchPreference extends SwitchPreferenceCompat { mHasCustomLayout = ManagedPreferencesUtils.isCustomLayoutApplied(context, attrs); mUseSummaryAsTitle = true; @@ -1054,16 +1080,8 @@ diff --git a/components/browser_ui/settings/android/widget/java/src/org/chromium diff --git a/components/cached_flags/android/java/src/org/chromium/components/cached_flags/CachedFlag.java b/components/cached_flags/android/java/src/org/chromium/components/cached_flags/CachedFlag.java --- a/components/cached_flags/android/java/src/org/chromium/components/cached_flags/CachedFlag.java +++ b/components/cached_flags/android/java/src/org/chromium/components/cached_flags/CachedFlag.java -@@ -5,6 +5,7 @@ - package org.chromium.components.cached_flags; - - import android.content.SharedPreferences; -+import androidx.annotation.Nullable; - - import org.chromium.base.FeatureList; - import org.chromium.base.FeatureMap; -@@ -143,7 +144,7 @@ public class CachedFlag extends Flag { - editor.putBoolean(getSharedPreferenceKey(), isEnabledInNative); +@@ -155,7 +155,7 @@ public class CachedFlag extends Flag { + editor.putBoolean(getSharedPreferenceKey(), featureValue); } - String getSharedPreferenceKey() { @@ -1071,7 +1089,7 @@ diff --git a/components/cached_flags/android/java/src/org/chromium/components/ca // Create the key only once to avoid String concatenation every flag check. if (mPreferenceKey == null) { mPreferenceKey = CachedFlagsSharedPreferences.FLAGS_CACHED.createKey(mFeatureName); -@@ -151,6 +152,12 @@ public class CachedFlag extends Flag { +@@ -163,6 +163,12 @@ public class CachedFlag extends Flag { return mPreferenceKey; } @@ -1114,7 +1132,7 @@ new file mode 100644 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 -@@ -363,6 +363,21 @@ void FlagsState::GetSwitchesAndFeaturesFromFlags( +@@ -373,6 +373,21 @@ void FlagsState::GetSwitchesAndFeaturesFromFlags( for (const std::string& entry_name : enabled_entries) { const auto& entry_it = name_to_switch_map.find(entry_name); @@ -1136,7 +1154,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; -@@ -680,6 +695,27 @@ void FlagsState::GetFlagFeatureEntries( +@@ -690,6 +705,27 @@ void FlagsState::GetFlagFeatureEntries( data.Set("links", std::move(links)); } @@ -1164,7 +1182,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: -@@ -806,6 +842,16 @@ void FlagsState::AddSwitchesToCommandLine( +@@ -816,6 +852,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()) { @@ -1181,7 +1199,7 @@ diff --git a/components/flags_ui/flags_state.cc b/components/flags_ui/flags_stat NOTREACHED(); } -@@ -1057,6 +1103,14 @@ const FeatureEntry* FlagsState::FindFeatureEntryByName( +@@ -1067,6 +1113,14 @@ const FeatureEntry* FlagsState::FindFeatureEntryByName( bool FlagsState::IsSupportedFeature(const FlagsStorage* storage, const std::string& name, int platform_mask) const { @@ -1196,6 +1214,18 @@ 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, + std::string feature_internal_name = flag.substr(0, at_index); + const flags_ui::FeatureEntry* entry = + FindFeatureEntryByName(feature_internal_name); ++ if (!entry) { ++ if (base::FeatureList::IsCromiteFlag(feature_internal_name)) { ++ continue; ++ } ++ } + 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 @@ -1483,7 +1513,7 @@ diff --git a/components/offline_pages/core/offline_page_feature.h b/components/o 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 -@@ -188,4 +188,5 @@ BASE_FEATURE(kImprovedPasswordChangeService, +@@ -182,4 +182,5 @@ BASE_FEATURE(kImprovedPasswordChangeService, "ImprovedPasswordChangeService", base::FEATURE_DISABLED_BY_DEFAULT); @@ -1492,7 +1522,7 @@ diff --git a/components/password_manager/core/browser/features/password_features diff --git a/components/permissions/features.cc b/components/permissions/features.cc --- a/components/permissions/features.cc +++ b/components/permissions/features.cc -@@ -122,6 +122,7 @@ BASE_FEATURE(kCpssQuietChipTextUpdate, +@@ -120,6 +120,7 @@ BASE_FEATURE(kCpssQuietChipTextUpdate, BASE_FEATURE(kCpssUseTfliteSignatureRunner, "CpssUseTfliteSignatureRunner", base::FEATURE_DISABLED_BY_DEFAULT); @@ -1542,9 +1572,9 @@ diff --git a/components/variations/synthetic_trials_active_group_id_provider.h b // 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/version_ui/version_handler_helper.cc b/components/version_ui/version_handler_helper.cc ---- a/components/version_ui/version_handler_helper.cc -+++ b/components/version_ui/version_handler_helper.cc +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 @@ -20,7 +20,7 @@ namespace version_ui { namespace { @@ -1566,7 +1596,7 @@ diff --git a/components/version_ui/version_handler_helper.cc b/components/versio diff --git a/content/common/features.cc b/content/common/features.cc --- a/content/common/features.cc +++ b/content/common/features.cc -@@ -475,4 +475,5 @@ BASE_FEATURE(kLimitCrossOriginNonActivatedPaintHolding, +@@ -490,4 +490,5 @@ BASE_FEATURE(kLimitCrossOriginNonActivatedPaintHolding, // Please keep features in alphabetical order. @@ -1575,7 +1605,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 -@@ -1421,4 +1421,5 @@ bool IsVideoCaptureServiceEnabledForBrowserProcess() { +@@ -1425,4 +1425,5 @@ bool IsVideoCaptureServiceEnabledForBrowserProcess() { VideoCaptureServiceConfiguration::kEnabledForBrowserProcess; } @@ -1584,7 +1614,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 -@@ -341,6 +341,7 @@ CONTENT_EXPORT extern const base::FeatureParam +@@ -339,6 +339,7 @@ CONTENT_EXPORT extern const base::FeatureParam CONTENT_EXPORT bool IsVideoCaptureServiceEnabledForOutOfProcess(); CONTENT_EXPORT bool IsVideoCaptureServiceEnabledForBrowserProcess(); @@ -1930,7 +1960,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 -@@ -1819,5 +1819,5 @@ uint32_t GetPassthroughAudioFormats() { +@@ -1799,5 +1799,5 @@ uint32_t GetPassthroughAudioFormats() { return 0; #endif // BUILDFLAG(ENABLE_PASSTHROUGH_AUDIO_CODECS) } @@ -1940,7 +1970,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 -@@ -570,5 +570,5 @@ MEDIA_EXPORT OOPVDMode GetOutOfProcessVideoDecodingMode(); +@@ -568,5 +568,5 @@ MEDIA_EXPORT OOPVDMode GetOutOfProcessVideoDecodingMode(); MEDIA_EXPORT uint32_t GetPassthroughAudioFormats(); } // namespace media @@ -1950,18 +1980,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 -@@ -666,4 +666,5 @@ BASE_FEATURE(kHstsTopLevelNavigationsOnly, - "HstsTopLevelNavigationsOnly", - base::FEATURE_DISABLED_BY_DEFAULT); +@@ -701,4 +701,5 @@ BASE_FEATURE(kUseCertTransparencyAwareApiForOsCertVerify, + base::FEATURE_ENABLED_BY_DEFAULT); + #endif // BUILDFLAG(IS_ANDROID) +#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 -@@ -687,6 +687,7 @@ NET_EXPORT BASE_DECLARE_FEATURE(kNewClientCertPathBuilding); - // When enabled HSTS upgrades will only apply to top-level navigations. - NET_EXPORT BASE_DECLARE_FEATURE(kHstsTopLevelNavigationsOnly); +@@ -719,6 +719,7 @@ NET_EXPORT BASE_DECLARE_FEATURE(kReportingApiCorsOriginHeader); + NET_EXPORT BASE_DECLARE_FEATURE(kUseCertTransparencyAwareApiForOsCertVerify); + #endif // BUILDFLAG(IS_ANDROID) +#include "cromite_flags/net_base_features_h.inc" } // namespace net::features @@ -1970,8 +2000,8 @@ 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 -@@ -366,4 +366,5 @@ BASE_FEATURE(kSRIMessageSignatureEnforcement, - "SRIMessageSignatureEnforcement", +@@ -351,4 +351,5 @@ BASE_FEATURE(kAdAuctionEventRegistration, + "AdAuctionEventRegistration", base::FEATURE_DISABLED_BY_DEFAULT); +#include "cromite_flags/services_network_public_cpp_features_cc.inc" @@ -1979,9 +2009,9 @@ diff --git a/services/network/public/cpp/features.cc b/services/network/public/c 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 -@@ -155,6 +155,7 @@ BASE_DECLARE_FEATURE(kEnableLockCookieDatabaseByDefault); - COMPONENT_EXPORT(NETWORK_CPP) - BASE_DECLARE_FEATURE(kSRIMessageSignatureEnforcement); +@@ -150,6 +150,7 @@ COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kCreateURLLoaderPipeAsync); + // requests be processed? + COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kAdAuctionEventRegistration); +#include "cromite_flags/services_network_public_cpp_features_h.inc" } // namespace network::features @@ -1990,7 +2020,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 -@@ -2898,4 +2898,5 @@ bool IsLinkPreviewTriggerTypeEnabled(LinkPreviewTriggerType type) { +@@ -2899,4 +2899,5 @@ bool IsLinkPreviewTriggerTypeEnabled(LinkPreviewTriggerType type) { // // DO NOT ADD NEW FEATURES HERE. @@ -1999,7 +2029,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 -@@ -1874,6 +1874,7 @@ BLINK_COMMON_EXPORT bool IsUpdateComplexSafaAreaConstraintsEnabled(); +@@ -1889,6 +1889,7 @@ BLINK_COMMON_EXPORT bool IsUpdateComplexSafaAreaConstraintsEnabled(); // // DO NOT ADD NEW FEATURES HERE. @@ -2010,7 +2040,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 -@@ -454,4 +454,5 @@ BASE_FEATURE(kAsyncFullscreenWindowState, +@@ -451,4 +451,5 @@ BASE_FEATURE(kAsyncFullscreenWindowState, "AsyncFullscreenWindowState", base::FEATURE_DISABLED_BY_DEFAULT); @@ -2019,7 +2049,7 @@ diff --git a/ui/base/ui_base_features.cc b/ui/base/ui_base_features.cc diff --git a/ui/base/ui_base_features.h b/ui/base/ui_base_features.h --- a/ui/base/ui_base_features.h +++ b/ui/base/ui_base_features.h -@@ -235,6 +235,7 @@ BASE_DECLARE_FEATURE(kWriteBookmarkWithoutTitle); +@@ -230,6 +230,7 @@ BASE_DECLARE_FEATURE(kWriteBookmarkWithoutTitle); COMPONENT_EXPORT(UI_BASE_FEATURES) BASE_DECLARE_FEATURE(kAsyncFullscreenWindowState); diff --git a/build/cromite_patches/Add-custom-tab-intents-privacy-option.patch b/build/cromite_patches/Add-custom-tab-intents-privacy-option.patch index 9562750a189a2adbdab365a4681fa28d0073dbfe..f66bd056e7eaa631adb4084bb0acaddee9a50d0f 100644 --- a/build/cromite_patches/Add-custom-tab-intents-privacy-option.patch +++ b/build/cromite_patches/Add-custom-tab-intents-privacy-option.patch @@ -18,20 +18,20 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../customtabs/CustomTabsConnection.java | 1 + .../IncognitoCustomTabIntentDataProvider.java | 14 ++++++ .../privacy/settings/PrivacySettings.java | 50 +++++++++++++++++++ - .../browser/flags/ChromeFeatureList.java | 2 + + .../browser/flags/ChromeFeatureList.java | 3 ++ .../chrome/browser/tab/TabAssociatedApp.java | 6 ++- ...Add-custom-tab-intents-privacy-option.grdp | 25 ++++++++++ .../OriginVerifier.java | 5 ++ .../core/common/language_experiments.cc | 1 + .../add-custom-tab-intents-privacy-option.inc | 1 + - 12 files changed, 143 insertions(+), 2 deletions(-) + 12 files changed, 144 insertions(+), 2 deletions(-) create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-custom-tab-intents-privacy-option.grdp create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/add-custom-tab-intents-privacy-option.inc diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml --- a/chrome/android/java/res/xml/privacy_preferences.xml +++ b/chrome/android/java/res/xml/privacy_preferences.xml -@@ -62,6 +62,21 @@ found in the LICENSE file. +@@ -56,6 +56,21 @@ found in the LICENSE file. android:key="cromite_flags" android:title="@string/cromite_flags_title" app:url="@string/cromite_flags_url" /> @@ -178,7 +178,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Inco diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java -@@ -60,6 +60,15 @@ import org.chromium.device.DeviceFeatureList; +@@ -59,6 +59,15 @@ import org.chromium.device.DeviceFeatureList; import org.chromium.device.DeviceFeatureMap; import org.chromium.ui.text.SpanApplier; @@ -194,7 +194,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting import androidx.annotation.Nullable; import androidx.preference.PreferenceCategory; import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager; -@@ -112,6 +121,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment +@@ -107,6 +116,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment private IncognitoLockSettings mIncognitoLockSettings; private final ObservableSupplierImpl mPageTitle = new ObservableSupplierImpl<>(); @@ -204,7 +204,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting @Override public void onCreatePreferencesCromite(Bundle savedInstanceState, String rootKey) { mPageTitle.set(getString(R.string.prefs_privacy_security)); -@@ -349,6 +361,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment +@@ -336,6 +348,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment new SpanApplier.SpanInfo("", "", servicesLink)); } @@ -214,7 +214,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting @Override public boolean onPreferenceChange(Preference preference, Object newValue) { String key = preference.getKey(); -@@ -369,6 +384,31 @@ public class PrivacySettings extends ChromeBaseSettingsFragment +@@ -356,6 +371,31 @@ public class PrivacySettings extends ChromeBaseSettingsFragment } else if (PREF_SEARCH_SUGGESTIONS.equals(key)) { UserPrefs.get(getProfile()) .setBoolean(Pref.SEARCH_SUGGEST_ENABLED, (boolean) newValue); @@ -246,7 +246,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting } return true; } -@@ -401,6 +441,16 @@ public class PrivacySettings extends ChromeBaseSettingsFragment +@@ -388,6 +428,16 @@ public class PrivacySettings extends ChromeBaseSettingsFragment UserPrefs.get(getProfile()).getBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED)); } @@ -266,18 +266,19 @@ 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 -@@ -719,6 +719,7 @@ public abstract class ChromeFeatureList { - public static final CachedFlag sLogoPolishAnimationKillSwitch = - newCachedFlag(LOGO_POLISH_ANIMATION_KILL_SWITCH, true); +@@ -730,6 +730,8 @@ public abstract class ChromeFeatureList { public static final CachedFlag sMagicStackAndroid = newCachedFlag(MAGIC_STACK_ANDROID, true); -+ public static final CachedFlag sMayLaunchurlUsesSeparateStoragePartition = newCachedFlag(MAYLAUNCHURL_USES_SEPARATE_STORAGE_PARTITION, false); + public static final CachedFlag sMostVisitedTilesCustomization = + newCachedFlag(MOST_VISITED_TILES_CUSTOMIZATION, false); ++ public static final CachedFlag sMayLaunchurlUsesSeparateStoragePartition = ++ newCachedFlag(MAYLAUNCHURL_USES_SEPARATE_STORAGE_PARTITION, false); public static final CachedFlag sMostVisitedTilesReselect = newCachedFlag(MOST_VISITED_TILES_RESELECT, false); public static final CachedFlag sMultiInstanceApplicationStatusCleanup = -@@ -883,6 +884,7 @@ public abstract class ChromeFeatureList { - sLogoPolishAnimationKillSwitch, +@@ -897,6 +899,7 @@ public abstract class ChromeFeatureList { sNotificationTrampoline, sMagicStackAndroid, + sMostVisitedTilesCustomization, + sMayLaunchurlUsesSeparateStoragePartition, sMostVisitedTilesReselect, sMultiInstanceApplicationStatusCleanup, @@ -331,7 +332,7 @@ new file mode 100644 diff --git a/components/content_relationship_verification/android/java/src/org/chromium/components/content_relationship_verification/OriginVerifier.java b/components/content_relationship_verification/android/java/src/org/chromium/components/content_relationship_verification/OriginVerifier.java --- a/components/content_relationship_verification/android/java/src/org/chromium/components/content_relationship_verification/OriginVerifier.java +++ b/components/content_relationship_verification/android/java/src/org/chromium/components/content_relationship_verification/OriginVerifier.java -@@ -176,6 +176,11 @@ public abstract class OriginVerifier { +@@ -180,6 +180,11 @@ public abstract class OriginVerifier { assert mNativeOriginVerifier != 0 : "Either provide a browserContextHandle to " + "OriginVerifier#ctor or call initNativeOriginVerifier."; @@ -342,7 +343,7 @@ diff --git a/components/content_relationship_verification/android/java/src/org/c + } String scheme = origin.uri().getScheme(); - String host = origin.uri().getHost(); + String host = assumeNonNull(origin.uri().getHost()); diff --git a/components/language/core/common/language_experiments.cc b/components/language/core/common/language_experiments.cc --- a/components/language/core/common/language_experiments.cc +++ b/components/language/core/common/language_experiments.cc diff --git a/build/cromite_patches/Add-exit-menu-item.patch b/build/cromite_patches/Add-exit-menu-item.patch index bbdeae3474bc2459523e426c82fa90b3beded99b..784dbf484068da1a1c406fe1dc6cb6d7a9d7303e 100644 --- a/build/cromite_patches/Add-exit-menu-item.patch +++ b/build/cromite_patches/Add-exit-menu-item.patch @@ -16,7 +16,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml --- a/chrome/android/java/res/menu/main_menu.xml +++ b/chrome/android/java/res/menu/main_menu.xml -@@ -163,6 +163,9 @@ found in the LICENSE file. +@@ -166,6 +166,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 -@@ -192,6 +195,9 @@ found in the LICENSE file. +@@ -195,6 +198,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 -@@ -292,6 +292,8 @@ import java.util.Set; +@@ -293,6 +293,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. -@@ -3000,6 +3002,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn +@@ -3021,6 +3023,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn .closeTabs( TabClosureParams.closeTab(currentTab).build(), /* allowDialog= */ true); RecordUserAction.record("MobileTabClosed"); @@ -60,7 +60,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 -@@ -61,6 +61,7 @@ import org.chromium.chrome.R; +@@ -60,6 +60,7 @@ import org.chromium.chrome.R; import org.chromium.chrome.browser.ActivityTabProvider; import org.chromium.chrome.browser.ActivityUtils; import org.chromium.chrome.browser.AppHooks; @@ -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 -@@ -4388,6 +4388,9 @@ To change this setting, BEGIN_LINKdelete the Chrome d +@@ -4345,6 +4345,9 @@ To change this setting, BEGIN_LINKdelete the Chrome d Dark theme diff --git a/build/cromite_patches/Add-flag-for-omnibox-autocomplete-filtering.patch b/build/cromite_patches/Add-flag-for-omnibox-autocomplete-filtering.patch index 830ffb01adf01e7ecdfb50a7bbb1186a2c2f2d61..9ef86be5574e09728d3061973dfe3faa28c8febe 100644 --- a/build/cromite_patches/Add-flag-for-omnibox-autocomplete-filtering.patch +++ b/build/cromite_patches/Add-flag-for-omnibox-autocomplete-filtering.patch @@ -26,7 +26,7 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/ #include "base/feature_list.h" #include "base/format_macros.h" #include "base/functional/bind.h" -@@ -535,6 +536,15 @@ AutocompleteController::AutocompleteController( +@@ -540,6 +541,15 @@ AutocompleteController::AutocompleteController( provider_client_->GetOmniboxTriggeredFeatureService()), steady_state_omnibox_position_( metrics::OmniboxEventProto::UNKNOWN_POSITION) { @@ -45,7 +45,7 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/ diff --git a/components/omnibox/browser/history_url_provider.cc b/components/omnibox/browser/history_url_provider.cc --- a/components/omnibox/browser/history_url_provider.cc +++ b/components/omnibox/browser/history_url_provider.cc -@@ -490,6 +490,9 @@ void HistoryURLProvider::Start(const AutocompleteInput& input, +@@ -489,6 +489,9 @@ void HistoryURLProvider::Start(const AutocompleteInput& input, if (fixed_up_input.type() != metrics::OmniboxInputType::QUERY) matches_.push_back(what_you_typed_match); @@ -66,7 +66,7 @@ diff --git a/components/omnibox/browser/search_provider.cc b/components/omnibox/ #include "base/functional/callback.h" #include "base/i18n/break_iterator.h" #include "base/i18n/case_conversion.h" -@@ -628,6 +629,9 @@ void SearchProvider::Run(bool query_is_private) { +@@ -629,6 +630,9 @@ void SearchProvider::Run(bool query_is_private) { } void SearchProvider::DoHistoryQuery(bool minimal_changes) { @@ -79,7 +79,7 @@ diff --git a/components/omnibox/browser/search_provider.cc b/components/omnibox/ diff --git a/components/url_formatter/url_fixer.cc b/components/url_formatter/url_fixer.cc --- a/components/url_formatter/url_fixer.cc +++ b/components/url_formatter/url_fixer.cc -@@ -14,6 +14,8 @@ +@@ -15,6 +15,8 @@ #include #include "base/check_op.h" diff --git a/build/cromite_patches/Add-flag-to-configure-maximum-connections-per-host.patch b/build/cromite_patches/Add-flag-to-configure-maximum-connections-per-host.patch index 845cff1577f93730c3e612c9919fec36ce33b036..f43672e013664e4d3574359ee1e3c66c2c686bdf 100644 --- a/build/cromite_patches/Add-flag-to-configure-maximum-connections-per-host.patch +++ b/build/cromite_patches/Add-flag-to-configure-maximum-connections-per-host.patch @@ -92,7 +92,7 @@ new file mode 100644 diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket_pool_manager.cc --- a/net/socket/client_socket_pool_manager.cc +++ b/net/socket/client_socket_pool_manager.cc -@@ -26,6 +26,10 @@ +@@ -22,6 +22,10 @@ #include "net/socket/client_socket_handle.h" #include "net/socket/client_socket_pool.h" #include "net/socket/connect_job.h" @@ -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" -@@ -165,6 +169,19 @@ void ClientSocketPoolManager::set_max_sockets_per_pool( +@@ -161,6 +165,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/cromite_patches/Add-flag-to-disable-IPv6-probes.patch b/build/cromite_patches/Add-flag-to-disable-IPv6-probes.patch index ac0aed5148d4f81d39e0ab1016fe5f29c4b2e7da..6883cd5d31d785864c1e3c3e66df40bf421050a1 100644 --- a/build/cromite_patches/Add-flag-to-disable-IPv6-probes.patch +++ b/build/cromite_patches/Add-flag-to-disable-IPv6-probes.patch @@ -45,7 +45,7 @@ new file mode 100644 diff --git a/net/BUILD.gn b/net/BUILD.gn --- a/net/BUILD.gn +++ b/net/BUILD.gn -@@ -1112,6 +1112,7 @@ component("net") { +@@ -1118,6 +1118,7 @@ component("net") { "//build:chromeos_buildflags", "//components/miracle_parameter/common", "//components/network_time/time_tracker", @@ -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" -@@ -1426,6 +1427,13 @@ int HostResolverManager::StartIPv6ReachabilityCheck( +@@ -1425,6 +1426,13 @@ int HostResolverManager::StartIPv6ReachabilityCheck( return OK; } diff --git a/build/cromite_patches/Add-flag-to-disable-external-intent-requests.patch b/build/cromite_patches/Add-flag-to-disable-external-intent-requests.patch index b981be038a131b48ebcd8694098480df0bcb6983..b8e7af240fd1e4262b53f08bd2211b075f960924 100644 --- a/build/cromite_patches/Add-flag-to-disable-external-intent-requests.patch +++ b/build/cromite_patches/Add-flag-to-disable-external-intent-requests.patch @@ -32,7 +32,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml --- a/chrome/android/java/res/xml/privacy_preferences.xml +++ b/chrome/android/java/res/xml/privacy_preferences.xml -@@ -87,7 +87,12 @@ found in the LICENSE file. +@@ -81,7 +81,12 @@ found in the LICENSE file. android:title="@string/settings_incognito_tab_lock_title" android:summary="@string/settings_incognito_tab_lock_summary_android_setting_off" android:persistent="false" /> @@ -142,7 +142,7 @@ diff --git a/components/external_intents/android/external_intents_features.cc b/ --- a/components/external_intents/android/external_intents_features.cc +++ b/components/external_intents/android/external_intents_features.cc @@ -27,7 +27,6 @@ namespace { - const base::Feature* kFeaturesExposedToJava[] = { + const base::Feature* const kFeaturesExposedToJava[] = { &kExternalNavigationDebugLogs, &kBlockFrameRenavigations, &kBlockIntentsToSelf, &kTrustedClientGestureBypass}; - @@ -193,7 +193,7 @@ diff --git a/components/external_intents/android/java/src/org/chromium/component 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 -@@ -1530,6 +1530,12 @@ public class ExternalNavigationHandler { +@@ -1529,6 +1529,12 @@ public class ExternalNavigationHandler { || ignoreBackForwardNav(params); } @@ -206,7 +206,7 @@ diff --git a/components/external_intents/android/java/src/org/chromium/component private OverrideUrlLoadingResult shouldOverrideUrlLoadingInternal( ExternalNavigationParams params, Intent targetIntent, -@@ -1586,6 +1592,21 @@ public class ExternalNavigationHandler { +@@ -1585,6 +1591,21 @@ public class ExternalNavigationHandler { return OverrideUrlLoadingResult.forNoOverride(); } diff --git a/build/cromite_patches/Add-flag-to-disable-vibration.patch b/build/cromite_patches/Add-flag-to-disable-vibration.patch index c02d47a544fff5ead41e123e53b5a0c255d6cde6..5d3f0e58c722909cd491b0c4ec6bcb84577857fa 100644 --- a/build/cromite_patches/Add-flag-to-disable-vibration.patch +++ b/build/cromite_patches/Add-flag-to-disable-vibration.patch @@ -104,7 +104,7 @@ diff --git a/third_party/blink/renderer/platform/exported/web_runtime_features.c diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -853,6 +853,10 @@ +@@ -855,6 +855,10 @@ status: {"Android": "stable"}, base_feature: "none", }, diff --git a/build/cromite_patches/Add-lifetime-options-for-permissions.patch b/build/cromite_patches/Add-lifetime-options-for-permissions.patch index ff1b03136e795d2fb739d64ec84d4828bec61695..0baeefa9ec8cb1cb275b0f06ce8f161ef3b10186 100644 --- a/build/cromite_patches/Add-lifetime-options-for-permissions.patch +++ b/build/cromite_patches/Add-lifetime-options-for-permissions.patch @@ -57,7 +57,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../one_time_permissions_tracker.h | 5 +- .../one_time_permissions_tracker_factory.cc | 2 +- .../views/permissions/chip/chip_controller.cc | 2 +- - .../permissions/embedded_permission_prompt.cc | 2 +- ...exclusive_access_permission_prompt_view.cc | 2 +- .../permission_prompt_bubble_base_view.cc | 2 +- .../site_settings/PermissionInfo.java | 1 + @@ -74,6 +73,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html components/page_info/page_info.h | 1 + .../permissions/PermissionDialogDelegate.java | 13 +++ .../PermissionDialogModelFactory.java | 82 ++++++++++++++++++- + .../embedded_permission_prompt_android.cc | 3 +- + .../embedded_permission_prompt_android.h | 2 +- .../permission_dialog_delegate.cc | 24 +++++- .../permission_dialog_delegate.h | 1 + .../permission_prompt_android.cc | 8 +- @@ -81,6 +82,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../android/permissions_android_strings.grd | 17 ++++ .../geolocation_permission_context_android.cc | 34 ++++++-- .../geolocation_permission_context_android.h | 13 ++- + .../embedded_permission_prompt_flow_model.cc | 2 +- .../permissions/permission_context_base.cc | 52 ++++++++++-- .../permissions/permission_context_base.h | 23 +++++- components/permissions/permission_prompt.h | 3 +- @@ -88,7 +90,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html components/permissions/permission_request.h | 16 +++- .../permissions/permission_request_manager.cc | 45 ++++++---- .../permissions/permission_request_manager.h | 11 ++- - 36 files changed, 490 insertions(+), 69 deletions(-) + 38 files changed, 493 insertions(+), 71 deletions(-) diff --git a/chrome/browser/permissions/last_tab_standing_tracker.cc b/chrome/browser/permissions/last_tab_standing_tracker.cc --- a/chrome/browser/permissions/last_tab_standing_tracker.cc @@ -230,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 -@@ -234,7 +234,7 @@ void ChipController::OnWidgetDestroyed(views::Widget* widget) { +@@ -235,7 +235,7 @@ void ChipController::OnWidgetDestroyed(views::Widget* widget) { active_chip_permission_request_manager_.value()->Accept(); break; case permissions::PermissionAction::GRANTED_ONCE: @@ -239,18 +241,6 @@ diff --git a/chrome/browser/ui/views/permissions/chip/chip_controller.cc b/chrom break; case permissions::PermissionAction::DENIED: active_chip_permission_request_manager_.value()->Deny(); -diff --git a/chrome/browser/ui/views/permissions/embedded_permission_prompt.cc b/chrome/browser/ui/views/permissions/embedded_permission_prompt.cc ---- a/chrome/browser/ui/views/permissions/embedded_permission_prompt.cc -+++ b/chrome/browser/ui/views/permissions/embedded_permission_prompt.cc -@@ -664,7 +664,7 @@ void EmbeddedPermissionPrompt::SendDelegateAction(Action action) { - delegate_->Accept(); - break; - case Action::kAllowThisTime: -- delegate_->AcceptThisTime(); -+ delegate_->AcceptThisTime(content_settings::mojom::LifetimeMode::ONLY_THIS_TIME); - break; - case Action::kDeny: - delegate_->Deny(); diff --git a/chrome/browser/ui/views/permissions/exclusive_access_permission_prompt_view.cc b/chrome/browser/ui/views/permissions/exclusive_access_permission_prompt_view.cc --- a/chrome/browser/ui/views/permissions/exclusive_access_permission_prompt_view.cc +++ b/chrome/browser/ui/views/permissions/exclusive_access_permission_prompt_view.cc @@ -342,7 +332,7 @@ diff --git a/components/browser_ui/strings/android/browser_ui_strings.grd b/comp diff --git a/components/content_settings/core/browser/content_settings_utils.cc b/components/content_settings/core/browser/content_settings_utils.cc --- a/components/content_settings/core/browser/content_settings_utils.cc +++ b/components/content_settings/core/browser/content_settings_utils.cc -@@ -160,6 +160,42 @@ bool IsConstraintPersistent(const ContentSettingConstraints& constraints) { +@@ -157,6 +157,42 @@ bool IsConstraintPersistent(const ContentSettingConstraints& constraints) { return constraints.session_model() == mojom::SessionModel::DURABLE; } @@ -385,7 +375,7 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.cc bool CanTrackLastVisit(ContentSettingsType type) { // Last visit is not tracked for notification permission as it shouldn't be // auto-revoked. -@@ -258,9 +294,6 @@ const std::vector& GetTypesWithTemporaryGrants() { +@@ -240,9 +276,6 @@ const std::vector& GetTypesWithTemporaryGrants() { ContentSettingsType::CAPTURED_SURFACE_CONTROL, #endif ContentSettingsType::KEYBOARD_LOCK, @@ -395,7 +385,7 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.cc ContentSettingsType::HAND_TRACKING, ContentSettingsType::SMART_CARD_DATA, }}; -@@ -274,9 +307,6 @@ const std::vector& GetTypesWithTemporaryGrantsInHcsm() { +@@ -256,9 +289,6 @@ const std::vector& GetTypesWithTemporaryGrantsInHcsm() { ContentSettingsType::CAPTURED_SURFACE_CONTROL, #endif ContentSettingsType::KEYBOARD_LOCK, @@ -424,8 +414,8 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.h b diff --git a/components/content_settings/core/common/content_settings_enums.mojom b/components/content_settings/core/common/content_settings_enums.mojom --- a/components/content_settings/core/common/content_settings_enums.mojom +++ b/components/content_settings/core/common/content_settings_enums.mojom -@@ -58,6 +58,15 @@ enum SessionModel { - ONE_TIME, +@@ -63,6 +63,15 @@ enum SessionModel { + ONE_TIME = 3, }; +// GENERATED_JAVA_ENUM_PACKAGE: org.chromium.components.content_settings @@ -443,7 +433,7 @@ diff --git a/components/content_settings/core/common/content_settings_enums.mojo diff --git a/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java b/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java --- a/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java +++ b/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java -@@ -383,9 +383,9 @@ public class PageInfoController +@@ -385,9 +385,9 @@ public class PageInfoController String name, String nameMidSentence, int type, @@ -573,9 +563,9 @@ diff --git a/components/permissions/android/java/src/org/chromium/components/per import java.util.ArrayList; import java.util.List; -@@ -60,6 +61,9 @@ public class PermissionDialogDelegate { - /** The {@link ContentSettingsType}s requested in this dialog. */ - private int[] mContentSettingsTypes; +@@ -63,6 +64,9 @@ public class PermissionDialogDelegate { + // Prompt(screen) variant we want to display on the dialog. + private @EmbeddedPromptVariant int mEmbeddedPromptVariant; + /** Lifetime option selected by the user. */ + private int mSelectedLifetimeOption = LifetimeMode.ALWAYS; @@ -583,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. -@@ -117,6 +121,15 @@ public class PermissionDialogDelegate { +@@ -132,6 +136,15 @@ public class PermissionDialogDelegate { .acceptThisTime(mNativeDelegatePtr, PermissionDialogDelegate.this); } @@ -596,9 +586,9 @@ diff --git a/components/permissions/android/java/src/org/chromium/components/per + return mSelectedLifetimeOption; + } + - public void onCancel() { + public void onDeny() { assert mNativeDelegatePtr != 0; - PermissionDialogDelegateJni.get().cancel(mNativeDelegatePtr, PermissionDialogDelegate.this); + PermissionDialogDelegateJni.get().deny(mNativeDelegatePtr, PermissionDialogDelegate.this); 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 @@ -621,9 +611,9 @@ diff --git a/components/permissions/android/java/src/org/chromium/components/per /** This class creates the model for the permission dialog. */ class PermissionDialogModelFactory { public static PropertyModel getModel( -@@ -72,6 +84,74 @@ class PermissionDialogModelFactory { - ModalDialogProperties.NEGATIVE_BUTTON_TEXT, - delegate.getNegativeButtonText()); +@@ -65,7 +77,75 @@ class PermissionDialogModelFactory { + ModalDialogProperties.ButtonStyles.PRIMARY_FILLED_NEGATIVE_OUTLINE) + .with(ModalDialogProperties.CHANGE_CUSTOM_VIEW_OR_BUTTONS, true); } - return builder.build(); + @@ -696,12 +686,38 @@ diff --git a/components/permissions/android/java/src/org/chromium/components/per + } + return false; } + + public static ModalDialogProperties.ModalDialogButtonSpec[] getButtonSpecs( +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() { + delegate()->FinalizeCurrentRequests(); } + +-void EmbeddedPermissionPromptAndroid::AcceptThisTime() { ++void EmbeddedPermissionPromptAndroid::AcceptThisTime( ++ content_settings::mojom::LifetimeMode lifetimeOption) { + prompt_model_->PrecalculateVariantsForMetrics(); + prompt_model_->RecordPermissionActionUKM( + permissions::ElementAnchoredBubbleAction::kGrantedOnce); +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 { + const override; + void Closing() override; + void Accept() override; +- void AcceptThisTime() override; ++ void AcceptThisTime(content_settings::mojom::LifetimeMode lifetimeOption) override; + void Acknowledge() override; + void Deny() override; + void Resumed() override; diff --git a/components/permissions/android/permission_prompt/permission_dialog_delegate.cc b/components/permissions/android/permission_prompt/permission_dialog_delegate.cc --- a/components/permissions/android/permission_prompt/permission_dialog_delegate.cc +++ b/components/permissions/android/permission_prompt/permission_dialog_delegate.cc -@@ -158,6 +158,11 @@ void PermissionDialogJavaDelegate::DismissDialog() { - Java_PermissionDialogDelegate_dismissFromNative(env, j_delegate_); +@@ -139,6 +139,11 @@ void PermissionDialogJavaDelegate::UpdateDialog() { + static_cast(permission_prompt_->GetEmbeddedPromptVariant())); } +int PermissionDialogJavaDelegate::GetSelectedLifetimeOption() { @@ -710,9 +726,9 @@ diff --git a/components/permissions/android/permission_prompt/permission_dialog_ +} + // static - void PermissionDialogDelegate::Create( + std::unique_ptr PermissionDialogDelegate::Create( content::WebContents* web_contents, -@@ -186,6 +191,13 @@ PermissionDialogDelegate* PermissionDialogDelegate::CreateForTesting( +@@ -168,6 +173,13 @@ PermissionDialogDelegate::CreateForTesting( void PermissionDialogDelegate::Accept(JNIEnv* env, const JavaParamRef& obj) { CHECK(permission_prompt_); @@ -726,7 +742,7 @@ diff --git a/components/permissions/android/permission_prompt/permission_dialog_ permission_prompt_->Accept(); } -@@ -193,12 +205,22 @@ void PermissionDialogDelegate::AcceptThisTime( +@@ -175,7 +187,10 @@ void PermissionDialogDelegate::AcceptThisTime( JNIEnv* env, const JavaParamRef& obj) { CHECK(permission_prompt_); @@ -737,8 +753,10 @@ diff --git a/components/permissions/android/permission_prompt/permission_dialog_ + permission_prompt_->AcceptThisTime(lifetimeOption); } - void PermissionDialogDelegate::Cancel(JNIEnv* env, - const JavaParamRef& obj) { + void PermissionDialogDelegate::Acknowledge(JNIEnv* env, +@@ -187,6 +202,13 @@ void PermissionDialogDelegate::Acknowledge(JNIEnv* env, + void PermissionDialogDelegate::Deny(JNIEnv* env, + const JavaParamRef& obj) { CHECK(permission_prompt_); + content_settings::mojom::LifetimeMode lifetimeOption = + static_cast( @@ -753,18 +771,18 @@ diff --git a/components/permissions/android/permission_prompt/permission_dialog_ diff --git a/components/permissions/android/permission_prompt/permission_dialog_delegate.h b/components/permissions/android/permission_prompt/permission_dialog_delegate.h --- a/components/permissions/android/permission_prompt/permission_dialog_delegate.h +++ b/components/permissions/android/permission_prompt/permission_dialog_delegate.h -@@ -41,6 +41,7 @@ class PermissionDialogJavaDelegate { +@@ -42,6 +42,7 @@ class PermissionDialogJavaDelegate { const favicon_base::FaviconRawBitmapResult& favicon_result); virtual void DismissDialog(); + virtual int GetSelectedLifetimeOption(); - private: - base::android::ScopedJavaGlobalRef j_delegate_; + virtual void UpdateDialog(); + diff --git a/components/permissions/android/permission_prompt/permission_prompt_android.cc b/components/permissions/android/permission_prompt/permission_prompt_android.cc --- a/components/permissions/android/permission_prompt/permission_prompt_android.cc +++ b/components/permissions/android/permission_prompt/permission_prompt_android.cc -@@ -67,8 +67,12 @@ void PermissionPromptAndroid::Accept() { +@@ -76,8 +76,12 @@ void PermissionPromptAndroid::Accept() { delegate_->Accept(); } @@ -782,17 +800,18 @@ diff --git a/components/permissions/android/permission_prompt/permission_prompt_ diff --git a/components/permissions/android/permission_prompt/permission_prompt_android.h b/components/permissions/android/permission_prompt/permission_prompt_android.h --- a/components/permissions/android/permission_prompt/permission_prompt_android.h +++ b/components/permissions/android/permission_prompt/permission_prompt_android.h -@@ -49,8 +49,9 @@ class PermissionPromptAndroid : public PermissionPrompt { - - void Closing(); - void Accept(); -- void AcceptThisTime(); -+ void AcceptThisTime(content_settings::mojom::LifetimeMode lifetimeOption); - void Deny(); -+ void DenyThisTime(content_settings::mojom::LifetimeMode lifetimeOption); - void SetManageClicked(); - void SetLearnMoreClicked(); - bool ShouldCurrentRequestUseQuietUI(); +@@ -54,9 +54,10 @@ class PermissionPromptAndroid : public PermissionPrompt { + const; + virtual void Closing(); + virtual void Accept(); +- virtual void AcceptThisTime(); ++ virtual void AcceptThisTime(content_settings::mojom::LifetimeMode lifetimeOption); + virtual void Acknowledge() {} + virtual void Deny(); ++ virtual void DenyThisTime(content_settings::mojom::LifetimeMode lifetimeOption); + virtual void Resumed() {} + virtual void SystemSettingsShown() {} + virtual void SystemPermissionResolved(bool accepted) {} diff --git a/components/permissions/android/permissions_android_strings.grd b/components/permissions/android/permissions_android_strings.grd --- a/components/permissions/android/permissions_android_strings.grd +++ b/components/permissions/android/permissions_android_strings.grd @@ -823,7 +842,7 @@ diff --git a/components/permissions/android/permissions_android_strings.grd b/co diff --git a/components/permissions/contexts/geolocation_permission_context_android.cc b/components/permissions/contexts/geolocation_permission_context_android.cc --- a/components/permissions/contexts/geolocation_permission_context_android.cc +++ b/components/permissions/contexts/geolocation_permission_context_android.cc -@@ -162,7 +162,20 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( +@@ -168,7 +168,20 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( bool is_one_time, bool is_final_decision) { DCHECK(is_final_decision); @@ -844,7 +863,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr bool is_default_search = IsRequestingOriginDSE(requesting_origin); if (content_setting == CONTENT_SETTING_ALLOW && !location_settings_->IsSystemLocationSettingEnabled()) { -@@ -175,7 +188,8 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( +@@ -181,7 +194,8 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( if (IsInLocationSettingsBackOff(is_default_search)) { FinishNotifyPermissionSet(id, requesting_origin, embedding_origin, std::move(callback), false /* persist */, @@ -854,7 +873,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr return; } -@@ -193,7 +207,8 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( +@@ -199,7 +213,8 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( !location_settings_dialog_callback_.is_null()) { FinishNotifyPermissionSet(id, requesting_origin, embedding_origin, std::move(callback), false /* persist */, @@ -864,7 +883,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr return; } -@@ -205,13 +220,13 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( +@@ -211,13 +226,13 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( base::BindOnce( &GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown, weak_factory_.GetWeakPtr(), requesting_origin, embedding_origin, @@ -880,7 +899,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr } content::PermissionResult -@@ -381,7 +396,7 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown( +@@ -390,7 +405,7 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown( const GURL& embedding_origin, bool persist, ContentSetting content_setting, @@ -889,7 +908,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr LocationSettingsDialogOutcome prompt_outcome) { bool is_default_search = IsRequestingOriginDSE(requesting_origin); if (prompt_outcome == GRANTED) { -@@ -400,7 +415,8 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown( +@@ -409,7 +424,8 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown( FinishNotifyPermissionSet(location_settings_dialog_request_id_, requesting_origin, embedding_origin, std::move(location_settings_dialog_callback_), @@ -899,7 +918,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr location_settings_dialog_request_id_ = PermissionRequestID(content::GlobalRenderFrameHostId(0, 0), -@@ -414,10 +430,10 @@ void GeolocationPermissionContextAndroid::FinishNotifyPermissionSet( +@@ -423,10 +439,10 @@ void GeolocationPermissionContextAndroid::FinishNotifyPermissionSet( BrowserPermissionCallback callback, bool persist, ContentSetting content_setting, @@ -930,9 +949,9 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr + bool is_final_decision, + content_settings::mojom::LifetimeMode lifetime_option) override; content::PermissionResult UpdatePermissionStatusWithDeviceStatus( + content::WebContents* web_contents, content::PermissionResult result, - const GURL& requesting_origin, -@@ -133,6 +142,7 @@ class GeolocationPermissionContextAndroid +@@ -134,6 +143,7 @@ class GeolocationPermissionContextAndroid bool persist, ContentSetting content_setting, bool is_one_time, @@ -940,7 +959,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr LocationSettingsDialogOutcome prompt_outcome); void FinishNotifyPermissionSet(const PermissionRequestID& id, -@@ -141,7 +151,8 @@ class GeolocationPermissionContextAndroid +@@ -142,7 +152,8 @@ class GeolocationPermissionContextAndroid BrowserPermissionCallback callback, bool persist, ContentSetting content_setting, @@ -950,11 +969,23 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr std::unique_ptr location_settings_; +diff --git a/components/permissions/embedded_permission_prompt_flow_model.cc b/components/permissions/embedded_permission_prompt_flow_model.cc +--- a/components/permissions/embedded_permission_prompt_flow_model.cc ++++ b/components/permissions/embedded_permission_prompt_flow_model.cc +@@ -295,7 +295,7 @@ void EmbeddedPermissionPromptFlowModel::SetDelegateAction( + delegate_->Accept(); + break; + case DelegateAction::kAllowThisTime: +- delegate_->AcceptThisTime(); ++ delegate_->AcceptThisTime(content_settings::mojom::LifetimeMode::ONLY_THIS_TIME); + break; + case DelegateAction::kDeny: + delegate_->Deny(); diff --git a/components/permissions/permission_context_base.cc b/components/permissions/permission_context_base.cc --- a/components/permissions/permission_context_base.cc +++ b/components/permissions/permission_context_base.cc -@@ -251,6 +251,17 @@ bool PermissionContextBase::UsesAutomaticEmbargo() const { - return true; +@@ -267,6 +267,17 @@ const PermissionRequest* PermissionContextBase::FindPermissionRequest( + return request->second.first.get(); } +std::unique_ptr @@ -971,7 +1002,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm content::PermissionResult PermissionContextBase::GetPermissionStatus( content::RenderFrameHost* render_frame_host, const GURL& requesting_origin, -@@ -497,7 +508,8 @@ void PermissionContextBase::PermissionDecided(const PermissionRequestID& id, +@@ -526,7 +537,8 @@ void PermissionContextBase::PermissionDecided(const PermissionRequestID& id, const GURL& embedding_origin, ContentSetting content_setting, bool is_one_time, @@ -981,7 +1012,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm DCHECK(content_setting == CONTENT_SETTING_ALLOW || content_setting == CONTENT_SETTING_BLOCK || content_setting == CONTENT_SETTING_DEFAULT); -@@ -512,13 +524,14 @@ void PermissionContextBase::PermissionDecided(const PermissionRequestID& id, +@@ -541,13 +553,14 @@ void PermissionContextBase::PermissionDecided(const PermissionRequestID& id, // missing if a permission prompt was preignored and we already notified an // origin about it. if (request->second.second) { @@ -1000,7 +1031,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm } } -@@ -586,11 +599,27 @@ void PermissionContextBase::NotifyPermissionSet( +@@ -628,11 +641,27 @@ void PermissionContextBase::NotifyPermissionSet( ContentSetting content_setting, bool is_one_time, bool is_final_decision) { @@ -1029,7 +1060,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm } if (is_final_decision) { -@@ -630,6 +659,15 @@ void PermissionContextBase::UpdateContentSetting(const GURL& requesting_origin, +@@ -673,6 +702,15 @@ void PermissionContextBase::UpdateContentSetting(const GURL& requesting_origin, const GURL& embedding_origin, ContentSetting content_setting, bool is_one_time) { @@ -1045,19 +1076,19 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm DCHECK_EQ(requesting_origin, requesting_origin.DeprecatedGetOriginAsURL()); DCHECK_EQ(embedding_origin, embedding_origin.DeprecatedGetOriginAsURL()); DCHECK(content_setting == CONTENT_SETTING_ALLOW || -@@ -639,6 +677,8 @@ void PermissionContextBase::UpdateContentSetting(const GURL& requesting_origin, +@@ -682,6 +720,8 @@ void PermissionContextBase::UpdateContentSetting(const GURL& requesting_origin, constraints.set_session_model( is_one_time ? content_settings::mojom::SessionModel::ONE_TIME : content_settings::mojom::SessionModel::DURABLE); + if (is_one_time) + constraints = content_settings::GetConstraintSessionExpiration(lifetime_option); - #if BUILDFLAG(IS_ANDROID) - if (base::FeatureList::IsEnabled( + // The Permissions module in Safety check will revoke permissions after + // a finite amount of time if the permission can be revoked. diff --git a/components/permissions/permission_context_base.h b/components/permissions/permission_context_base.h --- a/components/permissions/permission_context_base.h +++ b/components/permissions/permission_context_base.h -@@ -163,6 +163,15 @@ class PermissionContextBase : public content_settings::Observer { +@@ -166,6 +166,15 @@ class PermissionContextBase : public content_settings::Observer { // Updates stored content setting if persist is set, updates tab indicators // and runs the callback to finish the request. @@ -1073,7 +1104,7 @@ diff --git a/components/permissions/permission_context_base.h b/components/permi virtual void NotifyPermissionSet(const PermissionRequestID& id, const GURL& requesting_origin, const GURL& embedding_origin, -@@ -184,6 +193,11 @@ class PermissionContextBase : public content_settings::Observer { +@@ -187,6 +196,11 @@ class PermissionContextBase : public content_settings::Observer { // Store the decided permission as a content setting. // virtual since the permission might be stored with different restrictions // (for example for desktop notifications). @@ -1086,8 +1117,8 @@ diff --git a/components/permissions/permission_context_base.h b/components/permi const GURL& embedding_origin, ContentSetting content_setting, @@ -217,6 +231,12 @@ class PermissionContextBase : public content_settings::Observer { - // Implementors can override this method to avoid using automatic embargo. - virtual bool UsesAutomaticEmbargo() const; + PermissionRequest::PermissionDecidedCallback permission_decided_callback, + base::OnceClosure delete_callback) const; + virtual std::unique_ptr CreatePermissionRequest( + content::WebContents* web_contents, @@ -1095,10 +1126,10 @@ diff --git a/components/permissions/permission_context_base.h b/components/permi + PermissionRequest::PermissionDecidedCallbackWithLifetime permission_decided_callback, + base::OnceClosure delete_callback) const; + - base::ObserverList permission_observers_; + // Implementors can override this method to avoid using automatic embargo. + virtual bool UsesAutomaticEmbargo() const; - // Set by subclasses to inform the base class that they will handle adding -@@ -240,7 +260,8 @@ class PermissionContextBase : public content_settings::Observer { +@@ -249,7 +269,8 @@ class PermissionContextBase : public content_settings::Observer { const GURL& embedding_origin, ContentSetting content_setting, bool is_one_time, @@ -1304,13 +1335,13 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p } NotifyRequestDecided(PermissionAction::DENIED); -@@ -1255,32 +1266,32 @@ PermissionRequestManager::VisitDuplicateRequests( +@@ -1267,32 +1278,32 @@ PermissionRequestManager::VisitDuplicateRequests( void PermissionRequestManager::PermissionGrantedIncludingDuplicates( PermissionRequest* request, - bool is_one_time) { + bool is_one_time, content_settings::mojom::LifetimeMode lifetime_option) { - DCHECK_EQ(1ul, base::ranges::count(requests_, request) + + DCHECK_EQ(1ul, std::ranges::count(requests_, request) + pending_permission_requests_.Count(request)) << "Only requests in [pending_permission_]requests_ can have duplicates"; - request->PermissionGranted(is_one_time); @@ -1331,7 +1362,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p void PermissionRequestManager::PermissionDeniedIncludingDuplicates( - PermissionRequest* request) { + PermissionRequest* request, bool is_one_time, content_settings::mojom::LifetimeMode lifetime_option) { - DCHECK_EQ(1ul, base::ranges::count(requests_, request) + + DCHECK_EQ(1ul, std::ranges::count(requests_, request) + pending_permission_requests_.Count(request)) << "Only requests in [pending_permission_]requests_ can have duplicates"; - request->PermissionDenied(); @@ -1347,7 +1378,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p request); } -@@ -1541,7 +1552,7 @@ void PermissionRequestManager::DoAutoResponseForTesting() { +@@ -1558,7 +1569,7 @@ void PermissionRequestManager::DoAutoResponseForTesting() { } switch (auto_response_for_test_) { case ACCEPT_ONCE: @@ -1371,7 +1402,7 @@ diff --git a/components/permissions/permission_request_manager.h b/components/pe void Dismiss() override; void Ignore() override; void FinalizeCurrentRequests() override; -@@ -375,9 +377,12 @@ class PermissionRequestManager +@@ -374,9 +376,12 @@ class PermissionRequestManager // Calls PermissionGranted on a request and all its duplicates. void PermissionGrantedIncludingDuplicates(PermissionRequest* request, diff --git a/build/cromite_patches/Add-menu-item-to-bookmark-all-tabs.patch b/build/cromite_patches/Add-menu-item-to-bookmark-all-tabs.patch index 9d380f90cc752df079a1a4e781ae6559cdcc3ed0..39eb971aa1d5dd91da913bf9605ccdb662ad2113 100644 --- a/build/cromite_patches/Add-menu-item-to-bookmark-all-tabs.patch +++ b/build/cromite_patches/Add-menu-item-to-bookmark-all-tabs.patch @@ -7,9 +7,9 @@ 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 | 44 +++++++++++- + .../bookmarks/android/bookmark_bridge.cc | 42 ++++++++++++ .../bookmarks/android/bookmark_bridge.h | 8 +++ - .../browser/bookmarks/bookmark_html_writer.cc | 11 ++- + .../browser/bookmarks/bookmark_html_writer.cc | 14 +++- .../bookmark_merged_surface_service.cc | 3 + .../permanent_folder_ordering_tracker.cc | 2 + .../dialogs/DownloadLocationCustomView.java | 4 +- @@ -29,7 +29,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html components/bookmarks/browser/bookmark_uuids.h | 1 + components/bookmarks/browser/model_loader.cc | 8 ++- .../bookmark_specifics_conversions.cc | 1 + - 25 files changed, 248 insertions(+), 15 deletions(-) + 25 files changed, 250 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 -@@ -186,6 +190,9 @@ found in the LICENSE file. +@@ -189,6 +193,9 @@ found in the LICENSE file. @@ -58,7 +58,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -96,6 +96,7 @@ import org.chromium.chrome.browser.bookmarks.BookmarkPane; +@@ -97,6 +97,7 @@ import org.chromium.chrome.browser.bookmarks.BookmarkPane; import org.chromium.chrome.browser.bookmarks.BookmarkUtils; import org.chromium.chrome.browser.browserservices.intents.WebappConstants; import org.chromium.chrome.browser.compositor.CompositorViewHolder; @@ -66,7 +66,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct import org.chromium.chrome.browser.compositor.layouts.Layout; import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChrome; import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChromePhone; -@@ -3032,6 +3033,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn +@@ -3053,6 +3054,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn getTabModelSelectorSupplier().get(), closeAllTabsRunnable); RecordUserAction.record("MobileMenuCloseAllTabs"); @@ -75,7 +75,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 = -@@ -3117,6 +3120,27 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn +@@ -3138,6 +3141,27 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn getTabModalLifetimeHandler().onOmniboxFocusChanged(hasFocus); } @@ -203,7 +203,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm /** * Helper method to mark an item as read. * -@@ -1339,6 +1401,9 @@ class BookmarkBridge { +@@ -1345,6 +1407,9 @@ class BookmarkBridge { BookmarkId getMostRecentlyAddedUserBookmarkIdForUrl( long nativeBookmarkBridge, @JniType("GURL") GURL url); @@ -213,7 +213,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm BookmarkItem getBookmarkById(long nativeBookmarkBridge, long id, int type); void getTopLevelFolderIds( -@@ -1360,6 +1425,8 @@ class BookmarkBridge { +@@ -1366,6 +1431,8 @@ class BookmarkBridge { BookmarkId getRootFolderId(long nativeBookmarkBridge); @@ -225,16 +225,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm 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 -@@ -185,7 +185,7 @@ class FileBookmarksExportObserver: public BookmarksExportObserver { - - JNIEnv* env = AttachCurrentThread(); - Java_BookmarkBridge_bookmarksExported(env, obj_, window_->GetJavaObject(), -- ConvertUTF8ToJavaString(env, export_path_), -+ base::android::ConvertUTF8ToJavaString(env, export_path_), - result == Result::kSuccess); - delete this; - } -@@ -363,6 +363,33 @@ jboolean BookmarkBridge::AreAccountBookmarkFoldersActive(JNIEnv* env) { +@@ -326,6 +326,33 @@ jboolean BookmarkBridge::AreAccountBookmarkFoldersActive(JNIEnv* env) { return bookmark_model_->account_mobile_node() != nullptr; } @@ -268,7 +259,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse base::android::ScopedJavaLocalRef BookmarkBridge::GetMostRecentlyAddedUserBookmarkIdForUrl(JNIEnv* env, const GURL& url) { -@@ -475,6 +502,7 @@ void BookmarkBridge::GetAllFoldersWithDepths( +@@ -438,6 +465,7 @@ void BookmarkBridge::GetAllFoldersWithDepths( // Vector to temporarily contain all child bookmarks at same level for sorting std::vector bookmarks = { bookmark_model_->mobile_node(), @@ -276,7 +267,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse bookmark_model_->bookmark_bar_node(), bookmark_model_->other_node(), }; -@@ -568,6 +596,9 @@ std::vector BookmarkBridge::GetTopLevelFolderIdsImpl( +@@ -531,6 +559,9 @@ std::vector BookmarkBridge::GetTopLevelFolderIdsImpl( top_level_folders.push_back(other_node); } @@ -286,7 +277,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse const BookmarkNode* reading_list_node = local_or_syncable_reading_list_manager_->GetRoot(); if (IsPermanentFolderVisible(ignore_visibility, reading_list_node)) { -@@ -1269,6 +1300,17 @@ void BookmarkBridge::GetBookmarksOfType( +@@ -1256,6 +1287,17 @@ void BookmarkBridge::GetBookmarksOfType( AddBookmarkNodesToBookmarkIdList(env, j_list, results); } @@ -318,7 +309,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser base::android::ScopedJavaLocalRef GetMostRecentlyAddedUserBookmarkIdForUrl(JNIEnv* env, const GURL& url); const bookmarks::BookmarkNode* GetMostRecentlyAddedUserBookmarkIdForUrlImpl( -@@ -222,6 +226,10 @@ class BookmarkBridge : public ProfileObserver, +@@ -223,6 +227,10 @@ class BookmarkBridge : public ProfileObserver, const base::android::JavaParamRef& j_list, jint type); @@ -332,50 +323,73 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser 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 -@@ -174,7 +174,8 @@ class Writer : public base::RefCountedThreadSafe { +@@ -173,14 +173,15 @@ class Writer : public base::RefCountedThreadSafe { BookmarkCodec codec; - bookmarks_ = + local_bookmarks_ = codec.Encode(model->bookmark_bar_node(), model->other_node(), - model->mobile_node(), /*sync_metadata_str=*/std::string()); + model->mobile_node(), model->tabs_collection_node(), + /*sync_metadata_str=*/std::string()); - } - Writer(const Writer&) = delete; -@@ -201,15 +202,19 @@ class Writer : public base::RefCountedThreadSafe { - roots->FindDict(BookmarkCodec::kOtherBookmarkFolderNameKey); - base::Value::Dict* mobile_folder_value = - roots->FindDict(BookmarkCodec::kMobileBookmarkFolderNameKey); + if (model->account_bookmark_bar_node()) { + CHECK(model->account_other_node()); + CHECK(model->account_mobile_node()); + account_bookmarks_ = codec.Encode( + model->account_bookmark_bar_node(), model->account_other_node(), +- model->account_mobile_node(), /*sync_metadata_str=*/std::string()); ++ model->account_mobile_node(), /*tabs_folder_node*/ nullptr, /*sync_metadata_str=*/std::string()); + } else { + CHECK(!model->account_other_node()); + CHECK(!model->account_mobile_node()); +@@ -214,6 +215,9 @@ class Writer : public base::RefCountedThreadSafe { + base::Value::Dict* mobile_folder_value = local_permanent_folders->FindDict( + BookmarkCodec::kMobileBookmarkFolderNameKey); + CHECK(mobile_folder_value); + base::Value::Dict* tabs_collection_value = -+ roots->FindDict(BookmarkCodec::kTabsBookmarkFolderNameKey); - DCHECK(root_folder_value); - DCHECK(other_folder_value); - DCHECK(mobile_folder_value); -+ DCHECK(tabs_collection_value); - - IncrementIndent(); - - if (!WriteNode(*root_folder_value, BookmarkNode::BOOKMARK_BAR) || - !WriteNode(*other_folder_value, BookmarkNode::OTHER_NODE) || -- !WriteNode(*mobile_folder_value, BookmarkNode::MOBILE)) { -+ !WriteNode(*mobile_folder_value, BookmarkNode::MOBILE) || -+ !WriteNode(*tabs_collection_value, BookmarkNode::TABS_COLLECTION)) { - NotifyOnFinish(BookmarksExportObserver::Result::kCouldNotWriteNodes); - return; ++ local_permanent_folders->FindDict(BookmarkCodec::kTabsBookmarkFolderNameKey); ++ CHECK(tabs_collection_value); + + base::Value::Dict* account_permanent_folders = + account_bookmarks_.FindDict(BookmarkCodec::kRootsKey); +@@ -289,6 +293,10 @@ class Writer : public base::RefCountedThreadSafe { + return bookmark_html_writer::Result::kCouldNotWriteNodes; } -@@ -460,6 +465,8 @@ void BookmarkFaviconFetcher::ExportBookmarks() { - BookmarkModelFactory::GetForBrowserContext(profile_)->other_node()); - ExtractUrls( - BookmarkModelFactory::GetForBrowserContext(profile_)->mobile_node()); -+ ExtractUrls( -+ BookmarkModelFactory::GetForBrowserContext(profile_)->tabs_collection_node()); - if (!bookmark_urls_.empty()) - FetchNextFavicon(); - else + ++ if (!WriteDescendants(*tabs_collection_value)) { ++ return bookmark_html_writer::Result::kCouldNotWriteNodes; ++ } ++ + DecrementIndent(); + + if (!Write(kFolderChildrenEnd) || !Write(kNewline)) { +@@ -435,6 +443,7 @@ class Writer : public base::RefCountedThreadSafe { + case BookmarkNode::URL: + case BookmarkNode::OTHER_NODE: + case BookmarkNode::MOBILE: ++ case BookmarkNode::TABS_COLLECTION: + NOTREACHED(); + } + +@@ -563,6 +572,7 @@ void BookmarkFaviconFetcher::ExportBookmarks() { + ExtractUrls(model->bookmark_bar_node()); + ExtractUrls(model->other_node()); + ExtractUrls(model->mobile_node()); ++ ExtractUrls(model->tabs_collection_node()); + + if (model->account_bookmark_bar_node()) { + CHECK(model->account_other_node()); 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 -@@ -44,6 +44,8 @@ std::optional GetIfPermanentFolderType( +@@ -29,6 +29,7 @@ BookmarkParentFolder GetBookmarkParentFolderFromPermanentType( + BookmarkNode::Type type) { + switch (type) { + case bookmarks::BookmarkNode::URL: ++ case bookmarks::BookmarkNode::TABS_COLLECTION: + NOTREACHED(); + case bookmarks::BookmarkNode::FOLDER: + // TODO(crbug.com/381252292): Consider extending type with a value +@@ -67,6 +68,8 @@ std::optional GetIfPermanentFolderType( case BookmarkNode::Type::URL: NOTREACHED(); @@ -384,18 +398,10 @@ diff --git a/chrome/browser/bookmarks/bookmark_merged_surface_service.cc b/chrom } NOTREACHED(); } -@@ -99,6 +101,7 @@ BookmarkParentFolder BookmarkParentFolder::FromFolderNode( - } - switch (node->type()) { - case bookmarks::BookmarkNode::URL: -+ case bookmarks::BookmarkNode::TABS_COLLECTION: - NOTREACHED(); - case bookmarks::BookmarkNode::FOLDER: - // TODO(crbug.com/381252292): Consider extending type with a value diff --git a/chrome/browser/bookmarks/permanent_folder_ordering_tracker.cc b/chrome/browser/bookmarks/permanent_folder_ordering_tracker.cc --- a/chrome/browser/bookmarks/permanent_folder_ordering_tracker.cc +++ b/chrome/browser/bookmarks/permanent_folder_ordering_tracker.cc -@@ -22,6 +22,7 @@ bool IsValidTrackedType(BookmarkNode::Type type) { +@@ -23,6 +23,7 @@ bool IsValidTrackedType(BookmarkNode::Type type) { switch (type) { case bookmarks::BookmarkNode::URL: case bookmarks::BookmarkNode::FOLDER: @@ -403,7 +409,7 @@ diff --git a/chrome/browser/bookmarks/permanent_folder_ordering_tracker.cc b/chr NOTREACHED(); case bookmarks::BookmarkNode::BOOKMARK_BAR: -@@ -168,6 +169,7 @@ void PermanentFolderOrderingTracker::SetTrackedPermanentNodes() { +@@ -226,6 +227,7 @@ void PermanentFolderOrderingTracker::SetTrackedPermanentNodes() { switch (tracked_type_) { case bookmarks::BookmarkNode::URL: case bookmarks::BookmarkNode::FOLDER: @@ -435,7 +441,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 -@@ -4515,6 +4515,9 @@ To change this setting, BEGIN_LINKdelete the Chrome d +@@ -4447,6 +4447,9 @@ To change this setting, BEGIN_LINKdelete the Chrome d Select tabs @@ -448,7 +454,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro diff --git a/chrome/browser/ui/bookmarks/bookmark_ui_operations_helper.cc b/chrome/browser/ui/bookmarks/bookmark_ui_operations_helper.cc --- a/chrome/browser/ui/bookmarks/bookmark_ui_operations_helper.cc +++ b/chrome/browser/ui/bookmarks/bookmark_ui_operations_helper.cc -@@ -137,6 +137,8 @@ ui::mojom::DragOperation BookmarkUIOperationsHelper::DropBookmarks( +@@ -104,6 +104,8 @@ ui::mojom::DragOperation BookmarkUIOperationsHelper::DropBookmarks( if (is_reorder) { base::UmaHistogramEnumeration("Bookmarks.ReorderDropTarget", target); switch (target_parent()->GetType()) { @@ -710,7 +716,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 -@@ -825,7 +825,7 @@ bool BookmarkModel::HasBookmarks() const { +@@ -809,7 +809,7 @@ bool BookmarkModel::HasBookmarks() const { bool BookmarkModel::HasNoUserCreatedBookmarksOrFolders() const { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); return bookmark_bar_node_->children().empty() && @@ -719,7 +725,7 @@ diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmar } bool BookmarkModel::IsBookmarked(const GURL& url) const { -@@ -1147,6 +1147,7 @@ void BookmarkModel::DoneLoading(std::unique_ptr details) { +@@ -1141,6 +1141,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(); @@ -730,7 +736,7 @@ diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmar diff --git a/components/bookmarks/browser/bookmark_model.h b/components/bookmarks/browser/bookmark_model.h --- a/components/bookmarks/browser/bookmark_model.h +++ b/components/bookmarks/browser/bookmark_model.h -@@ -151,6 +151,12 @@ class BookmarkModel : public BookmarkUndoProvider, +@@ -150,6 +150,12 @@ class BookmarkModel : public BookmarkUndoProvider, // bookmarks in the account storage). const BookmarkNode* account_mobile_node() const; @@ -743,7 +749,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_; -@@ -592,6 +598,7 @@ class BookmarkModel : public BookmarkUndoProvider, +@@ -602,6 +608,7 @@ class BookmarkModel : public BookmarkUndoProvider, raw_ptr account_bookmark_bar_node_ = nullptr; raw_ptr account_other_node_ = nullptr; raw_ptr account_mobile_node_ = nullptr; @@ -790,7 +796,7 @@ diff --git a/components/bookmarks/browser/bookmark_node.h b/components/bookmarks MOBILE }; -@@ -236,6 +237,8 @@ class BookmarkPermanentNode : public BookmarkNode { +@@ -241,6 +242,8 @@ class BookmarkPermanentNode : public BookmarkNode { int64_t id); static std::unique_ptr CreateMobileBookmarks( int64_t id); diff --git a/build/cromite_patches/Add-menu-item-to-view-source.patch b/build/cromite_patches/Add-menu-item-to-view-source.patch index efe0eb24294e93d7346c19060a2c1d1be042018a..ea0b015fe7cd87132f019de98c56854c92e11b63 100644 --- a/build/cromite_patches/Add-menu-item-to-view-source.patch +++ b/build/cromite_patches/Add-menu-item-to-view-source.patch @@ -29,7 +29,7 @@ diff --git a/chrome/android/java/res/menu/custom_tabs_menu.xml b/chrome/android/ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml --- a/chrome/android/java/res/menu/main_menu.xml +++ b/chrome/android/java/res/menu/main_menu.xml -@@ -116,6 +116,9 @@ found in the LICENSE file. +@@ -119,6 +119,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 -@@ -3065,6 +3065,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn +@@ -3086,6 +3086,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 -@@ -2518,6 +2518,11 @@ public abstract class ChromeActivity extends AsyncInitializationActivity +@@ -2524,6 +2524,11 @@ public abstract class ChromeActivity extends AsyncInitializationActivity return doOpenWebApk(currentTab); } @@ -77,7 +77,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App updateAutoDarkMenuItem(menu, currentTab, isNativePage); -@@ -1281,6 +1282,23 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -1293,6 +1294,23 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate findInPageMenuRow.setVisible(itemVisible); } diff --git a/build/cromite_patches/Add-option-to-force-tablet-UI.patch b/build/cromite_patches/Add-option-to-force-tablet-UI.patch index 31e5829c94b02bf8a09f803628960b2aeaade7f7..0ec3592a9988c8fb2d640d2496d9d7b8c7abb370 100644 --- a/build/cromite_patches/Add-option-to-force-tablet-UI.patch +++ b/build/cromite_patches/Add-option-to-force-tablet-UI.patch @@ -80,7 +80,7 @@ diff --git a/chrome/android/java/res/values-sw600dp/dimens.xml b/chrome/android/ diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res/values/dimens.xml --- a/chrome/android/java/res/values/dimens.xml +++ b/chrome/android/java/res/values/dimens.xml -@@ -125,9 +125,13 @@ found in the LICENSE file. +@@ -117,9 +117,13 @@ found in the LICENSE file. 16dp @@ -98,7 +98,7 @@ diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java -@@ -57,6 +57,7 @@ import org.chromium.chrome.browser.metrics.UmaSessionStats; +@@ -58,6 +58,7 @@ import org.chromium.chrome.browser.metrics.UmaSessionStats; import org.chromium.chrome.browser.night_mode.GlobalNightModeStateProviderHolder; import org.chromium.chrome.browser.night_mode.NightModeStateProvider; import org.chromium.chrome.browser.night_mode.NightModeUtils; @@ -106,7 +106,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCo import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeUtils; import org.chromium.components.browser_ui.edge_to_edge.EdgeToEdgeManager; import org.chromium.components.browser_ui.edge_to_edge.EdgeToEdgeStateProvider; -@@ -128,6 +129,8 @@ public class ChromeBaseAppCompatActivity extends AppCompatActivity +@@ -131,6 +132,8 @@ public class ChromeBaseAppCompatActivity extends AppCompatActivity protected void attachBaseContext(Context newBase) { super.attachBaseContext(newBase); @@ -126,7 +126,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.j import org.chromium.ui.base.WindowAndroid; import org.chromium.ui.display.DisplayUtil; import org.chromium.url.GURL; -@@ -473,7 +474,9 @@ public class WarmupManager { +@@ -476,7 +477,9 @@ public class WarmupManager { ControlContainer controlContainer = mainView.findViewById(R.id.control_container); if (toolbarId != ActivityUtils.NO_RESOURCE_ID && controlContainer != null) { @@ -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 -@@ -757,7 +757,9 @@ public abstract class ChromeActivity extends AsyncInitializationActivity +@@ -758,7 +758,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,7 +183,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/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 -@@ -112,6 +112,7 @@ import org.chromium.components.tab_group_sync.SavedTabGroup; +@@ -114,6 +114,7 @@ import org.chromium.components.tab_group_sync.SavedTabGroup; import org.chromium.components.tab_group_sync.TabGroupSyncService; import org.chromium.components.tab_groups.TabGroupColorId; import org.chromium.ui.MotionEventUtils; @@ -191,7 +191,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.WindowAndroid; import org.chromium.ui.modaldialog.ModalDialogManager; -@@ -3999,8 +4000,13 @@ public class StripLayoutHelper +@@ -4060,8 +4061,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 -@@ -91,6 +91,7 @@ import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateMa +@@ -94,6 +94,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; -@@ -438,7 +439,10 @@ public class StripLayoutHelperManager +@@ -453,7 +454,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 -@@ -602,7 +602,9 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -620,7 +620,9 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { @Override public int getControlContainerHeightResource() { @@ -266,7 +266,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java -@@ -105,6 +105,8 @@ import org.chromium.chrome.browser.paint_preview.DemoPaintPreview; +@@ -109,6 +109,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; @@ -275,7 +275,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi import org.chromium.chrome.browser.price_insights.PriceInsightsButtonController; import org.chromium.chrome.browser.price_tracking.CurrentTabPriceTrackingStateSupplier; import org.chromium.chrome.browser.price_tracking.PriceTrackingButtonController; -@@ -1788,7 +1790,9 @@ public class RootUiCoordinator +@@ -1777,7 +1779,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 -@@ -274,6 +274,7 @@ public final class ChromePreferenceKeys { +@@ -280,6 +280,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"; @@ -311,16 +311,16 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromeSharedPreferences.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromeSharedPreferences.java --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromeSharedPreferences.java +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromeSharedPreferences.java -@@ -12,6 +12,8 @@ import org.chromium.base.shared_preferences.SharedPreferencesManager; - import org.chromium.build.BuildConfig; - import org.chromium.build.annotations.AssumeNonNull; +@@ -14,6 +14,8 @@ import org.chromium.build.annotations.NullMarked; + import org.chromium.build.annotations.Nullable; + import org.chromium.build.annotations.OptimizeAsNonNull; +import org.chromium.ui.base.DeviceFormFactor; + @JNINamespace("android::shared_preferences") + @NullMarked public class ChromeSharedPreferences { - public static final PreferenceKeyRegistry REGISTRY = -@@ -23,6 +25,16 @@ public class ChromeSharedPreferences { +@@ -26,6 +28,16 @@ public class ChromeSharedPreferences { LegacyChromePreferenceKeys.getPrefixesInUse()) : null); @@ -340,7 +340,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java -@@ -55,6 +55,7 @@ public class LegacyChromePreferenceKeys { +@@ -57,6 +57,7 @@ public class LegacyChromePreferenceKeys { ChromePreferenceKeys.FIRST_RUN_FLOW_COMPLETE, ChromePreferenceKeys.FIRST_RUN_FLOW_SIGNIN_SETUP, ChromePreferenceKeys.FIRST_RUN_LIGHTWEIGHT_FLOW_COMPLETE, @@ -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; -@@ -259,6 +260,7 @@ public class AppHeaderCoordinator +@@ -260,6 +261,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 -@@ -814,7 +814,7 @@ public class LocationBarCoordinator +@@ -799,7 +799,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 -@@ -1710,6 +1710,13 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1657,6 +1657,13 @@ Your Google account may have other forms of browsing history like searches and a Hide your IP address @@ -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; -@@ -544,6 +545,7 @@ class HeightTransitionHandler { +@@ -559,6 +560,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 { -@@ -151,7 +152,10 @@ public class TabStripTransitionCoordinator implements ComponentCallbacks, AppHea +@@ -153,7 +154,10 @@ public class TabStripTransitionCoordinator implements ComponentCallbacks, AppHea mTabStripReservedTopPadding = controlContainerView() .getResources() diff --git a/build/cromite_patches/Add-option-to-not-persist-tabs-across-sessions.patch b/build/cromite_patches/Add-option-to-not-persist-tabs-across-sessions.patch index 7b156254d5db594a80b165c867a778fa633ccc24..286ce00557f534923acf12cc04787bf2c0ebaedc 100644 --- a/build/cromite_patches/Add-option-to-not-persist-tabs-across-sessions.patch +++ b/build/cromite_patches/Add-option-to-not-persist-tabs-across-sessions.patch @@ -13,7 +13,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml --- a/chrome/android/java/res/xml/privacy_preferences.xml +++ b/chrome/android/java/res/xml/privacy_preferences.xml -@@ -102,6 +102,11 @@ found in the LICENSE file. +@@ -96,6 +96,11 @@ found in the LICENSE file. android:title="@string/incognito_settings_title" android:summary="@string/incognito_settings_summary" android:fragment="org.chromium.chrome.browser.privacy.settings.IncognitoSettings"/> @@ -28,7 +28,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 -@@ -44,6 +44,7 @@ import org.chromium.base.Callback; +@@ -45,6 +45,7 @@ import org.chromium.base.Callback; import org.chromium.base.CallbackController; import org.chromium.base.CallbackUtils; import org.chromium.base.CommandLine; @@ -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; -@@ -1652,8 +1653,10 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn +@@ -1666,8 +1667,10 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn boolean hadCipherData = CipherLazyHolder.sCipherInstance.restoreFromBundle(getSavedInstanceState()); @@ -68,7 +68,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting import org.chromium.chrome.R; import org.chromium.chrome.browser.enterprise.util.ManagedBrowserUtils; import org.chromium.chrome.browser.flags.ChromeFeatureList; -@@ -94,6 +97,8 @@ public class PrivacySettings extends ChromeBaseSettingsFragment +@@ -92,6 +95,8 @@ public class PrivacySettings extends ChromeBaseSettingsFragment private final SharedPreferencesManager mSharedPreferencesManager = ChromeSharedPreferences.getInstance(); @@ -77,7 +77,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting private ManagedPreferenceDelegate mManagedPreferenceDelegate; @VisibleForTesting static final String PREF_FP_PROTECTION = "fp_protection"; @VisibleForTesting static final String PREF_IP_PROTECTION = "ip_protection"; -@@ -346,7 +351,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment +@@ -333,7 +338,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment @Override public boolean onPreferenceChange(Preference preference, Object newValue) { String key = preference.getKey(); @@ -90,7 +90,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting UserPrefs.get(getProfile()) .setBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue); } else if (PREF_HTTPS_FIRST_MODE_LEGACY.equals(key)) { -@@ -422,6 +431,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment +@@ -409,6 +418,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment getContext(), getProfile())); } @@ -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 -@@ -5539,6 +5539,12 @@ To change this setting, BEGIN_LINKdelete the Chrome d +@@ -5479,6 +5479,12 @@ To change this setting, BEGIN_LINKdelete the Chrome d IMAGE diff --git a/build/cromite_patches/Add-option-to-use-home-page-as-NTP.patch b/build/cromite_patches/Add-option-to-use-home-page-as-NTP.patch index f9e160516578f2737731a18e4378595c8c2afd8a..19ba9f2bf7253ce0b8c37cd9788e5d8d21aaf2ab 100644 --- a/build/cromite_patches/Add-option-to-use-home-page-as-NTP.patch +++ b/build/cromite_patches/Add-option-to-use-home-page-as-NTP.patch @@ -24,7 +24,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediator.java --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediator.java +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediator.java -@@ -94,6 +94,9 @@ import java.util.Map; +@@ -99,6 +99,9 @@ import java.util.Map; import java.util.Objects; import java.util.Optional; @@ -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. -@@ -914,9 +917,15 @@ public class TabGridDialogMediator +@@ -918,9 +921,15 @@ public class TabGridDialogMediator return; } @@ -62,7 +62,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser import org.chromium.chrome.browser.layouts.LayoutStateProvider; import org.chromium.chrome.browser.layouts.LayoutStateProvider.LayoutStateObserver; import org.chromium.chrome.browser.layouts.LayoutType; -@@ -367,10 +368,15 @@ public class TabGroupUiMediator implements BackPressHandler, ThemeColorObserver, +@@ -366,10 +367,15 @@ public class TabGroupUiMediator implements BackPressHandler, ThemeColorObserver, assert relatedTabs.size() > 0; Tab parentTabToAttach = relatedTabs.get(relatedTabs.size() - 1); @@ -97,7 +97,7 @@ diff --git a/chrome/android/java/res/xml/homepage_preferences.xml b/chrome/andro diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/TabGroupContextMenuCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/TabGroupContextMenuCoordinator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/TabGroupContextMenuCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/TabGroupContextMenuCoordinator.java -@@ -63,6 +63,9 @@ import org.chromium.ui.text.EmptyTextWatcher; +@@ -66,6 +66,9 @@ import org.chromium.ui.text.EmptyTextWatcher; import org.chromium.ui.widget.AnchoredPopupWindow.HorizontalOrientation; import org.chromium.ui.widget.RectProvider; @@ -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. -@@ -191,9 +194,15 @@ public class TabGroupContextMenuCoordinator extends TabGroupOverflowMenuCoordina +@@ -197,9 +200,15 @@ public class TabGroupContextMenuCoordinator extends TabGroupOverflowMenuCoordina /* didCloseCallback= */ null); recordUserAction("DeleteGroup"); } else if (menuId == org.chromium.chrome.R.id.open_new_tab_in_group) { @@ -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 -@@ -287,6 +287,7 @@ public final class ChromePreferenceKeys { +@@ -293,6 +293,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"; @@ -236,7 +236,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java -@@ -59,6 +59,7 @@ public class LegacyChromePreferenceKeys { +@@ -61,6 +61,7 @@ public class LegacyChromePreferenceKeys { ChromePreferenceKeys.HISTORY_SHOW_HISTORY_INFO, ChromePreferenceKeys.HOMEPAGE_ENABLED, ChromePreferenceKeys.HOMEPAGE_USE_DEFAULT_URI, @@ -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 -@@ -1528,6 +1528,9 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1478,6 +1478,9 @@ Your Google account may have other forms of browsing history like searches and a Last hour @@ -260,7 +260,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc --- a/chrome/browser/ui/browser_ui_prefs.cc +++ b/chrome/browser/ui/browser_ui_prefs.cc -@@ -91,6 +91,8 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) { +@@ -90,6 +90,8 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( prefs::kShowForwardButton, true, GetHomeAndForwardButtonAndHomePageIsNewTabPageFlags()); @@ -272,7 +272,7 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_u diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h --- a/chrome/common/pref_names.h +++ b/chrome/common/pref_names.h -@@ -1342,6 +1342,10 @@ inline constexpr char kShowHomeButton[] = "browser.show_home_button"; +@@ -1326,6 +1326,10 @@ inline constexpr char kShowHomeButton[] = "browser.show_home_button"; // toolbar. inline constexpr char kShowForwardButton[] = "browser.show_forward_button"; diff --git a/build/cromite_patches/Add-search-engine.patch b/build/cromite_patches/Add-search-engine.patch index 3b6fa1eaea161978c01931ecfffeb856e73fd0b8..797e7b8ffa9a58feefceb60f97814cdefff00aeb 100644 --- a/build/cromite_patches/Add-search-engine.patch +++ b/build/cromite_patches/Add-search-engine.patch @@ -10,14 +10,22 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html --- .../search_engine_choice/default_favicon.png | Bin 0 -> 903 bytes ...search_engine_choice_scaled_resources.grdp | 1 + - .../search_engines/prepopulated_engines.json | 31 ++++++++++++++++++ + components/search_engines/BUILD.gn | 3 ++ + components/search_engines/cromite/BUILD.gn | 12 ++++++ + .../cromite/cromite_prepopulated_engines.json | 37 ++++++++++++++++++ .../search_engine_choice_utils.cc | 5 +-- - .../search_engine_countries-inc.cc | 3 ++ + .../search_engine_countries-inc.cc | 2 + .../search_engines/search_engine_type.h | 5 +++ - .../template_url_prepopulate_data.cc | 1 - + .../template_url_prepopulate_data.cc | 3 +- .../template_url_prepopulate_data.h | 7 ---- - 8 files changed, 41 insertions(+), 12 deletions(-) + tools/json_to_struct/json_to_struct.gni | 9 +++++ + tools/json_to_struct/json_to_struct.py | 26 ++++++++---- + tools/json_to_struct/struct_generator.py | 10 +++-- + tools/variations/fieldtrial_to_struct.py | 4 +- + 14 files changed, 99 insertions(+), 25 deletions(-) create mode 100644 components/resources/default_100_percent/search_engine_choice/default_favicon.png + create mode 100644 components/search_engines/cromite/BUILD.gn + create mode 100644 components/search_engines/cromite/cromite_prepopulated_engines.json diff --git a/components/resources/default_100_percent/search_engine_choice/default_favicon.png b/components/resources/default_100_percent/search_engine_choice/default_favicon.png new file mode 100644 @@ -57,58 +65,96 @@ diff --git a/components/resources/search_engine_choice_scaled_resources.grdp b/c -diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json ---- a/components/search_engines/prepopulated_engines.json -+++ b/components/search_engines/prepopulated_engines.json -@@ -130,6 +130,16 @@ - ] - }, - -+ "duckduckgo_light": { -+ "name": "DuckDuckGo Light", -+ "keyword": "duckduckgo.com/lite", -+ "favicon_url": "https://duckduckgo.com/favicon.ico", -+ "search_url": "https://duckduckgo.com/lite/?q={searchTerms}", -+ "suggest_url": "https://duckduckgo.com/ac/?q={searchTerms}&type=list", -+ "type": "SEARCH_ENGINE_DUCKDUCKGOLIGHT", -+ "id": 12 -+ }, +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") { + "//third_party/metrics_proto", + "//third_party/omnibox_proto", + "//third_party/search_engines_data:prepopulated_engines", ++ "cromite:cromite_prepopulated_engines", + ] + + deps = [ +@@ -155,6 +156,7 @@ source_set("search_engine_utils") { + ":search_engine_type", + "//components/google/core/common", + "//third_party/search_engines_data:prepopulated_engines", ++ "cromite:cromite_prepopulated_engines", + ] + + deps = [ "//url" ] +@@ -235,6 +237,7 @@ source_set("unit_tests") { + "//testing/gmock", + "//testing/gtest", + "//third_party/search_engines_data:prepopulated_engines", ++ "cromite:cromite_prepopulated_engines", + "//ui/base", + "//url", + ] +diff --git a/components/search_engines/cromite/BUILD.gn b/components/search_engines/cromite/BUILD.gn +new file mode 100644 +--- /dev/null ++++ b/components/search_engines/cromite/BUILD.gn +@@ -0,0 +1,12 @@ ++import("//tools/json_to_struct/json_to_struct.gni") ++ ++json_to_struct("cromite_prepopulated_engines") { ++ visibility = [ "//components/search_engines:*" ] + - "ecosia": { - "name": "Ecosia", - "keyword": "ecosia.org", -@@ -205,6 +215,27 @@ - "id": 111 - }, - -+ "googleen": { -+ "name": "Google in English", -+ "keyword": "googleen", -+ "favicon_url": "https://www.google.com/favicon.ico", -+ "search_url": "{google:baseURL}search?q={searchTerms}&ie={inputEncoding}&hl=en", -+ "suggest_url": "{google:baseSuggestURL}search?client={google:suggestClient}&q={searchTerms}&hl=en", -+ "image_url": "{google:baseURL}searchbyimage/upload?hl=en", -+ "new_tab_url": "{google:baseURL}_/chrome/newtab?hl=en&ie={inputEncoding}", -+ "contextual_search_url": "{google:baseURL}_/contextualsearch?{google:contextualSearchVersion}{google:contextualSearchContextData}&hl=en", -+ "image_url_post_params": "encoded_image={google:imageThumbnail},image_url={google:imageURL},sbisrc={google:imageSearchSource},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight}", -+ "alternate_urls": [ -+ "{google:baseURL}?hl=en#q={searchTerms}", -+ "{google:baseURL}search?hl=en#q={searchTerms}", -+ "{google:baseURL}webhp?hl=en#q={searchTerms}", -+ "{google:baseURL}s?hl=en#q={searchTerms}", -+ "{google:baseURL}s?hl=en&q={searchTerms}" -+ ], -+ "type": "SEARCH_ENGINE_GOOGLE_EN", -+ "id": 13 ++ source = "cromite_prepopulated_engines.json" ++ schema_file = "//third_party/search_engines_data/prepopulated_engines_schema.json" ++ namespace = "TemplateURLPrepopulateData" ++ excludetype = true ++ ++ deps = [ "//base" ] ++} +diff --git a/components/search_engines/cromite/cromite_prepopulated_engines.json b/components/search_engines/cromite/cromite_prepopulated_engines.json +new file mode 100644 +--- /dev/null ++++ b/components/search_engines/cromite/cromite_prepopulated_engines.json +@@ -0,0 +1,37 @@ ++{ ++ "additionals_includes": { ++ "third_party/search_engines_data/resources/definitions/prepopulated_engines.h": "" + }, ++ "elements": { ++ "duckduckgo_light": { ++ "name": "DuckDuckGo Light", ++ "keyword": "duckduckgo.com/lite", ++ "favicon_url": "https://duckduckgo.com/favicon.ico", ++ "search_url": "https://duckduckgo.com/lite/?q={searchTerms}", ++ "suggest_url": "https://duckduckgo.com/ac/?q={searchTerms}&type=list", ++ "type": "SEARCH_ENGINE_DUCKDUCKGOLIGHT", ++ "id": 12 ++ }, + - "mail_ru": { - "name": "@MAIL.RU", - "keyword": "mail.ru", ++ "googleen": { ++ "name": "Google in English", ++ "keyword": "googleen", ++ "favicon_url": "https://www.google.com/favicon.ico", ++ "search_url": "{google:baseURL}search?q={searchTerms}&ie={inputEncoding}&hl=en", ++ "suggest_url": "{google:baseSuggestURL}search?client={google:suggestClient}&q={searchTerms}&hl=en", ++ "image_url": "{google:baseURL}searchbyimage/upload?hl=en", ++ "new_tab_url": "{google:baseURL}_/chrome/newtab?hl=en&ie={inputEncoding}", ++ "contextual_search_url": "{google:baseURL}_/contextualsearch?{google:contextualSearchVersion}{google:contextualSearchContextData}&hl=en", ++ "image_url_post_params": "encoded_image={google:imageThumbnail},image_url={google:imageURL},sbisrc={google:imageSearchSource},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight}", ++ "alternate_urls": [ ++ "{google:baseURL}?hl=en#q={searchTerms}", ++ "{google:baseURL}search?hl=en#q={searchTerms}", ++ "{google:baseURL}webhp?hl=en#q={searchTerms}", ++ "{google:baseURL}s?hl=en#q={searchTerms}", ++ "{google:baseURL}s?hl=en&q={searchTerms}" ++ ], ++ "type": "SEARCH_ENGINE_GOOGLE_EN", ++ "id": 13 ++ } ++ } ++} diff --git a/components/search_engines/search_engine_choice/search_engine_choice_utils.cc b/components/search_engines/search_engine_choice/search_engine_choice_utils.cc --- a/components/search_engines/search_engine_choice/search_engine_choice_utils.cc +++ b/components/search_engines/search_engine_choice/search_engine_choice_utils.cc -@@ -186,10 +186,7 @@ void RecordChoiceScreenDefaultSearchProviderType( +@@ -182,10 +182,7 @@ void RecordChoiceScreenDefaultSearchProviderType( } void RecordChoiceScreenSelectedIndex(int selected_engine_index) { @@ -123,15 +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 -@@ -38,6 +38,7 @@ struct EngineAndTier { - - // Default (for countries with no better engine set) - constexpr EngineAndTier engines_default[] = { -+ {SearchEngineTier::kTopEngines, &googleen}, - {SearchEngineTier::kTopEngines, &google}, - {SearchEngineTier::kTopEngines, &bing}, - {SearchEngineTier::kTopEngines, &yahoo}, -@@ -1452,5 +1453,7 @@ const std::vector GetPrepopulationSetFromCountryID( +@@ -1452,5 +1452,7 @@ const std::vector GetPrepopulationSetFromCountryID( for (size_t i = 0; i < num_engines; i++) { t_url.push_back(engines[i]); } @@ -161,7 +199,16 @@ 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 -@@ -78,7 +78,6 @@ GetPrepopulatedEnginesForEeaRegionCountries(int country_id, +@@ -29,6 +29,8 @@ + #include "components/version_info/version_info.h" + #include "third_party/search_engines_data/resources/definitions/prepopulated_engines.h" + ++#include "components/search_engines/cromite/cromite_prepopulated_engines.h" ++ + namespace TemplateURLPrepopulateData { + + // Helpers -------------------------------------------------------------------- +@@ -78,7 +80,6 @@ GetPrepopulatedEnginesForEeaRegionCountries(int country_id, generator.seed(profile_seed); std::shuffle(t_urls.begin(), t_urls.end(), generator); @@ -186,4 +233,172 @@ diff --git a/components/search_engines/template_url_prepopulate_data.h b/compone // The maximum number of prepopulated search engines that can be returned in // in the rest of the world by `GetPrepopulatedEngines()`. inline constexpr size_t kMaxRowPrepopulatedEngines = 5; +diff --git a/tools/json_to_struct/json_to_struct.gni b/tools/json_to_struct/json_to_struct.gni +--- a/tools/json_to_struct/json_to_struct.gni ++++ b/tools/json_to_struct/json_to_struct.gni +@@ -25,6 +25,11 @@ template("json_to_struct") { + action_name = target_name + "_action" + source_set_name = target_name + ++ excludetype = false ++ if (defined(invoker.excludetype)) { ++ excludetype = invoker.excludetype ++ } ++ + action(action_name) { + visibility = [ ":$source_set_name" ] + script = "//tools/json_to_struct/json_to_struct.py" +@@ -49,6 +54,10 @@ template("json_to_struct") { + "--namespace=" + invoker.namespace, + "--schema=" + rebase_path(invoker.schema_file, root_build_dir), + ] ++ ++ if (excludetype) { ++ args += [ "--excludetype=yes" ] ++ } + } + + source_set(source_set_name) { +diff --git a/tools/json_to_struct/json_to_struct.py b/tools/json_to_struct/json_to_struct.py +--- a/tools/json_to_struct/json_to_struct.py ++++ b/tools/json_to_struct/json_to_struct.py +@@ -97,7 +97,7 @@ def _GenerateHeaderGuard(h_filename): + return re.sub(u'^_*', '', result) + u'_' # Remove leading underscores. + + +-def _GenerateH(basepath, fileroot, head, namespace, schema, description): ++def _GenerateH(basepath, fileroot, head, namespace, schema, description, excludetype): + """Generates the .h file containing the definition of the structure specified + by the schema. + +@@ -133,11 +133,15 @@ def _GenerateH(basepath, fileroot, head, namespace, schema, description): + f.write(u'#include "%s"\n' % header) + f.write(u'\n') + ++ for header in description.get(u'additionals_includes', []): ++ f.write(u'#include "%s"\n' % header) ++ f.write(u'\n') ++ + if namespace: + f.write(u'namespace %s {\n' % namespace) + f.write(u'\n') + +- f.write(struct_generator.GenerateStruct( ++ f.write(struct_generator.GenerateStruct(excludetype, + schema['type_name'], schema['schema'])) + f.write(u'\n') + +@@ -162,7 +166,7 @@ def _GenerateH(basepath, fileroot, head, namespace, schema, description): + f.write(u'#endif // %s\n' % header_guard) + + +-def _GenerateCC(basepath, fileroot, head, namespace, schema, description): ++def _GenerateCC(basepath, fileroot, head, namespace, schema, description, excludetype): + """Generates the .cc file containing the static initializers for the + of the elements specified in the description. + +@@ -191,7 +195,7 @@ def _GenerateCC(basepath, fileroot, head, namespace, schema, description): + f.write(element_generator.GenerateElements(schema['type_name'], + schema['schema'], description)) + +- if 'generate_array' in description: ++ if excludetype == False and 'generate_array' in description: + f.write(u'\n') + f.write( + u'const %s* const array_%s[] = {\n' % +@@ -283,7 +287,7 @@ def GenerateClass(basepath, + + + def GenerateStruct(basepath, output_root, namespace, schema, description, +- description_filename, schema_filename, year=None): ++ description_filename, schema_filename, excludetype, year): + """Generates a C++ struct from a JSON description. + + Args: +@@ -302,8 +306,8 @@ def GenerateStruct(basepath, output_root, namespace, schema, description, + """ + year = int(year) if year else datetime.now().year + head = HEAD % (year, schema_filename, description_filename) +- _GenerateH(basepath, output_root, head, namespace, schema, description) +- _GenerateCC(basepath, output_root, head, namespace, schema, description) ++ _GenerateH(basepath, output_root, head, namespace, schema, description, excludetype) ++ _GenerateCC(basepath, output_root, head, namespace, schema, description, excludetype) + + if __name__ == '__main__': + parser = optparse.OptionParser( +@@ -318,11 +322,17 @@ if __name__ == '__main__': + parser.add_option('-s', '--schema', help='path to the schema file, ' + 'mandatory.') + parser.add_option('-o', '--output', help='output filename, ') ++ parser.add_option('-x', '--excludetype', help='exclude type generator, ') + (opts, args) = parser.parse_args() + + if not opts.schema: + parser.error('You must specify a --schema.') + ++ if not opts.excludetype: ++ opts.excludetype = False ++ else: ++ opts.excludetype = True ++ + description_filename = os.path.normpath(args[0]) + root, ext = os.path.splitext(description_filename) + shortroot = opts.output if opts.output else os.path.split(root)[1] +@@ -339,4 +349,4 @@ if __name__ == '__main__': + schema = _Load(opts.schema) + description = _Load(description_filename) + GenerateStruct(basepath, output_root, opts.namespace, schema, description, +- description_filename, opts.schema) ++ description_filename, opts.schema, opts.excludetype, datetime.now().year) +diff --git a/tools/json_to_struct/struct_generator.py b/tools/json_to_struct/struct_generator.py +--- a/tools/json_to_struct/struct_generator.py ++++ b/tools/json_to_struct/struct_generator.py +@@ -30,20 +30,24 @@ def GenerateField(field_info): + else: + raise RuntimeError('Unknown field type "%s"' % type) + +-def GenerateStruct(type_name, schema): ++def GenerateStruct(excludetype, type_name, schema): + """Generate a string defining a structure containing the fields specified in + the schema list. + """ + lines = [] ++ if excludetype: ++ lines.append('struct %s;' % type_name) ++ return '\n'.join(lines) + '\n' ++ + lines.append('struct %s {' % type_name) + for field_info in schema: + if field_info['type'] == 'struct': +- lines.insert(0, GenerateStruct(field_info['type_name'], ++ lines.insert(0, GenerateStruct(excludetype, field_info['type_name'], + field_info['fields'])) + elif (field_info['type'] == 'array' + and field_info['contents']['type'] == 'struct'): + contents = field_info['contents'] +- lines.insert(0, GenerateStruct(contents['type_name'], ++ lines.insert(0, GenerateStruct(excludetype, contents['type_name'], + contents['fields'])) + lines.append(' ' + GenerateField(field_info) + ';') + lines.append('};') +diff --git a/tools/variations/fieldtrial_to_struct.py b/tools/variations/fieldtrial_to_struct.py +--- a/tools/variations/fieldtrial_to_struct.py ++++ b/tools/variations/fieldtrial_to_struct.py +@@ -232,14 +232,14 @@ def main(arguments): + json_to_struct.GenerateStruct( + basepath, output_root, opts.namespace, schema, description, + os.path.split(description_filename)[1], os.path.split(opts.schema)[1], +- opts.year) ++ False, opts.year) + + # TODO(peilinwang) filter the schema by platform, form_factor, etc. + if opts.java: + json_to_struct.GenerateClass(basepath, output_root, opts.namespace, schema, + description, + os.path.split(description_filename)[1], +- os.path.split(opts.schema)[1], opts.year) ++ os.path.split(opts.schema)[1], False, opts.year) + + + if __name__ == '__main__': -- diff --git a/build/cromite_patches/Add-site-engagement-flag.patch b/build/cromite_patches/Add-site-engagement-flag.patch index 8b3aee18f498a6804acde52a82c7f23ea5cb414e..52f5e3b161f5af380adada5aab5beb33447c20f8 100644 --- a/build/cromite_patches/Add-site-engagement-flag.patch +++ b/build/cromite_patches/Add-site-engagement-flag.patch @@ -24,7 +24,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -164,6 +164,7 @@ +@@ -166,6 +166,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" @@ -35,7 +35,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/engagement/important_sites_util.cc b/chrome/browser/engagement/important_sites_util.cc --- a/chrome/browser/engagement/important_sites_util.cc +++ b/chrome/browser/engagement/important_sites_util.cc -@@ -33,6 +33,7 @@ +@@ -32,6 +32,7 @@ #include "components/prefs/scoped_user_pref_update.h" #include "components/site_engagement/content/site_engagement_score.h" #include "components/site_engagement/content/site_engagement_service.h" @@ -43,7 +43,7 @@ diff --git a/chrome/browser/engagement/important_sites_util.cc b/chrome/browser/ #include "components/site_engagement/core/mojom/site_engagement_details.mojom.h" #include "components/webapps/browser/banners/app_banner_settings_helper.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" -@@ -350,6 +351,10 @@ void ImportantSitesUtil::RegisterProfilePrefs( +@@ -349,6 +350,10 @@ void ImportantSitesUtil::RegisterProfilePrefs( // static std::set ImportantSitesUtil::GetInstalledRegisterableDomains( Profile* profile) { @@ -54,7 +54,7 @@ diff --git a/chrome/browser/engagement/important_sites_util.cc b/chrome/browser/ std::set installed_origins = GetOriginsWithInstalledWebApps(profile); std::set registerable_domains; -@@ -364,6 +369,10 @@ std::vector +@@ -363,6 +368,10 @@ std::vector ImportantSitesUtil::GetImportantRegisterableDomains(Profile* profile, size_t max_results) { SCOPED_UMA_HISTOGRAM_TIMER("Storage.ImportantSites.GenerationTime"); @@ -76,7 +76,7 @@ diff --git a/components/feature_engagement/internal/tracker_impl.cc b/components #include "components/feature_engagement/internal/availability_model_impl.h" #include "components/feature_engagement/internal/blocked_iph_features.h" #include "components/feature_engagement/internal/chrome_variations_configuration.h" -@@ -211,6 +212,8 @@ TrackerImpl::TrackerImpl( +@@ -236,6 +237,8 @@ TrackerImpl::TrackerImpl( TrackerImpl::~TrackerImpl() = default; void TrackerImpl::NotifyEvent(const std::string& event) { @@ -88,7 +88,7 @@ diff --git a/components/feature_engagement/internal/tracker_impl.cc b/components diff --git a/components/feature_engagement/public/feature_configurations.cc b/components/feature_engagement/public/feature_configurations.cc --- a/components/feature_engagement/public/feature_configurations.cc +++ b/components/feature_engagement/public/feature_configurations.cc -@@ -6,6 +6,7 @@ +@@ -11,6 +11,7 @@ #include "base/strings/string_util.h" #include "build/build_config.h" @@ -96,7 +96,7 @@ diff --git a/components/feature_engagement/public/feature_configurations.cc b/co #include "components/feature_engagement/public/configuration.h" #include "components/feature_engagement/public/event_constants.h" #include "components/feature_engagement/public/feature_constants.h" -@@ -113,6 +114,12 @@ std::optional GetClientSideFeatureConfig( +@@ -118,6 +119,12 @@ std::optional GetClientSideFeatureConfig( } #endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) diff --git a/build/cromite_patches/Add-support-for-ISupportHelpAndFeedback.patch b/build/cromite_patches/Add-support-for-ISupportHelpAndFeedback.patch index 279cf1eb1300cf1818e4ec4ef3fb1d5369e8eb3e..c376258cef3afc8ec003d8df4755cd50faac1326 100644 --- a/build/cromite_patches/Add-support-for-ISupportHelpAndFeedback.patch +++ b/build/cromite_patches/Add-support-for-ISupportHelpAndFeedback.patch @@ -20,7 +20,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin import org.chromium.components.browser_ui.modaldialog.AppModalPresenter; import org.chromium.components.browser_ui.settings.EmbeddableSettingsPage; import org.chromium.components.browser_ui.util.TraceEventVectorDrawableCompat; -@@ -458,8 +459,12 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity +@@ -442,8 +443,12 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity finishCurrentSettings(mainFragment); return true; } else if (item.getItemId() == R.id.menu_id_general_help) { @@ -38,7 +38,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin diff --git a/components/browser_ui/settings/android/java/src/org/chromium/components/browser_ui/settings/SettingsUtils.java b/components/browser_ui/settings/android/java/src/org/chromium/components/browser_ui/settings/SettingsUtils.java --- a/components/browser_ui/settings/android/java/src/org/chromium/components/browser_ui/settings/SettingsUtils.java +++ b/components/browser_ui/settings/android/java/src/org/chromium/components/browser_ui/settings/SettingsUtils.java -@@ -91,4 +91,8 @@ public class SettingsUtils { +@@ -93,4 +93,8 @@ public class SettingsUtils { ToolbarUtils.setOverflowMenuVisibility(toolbar, visibility); return true; } diff --git a/build/cromite_patches/Add-webGL-site-setting.patch b/build/cromite_patches/Add-webGL-site-setting.patch index c532b36c27bf97f8c209f561d81a39f7b82eb83e..bc6548a194d80e7e490ec9690391cc76a8477012 100644 --- a/build/cromite_patches/Add-webGL-site-setting.patch +++ b/build/cromite_patches/Add-webGL-site-setting.patch @@ -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 -@@ -291,6 +291,13 @@ void WebGLRenderingContextBase::InitializeWebGLContextLimits( +@@ -297,6 +297,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_); -@@ -560,25 +567,6 @@ static String ExtractWebGLContextCreationError( +@@ -566,25 +573,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('.'); -@@ -638,6 +626,12 @@ WebGLRenderingContextBase::CreateWebGraphicsContext3DProvider( +@@ -644,6 +632,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 -@@ -1926,6 +1926,8 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext, +@@ -1936,6 +1936,8 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext, DOMArrayBufferView* pixels, int64_t offset); diff --git a/build/cromite_patches/Add-webRTC-site-settings.patch b/build/cromite_patches/Add-webRTC-site-settings.patch index 2edaf11e3e729751582521a054f36accc8559aca..4009e2b61a4c74c0a33ccef0b6d15d45b7c2f0a6 100644 --- a/build/cromite_patches/Add-webRTC-site-settings.patch +++ b/build/cromite_patches/Add-webRTC-site-settings.patch @@ -210,7 +210,7 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/peer_connection_d diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver.cc b/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver.cc --- a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver.cc +++ b/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver.cc -@@ -13,6 +13,8 @@ +@@ -14,6 +14,8 @@ #include "third_party/blink/public/common/privacy_budget/identifiable_surface.h" #include "third_party/blink/public/common/privacy_budget/identifiable_token_builder.h" #include "third_party/blink/public/platform/modules/webrtc/webrtc_logging.h" @@ -219,7 +219,7 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver. #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h" #include "third_party/blink/renderer/bindings/modules/v8/v8_rtc_insertable_streams.h" #include "third_party/blink/renderer/bindings/modules/v8/v8_rtc_rtcp_parameters.h" -@@ -284,6 +286,14 @@ RTCRtpCapabilities* RTCRtpReceiver::getCapabilities(ScriptState* state, +@@ -286,6 +288,14 @@ RTCRtpCapabilities* RTCRtpReceiver::getCapabilities(ScriptState* state, if (kind != "audio" && kind != "video") return nullptr; @@ -237,7 +237,7 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver. diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc b/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc --- a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc +++ b/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc -@@ -18,6 +18,8 @@ +@@ -19,6 +19,8 @@ #include "third_party/blink/public/common/privacy_budget/identifiable_surface.h" #include "third_party/blink/public/common/privacy_budget/identifiable_token_builder.h" #include "third_party/blink/public/platform/modules/webrtc/webrtc_logging.h" @@ -246,7 +246,7 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h" #include "third_party/blink/renderer/bindings/modules/v8/v8_rtc_encoding_options.h" #include "third_party/blink/renderer/bindings/modules/v8/v8_rtc_insertable_streams.h" -@@ -1031,6 +1033,14 @@ RTCRtpCapabilities* RTCRtpSender::getCapabilities(ScriptState* state, +@@ -1033,6 +1035,14 @@ RTCRtpCapabilities* RTCRtpSender::getCapabilities(ScriptState* state, if (kind != "audio" && kind != "video") return nullptr; diff --git a/build/cromite_patches/Allow-building-without-enable_reporting.patch b/build/cromite_patches/Allow-building-without-enable_reporting.patch index 95f47a12c6909f093bd3bd39a8d28c1113d45649..b70484c8283195fea0fce6c8d994194c2ad83da4 100644 --- a/build/cromite_patches/Allow-building-without-enable_reporting.patch +++ b/build/cromite_patches/Allow-building-without-enable_reporting.patch @@ -10,6 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../browser/network/reporting_service_proxy.cc | 3 +++ .../renderer_host/render_frame_host_impl.cc | 6 ------ .../coop/cross_origin_opener_policy_reporter.cc | 16 +++++++--------- + .../dip/document_isolation_policy_reporter.cc | 2 ++ .../web_package/signed_exchange_reporter.cc | 2 ++ ...content_switch_dependent_feature_overrides.cc | 1 + .../Allow-building-without-enable_reporting.inc | 2 ++ @@ -25,7 +26,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../renderer/core/frame/reporting_context.cc | 9 +++++++++ .../renderer/core/frame/reporting_context.h | 7 +++++-- .../renderer/core/frame/reporting_observer.cc | 3 +-- - 21 files changed, 61 insertions(+), 26 deletions(-) + 22 files changed, 63 insertions(+), 26 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 @@ -42,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 -@@ -1470,6 +1470,7 @@ String BuildReportStatus(const net::ReportingReport::Status status) { +@@ -1473,6 +1473,7 @@ String BuildReportStatus(const net::ReportingReport::Status status) { } } @@ -50,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( -@@ -1483,6 +1484,7 @@ std::vector ComputeReportingURLs(RenderFrameHostImpl* frame_host) { +@@ -1486,6 +1487,7 @@ std::vector ComputeReportingURLs(RenderFrameHostImpl* frame_host) { }); return urls; } @@ -107,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" -@@ -190,12 +191,14 @@ class ReportingServiceProxyImpl : public blink::mojom::ReportingServiceProxy { +@@ -222,12 +223,14 @@ class ReportingServiceProxyImpl : public blink::mojom::ReportingServiceProxy { const std::string& group, const std::string& type, base::Value::Dict body) { @@ -125,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 -@@ -15258,12 +15258,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport( +@@ -15702,12 +15702,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport( } } } @@ -215,6 +216,23 @@ diff --git a/content/browser/security/coop/cross_origin_opener_policy_reporter.c } } // namespace content +diff --git a/content/browser/security/dip/document_isolation_policy_reporter.cc b/content/browser/security/dip/document_isolation_policy_reporter.cc +--- a/content/browser/security/dip/document_isolation_policy_reporter.cc ++++ b/content/browser/security/dip/document_isolation_policy_reporter.cc +@@ -94,11 +94,13 @@ void DocumentIsolationPolicyReporter::QueueAndNotify( + } + body_to_pass.Set("disposition", disposition); + ++#if BUILDFLAG(ENABLE_REPORTING) + if (auto* storage_partition = storage_partition_.get()) { + storage_partition->GetNetworkContext()->QueueReport( + kType, *endpoint, context_url_, reporting_source_, + network_anonymization_key_, std::move(body_to_pass)); + } ++#endif + } + } + diff --git a/content/browser/web_package/signed_exchange_reporter.cc b/content/browser/web_package/signed_exchange_reporter.cc --- a/content/browser/web_package/signed_exchange_reporter.cc +++ b/content/browser/web_package/signed_exchange_reporter.cc @@ -255,7 +273,7 @@ new file mode 100644 diff --git a/net/reporting/reporting_header_parser.cc b/net/reporting/reporting_header_parser.cc --- a/net/reporting/reporting_header_parser.cc +++ b/net/reporting/reporting_header_parser.cc -@@ -332,6 +332,7 @@ void ReportingHeaderParser::ProcessParsedReportingEndpointsHeader( +@@ -337,6 +337,7 @@ void ReportingHeaderParser::ProcessParsedReportingEndpointsHeader( const NetworkAnonymizationKey& network_anonymization_key, const url::Origin& origin, base::flat_map header) { @@ -282,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 -@@ -468,14 +468,14 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext +@@ -470,14 +470,14 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext const GURL& url, const std::optional& reporting_source, const net::NetworkAnonymizationKey& network_anonymization_key, @@ -314,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 -@@ -1557,7 +1557,6 @@ mojom("mojom") { +@@ -1590,7 +1590,6 @@ mojom("mojom") { export_define_blink = "BLINK_PLATFORM_IMPLEMENTATION=1" export_header_blink = "third_party/blink/public/platform/web_common.h" if (enable_reporting) { @@ -325,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 -@@ -1208,6 +1208,7 @@ interface NetworkContext { +@@ -1205,6 +1205,7 @@ interface NetworkContext { // provided `network_anonymization_key`. // // Spec: https://w3c.github.io/reporting/#concept-reports @@ -333,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, -@@ -1215,6 +1216,7 @@ interface NetworkContext { +@@ -1212,6 +1213,7 @@ interface NetworkContext { NetworkAnonymizationKey network_anonymization_key, mojo_base.mojom.DictionaryValue body); @@ -341,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, -@@ -1225,6 +1227,7 @@ interface NetworkContext { +@@ -1222,6 +1224,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`. @@ -352,15 +370,15 @@ diff --git a/services/network/public/mojom/network_context.mojom b/services/netw diff --git a/third_party/blink/renderer/core/frame/csp/content_security_policy.cc b/third_party/blink/renderer/core/frame/csp/content_security_policy.cc --- a/third_party/blink/renderer/core/frame/csp/content_security_policy.cc +++ b/third_party/blink/renderer/core/frame/csp/content_security_policy.cc -@@ -30,6 +30,7 @@ +@@ -31,6 +31,7 @@ #include #include +#include "net/net_buildflags.h" #include "base/containers/contains.h" #include "base/debug/dump_without_crashing.h" - #include "base/ranges/algorithm.h" -@@ -1284,6 +1285,7 @@ void ContentSecurityPolicy::ReportViolation( + #include "services/network/public/cpp/web_sandbox_flags.h" +@@ -1295,6 +1296,7 @@ void ContentSecurityPolicy::ReportViolation( return; } @@ -368,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); -@@ -1291,6 +1293,7 @@ void ContentSecurityPolicy::ReportViolation( +@@ -1302,6 +1304,7 @@ void ContentSecurityPolicy::ReportViolation( // `context_frame` (i.e. we're not processing 'frame-ancestors'). if (delegate_ && !context_frame) delegate_->DispatchViolationEvent(*violation_data, element); @@ -379,7 +397,7 @@ diff --git a/third_party/blink/renderer/core/frame/csp/content_security_policy.c 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 -@@ -46,6 +46,7 @@ +@@ -47,6 +47,7 @@ #include "build/build_config.h" #include "mojo/public/cpp/bindings/self_owned_receiver.h" #include "mojo/public/cpp/system/message_pipe.h" @@ -387,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" -@@ -2791,9 +2792,11 @@ DocumentResourceCoordinator* LocalFrame::GetDocumentResourceCoordinator() { +@@ -2796,9 +2797,11 @@ DocumentResourceCoordinator* LocalFrame::GetDocumentResourceCoordinator() { return CHECK_DEREF(GetDocument()).GetResourceCoordinator(); } @@ -402,7 +420,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 -@@ -36,6 +36,7 @@ +@@ -37,6 +37,7 @@ #include "base/time/time.h" #include "base/unguessable_token.h" #include "build/build_config.h" @@ -410,7 +428,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/b #include "mojo/public/cpp/bindings/pending_associated_receiver.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "services/metrics/public/cpp/ukm_source_id.h" -@@ -660,8 +661,9 @@ class CORE_EXPORT LocalFrame final +@@ -659,8 +660,9 @@ class CORE_EXPORT LocalFrame final void FinishedScrollSequence(); SmoothScrollSequencer* GetSmoothScrollSequencer() const; @@ -439,17 +457,17 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.cc b/third_ +#if BUILDFLAG(ENABLE_REPORTING) reporting_service_(&context), +#endif - receiver_(this, &context) {} + receivers_(this, &context) {} // static -@@ -126,7 +129,9 @@ void ReportingContext::Trace(Visitor* visitor) const { +@@ -125,7 +128,9 @@ void ReportingContext::Trace(Visitor* visitor) const { visitor->Trace(observers_); visitor->Trace(report_buffer_); visitor->Trace(execution_context_); +#if BUILDFLAG(ENABLE_REPORTING) visitor->Trace(reporting_service_); +#endif - visitor->Trace(receiver_); + visitor->Trace(receivers_); Supplement::Trace(visitor); } @@ -148,6 +153,7 @@ void ReportingContext::CountReport(Report* report) { @@ -476,7 +494,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 || -@@ -246,6 +254,7 @@ void ReportingContext::SendToReportingAPI(Report* report, +@@ -254,6 +262,7 @@ void ReportingContext::SendToReportingAPI(Report* report, url, endpoint, body->featureId(), body->disposition(), body->message(), body->sourceFile(), line_number, column_number); } @@ -517,8 +535,8 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.h b/third_p reporting_service_; +#endif - HeapMojoReceiver receiver_; - }; + // There might be up to two ReportingObservers stored here: one that is called + // from the CrossOriginEmbedderPolicyReporter and one that is called from the diff --git a/third_party/blink/renderer/core/frame/reporting_observer.cc b/third_party/blink/renderer/core/frame/reporting_observer.cc --- a/third_party/blink/renderer/core/frame/reporting_observer.cc +++ b/third_party/blink/renderer/core/frame/reporting_observer.cc diff --git a/build/cromite_patches/Allow-building-without-supervised-users.patch b/build/cromite_patches/Allow-building-without-supervised-users.patch index 306c382d318960ad6b788e181e8efe032508871c..30af6ffb74ff5568f6d0e10a6533b5075c04193a 100644 --- a/build/cromite_patches/Allow-building-without-supervised-users.patch +++ b/build/cromite_patches/Allow-building-without-supervised-users.patch @@ -23,7 +23,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -774,7 +774,6 @@ if (current_toolchain == default_toolchain) { +@@ -784,7 +784,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 -@@ -91,7 +91,6 @@ public class ChromeFeedbackCollector extends FeedbackCollectorSetManagedPolicies(policy_service, policy_connector); factory->SetRecommendedPolicies(policy_service, policy_connector); @@ -76,7 +76,7 @@ diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browse diff --git a/chrome/browser/profiles/profile_attributes_entry.cc b/chrome/browser/profiles/profile_attributes_entry.cc --- a/chrome/browser/profiles/profile_attributes_entry.cc +++ b/chrome/browser/profiles/profile_attributes_entry.cc -@@ -459,7 +459,7 @@ bool ProfileAttributesEntry::IsSigninRequired() const { +@@ -469,7 +469,7 @@ bool ProfileAttributesEntry::IsSigninRequired() const { } std::string ProfileAttributesEntry::GetSupervisedUserId() const { @@ -88,7 +88,7 @@ diff --git a/chrome/browser/profiles/profile_attributes_entry.cc b/chrome/browse diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc -@@ -670,10 +670,6 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) { +@@ -675,10 +675,6 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) { prefs->SetTime(prefs::kProfileCreationTime, path_creation_time_); pref_change_registrar_.Init(prefs); @@ -99,7 +99,7 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/p // Changes in the profile avatar. pref_change_registrar_.Add( -@@ -1625,6 +1621,7 @@ GURL ProfileImpl::GetHomePage() { +@@ -1623,6 +1619,7 @@ GURL ProfileImpl::GetHomePage() { } void ProfileImpl::UpdateSupervisedUserIdInStorage() { @@ -110,7 +110,7 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/p 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 -@@ -1178,10 +1178,6 @@ void ProfileManager::InitProfileUserPrefs(Profile* profile) { +@@ -1181,10 +1181,6 @@ void ProfileManager::InitProfileUserPrefs(Profile* profile) { profile->GetPrefs()->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); -@@ -1962,9 +1958,6 @@ void ProfileManager::AddProfileToStorage(Profile* profile) { +@@ -1970,9 +1966,6 @@ void ProfileManager::AddProfileToStorage(Profile* profile) { init_params.icon_index = profile->GetPrefs()->GetInteger(prefs::kProfileAvatarIndex); @@ -134,7 +134,7 @@ diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profile diff --git a/chrome/browser/ui/webui/managed_ui_handler.cc b/chrome/browser/ui/webui/managed_ui_handler.cc --- a/chrome/browser/ui/webui/managed_ui_handler.cc +++ b/chrome/browser/ui/webui/managed_ui_handler.cc -@@ -90,10 +90,6 @@ void ManagedUIHandler::AddObservers() { +@@ -89,10 +89,6 @@ void ManagedUIHandler::AddObservers() { auto domain = static_cast(i); policy_service->AddObserver(domain, this); } @@ -148,7 +148,7 @@ diff --git a/chrome/browser/ui/webui/managed_ui_handler.cc b/chrome/browser/ui/w diff --git a/chrome/browser/ui/webui/management/management_ui_handler.cc b/chrome/browser/ui/webui/management/management_ui_handler.cc --- a/chrome/browser/ui/webui/management/management_ui_handler.cc +++ b/chrome/browser/ui/webui/management/management_ui_handler.cc -@@ -578,10 +578,6 @@ bool ManagementUIHandler::managed() const { +@@ -595,10 +595,6 @@ bool ManagementUIHandler::managed() const { void ManagementUIHandler::RegisterPrefChange( PrefChangeRegistrar& pref_registrar) { @@ -196,7 +196,7 @@ diff --git a/components/supervised_user/core/browser/supervised_user_preferences diff --git a/components/supervised_user/core/browser/supervised_user_service.cc b/components/supervised_user/core/browser/supervised_user_service.cc --- a/components/supervised_user/core/browser/supervised_user_service.cc +++ b/components/supervised_user/core/browser/supervised_user_service.cc -@@ -49,10 +49,6 @@ void SupervisedUserService::Init() { +@@ -50,10 +50,6 @@ void SupervisedUserService::Init() { DCHECK(settings_service_->IsReady()); pref_change_registrar_.Init(&user_prefs_.get()); @@ -207,7 +207,7 @@ diff --git a/components/supervised_user/core/browser/supervised_user_service.cc SetActive(supervised_user::IsSubjectToParentalControls(user_prefs_.get())); } -@@ -138,6 +134,7 @@ SupervisedUserService::SupervisedUserService( +@@ -139,6 +135,7 @@ SupervisedUserService::SupervisedUserService( } void SupervisedUserService::SetActive(bool active) { @@ -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 -@@ -145,6 +145,7 @@ GURL NormalizeUrl(const GURL& url) { +@@ -300,6 +300,7 @@ GURL NormalizeUrl(const GURL& url) { } bool AreWebFilterPrefsDefault(const PrefService& pref_service) { @@ -229,11 +229,11 @@ 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 -@@ -196,4 +196,10 @@ bool IsKidFriendlyContentFeedAvailable() { - return base::FeatureList::IsEnabled(kKidFriendlyContentFeed); - } - -+SET_CROMITE_FEATURE_DISABLED(kKidFriendlyContentFeed); +@@ -171,4 +171,10 @@ BASE_FEATURE(kReplaceSupervisionSystemCapabilitiesWithAccountCapabilitiesOnIOS, + "ReplaceSupervisionSystemCapabilitiesWithAccountCapabilitiesOnIOS", + base::FEATURE_DISABLED_BY_DEFAULT); + #endif ++ +SET_CROMITE_FEATURE_DISABLED(kLocalWebApprovals); +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +SET_CROMITE_FEATURE_DISABLED(kEnableExtensionsPermissionsForSupervisedUsersOnDesktop); diff --git a/build/cromite_patches/Allow-playing-audio-in-background.patch b/build/cromite_patches/Allow-playing-audio-in-background.patch index c2018a10208e24cf397a5269bb42dcd41008654a..d69d5d87a99effa0f419ff7ab0be1594a499872d 100644 --- a/build/cromite_patches/Allow-playing-audio-in-background.patch +++ b/build/cromite_patches/Allow-playing-audio-in-background.patch @@ -11,7 +11,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc b/third_party/blink/renderer/platform/media/web_media_player_impl.cc --- a/third_party/blink/renderer/platform/media/web_media_player_impl.cc +++ b/third_party/blink/renderer/platform/media/web_media_player_impl.cc -@@ -1309,6 +1309,12 @@ void WebMediaPlayerImpl::OnSelectedVideoTrackChanged( +@@ -1311,6 +1311,12 @@ void WebMediaPlayerImpl::OnSelectedVideoTrackChanged( pipeline_controller_->OnSelectedVideoTrackChanged(selected); } @@ -22,7 +22,7 @@ diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc +} + void WebMediaPlayerImpl::EnabledAudioTracksChanged( - const WebVector& enabled_track_ids) { + const std::vector& enabled_track_ids) { DCHECK(main_task_runner_->BelongsToCurrentThread()); @@ -3710,7 +3716,10 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const { : HasAudio(); @@ -39,7 +39,7 @@ diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.h b/third_party/blink/renderer/platform/media/web_media_player_impl.h --- a/third_party/blink/renderer/platform/media/web_media_player_impl.h +++ b/third_party/blink/renderer/platform/media/web_media_player_impl.h -@@ -212,6 +212,9 @@ class PLATFORM_EXPORT WebMediaPlayerImpl +@@ -211,6 +211,9 @@ class PLATFORM_EXPORT WebMediaPlayerImpl bool HasVideo() const override; bool HasAudio() const override; @@ -47,6 +47,6 @@ diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.h b + bool HasVideoNonEmptySize() const; + void EnabledAudioTracksChanged( - const WebVector& enabled_track_ids) override; + const std::vector& enabled_track_ids) override; void SelectedVideoTrackChanged( -- diff --git a/build/cromite_patches/Always-use-new-tab-page-for-default-home-page.patch b/build/cromite_patches/Always-use-new-tab-page-for-default-home-page.patch index 23300d41b1716d8c48c0119612591b02bbd36c4d..a625a469b3b2360f97b94e8526c060fed987c9d7 100644 --- a/build/cromite_patches/Always-use-new-tab-page-for-default-home-page.patch +++ b/build/cromite_patches/Always-use-new-tab-page-for-default-home-page.patch @@ -43,7 +43,7 @@ diff --git a/chrome/browser/partnerbookmarks/android/java/src/org/chromium/chrom 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 -@@ -210,7 +210,7 @@ public class PartnerBrowserCustomizations { +@@ -213,7 +213,7 @@ public class PartnerBrowserCustomizations { & ApplicationInfo.FLAG_SYSTEM) == 1 || !VersionInfo.isStableBuild(); @@ -55,7 +55,7 @@ diff --git a/chrome/browser/partnercustomizations/java/src/org/chromium/chrome/b diff --git a/components/search_engines/android/java/src/org/chromium/components/search_engines/TemplateUrl.java b/components/search_engines/android/java/src/org/chromium/components/search_engines/TemplateUrl.java --- a/components/search_engines/android/java/src/org/chromium/components/search_engines/TemplateUrl.java +++ b/components/search_engines/android/java/src/org/chromium/components/search_engines/TemplateUrl.java -@@ -72,6 +72,7 @@ public class TemplateUrl { +@@ -74,6 +74,7 @@ public class TemplateUrl { * prepopulated_engines.json. */ public String getNewTabURL() { diff --git a/build/cromite_patches/AudioBuffer-AnalyserNode-fp-mitigations.patch b/build/cromite_patches/AudioBuffer-AnalyserNode-fp-mitigations.patch index 17cea64c6667c19c4ea7e36b0ef2a2551496aee9..b494c711b46bae62d66eea43e262776839aa1255 100644 --- a/build/cromite_patches/AudioBuffer-AnalyserNode-fp-mitigations.patch +++ b/build/cromite_patches/AudioBuffer-AnalyserNode-fp-mitigations.patch @@ -52,7 +52,7 @@ new file mode 100644 diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.cc b/third_party/blink/renderer/modules/webaudio/audio_buffer.cc --- a/third_party/blink/renderer/modules/webaudio/audio_buffer.cc +++ b/third_party/blink/renderer/modules/webaudio/audio_buffer.cc -@@ -197,6 +197,20 @@ AudioBuffer::AudioBuffer(AudioBus* bus) +@@ -202,6 +202,20 @@ AudioBuffer::AudioBuffer(AudioBus* bus) } } @@ -88,7 +88,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.h b/third_ diff --git a/third_party/blink/renderer/modules/webaudio/audio_context.cc b/third_party/blink/renderer/modules/webaudio/audio_context.cc --- a/third_party/blink/renderer/modules/webaudio/audio_context.cc +++ b/third_party/blink/renderer/modules/webaudio/audio_context.cc -@@ -13,6 +13,7 @@ +@@ -15,6 +15,7 @@ #include "third_party/blink/public/common/features.h" #include "third_party/blink/public/common/mediastream/media_devices.h" #include "third_party/blink/public/platform/browser_interface_broker_proxy.h" @@ -96,7 +96,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/audio_context.cc b/thir #include "third_party/blink/public/platform/modules/webrtc/webrtc_logging.h" #include "third_party/blink/public/platform/web_audio_latency_hint.h" #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h" -@@ -637,7 +638,9 @@ double AudioContext::baseLatency() const { +@@ -639,7 +640,9 @@ double AudioContext::baseLatency() const { DCHECK_CALLED_ON_VALID_SEQUENCE(main_thread_sequence_checker_); DCHECK(destination()); @@ -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 -@@ -481,9 +481,8 @@ +@@ -485,9 +485,8 @@ { // AudioContext.playoutStats interface. // https://chromestatus.com/feature/5172818344148992 diff --git a/build/cromite_patches/Block-qjz9zk-or-trk-requests.patch b/build/cromite_patches/Block-qjz9zk-or-trk-requests.patch index 9cc2ecd0ccf1d8d4d8e34d94e4f06bcbdcb11756..5742a106c538505361b60d650d081753cf2510d3 100644 --- a/build/cromite_patches/Block-qjz9zk-or-trk-requests.patch +++ b/build/cromite_patches/Block-qjz9zk-or-trk-requests.patch @@ -64,7 +64,7 @@ diff --git a/chrome/browser/ui/singleton_tabs.cc b/chrome/browser/ui/singleton_t diff --git a/components/omnibox/browser/autocomplete_input.cc b/components/omnibox/browser/autocomplete_input.cc --- a/components/omnibox/browser/autocomplete_input.cc +++ b/components/omnibox/browser/autocomplete_input.cc -@@ -92,10 +92,15 @@ void OffsetComponentsExcludingScheme(url::Parsed* parts, int offset) { +@@ -96,10 +96,15 @@ void OffsetComponentsExcludingScheme(url::Parsed* parts, int offset) { bool HasScheme(const std::u16string& input, const char* scheme) { std::string utf8_input(base::UTF16ToUTF8(input)); url::Component view_source_scheme; @@ -80,7 +80,7 @@ diff --git a/components/omnibox/browser/autocomplete_input.cc b/components/omnib return url::FindAndCompareScheme(utf8_input, scheme, nullptr); } -@@ -568,7 +573,8 @@ void AutocompleteInput::ParseForEmphasizeComponents( +@@ -582,7 +587,8 @@ void AutocompleteInput::ParseForEmphasizeComponents( // For the view-source and blob schemes, we should emphasize the host of the // URL qualified by the view-source or blob prefix. if ((base::EqualsCaseInsensitiveASCII(scheme_str, kViewSourceScheme) || @@ -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 -@@ -1079,6 +1079,8 @@ component("net") { +@@ -1085,6 +1085,8 @@ component("net") { "url_request/url_request_http_job.cc", "url_request/url_request_http_job.h", "url_request/url_request_interceptor.cc", diff --git a/build/cromite_patches/Bromite-subresource-adblocker.patch b/build/cromite_patches/Bromite-subresource-adblocker.patch index 8222750a29f4ade334e3a5921a8b1ebc4e8b1225..c707f34a905d046e0f6e431b7722ec3f7c834509 100644 --- a/build/cromite_patches/Bromite-subresource-adblocker.patch +++ b/build/cromite_patches/Bromite-subresource-adblocker.patch @@ -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 -@@ -433,6 +433,7 @@ chrome_java_resources = [ +@@ -436,6 +436,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,18 +85,18 @@ 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", -@@ -621,6 +622,7 @@ chrome_java_resources = [ +@@ -624,6 +625,7 @@ chrome_java_resources = [ "java/res/xml/about_chrome_preferences.xml", "java/res/xml/account_management_preferences.xml", "java/res/xml/ad_services_config.xml", + "java/res/xml/adblock_preferences.xml", "java/res/xml/bookmark_widget_info.xml", - "java/res/xml/clear_browsing_data_preferences_tab.xml", + "java/res/xml/clear_browsing_data_preferences.xml", "java/res/xml/contextual_search_preferences.xml", diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -928,6 +928,8 @@ chrome_java_sources = [ +@@ -941,6 +941,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", @@ -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 -@@ -924,9 +924,7 @@ public class TabModelImpl extends TabModelJniBridge { +@@ -923,9 +923,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 -@@ -16566,6 +16566,16 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -16490,6 +16490,16 @@ Please help our engineers fix this problem. Tell us what happened right before y Never show this again. @@ -481,15 +481,15 @@ 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 -@@ -31,6 +31,7 @@ - #include "build/chromeos_buildflags.h" +@@ -32,6 +32,7 @@ #include "chrome/common/buildflags.h" + #include "components/safe_browsing/buildflags.h" #include "media/media_buildflags.h" +#include "components/component_updater/adblock_updater_service.h" class BackgroundModeManager; class BrowserProcessPlatformPart; -@@ -86,6 +87,10 @@ namespace component_updater { +@@ -89,6 +90,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; } -@@ -264,6 +269,7 @@ class BrowserProcess { +@@ -269,6 +274,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 -@@ -1220,6 +1220,34 @@ BrowserProcessImpl::component_updater() { +@@ -1240,6 +1240,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 -@@ -214,6 +214,7 @@ class BrowserProcessImpl : public BrowserProcess, +@@ -217,6 +217,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; -@@ -421,6 +422,7 @@ class BrowserProcessImpl : public BrowserProcess, +@@ -429,6 +430,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_; @@ -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 -@@ -651,6 +651,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) { +@@ -640,6 +640,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 -@@ -2846,6 +2846,11 @@ inline constexpr char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled"; +@@ -2868,6 +2868,11 @@ inline constexpr char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled"; inline constexpr char kAudioCaptureAllowedUrls[] = "hardware.audio_capture_allowed_urls"; @@ -1591,7 +1591,7 @@ diff --git a/components/subresource_filter/content/browser/content_subresource_f web_contents_helper_(web_contents_helper) {} ContentSubresourceFilterThrottleManager:: -@@ -672,6 +676,17 @@ ContentSubresourceFilterThrottleManager:: +@@ -679,6 +683,17 @@ ContentSubresourceFilterThrottleManager:: throttle->NotifyPageActivationWithRuleset(EnsureRulesetHandle(), ad_tagging_state); } diff --git a/build/cromite_patches/Client-hints-overrides.patch b/build/cromite_patches/Client-hints-overrides.patch index aa779b6bd79c3350a03a38b4288348d3d908b801..a6650a281c44706d30a5c82d7d9ff079ba08316d 100644 --- a/build/cromite_patches/Client-hints-overrides.patch +++ b/build/cromite_patches/Client-hints-overrides.patch @@ -21,8 +21,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../renderer/core/frame/navigator_ua_data.cc | 1 + .../renderer/core/frame/navigator_ua_data.idl | 5 ++++- .../renderer/core/loader/frame_fetch_context.cc | 4 +++- - .../platform/runtime_enabled_features.json5 | 5 +++++ - 15 files changed, 55 insertions(+), 13 deletions(-) + .../platform/runtime_enabled_features.json5 | 8 ++++++-- + 15 files changed, 56 insertions(+), 15 deletions(-) create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Client-hints-overrides.inc create mode 100644 cromite_flags/content/common/features_cc/Client-hints-overrides.inc create mode 100644 cromite_flags/services/network/public/cpp/features_cc/Client-hints-overrides.inc @@ -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 -@@ -190,9 +190,7 @@ const blink::UserAgentBrandList GetUserAgentBrandList( +@@ -188,9 +188,7 @@ const blink::UserAgentBrandList GetUserAgentBrandList( bool parse_result = base::StringToInt(major_version, &major_version_number); DCHECK(parse_result); std::optional brand; @@ -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 -@@ -1283,6 +1283,11 @@ void NavigationURLLoaderImpl::OnAcceptCHFrameReceived( +@@ -1301,6 +1301,11 @@ void NavigationURLLoaderImpl::OnAcceptCHFrameReceived( return; } @@ -161,7 +161,7 @@ diff --git a/third_party/blink/common/client_hints/client_hints.cc b/third_party #include "third_party/blink/public/common/permissions_policy/permissions_policy.h" #include "url/origin.h" -@@ -106,11 +107,12 @@ const PolicyFeatureToClientHintMap& GetPolicyFeatureToClientHintMap() { +@@ -108,11 +109,12 @@ const PolicyFeatureToClientHintMap& GetPolicyFeatureToClientHintMap() { bool IsClientHintSentByDefault(network::mojom::WebClientHintsType type) { switch (type) { @@ -208,14 +208,14 @@ diff --git a/third_party/blink/renderer/core/frame/navigator_ua.idl b/third_part diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.cc b/third_party/blink/renderer/core/frame/navigator_ua_data.cc --- a/third_party/blink/renderer/core/frame/navigator_ua_data.cc +++ b/third_party/blink/renderer/core/frame/navigator_ua_data.cc -@@ -219,6 +219,7 @@ ScriptPromise NavigatorUAData::getHighEntropyValues( - Dactyloscoper::RecordDirectSurface( - GetExecutionContext(), WebFeature::kNavigatorUAData_Platform, platform()); +@@ -186,6 +186,7 @@ const String& NavigatorUAData::platform() const { + } -+ if ((false)) - for (const String& hint : hints) { - if (hint == "platformVersion") { - values->setPlatformVersion(platform_version_); + bool AllowedToCollectHighEntropyValues(ExecutionContext* execution_context) { ++ if ((true)) return false; + // To determine whether a document is allowed to use the get high-entropy + // client hints returned by navigator.userAgentData.getHighEntropyValues(), + // check the following: diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.idl b/third_party/blink/renderer/core/frame/navigator_ua_data.idl --- a/third_party/blink/renderer/core/frame/navigator_ua_data.idl +++ b/third_party/blink/renderer/core/frame/navigator_ua_data.idl @@ -255,7 +255,7 @@ diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/thi diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -417,6 +417,11 @@ +@@ -438,6 +438,11 @@ name: "AriaNotify", status: "test", }, @@ -267,4 +267,14 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 { name: "AriaRowColIndexText", status: "stable", +@@ -804,8 +809,7 @@ + // Allows top-level sites to restrict collection of high-entropy UA client + // hints (from 3Ps, or itself) via the getHighEntropyValues API. + // crbug.com/385161047 +- name: "ClientHintUAHighEntropyValuesPermissionPolicy", +- 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. -- diff --git a/build/cromite_patches/Content-settings-infrastructure.patch b/build/cromite_patches/Content-settings-infrastructure.patch index f4b6428fe0170a3a21f392d5b022808c6120a983..380d7c320e738ddc52322df233afe968a3a417a1 100644 --- a/build/cromite_patches/Content-settings-infrastructure.patch +++ b/build/cromite_patches/Content-settings-infrastructure.patch @@ -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 -@@ -69,6 +69,10 @@ import org.chromium.url.GURL; +@@ -68,6 +68,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 = -@@ -243,7 +247,7 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate { +@@ -242,7 +246,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 -@@ -400,6 +404,17 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate { +@@ -399,6 +403,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 -@@ -1457,4 +1457,5 @@ +@@ -1432,4 +1432,5 @@ @@ -263,7 +263,7 @@ diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resourc /** * Add all of the child routes that originate from the privacy route, -@@ -165,6 +166,7 @@ function addPrivacyChildRoutes(r: Partial) { +@@ -166,6 +167,7 @@ function addPrivacyChildRoutes(r: Partial) { r.SITE_SETTINGS_WEB_APP_INSTALLATION = r.SITE_SETTINGS.createChild('webApplications'); } @@ -370,7 +370,7 @@ diff --git a/chrome/browser/resources/settings/site_settings/settings_category_d diff --git a/chrome/browser/resources/settings/site_settings/site_details.html b/chrome/browser/resources/settings/site_settings/site_details.html --- a/chrome/browser/resources/settings/site_settings/site_details.html +++ b/chrome/browser/resources/settings/site_settings/site_details.html -@@ -331,4 +331,5 @@ +@@ -326,4 +326,5 @@ label="$i18n{siteSettingsWebAppInstallation}"> @@ -589,7 +589,7 @@ diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_ { route: routes.SITE_SETTINGS_ADS, id: Id.ADS, -@@ -451,10 +451,36 @@ function getCategoryItemMap(): Map { +@@ -440,10 +440,36 @@ function getCategoryItemMap(): Map { icon: 'privacy:cookie', }, ]; @@ -626,7 +626,7 @@ diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_ function buildItemListFromIds(orderedIdList: ContentSettingsTypes[]): CategoryListItem[] { const map = getCategoryItemMap(); -@@ -544,7 +570,7 @@ export class SettingsSiteSettingsPageElement extends +@@ -532,7 +558,7 @@ export class SettingsSiteSettingsPageElement extends Id.IMAGES, Id.POPUPS, ]), @@ -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 -@@ -1767,6 +1767,7 @@ static_library("ui") { +@@ -1791,6 +1791,7 @@ static_library("ui") { "//components/commerce/core/mojom:mojo_bindings", "//components/commerce/core/webui", "//components/endpoint_fetcher:endpoint_fetcher", @@ -718,7 +718,7 @@ 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", -@@ -4962,6 +4963,7 @@ static_library("ui") { +@@ -5006,6 +5007,7 @@ static_library("ui") { "//components/prefs", "//components/reading_list/features:flags", "//components/segmentation_platform/embedder/default_model:default_model", @@ -746,7 +746,7 @@ diff --git a/chrome/browser/ui/views/controls/rich_controls_container_view.h 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 -@@ -54,6 +54,7 @@ +@@ -56,6 +56,7 @@ #include "ui/views/controls/separator.h" #include "ui/views/layout/box_layout.h" #include "ui/views/layout/flex_layout.h" @@ -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) -@@ -254,8 +255,20 @@ void PageInfoMainView::SetPermissionInfo( +@@ -256,8 +257,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); -@@ -270,11 +283,16 @@ void PageInfoMainView::SetPermissionInfo( +@@ -272,11 +285,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); -@@ -282,6 +300,8 @@ void PageInfoMainView::SetPermissionInfo( +@@ -284,6 +302,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), -@@ -292,6 +312,10 @@ void PageInfoMainView::SetPermissionInfo( +@@ -294,6 +314,10 @@ void PageInfoMainView::SetPermissionInfo( content_view->AddChildView(std::move(object_view))); } @@ -817,7 +817,7 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_main_view.cc b/chrome/b diff --git a/chrome/browser/ui/views/page_info/page_info_view_factory.cc b/chrome/browser/ui/views/page_info/page_info_view_factory.cc --- a/chrome/browser/ui/views/page_info/page_info_view_factory.cc +++ b/chrome/browser/ui/views/page_info/page_info_view_factory.cc -@@ -28,6 +28,8 @@ +@@ -27,6 +27,8 @@ #include "chrome/browser/ui/views/page_info/page_info_permission_content_view.h" #include "chrome/browser/ui/views/page_info/page_info_security_content_view.h" #include "components/content_settings/core/common/content_settings_types.h" @@ -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" -@@ -74,6 +75,9 @@ +@@ -73,6 +74,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" -@@ -3779,6 +3783,56 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, +@@ -3802,6 +3806,56 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, policy_indicator::AddLocalizedStrings(html_source); AddSecurityKeysStrings(html_source); @@ -1247,7 +1247,7 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provide diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/browser/ui/webui/settings/site_settings_helper.cc --- a/chrome/browser/ui/webui/settings/site_settings_helper.cc +++ b/chrome/browser/ui/webui/settings/site_settings_helper.cc -@@ -49,6 +49,8 @@ +@@ -47,6 +47,8 @@ #include "chrome/grit/generated_resources.h" #include "components/content_settings/core/browser/content_settings_provider.h" #include "components/content_settings/core/browser/host_content_settings_map.h" @@ -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" -@@ -247,13 +249,13 @@ constexpr auto kContentSettingsTypeGroupNames = std::to_array< - {ContentSettingsType::LEGACY_COOKIE_SCOPE, nullptr}, +@@ -249,13 +251,13 @@ constexpr auto kContentSettingsTypeGroupNames = std::to_array< + {ContentSettingsType::POINTER_LOCK, 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; -@@ -501,6 +503,13 @@ bool HasRegisteredGroupName(ContentSettingsType type) { +@@ -503,6 +505,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; } -@@ -514,11 +523,24 @@ ContentSettingsType ContentSettingsTypeFromGroupName(std::string_view name) { +@@ -516,11 +525,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 -@@ -533,7 +555,6 @@ std::string_view ContentSettingsTypeToGroupName(ContentSettingsType type) { +@@ -535,7 +557,6 @@ std::string_view ContentSettingsTypeToGroupName(ContentSettingsType type) { return entry.name ? entry.name : std::string_view(); } } @@ -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."; } -@@ -643,6 +664,13 @@ std::vector GetVisiblePermissionCategories( +@@ -644,6 +665,13 @@ std::vector GetVisiblePermissionCategories( base_types->push_back(ContentSettingsType::WEB_APP_INSTALLATION); } @@ -1450,15 +1450,15 @@ new file mode 100644 diff --git a/components/browser_ui/settings/android/widget/java/src/org/chromium/components/browser_ui/settings/SpinnerPreference.java b/components/browser_ui/settings/android/widget/java/src/org/chromium/components/browser_ui/settings/SpinnerPreference.java --- a/components/browser_ui/settings/android/widget/java/src/org/chromium/components/browser_ui/settings/SpinnerPreference.java +++ b/components/browser_ui/settings/android/widget/java/src/org/chromium/components/browser_ui/settings/SpinnerPreference.java -@@ -23,6 +23,7 @@ public class SpinnerPreference extends Preference { - private ArrayAdapter mAdapter; +@@ -29,6 +29,7 @@ public class SpinnerPreference extends Preference { + private @Nullable ArrayAdapter mAdapter; private int mSelectedIndex; private final boolean mSingleLine; + private boolean mIsWidget = false; /** Constructor for inflating from XML. */ public SpinnerPreference(Context context, AttributeSet attrs) { -@@ -37,6 +38,19 @@ public class SpinnerPreference extends Preference { +@@ -43,6 +44,19 @@ public class SpinnerPreference extends Preference { } } @@ -1478,7 +1478,7 @@ diff --git a/components/browser_ui/settings/android/widget/java/src/org/chromium /** * Provides a list of arbitrary objects to be shown in the spinner. Visually, each option will * be presented as its toString() text. Alternative to {@link #setAdapter(ArrayAdapter, int)}. -@@ -56,6 +70,12 @@ public class SpinnerPreference extends Preference { +@@ -62,6 +76,12 @@ public class SpinnerPreference extends Preference { mSelectedIndex = selectedIndex; } @@ -1489,9 +1489,9 @@ diff --git a/components/browser_ui/settings/android/widget/java/src/org/chromium + } + /** Returns the Spinner instance for introspection during tests. */ - public Spinner getSpinnerForTesting() { + public @Nullable Spinner getSpinnerForTesting() { return mSpinner; -@@ -88,6 +108,10 @@ public class SpinnerPreference extends Preference { +@@ -94,6 +114,10 @@ public class SpinnerPreference extends Preference { public void onBindViewHolder(PreferenceViewHolder holder) { super.onBindViewHolder(holder); @@ -1499,7 +1499,7 @@ diff --git a/components/browser_ui/settings/android/widget/java/src/org/chromium + holder.setDividerAllowedAbove(true); + holder.setDividerAllowedBelow(true); + } - ((TextView) holder.findViewById(R.id.title)).setText(getTitle()); + ((TextView) assumeNonNull(holder.findViewById(R.id.title))).setText(getTitle()); CharSequence summary = getSummary(); TextView summaryView = ((TextView) holder.findViewById(R.id.summary)); diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/browser_ui/site_settings/android/BUILD.gn @@ -2842,7 +2842,7 @@ diff --git a/components/content_settings/core/browser/content_settings_registry. namespace content_settings { -@@ -848,6 +849,7 @@ void ContentSettingsRegistry::Init() { +@@ -858,6 +859,7 @@ void ContentSettingsRegistry::Init() { WebsiteSettingsRegistry::DESKTOP, ContentSettingsInfo::INHERIT_IN_INCOGNITO, ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY); @@ -2853,7 +2853,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 -@@ -207,11 +207,7 @@ void RecordContentSettingsHistogram(const std::string& name, +@@ -212,11 +212,7 @@ void RecordContentSettingsHistogram(const std::string& name, } int ContentSettingTypeToHistogramValue(ContentSettingsType content_setting) { @@ -2869,7 +2869,7 @@ diff --git a/components/content_settings/core/browser/content_settings_uma_util. diff --git a/components/content_settings/core/browser/content_settings_utils.cc b/components/content_settings/core/browser/content_settings_utils.cc --- a/components/content_settings/core/browser/content_settings_utils.cc +++ b/components/content_settings/core/browser/content_settings_utils.cc -@@ -20,6 +20,7 @@ +@@ -16,6 +16,7 @@ #include "build/build_config.h" #include "components/content_settings/core/browser/content_settings_registry.h" #include "components/content_settings/core/browser/host_content_settings_map.h" @@ -2877,7 +2877,7 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.cc #include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_types.h" #include "components/content_settings/core/common/content_settings_utils.h" -@@ -128,6 +129,17 @@ PatternPair ParsePatternString(const std::string& pattern_str) { +@@ -125,6 +126,17 @@ PatternPair ParsePatternString(const std::string& pattern_str) { void GetRendererContentSettingRules(const HostContentSettingsMap* map, RendererContentSettingRules* rules) { @@ -3185,10 +3185,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 -@@ -468,5 +468,7 @@ enum ContentSettingsType { - // Checks whether cookies scope is handled according to origin-bound cookies - // or legacy behavior. - LEGACY_COOKIE_SCOPE, +@@ -475,5 +475,7 @@ enum ContentSettingsType { + + // Content settings for access to the Controlled Frame API. + CONTROLLED_FRAME, + +#include "components/content_settings/core/common/bromite_content_settings.inc" }; @@ -3572,7 +3572,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context --- 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_feature.mojom-blink-forward.h" + #include "third_party/blink/public/mojom/permissions_policy/permissions_policy.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" diff --git a/build/cromite_patches/Dictionary-suggestions-for-the-Omnibox.patch b/build/cromite_patches/Dictionary-suggestions-for-the-Omnibox.patch index 74427050d903192970b16003670aa578129ac5cb..2d7f7429e38f32352e92c2c6100893de892e615d 100644 --- a/build/cromite_patches/Dictionary-suggestions-for-the-Omnibox.patch +++ b/build/cromite_patches/Dictionary-suggestions-for-the-Omnibox.patch @@ -27,7 +27,7 @@ diff --git a/chrome/android/java/res/layout/url_bar.xml b/chrome/android/java/re diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java -@@ -292,8 +292,17 @@ class LocationBarMediator +@@ -297,8 +297,17 @@ class LocationBarMediator if (!mUrlFocusedWithPastedText && !shouldRetainOmniboxOnFocus && mLocationBarLayout.shouldClearTextOnFocus()) { @@ -58,15 +58,15 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow import android.os.SystemClock; import android.text.Editable; import android.text.InputType; -@@ -107,6 +108,7 @@ public class UrlBar extends AutocompleteEditText { +@@ -110,6 +111,7 @@ public class UrlBar extends AutocompleteEditText { private boolean mAllowFocus = true; private boolean mShouldSendTypingStartedEvent; + private boolean mPendingSelectAll; private boolean mPendingScroll; + private boolean mIsInCct; - // Captures the current intended text scroll type. -@@ -332,6 +334,28 @@ public class UrlBar extends AutocompleteEditText { +@@ -336,6 +338,28 @@ public class UrlBar extends AutocompleteEditText { fixupTextDirection(); mShouldSendTypingStartedEvent = focused; diff --git a/build/cromite_patches/Disable-PrivacyGuide.patch b/build/cromite_patches/Disable-PrivacyGuide.patch index 08dbffb50ab8e2422f61291ee3421d5978d1dfb2..5bf041d5af243daaee9c078ece2d4ea9427fc74d 100644 --- a/build/cromite_patches/Disable-PrivacyGuide.patch +++ b/build/cromite_patches/Disable-PrivacyGuide.patch @@ -11,8 +11,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml --- a/chrome/android/java/res/xml/privacy_preferences.xml +++ b/chrome/android/java/res/xml/privacy_preferences.xml -@@ -27,6 +27,7 @@ found in the LICENSE file. - app:isPreferenceVisible="false" /> +@@ -21,6 +21,7 @@ found in the LICENSE file. + android:fragment="org.chromium.chrome.browser.browsing_data.ClearBrowsingDataFragment" /> IsChild()); +- (!ShouldDisplayManagedUi(profile) && !profile->IsChild()); + false; html_source->AddBoolean("showPrivacyGuide", show_privacy_guide); diff --git a/build/cromite_patches/Disable-TLS-resumption.patch b/build/cromite_patches/Disable-TLS-resumption.patch index 2761b6d2bfb51e83eeb49d6e496ee9f86bd05756..b9daa680a76e5f8868afe935b1c6e295e67bfd09 100644 --- a/build/cromite_patches/Disable-TLS-resumption.patch +++ b/build/cromite_patches/Disable-TLS-resumption.patch @@ -98,7 +98,7 @@ diff --git a/net/quic/quic_session_pool.cc b/net/quic/quic_session_pool.cc #include "url/gurl.h" #include "url/scheme_host_port.h" #include "url/url_constants.h" -@@ -332,6 +333,38 @@ void LogSessionKeyMismatch(QuicSessionKeyPartialMatchResult result, +@@ -370,6 +371,38 @@ void LogSessionKeyMismatch(QuicSessionKeyPartialMatchResult result, } // namespace @@ -137,7 +137,7 @@ diff --git a/net/quic/quic_session_pool.cc b/net/quic/quic_session_pool.cc QuicSessionRequest::QuicSessionRequest(QuicSessionPool* pool) : pool_(pool) {} QuicSessionRequest::~QuicSessionRequest() { -@@ -2229,7 +2262,7 @@ QuicSessionPool::CreateCryptoConfigHandle( +@@ -2267,7 +2300,7 @@ QuicSessionPool::CreateCryptoConfigHandle( cert_verifier_, transport_security_state_, sct_auditing_delegate_, HostsFromOrigins(params_.origins_to_force_quic_on), actual_network_anonymization_key), diff --git a/build/cromite_patches/Disable-UA-full-version.patch b/build/cromite_patches/Disable-UA-full-version.patch index 7eb11dd28b2d96ad56320685fa1b273866ea0894..a5434f2ea202b63e6465409d0ba9824ba68f8df7 100644 --- a/build/cromite_patches/Disable-UA-full-version.patch +++ b/build/cromite_patches/Disable-UA-full-version.patch @@ -22,7 +22,7 @@ diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.cc b/third_ #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_surface.h" -@@ -64,6 +66,16 @@ void MaybeRecordMetric(bool record_identifiability, +@@ -65,6 +67,16 @@ void MaybeRecordMetric(bool record_identifiability, execution_context); } @@ -39,7 +39,7 @@ diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.cc b/third_ } // namespace NavigatorUAData::NavigatorUAData(ExecutionContext* context) -@@ -102,7 +114,7 @@ void NavigatorUAData::SetFullVersionList( +@@ -103,7 +115,7 @@ void NavigatorUAData::SetFullVersionList( const UserAgentBrandList& full_version_list) { for (const auto& brand_version : full_version_list) { AddBrandFullVersion(String::FromUTF8(brand_version.brand), @@ -48,7 +48,7 @@ diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.cc b/third_ } } -@@ -124,7 +136,7 @@ void NavigatorUAData::SetModel(const String& model) { +@@ -125,7 +137,7 @@ void NavigatorUAData::SetModel(const String& model) { } void NavigatorUAData::SetUAFullVersion(const String& ua_full_version) { diff --git a/build/cromite_patches/Disable-all-predictors-code.patch b/build/cromite_patches/Disable-all-predictors-code.patch index 9d2611301f7ef0069b9e04495f690b4f718782f4..76b61403ed43d39d4f59e038c105073e56c279a8 100644 --- a/build/cromite_patches/Disable-all-predictors-code.patch +++ b/build/cromite_patches/Disable-all-predictors-code.patch @@ -5,15 +5,18 @@ Subject: Disable all predictors code Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - chrome/browser/BUILD.gn | 3 --- + chrome/browser/BUILD.gn | 4 +--- .../preloading_model_keyed_service.cc | 3 +++ .../preloading_model_keyed_service_factory.cc | 4 +--- .../optimization_guide/chrome_hints_manager.cc | 1 + .../model_validator_keyed_service.cc | 6 +++++- .../optimization_guide_keyed_service.cc | 1 - + chrome/browser/permissions/BUILD.gn | 2 -- + .../permissions/chrome_permissions_client.cc | 2 -- .../predictors/autocomplete_action_predictor.cc | 2 ++ .../predictors/loading_predictor_config.cc | 4 ++-- chrome/browser/predictors/predictors_features.cc | 3 +-- + .../chrome_browser_main_extra_parts_profiles.cc | 1 - chrome/browser/safe_browsing/BUILD.gn | 1 - ...fication_content_detection_service_factory.cc | 5 +++++ chrome/browser/ui/tab_helpers.cc | 1 - @@ -33,6 +36,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html components/optimization_guide/features.gni | 3 +-- .../core/page_content_annotations_features.cc | 4 ++++ .../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 | 1 + @@ -44,7 +48,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../core/html/parser/html_document_parser.cc | 1 + .../document_speculation_rules.cc | 1 + .../platform/runtime_enabled_features.json5 | 2 +- - 39 files changed, 106 insertions(+), 40 deletions(-) + 43 files changed, 114 insertions(+), 45 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 @@ -55,7 +59,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 -@@ -727,8 +727,6 @@ static_library("browser") { +@@ -746,8 +746,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", @@ -64,11 +68,12 @@ 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", -@@ -2226,7 +2224,6 @@ static_library("browser") { +@@ -2261,7 +2259,7 @@ static_library("browser") { "//components/safe_browsing/content/browser", "//components/safe_browsing/content/browser:client_side_detection", "//components/safe_browsing/content/browser:safe_browsing_service", - "//components/safe_browsing/content/browser/notification_content_detection", ++ "//components/safe_browsing/content/browser/notification_content_detection:constants", "//components/safe_browsing/content/browser/password_protection", "//components/safe_browsing/content/browser/web_ui", "//components/safe_browsing/core/browser", @@ -183,10 +188,34 @@ diff --git a/chrome/browser/optimization_guide/optimization_guide_keyed_service. } optimization_guide::OptimizationGuideDecision +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", + "permission_revocation_request.h", +- "prediction_based_permission_ui_selector.cc", +- "prediction_based_permission_ui_selector.h", + "prediction_model_handler_provider.cc", + "prediction_model_handler_provider.h", + "prediction_service_factory.cc", +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()); + selectors.emplace_back(std::make_unique( + Profile::FromBrowserContext(browser_context))); +- selectors.emplace_back(std::make_unique( +- Profile::FromBrowserContext(browser_context))); + return selectors; + } + diff --git a/chrome/browser/predictors/autocomplete_action_predictor.cc b/chrome/browser/predictors/autocomplete_action_predictor.cc --- a/chrome/browser/predictors/autocomplete_action_predictor.cc +++ b/chrome/browser/predictors/autocomplete_action_predictor.cc -@@ -209,6 +209,8 @@ void AutocompleteActionPredictor::StartPrerendering( +@@ -210,6 +210,8 @@ void AutocompleteActionPredictor::StartPrerendering( SetIsNavigationInDomainCallback(preloading_data); @@ -222,10 +251,21 @@ diff --git a/chrome/browser/predictors/predictors_features.cc b/chrome/browser/p } // namespace +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:: + base::FeatureList::IsEnabled( + permissions::features::kPermissionOnDeviceGeolocationPredictions) || + base::FeatureList::IsEnabled(permissions::features::kPermissionsAIv1)) { +- PredictionModelHandlerProviderFactory::GetInstance(); + } + PredictionServiceFactory::GetInstance(); + predictors::AutocompleteActionPredictorFactory::GetInstance(); diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsing/BUILD.gn --- a/chrome/browser/safe_browsing/BUILD.gn +++ b/chrome/browser/safe_browsing/BUILD.gn -@@ -51,7 +51,6 @@ static_library("safe_browsing") { +@@ -52,7 +52,6 @@ static_library("safe_browsing") { "//components/safe_browsing/content/browser", "//components/safe_browsing/content/browser:client_side_detection", "//components/safe_browsing/content/browser:client_side_detection_service", @@ -265,7 +305,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 -@@ -426,7 +426,6 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { +@@ -419,7 +419,6 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { } MixedContentSettingsTabHelper::CreateForWebContents(web_contents); NavigationMetricsRecorder::CreateForWebContents(web_contents); @@ -316,7 +356,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.cc void ReadAloudAppModel::CalculatePhrases( a11y::ReadAloudCurrentGranularity& granularity) { if (!features::IsReadAnythingReadAloudPhraseHighlightingEnabled()) { -@@ -206,19 +213,23 @@ void ReadAloudAppModel::CalculatePhrases( +@@ -208,19 +215,23 @@ void ReadAloudAppModel::CalculatePhrases( base::BindOnce(&ReadAloudAppModel::UpdatePhraseBoundaries, weak_ptr_factory_.GetWeakPtr(), phrase_tokens)); } @@ -342,7 +382,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.cc // Reset the phrase calculation flag, so that the next phrase calculation can // be scheduled, if needed. is_calculating_phrases = false; -@@ -279,6 +290,7 @@ void ReadAloudAppModel::UpdatePhraseBoundaries(std::vector tokens, +@@ -282,6 +293,7 @@ void ReadAloudAppModel::UpdatePhraseBoundaries(std::vector tokens, current_phrase_calculation_index_ = -1; LOG(WARNING) << "All phrases calculated!"; } @@ -399,7 +439,7 @@ 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 -@@ -21,7 +21,9 @@ +@@ -26,7 +26,9 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/common/read_anything/read_anything_constants.h" #include "chrome/renderer/accessibility/ax_tree_distiller.h" @@ -409,7 +449,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_anything_app_contr #include "chrome/renderer/accessibility/read_anything/read_aloud_traversal_utils.h" #include "chrome/renderer/accessibility/read_anything/read_anything_node_utils.h" #include "components/language/core/common/locale_util.h" -@@ -1444,6 +1446,7 @@ void ReadAnythingAppController::OnConnected() { +@@ -1452,6 +1454,7 @@ void ReadAnythingAppController::OnConnected() { render_frame()->GetBrowserInterfaceBroker().GetInterface( std::move(page_handler_factory_receiver)); @@ -417,7 +457,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; -@@ -1452,6 +1455,7 @@ void ReadAnythingAppController::OnConnected() { +@@ -1460,6 +1463,7 @@ void ReadAnythingAppController::OnConnected() { page_handler_->GetDependencyParserModel( base::BindOnce(&ReadAnythingAppController::UpdateDependencyParserModel, weak_ptr_factory_.GetWeakPtr())); @@ -425,7 +465,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_anything_app_contr } void ReadAnythingAppController::OnCopy() const { -@@ -1661,11 +1665,13 @@ std::vector ReadAnythingAppController::GetCurrentText() { +@@ -1669,11 +1673,13 @@ std::vector ReadAnythingAppController::GetCurrentText() { } void ReadAnythingAppController::PreprocessTextForSpeech() { @@ -439,7 +479,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_anything_app_contr } void ReadAnythingAppController::MovePositionToNextGranularity() { -@@ -1843,14 +1849,18 @@ bool ReadAnythingAppController::IsDocsLoadMoreButtonVisible() const { +@@ -1851,14 +1857,18 @@ bool ReadAnythingAppController::IsDocsLoadMoreButtonVisible() const { void ReadAnythingAppController::UpdateDependencyParserModel( base::File model_file) { @@ -479,8 +519,8 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_anything_app_contr DependencyParserModel& GetDependencyParserModelForTesting(); +#endif - std::unique_ptr distiller_; - mojo::Remote + // 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 --- a/chrome/utility/BUILD.gn +++ b/chrome/utility/BUILD.gn @@ -521,7 +561,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 -@@ -206,6 +206,7 @@ void AutofillOptimizationGuide::OnDidParseForm( +@@ -229,6 +229,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`. @@ -529,7 +569,7 @@ diff --git a/components/autofill/core/browser/integrators/autofill_optimization_ decider_->RegisterOptimizationTypes( std::vector( std::move(optimization_types).extract())); -@@ -257,7 +258,7 @@ bool AutofillOptimizationGuide::ShouldBlockSingleFieldSuggestions( +@@ -280,7 +281,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`. @@ -538,7 +578,7 @@ diff --git a/components/autofill/core/browser/integrators/autofill_optimization_ optimization_guide::OptimizationGuideDecision decision = decider_->CanApplyOptimization( url, optimization_guide::proto::IBAN_AUTOFILL_BLOCKED, -@@ -283,7 +284,7 @@ bool AutofillOptimizationGuide::ShouldBlockFormFieldSuggestion( +@@ -306,7 +307,7 @@ bool AutofillOptimizationGuide::ShouldBlockFormFieldSuggestion( const CreditCard& card) const { if (auto optimization_type = GetVcnMerchantOptOutOptimizationTypeForCard(card); @@ -550,7 +590,7 @@ diff --git a/components/autofill/core/browser/integrators/autofill_optimization_ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/omnibox/browser/autocomplete_controller.cc --- a/components/omnibox/browser/autocomplete_controller.cc +++ b/components/omnibox/browser/autocomplete_controller.cc -@@ -49,7 +49,9 @@ +@@ -48,7 +48,9 @@ #include "components/omnibox/browser/autocomplete_input.h" #include "components/omnibox/browser/autocomplete_match_type.h" #include "components/omnibox/browser/autocomplete_provider.h" @@ -560,7 +600,7 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/ #include "components/omnibox/browser/autocomplete_scoring_signals_annotator.h" #include "components/omnibox/browser/bookmark_provider.h" #include "components/omnibox/browser/bookmark_scoring_signals_annotator.h" -@@ -119,6 +121,7 @@ using ProviderType = AutocompleteProvider::Type; +@@ -118,6 +120,7 @@ using ProviderType = AutocompleteProvider::Type; constexpr bool is_android = !!BUILDFLAG(IS_ANDROID); @@ -568,7 +608,7 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/ void RecordMlScoreCoverage(size_t matches_with_non_null_scores, size_t total_scored_matches) { int percent_score_coverage = -@@ -227,6 +230,7 @@ void RecordTotalMatchesScored(size_t num_scored) { +@@ -226,6 +229,7 @@ void RecordTotalMatchesScored(size_t num_scored) { base::UmaHistogramCounts1000("Omnibox.URLScoringModelExecuted.Matches", num_scored); } @@ -631,7 +671,7 @@ diff --git a/components/optimization_guide/core/optimization_guide_features.cc b } // namespace -@@ -450,8 +446,7 @@ size_t MaxURLKeyedHintCacheSize() { +@@ -445,8 +441,7 @@ size_t MaxURLKeyedHintCacheSize() { } bool ShouldPersistHintsToDisk() { @@ -641,7 +681,7 @@ diff --git a/components/optimization_guide/core/optimization_guide_features.cc b } RequestContextSet GetAllowedContextsForPersonalizedMetadata() { -@@ -897,5 +892,13 @@ bool IsPrivacyGuideAiSettingsEnabled() { +@@ -888,5 +883,13 @@ bool IsPrivacyGuideAiSettingsEnabled() { return base::FeatureList::IsEnabled(kPrivacyGuideAiSettings); } @@ -706,7 +746,7 @@ diff --git a/components/optimization_guide/core/prediction_model_fetcher_impl.cc diff --git a/components/optimization_guide/features.gni b/components/optimization_guide/features.gni --- a/components/optimization_guide/features.gni +++ b/components/optimization_guide/features.gni -@@ -11,8 +11,7 @@ declare_args() { +@@ -12,8 +12,7 @@ declare_args() { # This enables build with TFLite library. # TODO(b/269198471): Make sure the internal archive files for opt guide get # updated when win arm64 gets added as a supported platform for TFLite. @@ -719,8 +759,8 @@ diff --git a/components/optimization_guide/features.gni b/components/optimizatio diff --git a/components/page_content_annotations/core/page_content_annotations_features.cc b/components/page_content_annotations/core/page_content_annotations_features.cc --- a/components/page_content_annotations/core/page_content_annotations_features.cc +++ b/components/page_content_annotations/core/page_content_annotations_features.cc -@@ -255,4 +255,8 @@ size_t MaxRelatedSearchesCacheSize() { - "max_related_searches_cache_size", 10); +@@ -295,4 +295,8 @@ bool ShouldIncludeHiddenButSearchableContent() { + return kIncludeHiddenButSearchableContent.Get(); } +SET_CROMITE_FEATURE_DISABLED(kPageContentAnnotations); @@ -739,10 +779,27 @@ diff --git a/components/page_content_annotations/core/page_content_annotations_m if (page_visibility_model_handler_) return; +diff --git a/components/safe_browsing/content/browser/notification_content_detection/BUILD.gn b/components/safe_browsing/content/browser/notification_content_detection/BUILD.gn +--- a/components/safe_browsing/content/browser/notification_content_detection/BUILD.gn ++++ b/components/safe_browsing/content/browser/notification_content_detection/BUILD.gn +@@ -26,6 +26,13 @@ source_set("notification_content_detection") { + ] + } + ++source_set("constants") { ++ sources = [ ++ "notification_content_detection_constants.cc", ++ "notification_content_detection_constants.h", ++ ] ++} ++ + source_set("test_utils") { + testonly = true + sources = [ 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 -@@ -234,6 +234,7 @@ BASE_FEATURE(kLocalListsUseSBv5, +@@ -233,6 +233,7 @@ BASE_FEATURE(kLocalListsUseSBv5, BASE_FEATURE(kOnDeviceNotificationContentDetectionModel, "OnDeviceNotificationContentDetectionModel", base::FEATURE_DISABLED_BY_DEFAULT); @@ -806,7 +863,7 @@ diff --git a/services/webnn/features.gni b/services/webnn/features.gni 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 -@@ -1764,6 +1764,7 @@ ALWAYS_INLINE bool HTMLDocumentParser::ShouldCheckTimeBudget( +@@ -1757,6 +1757,7 @@ ALWAYS_INLINE bool HTMLDocumentParser::ShouldCheckTimeBudget( } bool HTMLDocumentParser::ShouldSkipPreloadScan() { @@ -817,7 +874,7 @@ diff --git a/third_party/blink/renderer/core/html/parser/html_document_parser.cc diff --git a/third_party/blink/renderer/core/speculation_rules/document_speculation_rules.cc b/third_party/blink/renderer/core/speculation_rules/document_speculation_rules.cc --- a/third_party/blink/renderer/core/speculation_rules/document_speculation_rules.cc +++ b/third_party/blink/renderer/core/speculation_rules/document_speculation_rules.cc -@@ -641,6 +641,7 @@ void DocumentSpeculationRules::UpdateSpeculationCandidates() { +@@ -642,6 +642,7 @@ void DocumentSpeculationRules::UpdateSpeculationCandidates() { return; } @@ -828,7 +885,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 -@@ -3385,7 +3385,7 @@ +@@ -3401,7 +3401,7 @@ // // It also has some feature params defined throughout the codebase. name: "Prerender2", diff --git a/build/cromite_patches/Disable-all-promo-dialogs.patch b/build/cromite_patches/Disable-all-promo-dialogs.patch index 3da7a8e366bcf3256982a4bc5c9da31c42a56180..cb8cc8061b2ab7120ab65ceac2a32053804b3192 100644 --- a/build/cromite_patches/Disable-all-promo-dialogs.patch +++ b/build/cromite_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 -@@ -1465,6 +1465,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -1511,6 +1511,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { } private boolean maybeShowPromo(Profile profile) { @@ -28,7 +28,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc --- a/chrome/browser/ui/browser_ui_prefs.cc +++ b/chrome/browser/ui/browser_ui_prefs.cc -@@ -151,7 +151,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) { +@@ -150,7 +150,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref(prefs::kEnterpriseHardwarePlatformAPIEnabled, false); @@ -103,15 +103,15 @@ diff --git a/components/user_education/common/feature_promo/impl/feature_promo_c diff --git a/components/user_education/common/feature_promo/impl/feature_promo_controller_25.cc b/components/user_education/common/feature_promo/impl/feature_promo_controller_25.cc --- a/components/user_education/common/feature_promo/impl/feature_promo_controller_25.cc +++ b/components/user_education/common/feature_promo/impl/feature_promo_controller_25.cc -@@ -172,6 +172,7 @@ FeaturePromoController25::~FeaturePromoController25() { +@@ -189,6 +189,7 @@ FeaturePromoController25::~FeaturePromoController25() { FeaturePromoResult FeaturePromoController25::CanShowPromo( const FeaturePromoParams& params) const { + if ((true)) return FeaturePromoResult::kBlockedByContext; auto* const spec = registry()->GetParamsForFeature(*params.feature); - return spec ? private_->queues.CanShow(*spec, params) - : FeaturePromoResult::kError; -@@ -184,7 +185,7 @@ void FeaturePromoController25::MaybeShowStartupPromo( + if (!spec) { + return FeaturePromoResult::kError; +@@ -209,7 +210,7 @@ void FeaturePromoController25::MaybeShowStartupPromo( void FeaturePromoController25::MaybeShowPromo(FeaturePromoParams params) { auto* const spec = registry()->GetParamsForFeature(*params.feature); diff --git a/build/cromite_patches/Disable-conversion-measurement-api.patch b/build/cromite_patches/Disable-conversion-measurement-api.patch index ca239642e8d539199d54cec4c72d0552913a4c5a..f866c11628ab828281c3218e7d76d5833e061763 100644 --- a/build/cromite_patches/Disable-conversion-measurement-api.patch +++ b/build/cromite_patches/Disable-conversion-measurement-api.patch @@ -26,8 +26,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../origin_trials/features.cc | 1 + .../render_view_context_menu_base.cc | 3 - .../aggregatable_report_sender.cc | 15 +- - .../attribution_data_host_manager_impl.cc | 2 + - .../attribution_reporting/attribution_host.cc | 1 + + .../attribution_data_host_manager_impl.cc | 8 +- + .../attribution_reporting/attribution_host.cc | 3 +- + .../attribution_manager_impl.cc | 4 - .../attribution_os_level_manager.cc | 3 +- .../attribution_report_network_sender.cc | 9 + .../attribution_storage_sql.cc | 8 +- @@ -38,21 +39,22 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../public/browser/content_browser_client.cc | 7 +- .../public/browser/navigation_controller.cc | 1 - .../Disable-conversion-measurement-api.inc | 1 + - .../Disable-conversion-measurement-api.inc | 8 + + .../Disable-conversion-measurement-api.inc | 10 + .../attribution/request_headers_internal.cc | 1 + - services/network/network_context.cc | 2 + + services/network/network_context.cc | 20 - .../network/public/cpp/attribution_utils.cc | 2 + + .../core/frame/attribution_src_loader.cc | 2 - third_party/blink/renderer/core/page/page.cc | 2 +- - .../platform/runtime_enabled_features.json5 | 14 +- + .../platform/runtime_enabled_features.json5 | 20 +- ui/events/android/motion_event_android.cc | 8 +- - 34 files changed, 96 insertions(+), 395 deletions(-) + 36 files changed, 101 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 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 -@@ -1298,6 +1298,7 @@ network::mojom::AttributionSupport +@@ -1302,6 +1302,7 @@ network::mojom::AttributionSupport AwContentBrowserClient::GetAttributionSupport( AttributionReportingOsApiState state, bool client_os_disabled) { @@ -60,7 +62,7 @@ diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webv // WebView only supports OS-level attribution and not web-attribution. switch (state) { case AttributionReportingOsApiState::kDisabled: -@@ -1316,6 +1317,8 @@ bool AwContentBrowserClient::IsAttributionReportingOperationAllowed( +@@ -1320,6 +1321,8 @@ bool AwContentBrowserClient::IsAttributionReportingOperationAllowed( const url::Origin* destination_origin, const url::Origin* reporting_origin, bool* can_bypass) { @@ -112,7 +114,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro @@ -375,7 +349,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro -@@ -1005,15 +970,6 @@ by a child template that "extends" this file. +@@ -1019,15 +984,6 @@ by a child template that "extends" this file. android:exported="false" android:permission="android.permission.BIND_JOB_SERVICE"/> @@ -391,8 +365,8 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro -@@ -1275,12 +1231,6 @@ by a child template that "extends" this file. - +@@ -1294,12 +1250,6 @@ by a child template that "extends" this file. + {% endif %} - @@ -721,15 +695,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/instantapps/Ins diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java -@@ -133,7 +133,6 @@ public class PasswordSettings extends ChromeBaseSettingsFragment +@@ -131,7 +131,6 @@ public class PasswordSettings extends ChromeBaseSettingsFragment private Preference mLinkPref; private Menu mMenu; - private @Nullable PasswordCheck mPasswordCheck; private @ManagePasswordsReferrer int mManagePasswordsReferrer; - private OneshotSupplier mBottomSheetControllerSupplier; private final ObservableSupplierImpl mPageTitle = new ObservableSupplierImpl<>(); -@@ -217,7 +216,6 @@ public class PasswordSettings extends ChromeBaseSettingsFragment + +@@ -214,7 +213,6 @@ public class PasswordSettings extends ChromeBaseSettingsFragment @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -737,7 +711,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage computeTrustedVaultBannerState(); } -@@ -322,9 +320,6 @@ public class PasswordSettings extends ChromeBaseSettingsFragment +@@ -319,9 +317,6 @@ public class PasswordSettings extends ChromeBaseSettingsFragment if (shouldShowAutoSigninOption()) { createAutoSignInCheckbox(); } @@ -747,7 +721,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage if (mTrustedVaultBannerState == TrustedVaultBannerState.OPTED_IN) { createTrustedVaultBanner( -@@ -527,10 +522,6 @@ public class PasswordSettings extends ChromeBaseSettingsFragment +@@ -518,10 +513,6 @@ public class PasswordSettings extends ChromeBaseSettingsFragment // by the system. if (getActivity().isFinishing()) { PasswordManagerHandlerProvider.getForProfile(getProfile()).removeObserver(this); @@ -758,6 +732,39 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage } } +diff --git a/chrome/android/javatests/BUILD.gn b/chrome/android/javatests/BUILD.gn +--- a/chrome/android/javatests/BUILD.gn ++++ b/chrome/android/javatests/BUILD.gn +@@ -12,13 +12,6 @@ testonly = true + + # Partition tests into one target per-package to keep incremental build times down. + chrome_test_java_helper_deps = [ +- "$google_play_services_package:google_play_services_base_java", +- "$google_play_services_package:google_play_services_basement_java", +- "$google_play_services_package:google_play_services_cast_framework_java", +- "$google_play_services_package:google_play_services_cast_java", +- "$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", + "//base:base_java", + "//base:base_java_test_support", + "//base:base_java_test_support_uncommon", +diff --git a/chrome/android/junit/BUILD.gn b/chrome/android/junit/BUILD.gn +--- a/chrome/android/junit/BUILD.gn ++++ b/chrome/android/junit/BUILD.gn +@@ -35,12 +35,6 @@ shared_library_with_jni("libchrome_junit_tests") { + if (is_android) { + # Partition tests into one target per-package to keep incremental build times down. + chrome_junit_tests_helper_deps = [ +- "$google_play_services_package:google_play_services_base_java", +- "$google_play_services_package:google_play_services_basement_java", +- "$google_play_services_package:google_play_services_cast_framework_java", +- "$google_play_services_package:google_play_services_cast_java", +- "$google_play_services_package:google_play_services_gcm_java", +- "$google_play_services_package:google_play_services_tasks_java", + "//base:base_java", + "//base:base_java_test_support", + "//base:base_java_test_support_uncommon", diff --git a/chrome/browser/language/android/BUILD.gn b/chrome/browser/language/android/BUILD.gn --- a/chrome/browser/language/android/BUILD.gn +++ b/chrome/browser/language/android/BUILD.gn @@ -862,7 +869,7 @@ diff --git a/chrome/browser/omaha/android/BUILD.gn b/chrome/browser/omaha/androi diff --git a/chrome/browser/password_manager/android/BUILD.gn b/chrome/browser/password_manager/android/BUILD.gn --- a/chrome/browser/password_manager/android/BUILD.gn +++ b/chrome/browser/password_manager/android/BUILD.gn -@@ -122,8 +122,6 @@ android_library("java") { +@@ -124,8 +124,6 @@ android_library("java") { ":java_resources", ":settings_interface_java", ":utils_java", @@ -871,7 +878,7 @@ diff --git a/chrome/browser/password_manager/android/BUILD.gn b/chrome/browser/p "account_storage_notice:java", "//base:base_java", "//build/android:build_java", -@@ -257,7 +255,6 @@ android_library("utils_java") { +@@ -259,7 +257,6 @@ android_library("utils_java") { ] deps = [ @@ -879,7 +886,7 @@ diff --git a/chrome/browser/password_manager/android/BUILD.gn b/chrome/browser/p "//chrome/browser/settings:factory_java", "//components/browser_ui/settings/android:java", ] -@@ -312,8 +309,6 @@ robolectric_binary("password_manager_junit_tests") { +@@ -314,8 +311,6 @@ robolectric_binary("password_manager_junit_tests") { ":test_support_java", ":unified_password_manager_proto_java", ":utils_java", @@ -897,10 +904,10 @@ diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrom -import com.google.android.gms.common.GoogleApiAvailability; - + import org.chromium.build.annotations.NullMarked; + /** Launches the UI through which the user can update Google Play Services/ */ - public class GmsUpdateLauncher { - // Referrer string for the Google Play Store when installing GMS Core package -@@ -22,31 +20,5 @@ public class GmsUpdateLauncher { +@@ -25,31 +23,5 @@ public class GmsUpdateLauncher { * @param context to start the new store Activity from. */ public static void launch(Context context) { @@ -1071,7 +1078,7 @@ diff --git a/chrome/browser/push_messaging/push_messaging_service_factory.cc b/c 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 -@@ -198,8 +198,6 @@ static_library("ui") { +@@ -194,8 +194,6 @@ static_library("ui") { "webui/flags/flags_ui.h", "webui/flags/flags_ui_handler.cc", "webui/flags/flags_ui_handler.h", @@ -1080,7 +1087,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn "webui/history_clusters/history_clusters_internals_ui_config.cc", "webui/history_clusters/history_clusters_internals_ui_config.h", "webui/interstitials/interstitial_ui.cc", -@@ -495,7 +493,6 @@ static_library("ui") { +@@ -489,7 +487,6 @@ static_library("ui") { "//components/find_in_page", "//components/fingerprinting_protection_filter/browser", "//components/flags_ui", @@ -1091,16 +1098,16 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn 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 -@@ -153,8 +153,6 @@ android_library("java") { +@@ -155,8 +155,6 @@ android_library("java") { deps = [ ":java_resources", - "$google_play_services_package:google_play_services_location_java", - "$google_play_services_package:google_play_services_tasks_java", "//base:base_java", + "//base/version_info/android:version_constants_java", "//build/android:build_java", - "//chrome/browser/android/lifecycle:java", -@@ -469,8 +467,6 @@ robolectric_library("junit") { +@@ -473,8 +471,6 @@ robolectric_library("junit") { deps = [ ":java", ":java_resources", @@ -1141,14 +1148,14 @@ diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/brows diff --git a/chrome/browser/ui/webauthn/sheet_models.cc b/chrome/browser/ui/webauthn/sheet_models.cc --- a/chrome/browser/ui/webauthn/sheet_models.cc +++ b/chrome/browser/ui/webauthn/sheet_models.cc -@@ -1519,16 +1519,9 @@ AuthenticatorMultiSourcePickerSheetModel:: +@@ -1548,16 +1548,9 @@ AuthenticatorMultiSourcePickerSheetModel:: bool AuthenticatorMultiSourcePickerSheetModel::IsManageDevicesButtonVisible() const { - using Mechanism = AuthenticatorRequestDialogModel::Mechanism; // If any phones or passkeys from a phone are shown then also show a button // that goes to the settings page to manage them. -- return base::ranges::any_of( +- return std::ranges::any_of( - dialog_model()->mechanisms, [](const Mechanism& mech) { - return absl::holds_alternative(mech.type) || - (absl::holds_alternative(mech.type) && @@ -1162,7 +1169,7 @@ diff --git a/chrome/browser/ui/webauthn/sheet_models.cc b/chrome/browser/ui/weba diff --git a/chrome/browser/ui/webui/chrome_web_ui_configs.cc b/chrome/browser/ui/webui/chrome_web_ui_configs.cc --- a/chrome/browser/ui/webui/chrome_web_ui_configs.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_configs.cc -@@ -223,7 +223,6 @@ void RegisterChromeWebUIConfigs() { +@@ -217,7 +217,6 @@ void RegisterChromeWebUIConfigs() { map.AddWebUIConfig(std::make_unique()); map.AddWebUIConfig(std::make_unique()); map.AddWebUIConfig(std::make_unique()); @@ -1243,7 +1250,7 @@ diff --git a/chrome/browser/webauthn/android/java/src/org/chromium/chrome/browse diff --git a/chrome/browser/webauthn/cablev2_devices.cc b/chrome/browser/webauthn/cablev2_devices.cc --- a/chrome/browser/webauthn/cablev2_devices.cc +++ b/chrome/browser/webauthn/cablev2_devices.cc -@@ -366,6 +366,9 @@ void AddPairing(Profile* profile, std::unique_ptr pairing) { +@@ -371,6 +371,9 @@ void AddPairing(Profile* profile, std::unique_ptr pairing) { // This is called when doing a QR-code pairing with a phone and the phone // sends long-term pairing information during the handshake. The pairing // information is saved in preferences for future operations. @@ -1256,7 +1263,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 -@@ -371,8 +371,6 @@ android_library("chrome_java_integration_test_support") { +@@ -379,8 +379,6 @@ android_library("chrome_java_integration_test_support") { deps = [ ":chrome_java_test_support_common", @@ -1268,7 +1275,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 -@@ -2553,14 +2553,6 @@ public class ExternalNavigationHandler { +@@ -2552,14 +2552,6 @@ public class ExternalNavigationHandler { * @return Whether the given intent is going to open an Instant App. */ private static boolean isIntentToInstantApp(Intent intent) { @@ -1425,7 +1432,7 @@ diff --git a/components/externalauth/android/java/src/org/chromium/components/ex 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 -@@ -128,6 +128,8 @@ public class GoogleCloudMessagingV2 implements GoogleCloudMessagingSubscriber { +@@ -136,6 +136,8 @@ public class GoogleCloudMessagingV2 implements GoogleCloudMessagingSubscriber { } private Intent registerRpc(Bundle data) throws IOException { @@ -1437,7 +1444,7 @@ diff --git a/components/gcm_driver/android/java/src/org/chromium/components/gcm_ diff --git a/components/gcm_driver/gcm_client_impl.cc b/components/gcm_driver/gcm_client_impl.cc --- a/components/gcm_driver/gcm_client_impl.cc +++ b/components/gcm_driver/gcm_client_impl.cc -@@ -449,6 +449,7 @@ void GCMClientImpl::StartGCM() { +@@ -432,6 +432,7 @@ void GCMClientImpl::StartGCM() { void GCMClientImpl::InitializeMCSClient() { DCHECK(network_connection_tracker_); @@ -1445,7 +1452,7 @@ diff --git a/components/gcm_driver/gcm_client_impl.cc b/components/gcm_driver/gc std::vector endpoints; endpoints.push_back(gservices_settings_.GetMCSMainEndpoint()); GURL fallback_endpoint = gservices_settings_.GetMCSFallbackEndpoint(); -@@ -642,6 +643,7 @@ void GCMClientImpl::AddHeartbeatInterval(const std::string& scope, +@@ -600,6 +601,7 @@ void GCMClientImpl::AddHeartbeatInterval(const std::string& scope, int interval_ms) { DCHECK(io_task_runner_->RunsTasksInCurrentSequence()); DCHECK(mcs_client_); @@ -1453,7 +1460,7 @@ diff --git a/components/gcm_driver/gcm_client_impl.cc b/components/gcm_driver/gc mcs_client_->AddHeartbeatInterval(scope, interval_ms); } -@@ -653,6 +655,7 @@ void GCMClientImpl::RemoveHeartbeatInterval(const std::string& scope) { +@@ -611,6 +613,7 @@ void GCMClientImpl::RemoveHeartbeatInterval(const std::string& scope) { void GCMClientImpl::StartCheckin() { DCHECK(io_task_runner_->RunsTasksInCurrentSequence()); @@ -1461,7 +1468,7 @@ diff --git a/components/gcm_driver/gcm_client_impl.cc b/components/gcm_driver/gc // Make sure no checkin is in progress. if (checkin_request_) -@@ -731,6 +734,7 @@ void GCMClientImpl::SetGServicesSettingsCallback(bool success) { +@@ -684,6 +687,7 @@ void GCMClientImpl::SetGServicesSettingsCallback(bool success) { void GCMClientImpl::SchedulePeriodicCheckin() { DCHECK(io_task_runner_->RunsTasksInCurrentSequence()); @@ -1498,15 +1505,16 @@ diff --git a/components/gcm_driver/instance_id/android/BUILD.gn b/components/gcm diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java b/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java --- a/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java +++ b/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java -@@ -28,7 +28,6 @@ public class InstanceIDBridge { +@@ -30,8 +30,6 @@ public class InstanceIDBridge { * Underlying InstanceIDWithSubtype. May be shared by multiple InstanceIDBridges. Must be * initialized on a background thread. */ +- @SuppressWarnings("NullAway.Init") - private InstanceIDWithSubtype mInstanceID; private static boolean sBlockOnAsyncTasksForTesting; -@@ -73,7 +72,7 @@ public class InstanceIDBridge { +@@ -76,7 +74,7 @@ public class InstanceIDBridge { new BridgeAsyncTask() { @Override protected String doBackgroundWork() { @@ -1515,7 +1523,7 @@ diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/com } @Override -@@ -90,7 +89,7 @@ public class InstanceIDBridge { +@@ -93,7 +91,7 @@ public class InstanceIDBridge { new BridgeAsyncTask() { @Override protected Long doBackgroundWork() { @@ -1524,7 +1532,7 @@ diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/com } @Override -@@ -117,21 +116,7 @@ public class InstanceIDBridge { +@@ -120,21 +118,7 @@ public class InstanceIDBridge { new BridgeAsyncTask() { @Override protected String doBackgroundWork() { @@ -1546,7 +1554,7 @@ diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/com } @Override -@@ -150,22 +135,7 @@ public class InstanceIDBridge { +@@ -153,22 +137,7 @@ public class InstanceIDBridge { new BridgeAsyncTask() { @Override protected Boolean doBackgroundWork() { @@ -1570,7 +1578,7 @@ diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/com } @Override -@@ -186,12 +156,7 @@ public class InstanceIDBridge { +@@ -189,12 +158,7 @@ public class InstanceIDBridge { new BridgeAsyncTask() { @Override protected Boolean doBackgroundWork() { @@ -1584,7 +1592,7 @@ diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/com } @Override -@@ -227,24 +192,12 @@ public class InstanceIDBridge { +@@ -230,24 +194,12 @@ public class InstanceIDBridge { protected abstract void sendResultToNative(Result result); public void execute() { @@ -3111,7 +3119,7 @@ diff --git a/components/omnibox/common/android/java/src/org/chromium/components/ import org.chromium.base.BaseSwitches; import org.chromium.base.CommandLine; import org.chromium.base.ContextUtils; -@@ -143,12 +141,6 @@ public class OmniboxFeatures { +@@ -146,12 +144,6 @@ public class OmniboxFeatures { "geolocation_request_min_update_interval_millis", (int) (9 * DateUtils.MINUTE_IN_MILLIS)); @@ -3136,7 +3144,7 @@ diff --git a/components/signin/public/android/BUILD.gn b/components/signin/publi "//base:base_java", "//base:service_loader_java", "//build/android:build_java", -@@ -199,7 +197,6 @@ robolectric_library("junit") { +@@ -197,7 +195,6 @@ robolectric_library("junit") { deps = [ ":java", ":signin_java_test_support", @@ -3144,39 +3152,6 @@ diff --git a/components/signin/public/android/BUILD.gn b/components/signin/publi "//base:base_java", "//base:base_java_test_support", "//base:base_java_test_support_uncommon", -diff --git a/components/signin/public/android/java/src/org/chromium/components/signin/AccountRenameChecker.java b/components/signin/public/android/java/src/org/chromium/components/signin/AccountRenameChecker.java ---- a/components/signin/public/android/java/src/org/chromium/components/signin/AccountRenameChecker.java -+++ b/components/signin/public/android/java/src/org/chromium/components/signin/AccountRenameChecker.java -@@ -10,10 +10,6 @@ import androidx.annotation.Nullable; - import androidx.annotation.VisibleForTesting; - import androidx.annotation.WorkerThread; - --import com.google.android.gms.auth.AccountChangeEvent; --import com.google.android.gms.auth.GoogleAuthException; --import com.google.android.gms.auth.GoogleAuthUtil; -- - import org.chromium.base.ContextUtils; - import org.chromium.base.Log; - import org.chromium.base.Promise; -@@ -45,18 +41,6 @@ public final class AccountRenameChecker { - /** Gets the new account name of the renamed account. */ - @Override - public @Nullable String getNewNameOfRenamedAccount(String accountEmail) { -- final Context context = ContextUtils.getApplicationContext(); -- try { -- final List accountChangeEvents = -- GoogleAuthUtil.getAccountChangeEvents(context, 0, accountEmail); -- for (AccountChangeEvent event : accountChangeEvents) { -- if (event.getChangeType() == GoogleAuthUtil.CHANGE_TYPE_ACCOUNT_RENAMED_TO) { -- return event.getChangeData(); -- } -- } -- } catch (IOException | GoogleAuthException e) { -- Log.w(TAG, "Failed to get change events", e); -- } - return null; - } - } diff --git a/components/webauthn/android/BUILD.gn b/components/webauthn/android/BUILD.gn --- a/components/webauthn/android/BUILD.gn +++ b/components/webauthn/android/BUILD.gn @@ -3222,7 +3197,7 @@ diff --git a/components/webauthn/android/BUILD.gn b/components/webauthn/android/ "internal_authenticator_android.cc", "internal_authenticator_android.h", "webauthn_browser_bridge.cc", -@@ -212,7 +200,6 @@ robolectric_library("junit") { +@@ -211,7 +199,6 @@ robolectric_library("junit") { deps = [ ":java", ":test_support_java", @@ -3588,7 +3563,7 @@ diff --git a/content/browser/push_messaging/push_messaging_manager.cc b/content/ diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn --- a/content/public/android/BUILD.gn +++ b/content/public/android/BUILD.gn -@@ -158,11 +158,6 @@ android_library("content_full_java") { +@@ -163,11 +163,6 @@ android_library("content_full_java") { ":content_java_resources", ":content_main_dex_java", ":content_util_java", @@ -3603,7 +3578,7 @@ diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn diff --git a/content/public/android/java/src/org/chromium/content/browser/webid/IdentityCredentialsDelegate.java b/content/public/android/java/src/org/chromium/content/browser/webid/IdentityCredentialsDelegate.java --- a/content/public/android/java/src/org/chromium/content/browser/webid/IdentityCredentialsDelegate.java +++ b/content/public/android/java/src/org/chromium/content/browser/webid/IdentityCredentialsDelegate.java -@@ -15,13 +15,6 @@ import android.os.Handler; +@@ -14,13 +14,6 @@ import android.os.Handler; import android.os.Looper; import android.os.ResultReceiver; @@ -3617,7 +3592,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/webid/ import org.chromium.base.Log; import org.chromium.base.Promise; import org.chromium.base.ServiceLoaderUtil; -@@ -44,83 +37,7 @@ public class IdentityCredentialsDelegate { +@@ -43,82 +36,7 @@ public class IdentityCredentialsDelegate { } public Promise get(Activity window, String origin, String request) { @@ -3635,8 +3610,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/webid/ - ResultReceiver resultReceiver = - new ResultReceiver(new Handler(Looper.getMainLooper())) { - // android.credentials.GetCredentialException requires API level 34 -- @NullUnmarked -- @SuppressLint("NewApi") +- @SuppressWarnings("NewApi") - @Override - protected void onReceiveResult(int code, Bundle data) { - Log.d(TAG, "Received a response"); @@ -3646,7 +3620,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/webid/ - response.getCredential() - .getData() - .getByteArray("identityToken"); -- result.fulfill(token); +- result.fulfill(Objects.requireNonNull(token)); - } catch (Exception e) { - Log.e(TAG, e.toString()); - @@ -3705,7 +3679,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 -@@ -3594,10 +3594,6 @@ if (is_android) { +@@ -3625,10 +3625,6 @@ if (is_android) { testonly = true sources = content_java_sources_needing_jni deps = [ @@ -3732,7 +3706,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 -@@ -137,6 +137,7 @@ BASE_FEATURE(kWebAuthniCloudKeychainPrf, +@@ -123,6 +123,7 @@ BASE_FEATURE(kWebAuthniCloudKeychainPrf, BASE_FEATURE(kWebAuthnHybridLinking, "WebAuthenticationHybridLinking", base::FEATURE_ENABLED_BY_DEFAULT); @@ -3743,7 +3717,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 -@@ -149,11 +149,6 @@ if (is_android) { +@@ -150,11 +150,6 @@ if (is_android) { "shape_detection/android/junit/src/org/chromium/shape_detection/BitmapUtilsTest.java", ] deps = [ @@ -3755,7 +3729,7 @@ diff --git a/services/BUILD.gn b/services/BUILD.gn "//base:base_java", "//base:base_java_test_support", "//base:base_junit_test_support", -@@ -183,10 +178,6 @@ if (is_android) { +@@ -184,10 +179,6 @@ if (is_android) { "shape_detection/android/javatests/src/org/chromium/shape_detection/TextDetectionImplTest.java", ] deps = [ @@ -3819,8 +3793,8 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD. } # The section below is generated by running -@@ -317,296 +308,6 @@ if (!limit_android_deps) { - ] +@@ -321,295 +312,6 @@ if (!limit_android_deps) { + [ "local_modifications/accessibility_test_framework.pcfg" ] } - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead. @@ -3905,12 +3879,11 @@ 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_basement_java") { -- aar_path = "cipd/libs/com_google_android_gms_play_services_basement/play-services-basement-18.4.0.aar" +- aar_path = "cipd/libs/com_google_android_gms_play_services_basement/play-services-basement-18.5.0.aar" - 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_java", -- "//third_party/androidx:androidx_core_core_java", +- "//third_party/androidx:androidx_collection_collection_jvm_java", - "//third_party/androidx:androidx_fragment_fragment_java", - ] - @@ -4003,7 +3976,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-alpha02.aar" +- aar_path = "cipd/libs/com_google_android_gms_play_services_identity_credentials/play-services-identity-credentials-16.0.0-alpha04.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 = [ @@ -4116,7 +4089,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") { -@@ -654,24 +355,6 @@ if (!limit_android_deps) { +@@ -657,24 +359,6 @@ if (!limit_android_deps) { } } @@ -4141,8 +4114,8 @@ 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") { -@@ -712,56 +395,6 @@ if (!limit_android_deps) { - ] +@@ -693,56 +377,6 @@ if (!limit_android_deps) { + } } - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead. @@ -4198,47 +4171,10 @@ 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") { -@@ -888,20 +521,6 @@ if (!limit_android_deps) { - requires_android = true - } - -- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead. -- android_aar_prebuilt("io_grpc_grpc_binder_java") { -- aar_path = "cipd/libs/io_grpc_grpc_binder/grpc-binder-1.49.0.aar" -- info_path = "libs/io_grpc_grpc_binder/io_grpc_grpc_binder.info" -- enable_bytecode_checks = false -- deps = [ -- ":io_grpc_grpc_core_java", -- "//third_party/android_deps:guava_android_java", -- "//third_party/androidx:androidx_annotation_annotation_jvm_java", -- "//third_party/androidx:androidx_core_core_java", -- "//third_party/androidx:androidx_lifecycle_lifecycle_common_java", -- ] -- } -- - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead. - java_prebuilt("io_grpc_grpc_context_java") { - jar_path = "cipd/libs/io_grpc_grpc_context/grpc-context-1.49.0.jar" -@@ -1181,357 +800,6 @@ if (!limit_android_deps) { +@@ -1081,340 +715,6 @@ if (!limit_android_deps) { is_robolectric = true } -- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead. -- java_prebuilt("com_google_android_annotations_java") { -- jar_path = -- "cipd/libs/com_google_android_annotations/annotations-4.1.1.4.jar" -- output_name = "com_google_android_annotations" -- supports_android = true -- enable_bytecode_checks = false -- -- # To remove visibility constraint, add this dependency to -- # //third_party/android_deps/build.gradle. -- visibility = [ -- ":*", -- "//third_party/androidx:*", -- ] -- } -- - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead. - if (google_play_services_package == "//third_party/android_deps") { - android_aar_prebuilt("google_android_datatransport_transport_api_java") { @@ -4389,7 +4325,6 @@ 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. @@ -4577,41 +4512,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") { -@@ -1584,33 +852,6 @@ if (!limit_android_deps) { - ] - } - -- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead. -- java_prebuilt("io_grpc_grpc_core_java") { -- jar_path = "cipd/libs/io_grpc_grpc_core/grpc-core-1.49.0.jar" -- output_name = "io_grpc_grpc_core" -- supports_android = true -- enable_bytecode_checks = false -- -- # To remove visibility constraint, add this dependency to -- # //third_party/android_deps/build.gradle. -- visibility = [ -- ":*", -- "//third_party/androidx:*", -- ] -- deps = [ -- ":com_google_android_annotations_java", -- ":com_google_code_gson_gson_java", -- ":com_google_errorprone_error_prone_annotations_java", -- ":io_grpc_grpc_api_java", -- ":io_perfmark_perfmark_api_java", -- ":org_codehaus_mojo_animal_sniffer_annotations_java", -- "//third_party/android_deps:guava_android_java", -- ] -- -- # https://crbug.com/1412551 -- requires_android = true -- } -- - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead. - java_prebuilt("io_perfmark_perfmark_api_java") { - jar_path = "cipd/libs/io_perfmark_perfmark_api/perfmark-api-0.25.0.jar" -@@ -1870,7 +1111,6 @@ if (!limit_android_deps) { +@@ -1700,7 +1000,6 @@ if (!limit_android_deps) { ] testonly = true deps = [ @@ -4619,7 +4520,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", -@@ -1892,7 +1132,6 @@ if (!limit_android_deps) { +@@ -1722,7 +1021,6 @@ if (!limit_android_deps) { ] testonly = true deps = [ @@ -4627,7 +4528,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", -@@ -1962,7 +1201,6 @@ if (!limit_android_deps) { +@@ -1792,7 +1090,6 @@ if (!limit_android_deps) { ] testonly = true deps = [ @@ -4656,10 +4557,10 @@ diff --git a/third_party/android_deps/util/org/chromium/gms/ChromiumPlayServices -import com.google.android.gms.common.ConnectionResult; -import com.google.android.gms.common.GoogleApiAvailability; - + import org.chromium.build.annotations.NullMarked; + // Refer to go/doubledown-play-services#new-apis for more detail. - public final class ChromiumPlayServicesAvailability { - /** -@@ -30,9 +27,7 @@ public final class ChromiumPlayServicesAvailability { +@@ -33,9 +30,7 @@ public final class ChromiumPlayServicesAvailability { * PM/UX. */ public static boolean isGooglePlayServicesAvailable(final Context context) { @@ -4670,7 +4571,7 @@ diff --git a/third_party/android_deps/util/org/chromium/gms/ChromiumPlayServices } /** -@@ -50,7 +45,6 @@ public final class ChromiumPlayServicesAvailability { +@@ -53,7 +48,6 @@ public final class ChromiumPlayServicesAvailability { * PM/UX. */ public static int getGooglePlayServicesConnectionResult(final Context context) { @@ -4682,7 +4583,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 -@@ -129,7 +129,7 @@ template("androidx_java_prebuilt") { +@@ -136,7 +136,7 @@ template("androidx_java_prebuilt") { } } @@ -4691,7 +4592,7 @@ 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" -@@ -152,6 +152,17 @@ template("androidx_android_aar_prebuilt") { +@@ -157,6 +157,17 @@ template("androidx_android_aar_prebuilt") { } } diff --git a/build/cromite_patches/Remove-help-menu-item.patch b/build/cromite_patches/Remove-help-menu-item.patch index 2bf965932832108b1bac3009be3389711a22152f..8aacb96df8002178dad9c4c68f2917a283d4f9be 100644 --- a/build/cromite_patches/Remove-help-menu-item.patch +++ b/build/cromite_patches/Remove-help-menu-item.patch @@ -30,7 +30,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 -@@ -155,9 +155,6 @@ found in the LICENSE file. +@@ -158,9 +158,6 @@ found in the LICENSE file. @@ -86,7 +86,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillPaymentMethodsFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillPaymentMethodsFragment.java --- a/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillPaymentMethodsFragment.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillPaymentMethodsFragment.java -@@ -113,6 +113,7 @@ public class AutofillPaymentMethodsFragment extends ChromeBaseSettingsFragment +@@ -115,6 +115,7 @@ public class AutofillPaymentMethodsFragment extends ChromeBaseSettingsFragment MenuItem help = menu.add(Menu.NONE, R.id.menu_id_targeted_help, Menu.NONE, R.string.menu_help); help.setIcon(R.drawable.ic_help_and_feedback); @@ -97,7 +97,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill/settin diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillProfilesFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillProfilesFragment.java --- a/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillProfilesFragment.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillProfilesFragment.java -@@ -124,6 +124,7 @@ public class AutofillProfilesFragment extends ChromeBaseSettingsFragment +@@ -126,6 +126,7 @@ public class AutofillProfilesFragment extends ChromeBaseSettingsFragment MenuItem help = menu.add(Menu.NONE, R.id.menu_id_targeted_help, Menu.NONE, R.string.menu_help); help.setIcon(R.drawable.ic_help_and_feedback); @@ -108,7 +108,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill/settin diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java --- a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java -@@ -916,6 +916,7 @@ public abstract class ClearBrowsingDataFragment extends ChromeBaseSettingsFragme +@@ -908,6 +908,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment TraceEventVectorDrawableCompat.create( getResources(), R.drawable.ic_help_and_feedback, getActivity().getTheme())); help.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); @@ -119,7 +119,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java -@@ -1024,7 +1024,6 @@ public abstract class BaseCustomTabActivity extends ChromeActivity { +@@ -1029,7 +1029,6 @@ public abstract class BaseCustomTabActivity extends ChromeActivity { // Disable creating new tabs, bookmark, print, help, focus_url, etc. if (id == R.id.focus_url_bar || id == R.id.all_bookmarks_menu_id @@ -130,7 +130,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Base diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java -@@ -237,6 +237,7 @@ public class PasswordSettings extends ChromeBaseSettingsFragment +@@ -234,6 +234,7 @@ public class PasswordSettings extends ChromeBaseSettingsFragment mSearchItem = menu.findItem(R.id.menu_id_search); mSearchItem.setVisible(true); mHelpItem = menu.findItem(R.id.menu_id_targeted_help); @@ -141,7 +141,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/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java -@@ -509,6 +509,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment +@@ -496,6 +496,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment help.setIcon( TraceEventVectorDrawableCompat.create( getResources(), R.drawable.ic_help_and_feedback, getActivity().getTheme())); @@ -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 -@@ -436,6 +436,7 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity +@@ -420,6 +420,7 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity help.setIcon( TraceEventVectorDrawableCompat.create( getResources(), R.drawable.ic_help_and_feedback, getTheme())); @@ -174,7 +174,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/G diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java -@@ -505,6 +505,7 @@ public class ManageSyncSettings extends ChromeBaseSettingsFragment +@@ -508,6 +508,7 @@ public class ManageSyncSettings extends ChromeBaseSettingsFragment MenuItem help = menu.add(Menu.NONE, R.id.menu_id_targeted_help, Menu.NONE, R.string.menu_help); help.setIcon(R.drawable.ic_help_and_feedback); @@ -263,12 +263,12 @@ diff --git a/chrome/browser/safe_browsing/android/java/src/org/chromium/chrome/b diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc --- a/chrome/browser/ui/chrome_pages.cc +++ b/chrome/browser/ui/chrome_pages.cc -@@ -141,6 +141,7 @@ void LaunchReleaseNotesImpl(Profile* profile, apps::LaunchSource source) { +@@ -138,6 +138,7 @@ void LaunchReleaseNotesImpl(Profile* profile, apps::LaunchSource source) { // shown in the last active browser. If there is no such browser, a new browser // is created. void ShowHelpImpl(Browser* browser, Profile* profile, HelpSource source) { + if ((true)) return; base::RecordAction(UserMetricsAction("ShowHelpTab")); - #if BUILDFLAG(IS_CHROMEOS_ASH) && BUILDFLAG(GOOGLE_CHROME_BRANDING) + #if BUILDFLAG(IS_CHROMEOS) && BUILDFLAG(GOOGLE_CHROME_BRANDING) auto app_launch_source = apps::LaunchSource::kUnknown; -- diff --git a/build/cromite_patches/Remove-segmentation-platform.patch b/build/cromite_patches/Remove-segmentation-platform.patch index b6e6fc09d2dace7d1b37a5eba1ed8cab3127cfc3..efc82253012faa5a44e054b4e1136e767308a03b 100644 --- a/build/cromite_patches/Remove-segmentation-platform.patch +++ b/build/cromite_patches/Remove-segmentation-platform.patch @@ -47,9 +47,9 @@ diff --git a/chrome/browser/segmentation_platform/chrome_browser_main_extra_part diff --git a/components/segmentation_platform/public/features.cc b/components/segmentation_platform/public/features.cc --- a/components/segmentation_platform/public/features.cc +++ b/components/segmentation_platform/public/features.cc -@@ -247,4 +247,7 @@ constexpr base::FeatureParam kMaxTabGroupSyncCardImpressions{ - &kEducationalTipModule, "max_tab_group_sync_card_impressions", - /*default_value=*/10}; +@@ -266,4 +266,7 @@ BASE_FEATURE(kSegmentationPlatformFedCmUser, + "SegmentationPlatformFedCmUser", + base::FEATURE_DISABLED_BY_DEFAULT); +SET_CROMITE_FEATURE_DISABLED(kSegmentationPlatformFeature); +SET_CROMITE_FEATURE_DISABLED(kSegmentationPlatformFeedSegmentFeature); diff --git a/build/cromite_patches/Remove-voice-recognition-integration.patch b/build/cromite_patches/Remove-voice-recognition-integration.patch index 7409023a05b8411cb5acbd4c6ecb9e2560ec61af..dbf39f1df9e908c0758fa12dd1c3f9c3bc247f0c 100644 --- a/build/cromite_patches/Remove-voice-recognition-integration.patch +++ b/build/cromite_patches/Remove-voice-recognition-integration.patch @@ -142,7 +142,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se 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; -@@ -322,7 +321,7 @@ public class SearchActivity extends AsyncInitializationActivity +@@ -325,7 +324,7 @@ public class SearchActivity extends AsyncInitializationActivity /*omniboxUma*/ (url, transition, isNtp) -> {}, TabWindowManagerSingleton::getInstance, /* bookmarkState= */ (url) -> false, @@ -179,7 +179,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java -@@ -95,7 +95,6 @@ import org.chromium.chrome.browser.omnibox.OmniboxStub; +@@ -96,7 +96,6 @@ import org.chromium.chrome.browser.omnibox.OmniboxStub; import org.chromium.chrome.browser.omnibox.OverrideUrlLoadingDelegateImpl; import org.chromium.chrome.browser.omnibox.UrlFocusChangeListener; import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestionsDropdownScrollListener; @@ -187,7 +187,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; -@@ -2601,10 +2600,6 @@ public class ToolbarManager +@@ -2682,10 +2681,6 @@ public class ToolbarManager return mLocationBar.getOmniboxStub(); } @@ -201,7 +201,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java -@@ -102,8 +102,6 @@ import org.chromium.chrome.browser.metrics.UmaSessionStats; +@@ -106,8 +106,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; @@ -210,7 +210,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi import org.chromium.chrome.browser.paint_preview.DemoPaintPreview; import org.chromium.chrome.browser.password_manager.ManagePasswordsReferrer; import org.chromium.chrome.browser.password_manager.PasswordManagerLauncher; -@@ -146,7 +144,6 @@ import org.chromium.chrome.browser.theme.TopUiThemeColorProvider; +@@ -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; @@ -218,7 +218,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi import org.chromium.chrome.browser.toolbar.adaptive.AdaptiveButtonActionMenuCoordinator; import org.chromium.chrome.browser.toolbar.adaptive.AdaptiveToolbarButtonController; import org.chromium.chrome.browser.toolbar.adaptive.AdaptiveToolbarButtonVariant; -@@ -308,7 +305,6 @@ public class RootUiCoordinator +@@ -310,7 +307,6 @@ public class RootUiCoordinator private LayoutManagerImpl mLayoutManager; protected OneshotSupplier mIntentMetadataOneshotSupplier; protected OneshotSupplierImpl mPromoShownOneshotSupplier = new OneshotSupplierImpl<>(); @@ -226,7 +226,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi private MediaCaptureOverlayController mCaptureController; private @Nullable ScrollCaptureManager mScrollCaptureManager; protected final ActivityLifecycleDispatcher mActivityLifecycleDispatcher; -@@ -638,9 +634,6 @@ public class RootUiCoordinator +@@ -636,9 +632,6 @@ public class RootUiCoordinator } if (mToolbarManager != null) { @@ -236,7 +236,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi mToolbarManager.destroy(); mToolbarManager = null; } -@@ -1471,39 +1464,12 @@ public class RootUiCoordinator +@@ -1472,39 +1465,12 @@ public class RootUiCoordinator () -> mToolbarManager.setUrlBarFocus( false, OmniboxFocusReason.UNFOCUS)); @@ -285,7 +285,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi adaptiveToolbarButtonController.addButtonVariant( AdaptiveToolbarButtonVariant.ADD_TO_BOOKMARKS, addToBookmarksToolbarButtonController); -@@ -1670,13 +1634,6 @@ public class RootUiCoordinator +@@ -1669,13 +1633,6 @@ public class RootUiCoordinator if (!mSupportsAppMenuSupplier.getAsBoolean()) { mToolbarManager.getToolbar().disableMenuButton(); } @@ -302,7 +302,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi 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 -@@ -143,7 +143,6 @@ android_library("java") { +@@ -145,7 +145,6 @@ android_library("java") { "java/src/org/chromium/chrome/browser/omnibox/suggestions/tail/TailSuggestionView.java", "java/src/org/chromium/chrome/browser/omnibox/suggestions/tail/TailSuggestionViewBinder.java", "java/src/org/chromium/chrome/browser/omnibox/suggestions/tail/TailSuggestionViewProperties.java", @@ -336,7 +336,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/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 -@@ -44,7 +44,6 @@ import org.chromium.chrome.browser.omnibox.suggestions.OmniboxLoadUrlParams; +@@ -42,7 +42,6 @@ import org.chromium.chrome.browser.omnibox.suggestions.OmniboxLoadUrlParams; import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestionsDropdownScrollListener; import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestionsVisualState; import org.chromium.chrome.browser.omnibox.suggestions.basic.BasicSuggestionProcessor.BookmarkState; @@ -344,7 +344,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; -@@ -479,13 +478,6 @@ public class LocationBarCoordinator +@@ -464,13 +463,6 @@ public class LocationBarCoordinator return mLocationBarLayout.getSecurityIconView(); } @@ -358,7 +358,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow @Nullable @Override public OmniboxStub getOmniboxStub() { -@@ -807,11 +799,6 @@ public class LocationBarCoordinator +@@ -792,11 +784,6 @@ public class LocationBarCoordinator // End tablet-specific methods. @@ -396,7 +396,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java -@@ -55,7 +55,6 @@ import org.chromium.chrome.browser.omnibox.status.StatusCoordinator; +@@ -57,7 +57,6 @@ import org.chromium.chrome.browser.omnibox.status.StatusCoordinator; import org.chromium.chrome.browser.omnibox.styles.OmniboxResourceProvider; import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteCoordinator; import org.chromium.chrome.browser.omnibox.suggestions.OmniboxLoadUrlParams; @@ -404,7 +404,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow import org.chromium.chrome.browser.prefetch.settings.PreloadPagesSettingsBridge; import org.chromium.chrome.browser.prefetch.settings.PreloadPagesState; import org.chromium.chrome.browser.profiles.Profile; -@@ -96,8 +95,6 @@ import java.util.function.BooleanSupplier; +@@ -98,8 +97,6 @@ import java.util.function.BooleanSupplier; class LocationBarMediator implements LocationBarDataProvider.Observer, OmniboxStub, @@ -413,15 +413,15 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow UrlBarDelegate, OnKeyListener, ComponentCallbacks, -@@ -162,7 +159,6 @@ class LocationBarMediator +@@ -164,7 +161,6 @@ class LocationBarMediator }; private final LocationBarLayout mLocationBarLayout; - private VoiceRecognitionHandler mVoiceRecognitionHandler; private final LocationBarDataProvider mLocationBarDataProvider; + private final @Nullable BrowserControlsStateProvider mBrowserControlsStateProvider; private final LocationBarEmbedderUiOverrides mEmbedderUiOverrides; - private StatusCoordinator mStatusCoordinator; -@@ -235,8 +231,6 @@ class LocationBarMediator +@@ -239,8 +235,6 @@ class LocationBarMediator mEmbedderUiOverrides = embedderUiOverrides; mOverrideUrlLoadingDelegate = overrideUrlLoadingDelegate; mLocaleManager = localeManager; @@ -430,7 +430,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow mProfileSupplier = profileSupplier; mProfileSupplier.addObserver(mCallbackController.makeCancelable(this::setProfile)); mTemplateUrlServiceSupplier = templateUrlServiceSupplier; -@@ -279,9 +273,6 @@ class LocationBarMediator +@@ -284,9 +278,6 @@ class LocationBarMediator mStatusCoordinator = null; mAutocompleteCoordinator = null; mUrlCoordinator = null; @@ -440,7 +440,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow mLocationBarDataProvider.removeObserver(this); mDeferredNativeRunnables.clear(); mUrlFocusChangeListeners.clear(); -@@ -413,11 +404,6 @@ class LocationBarMediator +@@ -418,11 +409,6 @@ class LocationBarMediator mLocationBarLayout.setUnfocusedWidth(unfocusedWidth); } @@ -452,7 +452,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow /* package */ void setLensControllerForTesting(LensController lensController) { mLensController = lensController; } -@@ -687,10 +673,6 @@ class LocationBarMediator +@@ -692,10 +678,6 @@ class LocationBarMediator // Hide keyboard before launch voice search to avoid keyboard action announcement in // TalkBack to be picked up by voice search. mUrlCoordinator.setKeyboardVisibility(false, false); @@ -463,7 +463,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow } /** package */ -@@ -1166,10 +1148,7 @@ class LocationBarMediator +@@ -1178,10 +1160,7 @@ class LocationBarMediator private boolean shouldShowMicButton() { if (shouldShowDeleteButton()) return false; @@ -475,7 +475,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow return false; } boolean isToolbarMicEnabled = mIsToolbarMicEnabledSupplier.getAsBoolean(); -@@ -1186,6 +1165,7 @@ class LocationBarMediator +@@ -1198,6 +1177,7 @@ class LocationBarMediator } private boolean shouldShowLensButton() { @@ -483,7 +483,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow if (shouldShowDeleteButton()) return false; // When this method is called on UI inflation, return false as the native is not ready. -@@ -1410,11 +1390,6 @@ class LocationBarMediator +@@ -1422,11 +1402,6 @@ class LocationBarMediator } } @@ -495,7 +495,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow @Override public void addUrlFocusChangeListener(UrlFocusChangeListener listener) { mUrlFocusChangeListeners.addObserver(listener); -@@ -1430,31 +1405,13 @@ class LocationBarMediator +@@ -1442,31 +1417,13 @@ class LocationBarMediator return mUrlHasFocus; } @@ -529,7 +529,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow public void setSearchQuery(String query) { if (TextUtils.isEmpty(query)) return; -@@ -1477,20 +1434,6 @@ class LocationBarMediator +@@ -1489,20 +1446,6 @@ class LocationBarMediator mUrlCoordinator.setKeyboardVisibility(true, false); } @@ -579,15 +579,15 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteController.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteController.java --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteController.java +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteController.java -@@ -15,7 +15,6 @@ import org.jni_zero.NativeMethods; - +@@ -15,7 +15,6 @@ import org.chromium.build.annotations.NullMarked; + import org.chromium.build.annotations.Nullable; import org.chromium.chrome.browser.omnibox.OmniboxMetrics; import org.chromium.chrome.browser.omnibox.suggestions.action.OmniboxAnswerAction; -import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler.VoiceResult; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.tab.Tab; import org.chromium.components.omnibox.AutocompleteMatch; -@@ -335,25 +334,6 @@ public class AutocompleteController { +@@ -331,25 +330,6 @@ public class AutocompleteController { mNativeController, match.getNativeObjectRef(), matchIndex, webContents); } @@ -613,7 +613,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow /** * Updates searchbox stats parameters on the selected match that we will navigate to and * returns the updated URL. -@@ -501,11 +481,6 @@ public class AutocompleteController { +@@ -497,11 +477,6 @@ public class AutocompleteController { Tab getMatchingTabForSuggestion( long nativeAutocompleteControllerAndroid, long nativeAutocompleteMatch); @@ -628,7 +628,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteCoordinator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteCoordinator.java --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteCoordinator.java +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteCoordinator.java -@@ -30,7 +30,6 @@ import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteController.On +@@ -31,7 +31,6 @@ import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteController.On import org.chromium.chrome.browser.omnibox.suggestions.SuggestionListViewBinder.SuggestionListViewHolder; import org.chromium.chrome.browser.omnibox.suggestions.base.BaseSuggestionViewBinder; import org.chromium.chrome.browser.omnibox.suggestions.basic.BasicSuggestionProcessor.BookmarkState; @@ -636,7 +636,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.share.ShareDelegate; import org.chromium.chrome.browser.tab.Tab; -@@ -292,13 +291,6 @@ public class AutocompleteCoordinator +@@ -293,13 +292,6 @@ public class AutocompleteCoordinator mRecycledViewPool.ifPresent(p -> p.onNativeInitialized()); } @@ -653,7 +653,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java -@@ -43,7 +43,6 @@ import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteDelegate.Auto +@@ -42,7 +42,6 @@ import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteDelegate.Auto import org.chromium.chrome.browser.omnibox.suggestions.action.OmniboxActionFactoryImpl; import org.chromium.chrome.browser.omnibox.suggestions.action.OmniboxAnswerAction; import org.chromium.chrome.browser.omnibox.suggestions.basic.BasicSuggestionProcessor.BookmarkState; @@ -661,7 +661,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.share.ShareDelegate; import org.chromium.chrome.browser.tab.Tab; -@@ -500,13 +499,6 @@ class AutocompleteMediator +@@ -479,13 +478,6 @@ class AutocompleteMediator mShouldPreventOmniboxAutocomplete = prevent; } diff --git a/build/cromite_patches/Remove-window-name-on-cross-origin-navigation.patch b/build/cromite_patches/Remove-window-name-on-cross-origin-navigation.patch index aaf6276078ab9fef46c84e610922ffb98da9930d..d7846150ac9ac9a68cdc827b13c811bb224ce4c1 100644 --- a/build/cromite_patches/Remove-window-name-on-cross-origin-navigation.patch +++ b/build/cromite_patches/Remove-window-name-on-cross-origin-navigation.patch @@ -21,7 +21,7 @@ new file mode 100644 diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_party/blink/renderer/core/loader/document_loader.cc --- a/third_party/blink/renderer/core/loader/document_loader.cc +++ b/third_party/blink/renderer/core/loader/document_loader.cc -@@ -2982,7 +2982,7 @@ void DocumentLoader::CommitNavigation() { +@@ -3004,7 +3004,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(); } -@@ -2993,6 +2993,7 @@ void DocumentLoader::CommitNavigation() { +@@ -3015,6 +3015,7 @@ void DocumentLoader::CommitNavigation() { // TODO(shuuran): CrossSiteCrossBrowsingContextGroupSetNulledName will just // record the fact that the name would be nulled and if the name is accessed // after we will fire a UseCounter. diff --git a/build/cromite_patches/Restore-LastTabStandingTracker.patch b/build/cromite_patches/Restore-LastTabStandingTracker.patch index 96e9423aed55101fe5ce52aceeaf867d16276b67..217e7bb010f1887d33db30c952ff909e1ff271c3 100644 --- a/build/cromite_patches/Restore-LastTabStandingTracker.patch +++ b/build/cromite_patches/Restore-LastTabStandingTracker.patch @@ -27,9 +27,9 @@ 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 -@@ -1661,6 +1661,16 @@ static_library("browser") { - "webid/identity_provider_permission_request.h", - ] +@@ -1698,6 +1698,16 @@ static_library("browser") { + ] + } + sources += [ + "permissions/last_tab_standing_tracker.cc", @@ -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 -@@ -129,6 +129,7 @@ +@@ -135,6 +135,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" -@@ -1046,6 +1047,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1058,6 +1059,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #if BUILDFLAG(BUILD_WITH_TFLITE_LIB) OnDeviceTailModelServiceFactory::GetInstance(); #endif @@ -401,7 +401,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc 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 -@@ -52,6 +52,7 @@ +@@ -51,6 +51,7 @@ #include "chrome/browser/page_info/page_info_features.h" #include "chrome/browser/page_load_metrics/page_load_metrics_initialize.h" #include "chrome/browser/password_manager/chrome_password_manager_client.h" @@ -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" -@@ -412,6 +413,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { +@@ -405,6 +406,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { HistoryEmbeddingsTabHelper::CreateForWebContents(web_contents); HttpsOnlyModeTabHelper::CreateForWebContents(web_contents); webapps::InstallableManager::CreateForWebContents(web_contents); diff --git a/build/cromite_patches/Restore-Search-Ready-Omnibox-flag.patch b/build/cromite_patches/Restore-Search-Ready-Omnibox-flag.patch index 0957f1baae86b84b63d66e55528c34c22710f6cb..f62657ac8eaf6f67e4d6023c161d15eb5defb477 100644 --- a/build/cromite_patches/Restore-Search-Ready-Omnibox-flag.patch +++ b/build/cromite_patches/Restore-Search-Ready-Omnibox-flag.patch @@ -23,7 +23,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -314,6 +314,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -316,6 +316,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kReadAloudIPHMenuButtonHighlightCCT, &kRecordSuppressionMetrics, &kReengagementNotification, @@ -34,10 +34,10 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java -@@ -386,6 +386,7 @@ public abstract class ChromeFeatureList { - public static final String MAGIC_STACK_ANDROID = "MagicStackAndroid"; +@@ -389,6 +389,7 @@ public abstract class ChromeFeatureList { public static final String MAYLAUNCHURL_USES_SEPARATE_STORAGE_PARTITION = "MayLaunchUrlUsesSeparateStoragePartition"; + public static final String MOST_VISITED_TILES_CUSTOMIZATION = "MostVisitedTilesCustomization"; + 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 = @@ -45,23 +45,23 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListBuilder.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListBuilder.java --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListBuilder.java +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListBuilder.java -@@ -11,6 +11,7 @@ import androidx.annotation.NonNull; - import androidx.annotation.Nullable; +@@ -9,6 +9,7 @@ import android.text.TextUtils; + import androidx.annotation.VisibleForTesting; +import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.base.supplier.Supplier; - import org.chromium.chrome.browser.omnibox.UrlBarEditingTextStateProvider; - import org.chromium.chrome.browser.omnibox.styles.OmniboxImageSupplier; -@@ -49,6 +50,7 @@ class DropdownItemViewInfoListBuilder { + import org.chromium.build.annotations.Initializer; + import org.chromium.build.annotations.NullMarked; +@@ -50,6 +51,7 @@ class DropdownItemViewInfoListBuilder { private @Nullable Supplier mShareDelegateSupplier; - private @NonNull Optional mImageSupplier; - private @NonNull BookmarkState mBookmarkState; + private Optional mImageSupplier; + private BookmarkState mBookmarkState; + private EditUrlSuggestionProcessor mEditUrlSuggestionProcessor; - DropdownItemViewInfoListBuilder( - @NonNull Supplier tabSupplier, @NonNull BookmarkState bookmarkState) { -@@ -81,9 +83,11 @@ class DropdownItemViewInfoListBuilder { + DropdownItemViewInfoListBuilder(Supplier tabSupplier, BookmarkState bookmarkState) { + mPriorityOrderedSuggestionProcessors = new ArrayList<>(); +@@ -80,9 +82,11 @@ class DropdownItemViewInfoListBuilder { mGroupSeparatorProcessor = new GroupSeparatorProcessor(context); mHeaderProcessor = new HeaderProcessor(context); @@ -75,7 +75,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow registerSuggestionProcessor( new AnswerSuggestionProcessor(context, host, textProvider, mImageSupplier)); registerSuggestionProcessor( -@@ -169,6 +173,9 @@ class DropdownItemViewInfoListBuilder { +@@ -168,6 +172,9 @@ class DropdownItemViewInfoListBuilder { mHeaderProcessor.onNativeInitialized(); mImageSupplier.ifPresent(s -> s.onNativeInitialized()); diff --git a/build/cromite_patches/Restore-Simplified-NTP-launch.patch b/build/cromite_patches/Restore-Simplified-NTP-launch.patch index 83f4f69c86605e1e60354fd201f2f8aa7175565f..9012187a47c3a9eb25389237e115c372654bc27e 100644 --- a/build/cromite_patches/Restore-Simplified-NTP-launch.patch +++ b/build/cromite_patches/Restore-Simplified-NTP-launch.patch @@ -28,11 +28,12 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../engagement/important_sites_util.cc | 2 +- .../flags/android/chrome_feature_list.cc | 1 + .../browser/flags/ChromeFeatureList.java | 3 +- + .../client_util/HomeModulesRankingHelper.java | 1 + .../history/core/browser/top_sites_impl.h | 2 +- .../Restore-Simplified-NTP-launch.inc | 12 ++ .../Restore-Simplified-NTP-launch.inc | 5 + .../Restore-Simplified-NTP-launch.inc | 1 + - 26 files changed, 398 insertions(+), 31 deletions(-) + 27 files changed, 399 insertions(+), 31 deletions(-) create mode 100644 chrome/android/java/res/layout/ntp_shortcuts.xml create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/feedback/SimplifiedNtpFeedbackSource.java create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/suggestions/tile/MostVisitedTilesGridLayout.java @@ -43,7 +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 -@@ -544,6 +544,7 @@ chrome_java_resources = [ +@@ -547,6 +547,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", @@ -54,7 +55,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 -@@ -627,6 +627,7 @@ chrome_java_sources = [ +@@ -640,6 +640,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/feedback/FeedFeedbackCollector.java", "java/src/org/chromium/chrome/browser/feedback/HelpAndFeedbackLauncherImpl.java", "java/src/org/chromium/chrome/browser/feedback/ScreenshotTask.java", @@ -62,7 +63,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", -@@ -1039,6 +1040,7 @@ chrome_java_sources = [ +@@ -1053,6 +1054,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", @@ -243,7 +244,7 @@ diff --git a/chrome/android/java/res/values/attrs.xml b/chrome/android/java/res/ diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res/values/dimens.xml --- a/chrome/android/java/res/values/dimens.xml +++ b/chrome/android/java/res/values/dimens.xml -@@ -134,6 +134,8 @@ found in the LICENSE file. +@@ -126,6 +126,8 @@ found in the LICENSE file. 62dp @@ -255,7 +256,7 @@ diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res diff --git a/chrome/android/java/src/org/chromium/chrome/browser/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 -@@ -66,6 +66,7 @@ public class ChromeFeedbackCollector extends FeedbackCollector 0, sort, and trim to kMaxBookmarks. @@ -737,7 +738,7 @@ diff --git a/chrome/browser/engagement/important_sites_util.cc b/chrome/browser/ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -277,6 +277,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -279,6 +279,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kHistoryPaneAndroid, &kLockBackPressHandlerAtStart, &kIncognitoScreenshot, @@ -748,23 +749,34 @@ 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 -@@ -387,6 +387,7 @@ public abstract class ChromeFeatureList { - public static final String MAGIC_STACK_ANDROID = "MagicStackAndroid"; +@@ -390,6 +390,7 @@ public abstract class ChromeFeatureList { public static final String MAYLAUNCHURL_USES_SEPARATE_STORAGE_PARTITION = "MayLaunchUrlUsesSeparateStoragePartition"; + public static final String MOST_VISITED_TILES_CUSTOMIZATION = "MostVisitedTilesCustomization"; + public static final String SIMPLIFIED_NTP = "SimplifiedNTP"; public static final String SEARCH_READY_OMNIBOX = "SearchReadyOmnibox"; public static final String MOST_VISITED_TILES_RESELECT = "MostVisitedTilesReselect"; public static final String MUlTI_INSTANCE_APPLICATION_STATUS_CLEANUP = -@@ -721,7 +722,7 @@ public abstract class ChromeFeatureList { +@@ -730,7 +731,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); - public static final CachedFlag sMagicStackAndroid = newCachedFlag(MAGIC_STACK_ANDROID, true); + public static final CachedFlag sMagicStackAndroid = newCachedFlag(MAGIC_STACK_ANDROID, false); - public static final CachedFlag sMayLaunchurlUsesSeparateStoragePartition = newCachedFlag(MAYLAUNCHURL_USES_SEPARATE_STORAGE_PARTITION, false); - public static final CachedFlag sMostVisitedTilesReselect = - newCachedFlag(MOST_VISITED_TILES_RESELECT, false); + public static final CachedFlag sMostVisitedTilesCustomization = + newCachedFlag(MOST_VISITED_TILES_CUSTOMIZATION, false); + public static final CachedFlag sMayLaunchurlUsesSeparateStoragePartition = +diff --git a/chrome/browser/segmentation_platform/android/java/src/org/chromium/chrome/browser/segmentation_platform/client_util/HomeModulesRankingHelper.java b/chrome/browser/segmentation_platform/android/java/src/org/chromium/chrome/browser/segmentation_platform/client_util/HomeModulesRankingHelper.java +--- a/chrome/browser/segmentation_platform/android/java/src/org/chromium/chrome/browser/segmentation_platform/client_util/HomeModulesRankingHelper.java ++++ b/chrome/browser/segmentation_platform/android/java/src/org/chromium/chrome/browser/segmentation_platform/client_util/HomeModulesRankingHelper.java +@@ -32,6 +32,7 @@ public final class HomeModulesRankingHelper { + @NonNull Profile profile, + @NonNull InputContext freshnessAndEphemeralInputs, + @NonNull Callback> callback) { ++ if ((true)) return; + HomeModulesRankingHelperJni.get() + .getClassificationResult( + profile, diff --git a/components/history/core/browser/top_sites_impl.h b/components/history/core/browser/top_sites_impl.h --- a/components/history/core/browser/top_sites_impl.h +++ b/components/history/core/browser/top_sites_impl.h diff --git a/build/cromite_patches/Restore-adaptive-button-in-top-toolbar-customization.patch b/build/cromite_patches/Restore-adaptive-button-in-top-toolbar-customization.patch index e66a226dea16723d5ea0d5acc58eba9dae8f9e78..c0b0bbba893efd29a80578d43824cf5dd287c3f8 100644 --- a/build/cromite_patches/Restore-adaptive-button-in-top-toolbar-customization.patch +++ b/build/cromite_patches/Restore-adaptive-button-in-top-toolbar-customization.patch @@ -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/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 -@@ -267,15 +267,7 @@ public class MainSettings extends ChromeBaseSettingsFragment +@@ -264,15 +264,7 @@ public class MainSettings extends ChromeBaseSettingsFragment templateUrlService.load(); } @@ -40,7 +40,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe 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 -@@ -71,6 +71,7 @@ constexpr int kAdaptiveToolbarDefaultSelectionTTLDays = 56; +@@ -72,6 +72,7 @@ constexpr int kAdaptiveToolbarDefaultSelectionTTLDays = 56; #if BUILDFLAG(IS_ANDROID) std::unique_ptr GetConfigForAdaptiveToolbar() { diff --git a/build/cromite_patches/Restore-chrome-password-store.patch b/build/cromite_patches/Restore-chrome-password-store.patch index 301bb605e9d2ff618bdf0e0d9b5f22ac4a6137e6..fa7ecc73b681d6bbc604b59f22ee189cc9e85f13 100644 --- a/build/cromite_patches/Restore-chrome-password-store.patch +++ b/build/cromite_patches/Restore-chrome-password-store.patch @@ -4,63 +4,62 @@ Subject: Restore chrome password store License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html --- - .../android/login_db_deprecation_runner_factory.cc | 2 +- - .../password_manager/profile_password_store_factory.cc | 2 +- - .../browser/resources/password_manager/user_utils_mixin.ts | 4 ++-- - chrome/browser/ui/android/strings/android_chrome_strings.grd | 2 +- - chrome/browser/ui/autofill/autofill_client_provider.cc | 5 ----- - components/password_manager/core/browser/buildflags.gni | 2 +- - .../features/password_manager_features_util_common.cc | 1 + - components/sync/service/sync_prefs.cc | 2 +- - .../password_features_cc/Restore-chrome-password-store.inc | 1 + - 9 files changed, 9 insertions(+), 12 deletions(-) + chrome/android/java/AndroidManifest.xml | 5 ++--- + .../autofill/AutofillClientProviderUtils.java | 1 + + .../login_db_deprecation_runner_factory.cc | 2 +- + .../android/strings/android_chrome_strings.grd | 2 +- + .../ui/autofill/autofill_client_provider.cc | 16 ---------------- + .../autofill/core/common/autofill_features.cc | 1 + + .../password_manager/core/browser/buildflags.gni | 2 +- + .../features/password_manager_features_util.cc | 1 + + components/sync/service/sync_prefs.cc | 2 +- + .../Restore-chrome-password-store.inc | 1 + + 10 files changed, 10 insertions(+), 23 deletions(-) create mode 100644 cromite_flags/components/password_manager/core/browser/features/password_features_cc/Restore-chrome-password-store.inc +diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml +--- a/chrome/android/java/AndroidManifest.xml ++++ b/chrome/android/java/AndroidManifest.xml +@@ -452,10 +452,9 @@ by a child template that "extends" this file. + + + +- ++ android:excludeFromRecents="true"> + + + +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 { + + @CalledByNative + public static void setAutofillOptionsDeepLinkPref(boolean featureOn) { ++ featureOn = false; + Editor editor = + ContextUtils.getApplicationContext() + .getSharedPreferences( diff --git a/chrome/browser/password_manager/android/login_db_deprecation_runner_factory.cc b/chrome/browser/password_manager/android/login_db_deprecation_runner_factory.cc --- a/chrome/browser/password_manager/android/login_db_deprecation_runner_factory.cc +++ b/chrome/browser/password_manager/android/login_db_deprecation_runner_factory.cc -@@ -38,7 +38,7 @@ std::unique_ptr +@@ -39,7 +39,7 @@ std::unique_ptr LoginDbDeprecationRunnerFactory::BuildServiceInstanceForBrowserContext( content::BrowserContext* context) const { #if BUILDFLAG(USE_LOGIN_DATABASE_AS_BACKEND) - return nullptr; + if ((true)) return nullptr; - #endif + #else Profile* profile = Profile::FromBrowserContext(context); PrefService* prefs = profile->GetPrefs(); -diff --git a/chrome/browser/password_manager/profile_password_store_factory.cc b/chrome/browser/password_manager/profile_password_store_factory.cc ---- a/chrome/browser/password_manager/profile_password_store_factory.cc -+++ b/chrome/browser/password_manager/profile_password_store_factory.cc -@@ -101,7 +101,7 @@ scoped_refptr BuildPasswordStore( - - password_affiliation_adapter->RegisterPasswordStore(ps.get()); - affiliation_service->RegisterSource(std::move(password_affiliation_adapter)); --#if BUILDFLAG(IS_ANDROID) -+#if BUILDFLAG(IS_ANDROID) && !BUILDFLAG(USE_LOGIN_DATABASE_AS_BACKEND) - CHECK(password_manager_android_util::IsInternalBackendPresent()); - password_manager::LoginDbDeprecationRunner* login_db_deprecation_runner = - LoginDbDeprecationRunnerFactory::GetForProfile(profile); -diff --git a/chrome/browser/resources/password_manager/user_utils_mixin.ts b/chrome/browser/resources/password_manager/user_utils_mixin.ts ---- a/chrome/browser/resources/password_manager/user_utils_mixin.ts -+++ b/chrome/browser/resources/password_manager/user_utils_mixin.ts -@@ -138,11 +138,11 @@ export const UserUtilMixin = dedupingMixin( - } - - private computeIsEligibleForAccountStorage_(): boolean { -- return !!this.syncInfo_ && this.syncInfo_.isEligibleForAccountStorage; -+ return !!this.syncInfo_ && !!this.syncInfo_.isEligibleForAccountStorage; - } - - private computeIsSyncingPasswords_(): boolean { -- return !!this.syncInfo_ && this.syncInfo_.isSyncingPasswords; -+ return !!this.syncInfo_ && !!this.syncInfo_.isSyncingPasswords; - } - - private computeAccountEmail_(): string { 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 -@@ -734,7 +734,7 @@ For more settings that use data to improve your Chrome experience, go to @@ -72,18 +71,40 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro diff --git a/chrome/browser/ui/autofill/autofill_client_provider.cc b/chrome/browser/ui/autofill/autofill_client_provider.cc --- a/chrome/browser/ui/autofill/autofill_client_provider.cc +++ b/chrome/browser/ui/autofill/autofill_client_provider.cc -@@ -26,11 +26,6 @@ AutofillClientProvider::AutofillClientProvider(PrefService* prefs) { +@@ -25,22 +25,6 @@ AutofillClientProvider::AutofillClientProvider(PrefService* prefs) { #if BUILDFLAG(IS_ANDROID) prefs->SetBoolean(prefs::kAutofillUsingVirtualViewStructure, true); - if (base::FeatureList::IsEnabled( +- autofill::features::kAutofillVirtualViewStructureAndroid) && +- base::FeatureList::IsEnabled( - autofill::features::kAutofillThirdPartyModeContentProvider)) { - Java_AutofillClientProviderUtils_setThirdPartyModePref( - base::android::AttachCurrentThread(), uses_platform_autofill_); +- } else { +- Java_AutofillClientProviderUtils_unsetThirdPartyModePref( +- base::android::AttachCurrentThread()); - } +- Java_AutofillClientProviderUtils_setAutofillOptionsDeepLinkPref( +- base::android::AttachCurrentThread(), +- base::FeatureList::IsEnabled( +- autofill::features::kAutofillVirtualViewStructureAndroid) && +- base::FeatureList::IsEnabled( +- autofill::features::kAutofillDeepLinkAutofillOptions)); #endif // BUILDFLAG(IS_ANDROID) } +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, + BASE_FEATURE(kAutofillDeepLinkAutofillOptions, + "AutofillDeepLinkAutofillOptions", + base::FEATURE_ENABLED_BY_DEFAULT); ++SET_CROMITE_FEATURE_DISABLED(kAutofillDeepLinkAutofillOptions); + + // Controls if Chrome Autofill UI surfaces ignore touch events if something is + // fully or partially obscuring the Chrome window. diff --git a/components/password_manager/core/browser/buildflags.gni b/components/password_manager/core/browser/buildflags.gni --- a/components/password_manager/core/browser/buildflags.gni +++ b/components/password_manager/core/browser/buildflags.gni @@ -96,10 +117,10 @@ diff --git a/components/password_manager/core/browser/buildflags.gni b/component } # Drawables from the downstream clank/ repository are -diff --git a/components/password_manager/core/browser/features/password_manager_features_util_common.cc b/components/password_manager/core/browser/features/password_manager_features_util_common.cc ---- a/components/password_manager/core/browser/features/password_manager_features_util_common.cc -+++ b/components/password_manager/core/browser/features/password_manager_features_util_common.cc -@@ -55,6 +55,7 @@ bool CanAccountStorageBeEnabled(const PrefService* pref_service, +diff --git a/components/password_manager/core/browser/features/password_manager_features_util.cc b/components/password_manager/core/browser/features/password_manager_features_util.cc +--- a/components/password_manager/core/browser/features/password_manager_features_util.cc ++++ b/components/password_manager/core/browser/features/password_manager_features_util.cc +@@ -63,6 +63,7 @@ bool CanAccountStorageBeEnabled(const PrefService* pref_service, // no way to enter the passphrase yet). bool IsUserEligibleForAccountStorage(const PrefService* pref_service, const syncer::SyncService* sync_service) { @@ -110,15 +131,15 @@ 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 -@@ -725,7 +725,7 @@ bool SyncPrefs::IsTypeSupportedInTransportMode(UserSelectableType type) { +@@ -726,7 +726,7 @@ bool SyncPrefs::IsTypeSupportedInTransportMode(UserSelectableType type) { return base::FeatureList::IsEnabled(kReplaceSyncPromosWithSignInPromos) && base::FeatureList::IsEnabled(kEnablePreferencesAccountStorage); case UserSelectableType::kPasswords: - return true; + return false; case UserSelectableType::kAutofill: - return base::FeatureList::IsEnabled( - kSyncEnableContactInfoDataTypeInTransportMode); + return true; + case UserSelectableType::kPayments: diff --git a/cromite_flags/components/password_manager/core/browser/features/password_features_cc/Restore-chrome-password-store.inc b/cromite_flags/components/password_manager/core/browser/features/password_features_cc/Restore-chrome-password-store.inc new file mode 100644 --- /dev/null diff --git a/build/cromite_patches/Restore-offline-indicator-v2-flag.patch b/build/cromite_patches/Restore-offline-indicator-v2-flag.patch index 2816094a873a64784fe823b411cbfc96af128efc..4a2b168df86678dc0a24ac940b90902070caeee8 100644 --- a/build/cromite_patches/Restore-offline-indicator-v2-flag.patch +++ b/build/cromite_patches/Restore-offline-indicator-v2-flag.patch @@ -92,7 +92,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/in diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java -@@ -1168,7 +1168,8 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -1174,7 +1174,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; } -@@ -1201,6 +1202,11 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -1207,6 +1208,11 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { hubManager.setStatusIndicatorHeight(mStatusIndicatorHeight); }); @@ -117,7 +117,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -295,6 +295,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -298,6 +298,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kNotificationPermissionVariant, &kNotificationPermissionBottomSheet, &kNotificationTrampoline, @@ -128,7 +128,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java -@@ -407,6 +407,7 @@ public abstract class ChromeFeatureList { +@@ -410,6 +410,7 @@ public abstract class ChromeFeatureList { public static final String NOTIFICATION_PERMISSION_BOTTOM_SHEET = "NotificationPermissionBottomSheet"; public static final String NOTIFICATION_TRAMPOLINE = "NotificationTrampoline"; diff --git a/build/cromite_patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch b/build/cromite_patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch index 720ee1851be7767ae02ad82cd0c8d0658e614131..8f7f756251ec6969f3ad96ea001d5594106ec259 100644 --- a/build/cromite_patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch +++ b/build/cromite_patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch @@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json --- a/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json -@@ -2061,6 +2061,10 @@ +@@ -2073,6 +2073,10 @@ "yangsharon@google.com", "alexmos@google.com", "creis@google.com" ], "expiry_milestone": 140 }, diff --git a/build/cromite_patches/Revert-removal-of-execution-context-address-space.patch b/build/cromite_patches/Revert-removal-of-execution-context-address-space.patch index 711e8dfe90f3239410dc1cbdd480b5a16f9be82f..aaa1cd153a0bab051b247c0324ac903c110cfeff 100644 --- a/build/cromite_patches/Revert-removal-of-execution-context-address-space.patch +++ b/build/cromite_patches/Revert-removal-of-execution-context-address-space.patch @@ -28,8 +28,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html ...ed_service_worker_module_script_fetcher.cc | 1 + .../modulescript/module_script_loader_test.cc | 1 + .../worker_module_script_fetcher.cc | 3 +- - .../renderer/core/workers/dedicated_worker.cc | 14 ++++++-- - .../renderer/core/workers/dedicated_worker.h | 5 ++- + .../renderer/core/workers/dedicated_worker.cc | 10 ++++++ + .../renderer/core/workers/dedicated_worker.h | 3 ++ .../workers/dedicated_worker_global_scope.cc | 9 ++++- .../workers/dedicated_worker_global_scope.h | 1 + .../workers/global_scope_creation_params.cc | 2 ++ @@ -53,7 +53,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../audio_worklet_global_scope_test.cc | 1 + .../webaudio/audio_worklet_thread_test.cc | 1 + .../worklet/worklet_thread_test_common.cc | 2 +- - 36 files changed, 191 insertions(+), 18 deletions(-) + 36 files changed, 188 insertions(+), 15 deletions(-) create mode 100644 cromite_flags/content/public/common/content_features_cc/Revert-removal-of-execution-context-address-space.inc diff --git a/cromite_flags/content/public/common/content_features_cc/Revert-removal-of-execution-context-address-space.inc b/cromite_flags/content/public/common/content_features_cc/Revert-removal-of-execution-context-address-space.inc @@ -85,15 +85,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 -@@ -34,6 +34,7 @@ - #include "base/task/single_thread_task_runner.h" +@@ -35,6 +35,7 @@ #include "net/storage_access_api/status.h" #include "services/metrics/public/cpp/ukm_source_id.h" + #include "services/network/public/mojom/permissions_policy/permissions_policy_feature.mojom-blink-forward.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/tokens/tokens.h" #include "third_party/blink/public/common/user_agent/user_agent_metadata.h" -@@ -385,6 +386,9 @@ class CORE_EXPORT ExecutionContext : public Supplementable, +@@ -391,6 +392,9 @@ class CORE_EXPORT ExecutionContext : public Supplementable, const String& message = g_empty_string, const String& source_file = g_empty_string) const {} @@ -106,7 +106,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context diff --git a/third_party/blink/renderer/core/exported/web_shared_worker_impl.cc b/third_party/blink/renderer/core/exported/web_shared_worker_impl.cc --- a/third_party/blink/renderer/core/exported/web_shared_worker_impl.cc +++ b/third_party/blink/renderer/core/exported/web_shared_worker_impl.cc -@@ -254,6 +254,7 @@ void WebSharedWorkerImpl::StartWorkerContext( +@@ -258,6 +258,7 @@ void WebSharedWorkerImpl::StartWorkerContext( MakeGarbageCollected(), std::make_unique( std::move(content_settings)), @@ -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 -@@ -8090,6 +8090,40 @@ TEST_F(WebFrameTest, PushStateStartsAndStops) { +@@ -8066,6 +8066,40 @@ TEST_F(WebFrameTest, PushStateStartsAndStops) { EXPECT_EQ(client.StopLoadingCount(), 2); } @@ -274,25 +274,25 @@ diff --git a/third_party/blink/renderer/core/workers/dedicated_worker.cc b/third Vector(), + std::nullopt /* response_address_space */, String() /* source_code */, reject_coep_unsafe_none, - std::move(back_forward_cache_controller_host)); - return; -@@ -429,6 +430,7 @@ void DedicatedWorker::OnScriptLoadStarted( + std::move(back_forward_cache_controller_host), + /*coep_reporting_observer=*/mojo::NullReceiver(), +@@ -435,6 +436,7 @@ void DedicatedWorker::OnScriptLoadStarted( ContinueStart(script_request_url_, std::move(worker_main_script_load_params), network::mojom::ReferrerPolicy::kDefault, Vector(), + std::nullopt /* response_address_space */, String() /* source_code */, RejectCoepUnsafeNone(false), - std::move(back_forward_cache_controller_host)); - } -@@ -501,6 +503,7 @@ void DedicatedWorker::OnFinished( + std::move(back_forward_cache_controller_host), + std::move(coep_reporting_observer), +@@ -509,6 +511,7 @@ void DedicatedWorker::OnFinished( ? mojo::Clone(classic_script_loader_->GetContentSecurityPolicy() ->GetParsedPolicies()) : Vector(), + classic_script_loader_->ResponseAddressSpace(), classic_script_loader_->SourceText(), RejectCoepUnsafeNone(false), - std::move(back_forward_cache_controller_host)); - probe::ScriptImported(GetExecutionContext(), -@@ -517,6 +520,7 @@ void DedicatedWorker::ContinueStart( + std::move(back_forward_cache_controller_host), + /*coep_reporting_observer=*/mojo::NullReceiver(), +@@ -527,6 +530,7 @@ void DedicatedWorker::ContinueStart( network::mojom::ReferrerPolicy referrer_policy, Vector response_content_security_policies, @@ -300,23 +300,23 @@ diff --git a/third_party/blink/renderer/core/workers/dedicated_worker.cc b/third const String& source_code, RejectCoepUnsafeNone reject_coep_unsafe_none, mojo::PendingRemote -@@ -539,6 +543,7 @@ void DedicatedWorker::ContinueStart( +@@ -553,6 +557,7 @@ void DedicatedWorker::ContinueStart( std::move(worker_main_script_load_params), std::move(referrer_policy), std::move(response_content_security_policies), + response_address_space, source_code, reject_coep_unsafe_none, - std::move(back_forward_cache_controller_host)), - base::Milliseconds(features::kDedicatedWorkerStartDelayInMs.Get())); -@@ -547,6 +552,7 @@ void DedicatedWorker::ContinueStart( - ContinueStartInternal(script_url, std::move(worker_main_script_load_params), - std::move(referrer_policy), - std::move(response_content_security_policies), -+ response_address_space, - source_code, reject_coep_unsafe_none, - std::move(back_forward_cache_controller_host)); - } -@@ -558,6 +564,7 @@ void DedicatedWorker::ContinueStartInternal( + std::move(back_forward_cache_controller_host), + std::move(coep_reporting_observer), +@@ -563,6 +568,7 @@ void DedicatedWorker::ContinueStart( + ContinueStartInternal( + script_url, std::move(worker_main_script_load_params), + std::move(referrer_policy), std::move(response_content_security_policies), ++ response_address_space, + source_code, reject_coep_unsafe_none, + std::move(back_forward_cache_controller_host), + std::move(coep_reporting_observer), std::move(dip_reporting_observer)); +@@ -575,6 +581,7 @@ void DedicatedWorker::ContinueStartInternal( network::mojom::ReferrerPolicy referrer_policy, Vector response_content_security_policies, @@ -324,27 +324,23 @@ diff --git a/third_party/blink/renderer/core/workers/dedicated_worker.cc b/third const String& source_code, RejectCoepUnsafeNone reject_coep_unsafe_none, mojo::PendingRemote -@@ -569,7 +576,8 @@ void DedicatedWorker::ContinueStartInternal( - context_proxy_->StartWorkerGlobalScope( +@@ -591,6 +598,7 @@ void DedicatedWorker::ContinueStartInternal( CreateGlobalScopeCreationParams( script_url, referrer_policy, -- std::move(response_content_security_policies)), -+ std::move(response_content_security_policies), -+ response_address_space), + std::move(response_content_security_policies), ++ response_address_space, + std::move(coep_reporting_observer), + std::move(dip_reporting_observer)), std::move(worker_main_script_load_params), options_, script_url, - *outside_fetch_client_settings_object_, v8_stack_trace_id_, source_code, - reject_coep_unsafe_none, token_, -@@ -606,7 +614,8 @@ DedicatedWorker::CreateGlobalScopeCreationParams( - const KURL& script_url, +@@ -630,6 +638,7 @@ DedicatedWorker::CreateGlobalScopeCreationParams( network::mojom::ReferrerPolicy referrer_policy, Vector -- response_content_security_policies) { -+ response_content_security_policies, -+ std::optional response_address_space) { - base::UnguessableToken parent_devtools_token; - std::unique_ptr settings; - ExecutionContext* execution_context = GetExecutionContext(); -@@ -655,6 +664,7 @@ DedicatedWorker::CreateGlobalScopeCreationParams( + response_content_security_policies, ++ std::optional response_address_space, + mojo::PendingReceiver + coep_reporting_observer, + mojo::PendingReceiver +@@ -682,6 +691,7 @@ DedicatedWorker::CreateGlobalScopeCreationParams( execution_context->GetSecurityOrigin(), execution_context->IsSecureContext(), execution_context->GetHttpsState(), MakeGarbageCollected(), CreateWebContentSettingsClient(), @@ -355,7 +351,7 @@ diff --git a/third_party/blink/renderer/core/workers/dedicated_worker.cc b/third diff --git a/third_party/blink/renderer/core/workers/dedicated_worker.h b/third_party/blink/renderer/core/workers/dedicated_worker.h --- a/third_party/blink/renderer/core/workers/dedicated_worker.h +++ b/third_party/blink/renderer/core/workers/dedicated_worker.h -@@ -152,6 +152,7 @@ class CORE_EXPORT DedicatedWorker final +@@ -157,6 +157,7 @@ class CORE_EXPORT DedicatedWorker final network::mojom::ReferrerPolicy, Vector response_content_security_policies, @@ -363,7 +359,7 @@ diff --git a/third_party/blink/renderer/core/workers/dedicated_worker.h b/third_ const String& source_code, RejectCoepUnsafeNone reject_coep_unsafe_none, mojo::PendingRemote -@@ -163,6 +164,7 @@ class CORE_EXPORT DedicatedWorker final +@@ -172,6 +173,7 @@ class CORE_EXPORT DedicatedWorker final network::mojom::ReferrerPolicy, Vector response_content_security_policies, @@ -371,16 +367,14 @@ diff --git a/third_party/blink/renderer/core/workers/dedicated_worker.h b/third_ const String& source_code, RejectCoepUnsafeNone reject_coep_unsafe_none, mojo::PendingRemote -@@ -171,7 +173,8 @@ class CORE_EXPORT DedicatedWorker final - const KURL& script_url, +@@ -185,6 +187,7 @@ class CORE_EXPORT DedicatedWorker final network::mojom::ReferrerPolicy, Vector -- response_content_security_policies); -+ response_content_security_policies, -+ std::optional response_address_space); - scoped_refptr CreateWebWorkerFetchContext(); - // May return nullptr. - std::unique_ptr CreateWebContentSettingsClient(); + response_content_security_policies, ++ std::optional response_address_space, + mojo::PendingReceiver + coep_reporting_observer, + mojo::PendingReceiver diff --git a/third_party/blink/renderer/core/workers/dedicated_worker_global_scope.cc b/third_party/blink/renderer/core/workers/dedicated_worker_global_scope.cc --- a/third_party/blink/renderer/core/workers/dedicated_worker_global_scope.cc +++ b/third_party/blink/renderer/core/workers/dedicated_worker_global_scope.cc @@ -450,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, -@@ -72,6 +73,7 @@ GlobalScopeCreationParams::GlobalScopeCreationParams( +@@ -76,6 +77,7 @@ GlobalScopeCreationParams::GlobalScopeCreationParams( starter_https_state(starter_https_state), worker_clients(worker_clients), content_settings_client(std::move(content_settings_client)), @@ -469,7 +463,7 @@ diff --git a/third_party/blink/renderer/core/workers/global_scope_creation_param #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" -@@ -62,6 +63,7 @@ struct CORE_EXPORT GlobalScopeCreationParams final { +@@ -63,6 +64,7 @@ struct CORE_EXPORT GlobalScopeCreationParams final { HttpsState starter_https_state, WorkerClients*, std::unique_ptr, @@ -477,7 +471,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, -@@ -182,6 +184,11 @@ struct CORE_EXPORT GlobalScopeCreationParams final { +@@ -187,6 +189,11 @@ struct CORE_EXPORT GlobalScopeCreationParams final { std::unique_ptr content_settings_client; @@ -647,7 +641,7 @@ diff --git a/third_party/blink/renderer/core/workers/threaded_worklet_test.cc b/ diff --git a/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc b/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc --- a/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc +++ b/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc -@@ -30,6 +30,7 @@ +@@ -35,6 +35,7 @@ #include #include "base/memory/scoped_refptr.h" @@ -655,7 +649,7 @@ diff --git a/third_party/blink/renderer/core/workers/worker_classic_script_loade #include "third_party/blink/public/common/features.h" #include "third_party/blink/public/mojom/fetch/fetch_api_request.mojom-blink.h" #include "third_party/blink/renderer/core/execution_context/execution_context.h" -@@ -100,7 +101,8 @@ String CheckSameOriginEnforcement(const KURL& request_url, +@@ -105,7 +106,8 @@ String CheckSameOriginEnforcement(const KURL& request_url, } // namespace @@ -665,7 +659,7 @@ diff --git a/third_party/blink/renderer/core/workers/worker_classic_script_loade void WorkerClassicScriptLoader::LoadSynchronously( ExecutionContext& execution_context, -@@ -236,6 +238,7 @@ void WorkerClassicScriptLoader::DidReceiveResponse( +@@ -241,6 +243,7 @@ void WorkerClassicScriptLoader::DidReceiveResponse( identifier_ = identifier; response_url_ = response.ResponseUrl(); response_encoding_ = response.TextEncodingName(); @@ -791,7 +785,7 @@ diff --git a/third_party/blink/renderer/modules/csspaint/paint_worklet_global_sc diff --git a/third_party/blink/renderer/modules/exported/web_embedded_worker_impl.cc b/third_party/blink/renderer/modules/exported/web_embedded_worker_impl.cc --- a/third_party/blink/renderer/modules/exported/web_embedded_worker_impl.cc +++ b/third_party/blink/renderer/modules/exported/web_embedded_worker_impl.cc -@@ -204,7 +204,9 @@ void WebEmbeddedWorkerImpl::StartWorkerThread( +@@ -213,7 +213,9 @@ void WebEmbeddedWorkerImpl::StartWorkerThread( Vector(), network::mojom::ReferrerPolicy::kDefault, starter_origin.get(), starter_secure_context, starter_https_state, nullptr /* worker_clients */, diff --git a/build/cromite_patches/Revert-remove-allowscript-content-setting-secondary-url.patch b/build/cromite_patches/Revert-remove-allowscript-content-setting-secondary-url.patch index a20a3056ec7908c229dea662f481880801f26a61..14e3330fb8e37ce28e56a809c9f69fb7dbf42743 100644 --- a/build/cromite_patches/Revert-remove-allowscript-content-setting-secondary-url.patch +++ b/build/cromite_patches/Revert-remove-allowscript-content-setting-secondary-url.patch @@ -188,7 +188,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_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 -@@ -50,6 +50,7 @@ +@@ -52,6 +52,7 @@ #include "third_party/blink/public/platform/task_type.h" #include "third_party/blink/public/platform/web_string.h" #include "third_party/blink/public/web/web_picture_in_picture_window_options.h" @@ -196,7 +196,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_p #include "third_party/blink/renderer/bindings/core/v8/binding_security.h" #include "third_party/blink/renderer/bindings/core/v8/capture_source_location.h" #include "third_party/blink/renderer/bindings/core/v8/isolated_world_csp.h" -@@ -488,7 +489,10 @@ bool LocalDOMWindow::CanExecuteScripts( +@@ -490,7 +491,10 @@ bool LocalDOMWindow::CanExecuteScripts( } return false; } @@ -211,7 +211,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_p diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc --- a/third_party/blink/renderer/core/frame/local_frame.cc +++ b/third_party/blink/renderer/core/frame/local_frame.cc -@@ -4070,19 +4070,6 @@ bool LocalFrame::IsSameOrigin() { +@@ -4065,19 +4065,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 -@@ -929,12 +929,6 @@ class CORE_EXPORT LocalFrame final +@@ -928,12 +928,6 @@ class CORE_EXPORT LocalFrame final return *v8_local_compile_hints_producer_; } diff --git a/build/cromite_patches/Site-setting-for-images.patch b/build/cromite_patches/Site-setting-for-images.patch index fb9433da159e729f84e022e8ad3f95af159115dc..debeeeb49cfb25b6dfa948b2808e26df957a95f4 100644 --- a/build/cromite_patches/Site-setting-for-images.patch +++ b/build/cromite_patches/Site-setting-for-images.patch @@ -323,7 +323,7 @@ diff --git a/third_party/blink/public/platform/web_content_settings_client.h b/t diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc --- a/third_party/blink/renderer/core/frame/local_frame.cc +++ b/third_party/blink/renderer/core/frame/local_frame.cc -@@ -4057,19 +4057,6 @@ bool LocalFrame::IsSameOrigin() { +@@ -4052,19 +4052,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 -@@ -928,12 +928,6 @@ class CORE_EXPORT LocalFrame final +@@ -927,12 +927,6 @@ class CORE_EXPORT LocalFrame final return *v8_local_compile_hints_producer_; } @@ -424,7 +424,7 @@ diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.h b/thir diff --git a/third_party/blink/renderer/core/page/page.cc b/third_party/blink/renderer/core/page/page.cc --- a/third_party/blink/renderer/core/page/page.cc +++ b/third_party/blink/renderer/core/page/page.cc -@@ -1033,9 +1033,8 @@ void Page::SettingsChanged(ChangeType change_type) { +@@ -1034,9 +1034,8 @@ void Page::SettingsChanged(ChangeType change_type) { for (Frame* frame = MainFrame(); frame; frame = frame->Tree().TraverseNext()) { if (auto* local_frame = DynamicTo(frame)) { @@ -451,7 +451,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/fetch_context.h b/ diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc b/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc --- a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc +++ b/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc -@@ -818,6 +818,7 @@ ResourceFetcher::ResourceFetcher(const ResourceFetcherInit& init) +@@ -819,6 +819,7 @@ ResourceFetcher::ResourceFetcher(const ResourceFetcherInit& init) blob_registry_remote_(init.context_lifecycle_notifier), context_lifecycle_notifier_(init.context_lifecycle_notifier), auto_load_images_(true), @@ -459,7 +459,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( -@@ -1980,7 +1981,7 @@ bool ResourceFetcher::IsImageResourceDisallowedToBeReused( +@@ -2001,7 +2002,7 @@ bool ResourceFetcher::IsImageResourceDisallowedToBeReused( return false; } @@ -468,7 +468,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.c } ResourceFetcher::RevalidationPolicy -@@ -2225,8 +2226,20 @@ void ResourceFetcher::SetAutoLoadImages(bool enable) { +@@ -2246,8 +2247,20 @@ void ResourceFetcher::SetAutoLoadImages(bool enable) { ReloadImagesIfNotDeferred(); } diff --git a/build/cromite_patches/Timezone-customization.patch b/build/cromite_patches/Timezone-customization.patch index 54546b415953c8f0545443401e9d46a317c8bab4..f8fcc18076dfdd5e300d3bd3cc7819de39c8bbe3 100644 --- a/build/cromite_patches/Timezone-customization.patch +++ b/build/cromite_patches/Timezone-customization.patch @@ -720,7 +720,7 @@ diff --git a/components/content_settings/core/browser/content_settings_pref_prov diff --git a/components/content_settings/core/browser/content_settings_utils.cc b/components/content_settings/core/browser/content_settings_utils.cc --- a/components/content_settings/core/browser/content_settings_utils.cc +++ b/components/content_settings/core/browser/content_settings_utils.cc -@@ -151,6 +151,11 @@ void GetRendererContentSettingRules(const HostContentSettingsMap* map, +@@ -148,6 +148,11 @@ void GetRendererContentSettingRules(const HostContentSettingsMap* map, ContentSettingToValue(CONTENT_SETTING_BLOCK), ProviderType::kNone, map->IsOffTheRecord())); #endif @@ -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 -@@ -666,6 +666,14 @@ void HostContentSettingsMap::SetClockForTesting(const base::Clock* clock) { +@@ -665,6 +665,14 @@ void HostContentSettingsMap::SetClockForTesting(const base::Clock* clock) { } } @@ -821,7 +821,7 @@ diff --git a/components/content_settings/core/common/content_settings_mojom_trai diff --git a/components/content_settings/core/common/pref_names.h b/components/content_settings/core/common/pref_names.h --- a/components/content_settings/core/common/pref_names.h +++ b/components/content_settings/core/common/pref_names.h -@@ -245,6 +245,9 @@ inline constexpr char kDesktopSiteWindowSettingEnabled[] = +@@ -251,6 +251,9 @@ inline constexpr char kDesktopSiteWindowSettingEnabled[] = "desktop_site.window_setting"; #endif diff --git a/build/cromite_patches/Use-browser-navigation-handler.patch b/build/cromite_patches/Use-browser-navigation-handler.patch index f2c6f7330af6bdadf3d272080e5426b6f055aeea..9b75b3b3ad61cc7f0a75f39b38007d99db7e4de3 100644 --- a/build/cromite_patches/Use-browser-navigation-handler.patch +++ b/build/cromite_patches/Use-browser-navigation-handler.patch @@ -32,7 +32,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/compositor/CompositorViewHolder.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java -@@ -97,6 +97,7 @@ import org.chromium.ui.resources.dynamics.DynamicResourceLoader; +@@ -92,6 +92,7 @@ import org.chromium.ui.resources.dynamics.DynamicResourceLoader; import org.chromium.url.GURL; import java.util.ArrayList; @@ -86,7 +86,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/gesturenav/Gest diff --git a/chrome/android/java/src/org/chromium/chrome/browser/gesturenav/HistoryNavigationCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/gesturenav/HistoryNavigationCoordinator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/gesturenav/HistoryNavigationCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/gesturenav/HistoryNavigationCoordinator.java -@@ -14,6 +14,7 @@ import org.chromium.base.BuildInfo; +@@ -13,6 +13,7 @@ import org.chromium.base.BuildInfo; import org.chromium.base.supplier.ObservableSupplier; import org.chromium.base.supplier.Supplier; import org.chromium.chrome.browser.flags.ChromeFeatureList; @@ -94,15 +94,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/gesturenav/Hist import org.chromium.chrome.browser.fullscreen.FullscreenManager; import org.chromium.chrome.browser.fullscreen.FullscreenOptions; import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher; -@@ -197,6 +198,9 @@ public class HistoryNavigationCoordinator +@@ -203,6 +204,9 @@ public class HistoryNavigationCoordinator * @return {@code} true if the feature is enabled. */ private boolean isFeatureEnabled() { + if (sUseBrowserNavigationHandler.getInstance().isEnabled()) { + return true; + } - if (mForceFeatureEnabledForTesting) { - return true; + if (mForceFeatureEnabledForTesting != null) { + return mForceFeatureEnabledForTesting; } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/gesturenav/HistoryNavigationLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/gesturenav/HistoryNavigationLayout.java --- a/chrome/android/java/src/org/chromium/chrome/browser/gesturenav/HistoryNavigationLayout.java @@ -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 -@@ -65,6 +65,7 @@ import org.chromium.chrome.browser.firstrun.FirstRunStatus; +@@ -69,6 +69,7 @@ import org.chromium.chrome.browser.firstrun.FirstRunStatus; import org.chromium.chrome.browser.flags.ActivityType; import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.flags.ChromeSwitches; @@ -235,7 +235,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab import org.chromium.chrome.browser.fullscreen.BrowserControlsManager; import org.chromium.chrome.browser.fullscreen.FullscreenManager; import org.chromium.chrome.browser.gesturenav.BackActionDelegate; -@@ -660,6 +661,8 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -678,6 +679,8 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { @Override public void onInflationComplete() { mCoordinator = mActivity.findViewById(R.id.coordinator); @@ -319,9 +319,9 @@ diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibil diff --git a/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/CoordinatorLayoutForPointer.java b/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/CoordinatorLayoutForPointer.java --- a/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/CoordinatorLayoutForPointer.java +++ b/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/CoordinatorLayoutForPointer.java -@@ -14,6 +14,10 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout; - - import org.chromium.base.ObserverList; +@@ -16,6 +16,10 @@ import org.chromium.base.ObserverList; + import org.chromium.build.annotations.NullMarked; + import org.chromium.build.annotations.Nullable; +import android.graphics.Rect; +import android.os.Build; @@ -330,7 +330,7 @@ diff --git a/components/browser_ui/widget/android/java/src/org/chromium/componen /** * This class overrides {@link onResolvePointerIcon} method to correctly determine the pointer icon * from a mouse motion event. This is needed because the default android impl does not consider view -@@ -34,6 +38,22 @@ public class CoordinatorLayoutForPointer extends CoordinatorLayout implements To +@@ -37,6 +41,22 @@ public class CoordinatorLayoutForPointer extends CoordinatorLayout implements To && (y >= view.getTop() && y <= view.getBottom())); } diff --git a/build/cromite_patches/Use-dummy-DFM-installer.patch b/build/cromite_patches/Use-dummy-DFM-installer.patch index bdd7e8a0dee7930cb981dcb9b6fcc34b41786488..6592b676ea2d65956bbb7f12ae5d706f0b6ee009 100644 --- a/build/cromite_patches/Use-dummy-DFM-installer.patch +++ b/build/cromite_patches/Use-dummy-DFM-installer.patch @@ -5,11 +5,11 @@ Subject: Use dummy DFM installer License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- components/module_installer/android/BUILD.gn | 1 - - .../engine/SplitCompatEngine.java | 64 +------------------ - .../engine/SplitCompatEngineFacade.java | 25 -------- + .../engine/SplitCompatEngine.java | 66 +------------------ + .../engine/SplitCompatEngineFacade.java | 25 ------- .../module_installer/util/ModuleUtil.java | 3 - .../util/SplitCompatInitializer.java | 6 -- - 5 files changed, 1 insertion(+), 98 deletions(-) + 5 files changed, 1 insertion(+), 100 deletions(-) diff --git a/components/module_installer/android/BUILD.gn b/components/module_installer/android/BUILD.gn --- a/components/module_installer/android/BUILD.gn @@ -25,7 +25,7 @@ diff --git a/components/module_installer/android/BUILD.gn b/components/module_in diff --git a/components/module_installer/android/java/src/org/chromium/components/module_installer/engine/SplitCompatEngine.java b/components/module_installer/android/java/src/org/chromium/components/module_installer/engine/SplitCompatEngine.java --- a/components/module_installer/android/java/src/org/chromium/components/module_installer/engine/SplitCompatEngine.java +++ b/components/module_installer/android/java/src/org/chromium/components/module_installer/engine/SplitCompatEngine.java -@@ -8,10 +8,6 @@ import android.app.Activity; +@@ -10,10 +10,6 @@ import android.app.Activity; import androidx.annotation.VisibleForTesting; @@ -34,17 +34,17 @@ diff --git a/components/module_installer/android/java/src/org/chromium/component -import com.google.android.play.core.splitinstall.model.SplitInstallSessionStatus; - import org.chromium.base.ThreadUtils; + import org.chromium.build.annotations.NullMarked; - import java.util.ArrayList; -@@ -24,7 +20,6 @@ import java.util.Set; - /** Install engine that uses Play Core and SplitCompat to install modules. */ +@@ -28,7 +24,6 @@ import java.util.Set; + @NullMarked class SplitCompatEngine implements InstallEngine { private final SplitCompatEngineFacade mFacade; - private final SplitInstallStateUpdatedListener mUpdateListener = getStatusUpdateListener(); private static final Map> sSessions = new HashMap<>(); public SplitCompatEngine() { -@@ -42,70 +37,19 @@ class SplitCompatEngine implements InstallEngine { +@@ -46,72 +41,19 @@ class SplitCompatEngine implements InstallEngine { @Override public boolean isInstalled(String moduleName) { @@ -108,15 +108,17 @@ diff --git a/components/module_installer/android/java/src/org/chromium/component - }; } - private void notifyListeners(String moduleName, Boolean success) { -- for (InstallListener listener : sSessions.get(moduleName)) { + private void notifyListeners(String moduleName, boolean success) { +- List listeners = sSessions.remove(moduleName); +- assumeNonNull(listeners); +- for (InstallListener listener : listeners) { - notifyListener(listener, success); - } - - sSessions.remove(moduleName); - unregisterUpdateListener(); -@@ -120,15 +64,9 @@ class SplitCompatEngine implements InstallEngine { + } + +@@ -124,15 +66,9 @@ class SplitCompatEngine implements InstallEngine { } private void registerUpdateListener() { @@ -135,7 +137,7 @@ diff --git a/components/module_installer/android/java/src/org/chromium/component diff --git a/components/module_installer/android/java/src/org/chromium/components/module_installer/engine/SplitCompatEngineFacade.java b/components/module_installer/android/java/src/org/chromium/components/module_installer/engine/SplitCompatEngineFacade.java --- a/components/module_installer/android/java/src/org/chromium/components/module_installer/engine/SplitCompatEngineFacade.java +++ b/components/module_installer/android/java/src/org/chromium/components/module_installer/engine/SplitCompatEngineFacade.java -@@ -6,48 +6,23 @@ package org.chromium.components.module_installer.engine; +@@ -6,14 +6,8 @@ package org.chromium.components.module_installer.engine; import android.app.Activity; @@ -145,12 +147,14 @@ diff --git a/components/module_installer/android/java/src/org/chromium/component -import com.google.android.play.core.splitinstall.SplitInstallRequest; - import org.chromium.base.ContextUtils; + import org.chromium.build.annotations.NullMarked; -import org.chromium.components.module_installer.util.ModuleUtil; /** * PlayCore SplitCompatEngine Context. Class used to segregate external dependencies that cannot be - * easily mocked and simplify the engine's design. +@@ -21,35 +15,16 @@ import org.chromium.components.module_installer.util.ModuleUtil; */ + @NullMarked class SplitCompatEngineFacade { - private final SplitInstallManager mSplitManager; - @@ -187,7 +191,7 @@ diff --git a/components/module_installer/android/java/src/org/chromium/component diff --git a/components/module_installer/android/java/src/org/chromium/components/module_installer/util/ModuleUtil.java b/components/module_installer/android/java/src/org/chromium/components/module_installer/util/ModuleUtil.java --- a/components/module_installer/android/java/src/org/chromium/components/module_installer/util/ModuleUtil.java +++ b/components/module_installer/android/java/src/org/chromium/components/module_installer/util/ModuleUtil.java -@@ -10,9 +10,6 @@ import org.chromium.base.BundleUtils; +@@ -12,9 +12,6 @@ import org.chromium.build.annotations.NullMarked; public class ModuleUtil { /** Updates the CrashKey report containing modules currently present. */ public static void updateCrashKeys() { @@ -209,7 +213,7 @@ diff --git a/components/module_installer/android/java/src/org/chromium/component import org.chromium.base.ContextUtils; import org.chromium.base.StrictModeContext; import org.chromium.base.ThreadUtils; -@@ -21,10 +19,6 @@ class SplitCompatInitializer { +@@ -23,10 +21,6 @@ class SplitCompatInitializer { return; } diff --git a/build/cromite_patches/User-agent-customization.patch b/build/cromite_patches/User-agent-customization.patch index 4ff21088548b6057b8262283912ae111a3ed1f2c..7419ad0aebfd8db7e0df6296732e704eedddfde9 100644 --- a/build/cromite_patches/User-agent-customization.patch +++ b/build/cromite_patches/User-agent-customization.patch @@ -33,7 +33,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../settings/PrivacyPreferencesManager.java | 8 + .../org/chromium/chrome/browser/tab/Tab.java | 2 + .../browser/tabmodel/TabWindowManager.java | 2 + - .../tabmodel/TabWindowManagerImpl.java | 18 ++ + .../tabmodel/TabWindowManagerImpl.java | 19 ++ .../strings/android_chrome_strings.grd | 26 +++ chrome/common/pref_names.h | 8 + ...omiteRequestDesktopSiteContentSetting.java | 76 ++++++++ @@ -46,7 +46,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../browser/web_contents/web_contents_impl.cc | 6 +- .../framehost/NavigationControllerImpl.java | 3 +- content/renderer/render_thread_impl.cc | 1 - - 36 files changed, 798 insertions(+), 16 deletions(-) + 36 files changed, 799 insertions(+), 16 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 @@ -80,7 +80,7 @@ diff --git a/base/base_switches.h b/base/base_switches.h diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni --- a/chrome/android/chrome_java_resources.gni +++ b/chrome/android/chrome_java_resources.gni -@@ -641,4 +641,6 @@ chrome_java_resources = [ +@@ -644,4 +644,6 @@ chrome_java_resources = [ "java/res/xml/search_widget_info.xml", "java/res/xml/tracing_preferences.xml", "java/res/xml/unified_account_settings_preferences.xml", @@ -90,7 +90,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -919,6 +919,7 @@ chrome_java_sources = [ +@@ -932,6 +932,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/payments/ui/DimmingDialog.java", "java/src/org/chromium/chrome/browser/payments/ui/LineItem.java", "java/src/org/chromium/chrome/browser/payments/ui/PaymentAppComparator.java", @@ -257,7 +257,7 @@ new file mode 100644 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java -@@ -2537,6 +2537,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity +@@ -2543,6 +2543,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity TabUtils.switchUserAgent( currentTab, usingDesktopUserAgent, @@ -958,7 +958,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 -@@ -1055,8 +1055,6 @@ public final class ChromePreferenceKeys { +@@ -1059,8 +1059,6 @@ public final class ChromePreferenceKeys { SIGNIN_PROMO_NTP_LAST_SHOWN_TIME, SYNC_PROMO_TOTAL_SHOW_COUNT, SEARCH_RESUMPTION_MODULE_COLLAPSE_ON_NTP, @@ -970,7 +970,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro diff --git a/chrome/browser/privacy/settings/java/src/org/chromium/chrome/browser/privacy/settings/PrivacyPreferencesManager.java b/chrome/browser/privacy/settings/java/src/org/chromium/chrome/browser/privacy/settings/PrivacyPreferencesManager.java --- a/chrome/browser/privacy/settings/java/src/org/chromium/chrome/browser/privacy/settings/PrivacyPreferencesManager.java +++ b/chrome/browser/privacy/settings/java/src/org/chromium/chrome/browser/privacy/settings/PrivacyPreferencesManager.java -@@ -100,6 +100,14 @@ public interface PrivacyPreferencesManager extends CrashReportingPermissionManag +@@ -102,6 +102,14 @@ public interface PrivacyPreferencesManager extends CrashReportingPermissionManag */ boolean isMetricsReportingEnabled(); @@ -1000,7 +1000,7 @@ diff --git a/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/Tab.jav diff --git a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManager.java b/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManager.java --- a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManager.java +++ b/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManager.java -@@ -119,6 +119,8 @@ public interface TabWindowManager { +@@ -121,6 +121,8 @@ public interface TabWindowManager { */ Tab getTabById(int tabId); @@ -1012,7 +1012,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 -@@ -419,6 +419,24 @@ public class TabWindowManagerImpl implements ActivityStateListener, TabWindowMan +@@ -33,6 +33,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 return null; } @@ -1036,7 +1044,7 @@ diff --git a/chrome/browser/tabmodel/internal/android/java/src/org/chromium/chro + @Override public Tab getTabById(int tabId) { - for (int i = 0; i < mSelectors.size(); i++) { + for (TabModelSelector selector : getAllTabModelSelectors()) { 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 @@ -1076,7 +1084,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 -@@ -1933,6 +1933,14 @@ inline constexpr char kNaviOnboardGroup[] = "browser.navi_onboard_group"; +@@ -1917,6 +1917,14 @@ inline constexpr char kNaviOnboardGroup[] = "browser.navi_onboard_group"; inline constexpr char kHadThreeConsecutiveNotificationPermissionDenies[] = "profile.content_settings.had_three_consecutive_denies.notifications"; @@ -1198,7 +1206,7 @@ new file mode 100644 diff --git a/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/RadioButtonWithEditText.java b/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/RadioButtonWithEditText.java --- a/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/RadioButtonWithEditText.java +++ b/components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/RadioButtonWithEditText.java -@@ -167,6 +167,17 @@ public class RadioButtonWithEditText extends RadioButtonWithDescription { +@@ -171,6 +171,17 @@ public class RadioButtonWithEditText extends RadioButtonWithDescription { mEditText.setCursorVisible(false); KeyboardVisibilityDelegate.getInstance().hideKeyboard(mEditText); } @@ -1219,7 +1227,7 @@ diff --git a/components/browser_ui/widget/android/java/src/org/chromium/componen diff --git a/components/embedder_support/user_agent_utils.cc b/components/embedder_support/user_agent_utils.cc --- a/components/embedder_support/user_agent_utils.cc +++ b/components/embedder_support/user_agent_utils.cc -@@ -562,7 +562,8 @@ void SetDesktopUserAgentOverride(content::WebContents* web_contents, +@@ -521,7 +521,8 @@ void SetDesktopUserAgentOverride(content::WebContents* web_contents, blink::UserAgentOverride spoofed_ua; spoofed_ua.ua_string_override = content::BuildUserAgentFromOSAndProduct( @@ -1264,7 +1272,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 -@@ -3475,6 +3475,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( +@@ -3534,6 +3534,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( #if BUILDFLAG(IS_CHROMEOS) switches::kSchedulerBoostUrgent, #endif @@ -1275,15 +1283,15 @@ diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content 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 -@@ -16,6 +16,7 @@ - #include - #include +@@ -19,6 +19,7 @@ -+#include "base/base_switches.h" + #include "base/auto_reset.h" #include "base/base_switches.h" ++#include "base/base_switches.h" #include "base/check_op.h" #include "base/command_line.h" -@@ -2314,8 +2315,6 @@ void WebContentsImpl::SetUserAgentOverride( + #include "base/containers/contains.h" +@@ -2320,8 +2321,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); @@ -1292,7 +1300,7 @@ diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser if (GetUserAgentOverride() == ua_override) { return; -@@ -3482,6 +3481,9 @@ const blink::web_pref::WebPreferences WebContentsImpl::ComputeWebPreferences() { +@@ -3491,6 +3490,9 @@ const blink::web_pref::WebPreferences WebContentsImpl::ComputeWebPreferences( #else prefs.viewport_meta_enabled = false; #endif @@ -1325,7 +1333,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 -@@ -912,7 +912,6 @@ void RenderThreadImpl::InitializeRenderer( +@@ -908,7 +908,6 @@ void RenderThreadImpl::InitializeRenderer( uint64_t trace_id) { TRACE_EVENT("navigation", "RenderThreadImpl::InitializeRenderer", perfetto::TerminatingFlow::Global(trace_id)); diff --git a/build/cromite_patches/Welcome-screen.patch b/build/cromite_patches/Welcome-screen.patch index 02be92377d7002fd1e788dc88f3f5e32fa6f36ce..5550b413cad389696074971b99951e7db1f22a71 100644 --- a/build/cromite_patches/Welcome-screen.patch +++ b/build/cromite_patches/Welcome-screen.patch @@ -9,7 +9,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html chrome/android/chrome_java_resources.gni | 1 + chrome/android/chrome_java_sources.gni | 2 + .../android/java/res/layout/fre_tosanduma.xml | 160 +++++++++ - chrome/android/java/res/values/dimens.xml | 10 + + chrome/android/java/res/values/dimens.xml | 11 + chrome/android/java/res/values/styles.xml | 24 ++ .../DefaultSearchEngineFirstRunFragment.java | 3 - .../browser/firstrun/FirstRunActivity.java | 23 +- @@ -21,7 +21,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html ...creenSigninAndHistorySyncActivityBase.java | 6 +- .../browser/locale/LocaleManagerDelegate.java | 5 +- .../Welcome-screen.grdp | 27 ++ - 15 files changed, 917 insertions(+), 80 deletions(-) + 15 files changed, 918 insertions(+), 80 deletions(-) create mode 100644 chrome/android/java/res/layout/fre_tosanduma.xml create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/firstrun/TosAndUmaFragmentView.java @@ -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 -@@ -505,6 +505,7 @@ chrome_java_resources = [ +@@ -508,6 +508,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 -@@ -651,6 +651,8 @@ chrome_java_sources = [ +@@ -664,6 +664,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", @@ -218,10 +218,11 @@ new file mode 100644 diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res/values/dimens.xml --- a/chrome/android/java/res/values/dimens.xml +++ b/chrome/android/java/res/values/dimens.xml -@@ -114,6 +114,16 @@ found in the LICENSE file. +@@ -106,6 +106,17 @@ found in the LICENSE file. 48dp 18dp 8dp ++ 110dp + 36dp + 32dp + 24dp @@ -298,10 +299,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR -import org.chromium.chrome.browser.signin.SigninCheckerProvider; -import org.chromium.chrome.browser.signin.SigninFirstRunFragment; +import org.chromium.chrome.browser.firstrun.ToSAndUMAFirstRunFragment; + import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeUtils; import org.chromium.chrome.browser.ui.signin.DialogWhenLargeContentLayout; import org.chromium.chrome.browser.ui.signin.SigninUtils; - import org.chromium.chrome.browser.ui.signin.fullscreen_signin.FullscreenSigninMediator; -@@ -233,7 +232,7 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa +@@ -234,7 +233,7 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa /** Creates first page and sets up adapter. Should result UI being shown on the screen. */ private void createFirstPage() { BooleanSupplier showWelcomePage = () -> !FirstRunStatus.shouldSkipWelcomePage(); @@ -310,7 +311,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR mFreProgressStates.add(MobileFreProgress.WELCOME_SHOWN); mPagerAdapter = new FirstRunPagerAdapter(FirstRunActivity.this, mPages); mPager.setAdapter(mPagerAdapter); -@@ -258,7 +257,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa +@@ -259,7 +258,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa // // TODO(b/245912657): explicitly sign in supervised users in {@link // FullscreenSigninMediator#handleContinueWithNative} rather than relying on SigninChecker. @@ -318,7 +319,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR mFirstRunFlowSequencer.updateFirstRunProperties(mFreProperties); -@@ -273,18 +271,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa +@@ -274,18 +272,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa mFreProgressStates.add(MobileFreProgress.DEFAULT_SEARCH_ENGINE_SHOWN); } @@ -337,7 +338,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR if (mPagerAdapter != null) { mPagerAdapter.notifyDataSetChanged(); } -@@ -690,11 +676,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa +@@ -697,11 +683,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa public void acceptTermsOfService(boolean allowMetricsAndCrashUploading) { assert mNativeInitializationPromise.isFulfilled(); diff --git a/build/cromite_patches/autofill-miscellaneous.patch b/build/cromite_patches/autofill-miscellaneous.patch index ea97073971bafa7996390585ed3ab934ce2a39ae..a2f36fa85845c87cf3d0079d3eed4ed244f53e4b 100644 --- a/build/cromite_patches/autofill-miscellaneous.patch +++ b/build/cromite_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 -@@ -1050,10 +1050,6 @@ ChromePasswordManagerClient::GetHttpAuthManager() { +@@ -1053,10 +1053,6 @@ ChromePasswordManagerClient::GetHttpAuthManager() { autofill::AutofillCrowdsourcingManager* ChromePasswordManagerClient::GetAutofillCrowdsourcingManager() { @@ -42,7 +42,7 @@ diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b diff --git a/chrome/browser/ui/autofill/chrome_autofill_client.cc b/chrome/browser/ui/autofill/chrome_autofill_client.cc --- a/chrome/browser/ui/autofill/chrome_autofill_client.cc +++ b/chrome/browser/ui/autofill/chrome_autofill_client.cc -@@ -322,15 +322,6 @@ ChromeAutofillClient::GetURLLoaderFactory() { +@@ -378,15 +378,6 @@ ChromeAutofillClient::GetURLLoaderFactory() { ->GetURLLoaderFactoryForBrowserProcess(); } @@ -100,11 +100,11 @@ diff --git a/components/android_autofill/browser/android_autofill_client.h b/com - autofill::AutofillCrowdsourcingManager& GetCrowdsourcingManager() final; autofill::VotesUploader& GetVotesUploader() override; autofill::PersonalDataManager& GetPersonalDataManager() final; - autofill::SingleFieldFillRouter& GetSingleFieldFillRouter() final; + autofill::EntityDataManager* GetEntityDataManager() override; 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 -@@ -481,33 +481,6 @@ std::optional GetUploadPayloadForApi( +@@ -475,33 +475,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) { -@@ -539,15 +512,7 @@ std::optional GetAPIQueryPayload( +@@ -533,15 +506,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() { -@@ -846,34 +811,13 @@ size_t AutofillCrowdsourcingManager::GetPayloadLength( +@@ -840,34 +805,13 @@ size_t AutofillCrowdsourcingManager::GetPayloadLength( std::tuple AutofillCrowdsourcingManager::GetRequestURLAndMethod( const FormRequestData& request_data) const { @@ -225,7 +225,7 @@ diff --git a/components/autofill/core/browser/crowdsourcing/votes_uploader.cc b/ diff --git a/components/autofill/core/browser/foundations/autofill_client.h b/components/autofill/core/browser/foundations/autofill_client.h --- a/components/autofill/core/browser/foundations/autofill_client.h +++ b/components/autofill/core/browser/foundations/autofill_client.h -@@ -242,10 +242,6 @@ class AutofillClient { +@@ -243,10 +243,6 @@ class AutofillClient { // Returns the VotesUploader. virtual VotesUploader& GetVotesUploader() = 0; @@ -239,7 +239,7 @@ diff --git a/components/autofill/core/browser/foundations/autofill_client.h b/co diff --git a/components/autofill/core/browser/foundations/autofill_manager.cc b/components/autofill/core/browser/foundations/autofill_manager.cc --- a/components/autofill/core/browser/foundations/autofill_manager.cc +++ b/components/autofill/core/browser/foundations/autofill_manager.cc -@@ -324,17 +324,6 @@ void AutofillManager::OnFormsParsed(const std::vector& forms) { +@@ -326,17 +326,6 @@ void AutofillManager::OnFormsParsed(const std::vector& forms) { driver().SendTypePredictionsToRenderer(queryable_forms); LogTypePredictionsAvailable(log_manager(), non_queryable_forms); LogTypePredictionsAvailable(log_manager(), queryable_forms); @@ -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 -@@ -961,6 +961,8 @@ BASE_FEATURE(kAutofillUploadThrottling, +@@ -877,6 +877,8 @@ BASE_FEATURE(kAutofillUploadThrottling, "AutofillUploadThrottling", base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/build/cromite_patches/bromite-build-utils.patch b/build/cromite_patches/bromite-build-utils.patch index a060920c1a52a8864c44b9f7d3c8bdbf2d6a3b4d..374e53cc702e0d6d82fa536d3d27defe7f5e8362 100644 --- a/build/cromite_patches/bromite-build-utils.patch +++ b/build/cromite_patches/bromite-build-utils.patch @@ -426,7 +426,7 @@ new file mode 100644 diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn --- a/build/config/BUILDCONFIG.gn +++ b/build/config/BUILDCONFIG.gn -@@ -735,6 +735,7 @@ set_defaults("component") { +@@ -734,6 +734,7 @@ set_defaults("component") { configs = default_component_configs } diff --git a/build/cromite_patches/disable-WebView-variations-support.patch b/build/cromite_patches/disable-WebView-variations-support.patch index 30015c505998ec56862155389ac7691f2d1358c7..fb849abbe6f424cb7875b528a29870ba8763e00b 100644 --- a/build/cromite_patches/disable-WebView-variations-support.patch +++ b/build/cromite_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 -@@ -343,12 +343,6 @@ public class WebViewChromiumAwInit { +@@ -349,12 +349,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 -@@ -554,10 +554,6 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider { +@@ -588,10 +588,6 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider { } } diff --git a/build/cromite_patches/eyeo-beta-118.0.5993.48-android_api.patch b/build/cromite_patches/eyeo-beta-118.0.5993.48-android_api.patch index dadc10130b4d0ed8969cae88ce23feb54ec271dc..96da3b63865206030b2c8b85bfd4247eee729238 100644 --- a/build/cromite_patches/eyeo-beta-118.0.5993.48-android_api.patch +++ b/build/cromite_patches/eyeo-beta-118.0.5993.48-android_api.patch @@ -19,7 +19,7 @@ Pre-requisites: eyeo Browser Ad filtering Solution: Base Module components/adblock/android/BUILD.gn | 99 +++ components/adblock/android/adblock_jni.cc | 176 ++++++ components/adblock/android/adblock_jni.h | 52 ++ - .../filtering_configuration_bindings.cc | 295 +++++++++ + .../filtering_configuration_bindings.cc | 294 +++++++++ .../filtering_configuration_bindings.h | 68 +++ .../adblock/AdblockContentType.java | 61 ++ .../components/adblock/AdblockController.java | 203 +++++++ @@ -43,9 +43,9 @@ Pre-requisites: eyeo Browser Ad filtering Solution: Base Module .../adblock/TestPagesSnippetsTestBase.java | 562 ++++++++++++++++++ .../adblock/TestPagesWebsocketTestBase.java | 56 ++ .../adblock/TestVerificationUtils.java | 163 +++++ - ...source_classification_notifier_bindings.cc | 164 +++++ + ...source_classification_notifier_bindings.cc | 163 +++++ ...esource_classification_notifier_bindings.h | 69 +++ - 39 files changed, 5008 insertions(+) + 39 files changed, 5006 insertions(+) create mode 100644 chrome/browser/android/adblock/adblock_jni_factory.cc create mode 100644 chrome/browser/android/adblock/adblock_jni_factory.h create mode 100644 chrome/browser/android/adblock/filtering_configuration_bindings_factory.cc @@ -97,31 +97,31 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn import("//build/android/resource_sizes.gni") import("//build/config/android/config.gni") -@@ -527,6 +531,7 @@ if (current_toolchain == default_toolchain) { +@@ -531,6 +535,7 @@ if (current_toolchain == default_toolchain) { + "//chrome/browser/xsurface:java", + "//chrome/browser/xsurface_provider:dependency_provider_impl_java", "//chrome/browser/xsurface_provider:java", ++ "//components/adblock/android:adblock_controller_java", "//components/android_autofill/browser:java", "//components/autofill/android:autofill_features_java", -+ "//components/adblock/android:adblock_controller_java", "//components/autofill/android:autofill_java", - "//components/background_task_scheduler:background_task_scheduler_java", - "//components/background_task_scheduler:background_task_scheduler_task_ids_java", -@@ -1709,6 +1714,7 @@ if (current_toolchain == default_toolchain) { - "//chrome/android/webapk/libs/client:client_java", - "//chrome/android/webapk/libs/common:common_java", - "//chrome/android/webapk/libs/runtime_library:webapk_service_aidl_java", +@@ -1320,6 +1325,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", + "//chrome/browser/adblock/android:adblock_java_tests", - "//chrome/browser/android/browserservices/intents:java", - "//chrome/browser/android/browserservices/verification:java", "//chrome/browser/android/browserservices/verification:javatests", -@@ -2095,6 +2101,7 @@ if (current_toolchain == default_toolchain) { - srcjar_deps = [ "//chrome/browser:tos_dialog_behavior_generated_enum" ] + "//chrome/browser/android/httpclient:javatests", + "//chrome/browser/android/metrics:ukm_javatests", +@@ -1366,6 +1372,7 @@ if (current_toolchain == default_toolchain) { + ] data = [ + "//chrome/test/data/adblock/", "//chrome/test/data/android/", "//chrome/test/data/autofill/", "//chrome/test/data/background_sync/", -@@ -3992,6 +3999,7 @@ group("jni_headers") { +@@ -3262,6 +3269,7 @@ group("jni_headers") { "//chrome/browser/util:jni_headers", "//chrome/browser/webauthn/android:jni_headers", "//components/browser_ui/device_lock/android:device_lock_bridge_jni_headers", @@ -132,7 +132,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2526,6 +2526,18 @@ static_library("browser") { +@@ -2561,6 +2561,18 @@ static_library("browser") { } if (is_android) { @@ -645,7 +645,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 -@@ -304,6 +304,11 @@ +@@ -310,6 +310,11 @@ #include "components/commerce/core/commerce_feature_list.h" #include "components/commerce/core/proto/merchant_signal_db_content.pb.h" @@ -657,7 +657,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc #else #include "chrome/browser/accessibility/live_caption/live_caption_controller_factory.h" -@@ -903,6 +908,11 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -912,6 +917,11 @@ void ChromeBrowserMainExtraPartsProfiles:: #if BUILDFLAG(IS_ANDROID) FastCheckoutCapabilitiesFetcherFactory::GetInstance(); @@ -1015,7 +1015,7 @@ diff --git a/components/adblock/android/filtering_configuration_bindings.cc b/co new file mode 100644 --- /dev/null +++ b/components/adblock/android/filtering_configuration_bindings.cc -@@ -0,0 +1,295 @@ +@@ -0,0 +1,294 @@ +/* + * This file is part of eyeo Chromium SDK, + * Copyright (C) 2006-present eyeo GmbH @@ -1040,7 +1040,6 @@ new file mode 100644 + +#include "base/android/jni_array.h" +#include "base/android/jni_string.h" -+#include "base/ranges/algorithm.h" +#include "components/adblock/android/java_bindings_getters.h" +#include "components/adblock/android/jni_headers/FilteringConfiguration_jni.h" +#include "components/adblock/core/configuration/filtering_configuration.h" @@ -1110,7 +1109,7 @@ new file mode 100644 + const std::string& configuration_name) { + const auto installed_configurations = GetConfigurations(); + auto existing_configuration_it = -+ base::ranges::find(installed_configurations, configuration_name, ++ std::ranges::find(installed_configurations, configuration_name, + &FilteringConfiguration::GetName); + return existing_configuration_it != installed_configurations.end() + ? *existing_configuration_it @@ -1190,7 +1189,7 @@ new file mode 100644 +JNI_FilteringConfiguration_GetConfigurations(JNIEnv* env) { + auto& bindings = adblock::GetFilteringConfigurationBindings(); + std::vector configurations; -+ base::ranges::transform( ++ std::ranges::transform( + bindings.GetConfigurations(), std::back_inserter(configurations), + [](adblock::FilteringConfiguration* fc) { return fc->GetName(); }); + return base::android::ToJavaArrayOfStrings(env, configurations); @@ -1244,7 +1243,7 @@ new file mode 100644 + std::vector urls; + auto* configuration = GetConfigurationWithName(env, configuration_name); + if (configuration) { -+ base::ranges::transform(configuration->GetFilterLists(), ++ std::ranges::transform(configuration->GetFilterLists(), + std::back_inserter(urls), &GURL::spec); + } + return base::android::ToJavaArrayOfStrings(env, urls); @@ -5097,7 +5096,7 @@ diff --git a/components/adblock/android/resource_classification_notifier_binding new file mode 100644 --- /dev/null +++ b/components/adblock/android/resource_classification_notifier_bindings.cc -@@ -0,0 +1,164 @@ +@@ -0,0 +1,163 @@ +/* + * This file is part of eyeo Chromium SDK, + * Copyright (C) 2006-present eyeo GmbH @@ -5123,7 +5122,6 @@ new file mode 100644 +#include "base/android/jni_android.h" +#include "base/android/jni_array.h" +#include "base/android/jni_string.h" -+#include "base/ranges/algorithm.h" +#include "components/adblock/android/java_bindings_getters.h" +#include "components/adblock/android/jni_headers/ResourceClassificationNotifier_jni.h" +#include "components/adblock/content/browser/resource_classification_runner.h" diff --git a/build/cromite_patches/eyeo-beta-118.0.5993.48-android_settings.patch b/build/cromite_patches/eyeo-beta-118.0.5993.48-android_settings.patch index 9c9ffc9c6de4c1be26c72d3f18533a0d9f83a9d3..c06560c3ee5ffbb6eb652b2d762c6e340d76b2ad 100644 --- a/build/cromite_patches/eyeo-beta-118.0.5993.48-android_settings.patch +++ b/build/cromite_patches/eyeo-beta-118.0.5993.48-android_settings.patch @@ -243,7 +243,7 @@ Pre-requisites: eyeo Browser Ad filtering Solution: Base Module and Android API diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -286,6 +286,10 @@ if (current_toolchain == default_toolchain) { +@@ -285,6 +285,10 @@ if (current_toolchain == default_toolchain) { "//third_party/androidx:androidx_preference_preference_java", ] @@ -254,8 +254,8 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn if (plus_addresses_use_internal_android_resources) { deps += [ "//clank/components/plus_addresses:java_resources" ] } else { -@@ -764,6 +768,10 @@ if (current_toolchain == default_toolchain) { - "//url/mojom:url_mojom_gurl_java", +@@ -774,6 +778,10 @@ if (current_toolchain == default_toolchain) { + "//url/mojom:url_mojom_origin_java", ] + ### Android UI module start diff --git a/build/cromite_patches/eyeo-beta-118.0.5993.48-base.patch b/build/cromite_patches/eyeo-beta-118.0.5993.48-base.patch index a10ad89e4ca63b59eaa1331b8b1b332e1c47cf65..fa2e478348ca29e396088492d67333e63f9da9b1 100644 --- a/build/cromite_patches/eyeo-beta-118.0.5993.48-base.patch +++ b/build/cromite_patches/eyeo-beta-118.0.5993.48-base.patch @@ -20,7 +20,7 @@ Based on Chromium 118.0.5993.48 .../content/browser/adblock_filter_match.h | 30 + .../adblock_telemetry_service_factory_base.cc | 100 ++ .../adblock_telemetry_service_factory_base.h | 54 + - .../browser/adblock_url_loader_factory.cc | 748 +++++++++ + .../browser/adblock_url_loader_factory.cc | 734 +++++++++ .../browser/adblock_url_loader_factory.h | 100 ++ .../adblock_url_loader_factory_for_test.cc | 436 +++++ .../adblock_url_loader_factory_for_test.h | 70 + @@ -49,7 +49,7 @@ Based on Chromium 118.0.5993.48 .../activeping_telemetry_topic_provider.cc | 285 ++++ .../activeping_telemetry_topic_provider.h | 87 + components/adblock/core/adblock_controller.h | 64 + - .../adblock/core/adblock_controller_impl.cc | 271 ++++ + .../adblock/core/adblock_controller_impl.cc | 270 ++++ .../adblock/core/adblock_controller_impl.h | 95 ++ components/adblock/core/adblock_switches.cc | 26 + components/adblock/core/adblock_switches.h | 29 + @@ -90,11 +90,11 @@ Based on Chromium 118.0.5993.48 .../adblock/core/converter/parser/BUILD.gn | 66 + .../core/converter/parser/content_filter.cc | 68 + .../core/converter/parser/content_filter.h | 49 + - .../core/converter/parser/domain_option.cc | 114 ++ + .../core/converter/parser/domain_option.cc | 111 ++ .../core/converter/parser/domain_option.h | 57 + .../converter/parser/filter_classifier.cc | 39 + .../core/converter/parser/filter_classifier.h | 45 + - .../adblock/core/converter/parser/metadata.cc | 145 ++ + .../adblock/core/converter/parser/metadata.cc | 144 ++ .../adblock/core/converter/parser/metadata.h | 64 + .../core/converter/parser/snippet_filter.cc | 62 + .../core/converter/parser/snippet_filter.h | 46 + @@ -126,27 +126,27 @@ Based on Chromium 118.0.5993.48 .../filtering_configuration_maintainer_impl.h | 119 ++ .../subscription/installed_subscription.cc | 42 + .../subscription/installed_subscription.h | 137 ++ - .../installed_subscription_impl.cc | 552 +++++++ + .../installed_subscription_impl.cc | 551 +++++++ .../installed_subscription_impl.h | 149 ++ .../ongoing_subscription_request.h | 50 + .../ongoing_subscription_request_impl.cc | 190 +++ .../ongoing_subscription_request_impl.h | 74 + - .../core/subscription/pattern_matcher.cc | 264 +++ + .../core/subscription/pattern_matcher.cc | 263 +++ .../core/subscription/pattern_matcher.h | 33 + .../preloaded_subscription_provider.h | 56 + - .../preloaded_subscription_provider_impl.cc | 120 ++ + .../preloaded_subscription_provider_impl.cc | 119 ++ .../preloaded_subscription_provider_impl.h | 50 + .../core/subscription/regex_matcher.cc | 162 ++ .../adblock/core/subscription/regex_matcher.h | 73 + .../adblock/core/subscription/subscription.cc | 24 + .../adblock/core/subscription/subscription.h | 78 + .../subscription/subscription_collection.h | 97 ++ - .../subscription_collection_impl.cc | 353 ++++ + .../subscription_collection_impl.cc | 352 ++++ .../subscription_collection_impl.h | 97 ++ .../core/subscription/subscription_config.cc | 338 ++++ .../core/subscription/subscription_config.h | 120 ++ .../subscription/subscription_downloader.h | 66 + - .../subscription_downloader_impl.cc | 288 ++++ + .../subscription_downloader_impl.cc | 287 ++++ .../subscription_downloader_impl.h | 102 ++ .../subscription_persistent_metadata.h | 86 + .../subscription_persistent_metadata_impl.cc | 170 ++ @@ -155,7 +155,7 @@ Based on Chromium 118.0.5993.48 .../subscription_persistent_storage_impl.cc | 229 +++ .../subscription_persistent_storage_impl.h | 80 + .../core/subscription/subscription_service.h | 87 + - .../subscription/subscription_service_impl.cc | 211 +++ + .../subscription/subscription_service_impl.cc | 210 +++ .../subscription/subscription_service_impl.h | 97 ++ .../core/subscription/subscription_updater.h | 35 + .../subscription/subscription_updater_impl.cc | 65 + @@ -163,7 +163,7 @@ Based on Chromium 118.0.5993.48 .../subscription/subscription_validator.h | 59 + .../subscription_validator_impl.cc | 144 ++ .../subscription_validator_impl.h | 53 + - .../subscription/url_keyword_extractor.cc | 67 + + .../subscription/url_keyword_extractor.cc | 66 + .../core/subscription/url_keyword_extractor.h | 59 + .../adblock/docs/ad-filtering/README.md | 18 + .../ad-filtering/element-hiding-sequence.png | Bin 0 -> 177168 bytes @@ -215,7 +215,7 @@ Based on Chromium 118.0.5993.48 .../network/public/cpp/net_ipc_param_traits.h | 5 + .../blink/public/mojom/frame/frame.mojom | 8 + third_party/blink/public/web/web_document.h | 12 + - .../renderer/core/exported/web_document.cc | 52 + + .../renderer/core/exported/web_document.cc | 48 + .../core/frame/local_frame_mojo_handler.cc | 8 + .../core/frame/local_frame_mojo_handler.h | 5 + .../url_loader/mojo_url_loader_client.cc | 6 +- @@ -223,7 +223,7 @@ Based on Chromium 118.0.5993.48 tools/eyeo/generate_modules.sh | 209 +++ tools/eyeo/snippets_deps.py | 61 + tools/gritsettings/resource_ids.spec | 11 +- - 219 files changed, 22053 insertions(+), 4 deletions(-) + 219 files changed, 22023 insertions(+), 4 deletions(-) create mode 100644 components/adblock/CHANGELOG.md create mode 100644 components/adblock/LICENSE create mode 100644 components/adblock/README.md @@ -444,9 +444,9 @@ diff --git a/DEPS b/DEPS 'aomedia_git': 'https://aomedia.googlesource.com', 'boringssl_git': 'https://boringssl.googlesource.com', 'chrome_git': 'https://chrome-internal.googlesource.com', -@@ -502,6 +508,11 @@ vars = { +@@ -498,6 +504,11 @@ vars = { # and whatever else without interference from each other. - 'llvm_libc_revision': '039fea2058d14b408637a931b36a717169617227', + 'llvm_libc_revision': '6d0c8ee02e2fd44e69ac30e721e13be463035ee5', + # Three lines of non-changing comments so that + # the commit queue can handle CLs rolling feed @@ -455,8 +455,8 @@ diff --git a/DEPS b/DEPS + # If you change this, also update the libc++ revision in # //buildtools/deps_revisions.gni. - 'libcxx_revision': '1f7db7501cf902d5d3ad5fd9b31bea33bb8bf9da', -@@ -1447,6 +1458,10 @@ deps = { + 'libcxx_revision': '2e25154d49c29fa9aa42c30ad4a027bd30123434', +@@ -1456,6 +1467,10 @@ deps = { 'condition': 'checkout_android and checkout_src_internal', }, @@ -465,9 +465,9 @@ diff --git a/DEPS b/DEPS + }, + 'src/docs/website': { - 'url': Var('chromium_git') + '/website.git' + '@' + '4d214097ba7305ec2b3f2dfcf0aa4fd2104c960a', + 'url': Var('chromium_git') + '/website.git' + '@' + '600fc3a0b121d5007b4bb97b001e756625e6d418', }, -@@ -1587,6 +1602,13 @@ deps = { +@@ -1596,6 +1611,13 @@ deps = { 'dep_type': 'cipd', }, @@ -525,14 +525,14 @@ diff --git a/README.md b/README.md diff --git a/base/trace_event/builtin_categories.h b/base/trace_event/builtin_categories.h --- a/base/trace_event/builtin_categories.h +++ b/base/trace_event/builtin_categories.h -@@ -98,6 +98,7 @@ - X("exo") \ - X("extensions") \ - X("explore_sites") \ -+ X("eyeo") \ - X("FileSystem") \ - X("file_system_provider") \ - X("fledge") \ +@@ -97,6 +97,7 @@ PERFETTO_DEFINE_CATEGORIES_IN_NAMESPACE_WITH_ATTRS( + perfetto::Category("exo"), + perfetto::Category("extensions"), + perfetto::Category("explore_sites"), ++ perfetto::Category("eyeo"), + perfetto::Category("FileSystem"), + perfetto::Category("file_system_provider"), + perfetto::Category("fledge"), diff --git a/build/install-build-deps.py b/build/install-build-deps.py --- a/build/install-build-deps.py +++ b/build/install-build-deps.py @@ -2512,7 +2512,7 @@ diff --git a/components/adblock/content/browser/adblock_url_loader_factory.cc b/ new file mode 100644 --- /dev/null +++ b/components/adblock/content/browser/adblock_url_loader_factory.cc -@@ -0,0 +1,748 @@ +@@ -0,0 +1,734 @@ +/* + * This file is part of eyeo Chromium SDK, + * Copyright (C) 2006-present eyeo GmbH @@ -2650,8 +2650,6 @@ new file mode 100644 + const std::optional& new_url) override; + void SetPriority(net::RequestPriority priority, + int32_t intra_priority_value) override; -+ void PauseReadingBodyFromNet() override; -+ void ResumeReadingBodyFromNet() override; + + void OnReceiveEarlyHints( + ::network::mojom::EarlyHintsPtr early_hints) override; @@ -2788,18 +2786,6 @@ new file mode 100644 + } +} + -+void AdblockURLLoaderFactory::InProgressRequest::PauseReadingBodyFromNet() { -+ if (target_loader_.is_bound()) { -+ target_loader_->PauseReadingBodyFromNet(); -+ } -+} -+ -+void AdblockURLLoaderFactory::InProgressRequest::ResumeReadingBodyFromNet() { -+ if (target_loader_.is_bound()) { -+ target_loader_->ResumeReadingBodyFromNet(); -+ } -+} -+ +void AdblockURLLoaderFactory::InProgressRequest::OnReceiveEarlyHints( + network::mojom::EarlyHintsPtr early_hints) { + target_client_->OnReceiveEarlyHints(std::move(early_hints)); @@ -3548,7 +3534,7 @@ new file mode 100644 + DCHECK(adblock_configuration) + << "Action called for non existing \"adblock\" configuration"; + std::vector subscriptions; -+ base::ranges::transform( ++ std::ranges::transform( + adblock_configuration->GetFilterLists(), + std::back_inserter(subscriptions), + [](const auto& subscription) { return subscription.spec(); }); @@ -3593,7 +3579,7 @@ new file mode 100644 + subscription_service->GetAdblockFilteringConfiguration(); + DCHECK(adblock_configuration) + << "Action called for non existing \"adblock\" configuration"; -+ return base::ranges::any_of( ++ return std::ranges::any_of( + adblock_configuration->GetFilterLists(), + [&](const auto& url) { return url == AcceptableAdsUrl(); }); +} @@ -4069,7 +4055,7 @@ new file mode 100644 +} + +bool AdblockWebContentObserver::IsAdblockEnabled() const { -+ return base::ranges::any_of( ++ return std::ranges::any_of( + subscription_service_->GetInstalledFilteringConfigurations(), + &adblock::FilteringConfiguration::IsEnabled); +} @@ -4685,14 +4671,14 @@ new file mode 100644 + collection->FindBySpecialFilter(SpecialFilterType::Elemhide, url, + frame_hierarchy, sitekey); + if (!ehe_allowlisted) { -+ base::ranges::copy( ++ std::ranges::copy( + collection->GetElementHideSelectors(url, frame_hierarchy, sitekey), + std::back_inserter(stylesheet)); -+ base::ranges::copy(collection->GetElementHideEmulationSelectors(url), ++ std::ranges::copy(collection->GetElementHideEmulationSelectors(url), + std::back_inserter(elemhide_js)); + } + if (!doc_allowlisted) { -+ base::ranges::for_each( ++ std::ranges::for_each( + collection->GenerateSnippets(url, frame_hierarchy), + [&snippet_js](auto& item) { snippet_js.Append(std::move(item)); }); + } @@ -7105,7 +7091,7 @@ diff --git a/components/adblock/core/adblock_controller_impl.cc b/components/adb new file mode 100644 --- /dev/null +++ b/components/adblock/core/adblock_controller_impl.cc -@@ -0,0 +1,271 @@ +@@ -0,0 +1,270 @@ +/* + * This file is part of eyeo Chromium SDK, + * Copyright (C) 2006-present eyeo GmbH @@ -7134,7 +7120,6 @@ new file mode 100644 +#include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/logging.h" -+#include "base/ranges/algorithm.h" +#include "base/strings/string_util.h" +#include "base/version.h" +#include "components/adblock/core/adblock_switches.h" @@ -7219,7 +7204,7 @@ new file mode 100644 +} + +bool AdblockControllerImpl::IsAcceptableAdsEnabled() const { -+ return base::ranges::any_of( ++ return std::ranges::any_of( + adblock_filtering_configuration_->GetFilterLists(), + [&](const auto& url) { return url == AcceptableAdsUrl(); }); +} @@ -7356,7 +7341,7 @@ new file mode 100644 + + // If there's no language-specific recommended subscription, see if we may + // install the default subscription.. -+ if (base::ranges::any_of( ++ if (std::ranges::any_of( + known_subscriptions_, [&](const KnownSubscriptionInfo& subscription) { + return subscription.url == DefaultSubscriptionUrl() && + subscription.first_run != @@ -8444,14 +8429,14 @@ new file mode 100644 + blocking_rewrites.end()); + // Remove blocking filters overruled by allowing filters. + blocking_rewrites_v.erase( -+ base::ranges::remove_if( -+ blocking_rewrites_v, -+ [&allowing_rewrites](const auto blocking_rewrite) { -+ return base::ranges::find_if( -+ allowing_rewrites, [&](const auto& allowing_rewrite) { -+ return blocking_rewrite == allowing_rewrite; -+ }) != allowing_rewrites.end(); -+ }), ++ std::remove_if(blocking_rewrites_v.begin(), blocking_rewrites_v.end(), ++ [&allowing_rewrites](const auto blocking_rewrite) { ++ return std::ranges::find_if( ++ allowing_rewrites, ++ [&](const auto& allowing_rewrite) { ++ return blocking_rewrite == allowing_rewrite; ++ }) != allowing_rewrites.end(); ++ }), + blocking_rewrites_v.end()); + + if (blocking_rewrites_v.empty()) { @@ -10274,7 +10259,7 @@ new file mode 100644 + const std::string& value) { + DCHECK(configuration.FindList(key)); // see SetDefaultValuesIfNeeded(). + auto* list = configuration.FindList(key); -+ if (base::ranges::find(*list, base::Value(value)) != list->end()) { ++ if (std::ranges::find(*list, base::Value(value)) != list->end()) { + // value already exists in the list. + return false; + } @@ -10287,7 +10272,7 @@ new file mode 100644 + const std::string& value) { + DCHECK(configuration.FindList(key)); // see SetDefaultValuesIfNeeded(). + auto* list = configuration.FindList(key); -+ auto it = base::ranges::find(*list, base::Value(value)); ++ auto it = std::ranges::find(*list, base::Value(value)); + if (it == list->end()) { + // value was not on the list. + return false; @@ -11172,7 +11157,7 @@ diff --git a/components/adblock/core/converter/parser/domain_option.cc b/compone new file mode 100644 --- /dev/null +++ b/components/adblock/core/converter/parser/domain_option.cc -@@ -0,0 +1,114 @@ +@@ -0,0 +1,111 @@ +/* + * This file is part of eyeo Chromium SDK, + * Copyright (C) 2006-present eyeo GmbH @@ -11193,7 +11178,6 @@ new file mode 100644 +#include "components/adblock/core/converter/parser/content_filter.h" + +#include "base/logging.h" -+#include "base/ranges/algorithm.h" +#include "base/strings/string_split.h" +#include "base/strings/string_util.h" + @@ -11251,22 +11235,20 @@ new file mode 100644 + +void DomainOption::RemoveDomainsWithNoSubdomain() { + exclude_domains_.erase( -+ base::ranges::remove_if( -+ exclude_domains_, -+ [](auto it) { return !HasSubdomainOrLocalhost(it); }), ++ std::remove_if(exclude_domains_.begin(), exclude_domains_.end(), ++ [](auto it) { return !HasSubdomainOrLocalhost(it); }), + exclude_domains_.end()); + + include_domains_.erase( -+ base::ranges::remove_if( -+ include_domains_, -+ [](auto it) { return !HasSubdomainOrLocalhost(it); }), ++ std::remove_if(include_domains_.begin(), include_domains_.end(), ++ [](auto it) { return !HasSubdomainOrLocalhost(it); }), + include_domains_.end()); +} + +bool DomainOption::UnrestrictedByDomain() const { -+ return base::ranges::count_if(exclude_domains_, &HasSubdomainOrLocalhost) == ++ return std::ranges::count_if(exclude_domains_, &HasSubdomainOrLocalhost) == + 0 && -+ base::ranges::count_if(include_domains_, &HasSubdomainOrLocalhost) == ++ std::ranges::count_if(include_domains_, &HasSubdomainOrLocalhost) == + 0; +} + @@ -11447,7 +11429,7 @@ diff --git a/components/adblock/core/converter/parser/metadata.cc b/components/a new file mode 100644 --- /dev/null +++ b/components/adblock/core/converter/parser/metadata.cc -@@ -0,0 +1,145 @@ +@@ -0,0 +1,144 @@ +/* + * This file is part of eyeo Chromium SDK, + * Copyright (C) 2006-present eyeo GmbH @@ -11468,7 +11450,6 @@ new file mode 100644 +#include "components/adblock/core/converter/parser/metadata.h" + +#include "base/logging.h" -+#include "base/ranges/algorithm.h" +#include "base/strings/string_number_conversions.h" +#include "base/strings/string_util.h" +#include "third_party/re2/src/re2/re2.h" @@ -11586,7 +11567,7 @@ new file mode 100644 + << kDefaultExpirationInterval.InDays() << " days."; + return kDefaultExpirationInterval; + } -+ return base::ranges::clamp(expiration_unit == "h" ++ return std::ranges::clamp(expiration_unit == "h" + ? base::Hours(expiration_time) + : base::Days(expiration_time), + kMinExpirationInterval, kMaxExpirationInterval); @@ -14423,7 +14404,7 @@ new file mode 100644 + if (custom_filters_) { + state.push_back(custom_filters_); + } -+ base::ranges::move( ++ std::ranges::move( + preloaded_subscription_provider_->GetCurrentPreloadedSubscriptions(), + std::back_inserter(state)); + VLOG(2) << "[eyeo] FilteringConfiguration " << configuration_->GetName() @@ -14437,17 +14418,17 @@ new file mode 100644 + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + // Result will contain the currently installed subscriptions: + std::vector> result; -+ base::ranges::copy(current_state_, std::back_inserter(result)); ++ std::ranges::copy(current_state_, std::back_inserter(result)); + // And all preloaded subscriptions: + auto preloaded_subscriptions = + preloaded_subscription_provider_->GetCurrentPreloadedSubscriptions(); -+ base::ranges::move(preloaded_subscriptions, std::back_inserter(result)); ++ std::ranges::move(preloaded_subscriptions, std::back_inserter(result)); + // Also, dummy subscriptions that represent ongoing installations (unless + // already present, in which case they'd represent updates). -+ base::ranges::copy_if( ++ std::ranges::copy_if( + ongoing_installations_, std::back_inserter(result), + [&](const auto& ongoing_installation) { -+ return base::ranges::find(result, ongoing_installation->GetSourceUrl(), ++ return std::ranges::find(result, ongoing_installation->GetSourceUrl(), + &Subscription::GetSourceUrl) == result.end(); + }); + return result; @@ -14486,15 +14467,15 @@ new file mode 100644 + DCHECK(IsInitialized()); + // Subscriptions that are either installed or being installed: + auto installed_subscriptions = GetReadySubscriptions(); -+ base::ranges::copy(GetPendingSubscriptions(), ++ std::ranges::copy(GetPendingSubscriptions(), + std::back_inserter(installed_subscriptions)); + // Subscriptions that are demanded by the FilteringConfiguration: + auto demanded_subscriptions = configuration_->GetFilterLists(); -+ base::ranges::sort(installed_subscriptions); -+ base::ranges::sort(demanded_subscriptions); ++ std::ranges::sort(installed_subscriptions); ++ std::ranges::sort(demanded_subscriptions); + // Missing subscriptions is the difference between the two: + std::vector missing_subscriptions; -+ base::ranges::set_difference(demanded_subscriptions, installed_subscriptions, ++ std::ranges::set_difference(demanded_subscriptions, installed_subscriptions, + std::back_inserter(missing_subscriptions)); + for (const auto& url : missing_subscriptions) { + DownloadAndInstallSubscription(url); @@ -14506,18 +14487,18 @@ new file mode 100644 + DCHECK(IsInitialized()); + // Subscriptions that are either installed or being installed: + auto installed_subscriptions = GetReadySubscriptions(); -+ base::ranges::copy(GetPendingSubscriptions(), ++ std::ranges::copy(GetPendingSubscriptions(), + std::back_inserter(installed_subscriptions)); + // Subscriptions that are demanded by the FilteringConfiguration: + auto demanded_subscriptions = configuration_->GetFilterLists(); -+ base::ranges::sort(installed_subscriptions); -+ base::ranges::sort(demanded_subscriptions); ++ std::ranges::sort(installed_subscriptions); ++ std::ranges::sort(demanded_subscriptions); + installed_subscriptions.erase(std::unique(installed_subscriptions.begin(), + installed_subscriptions.end()), + installed_subscriptions.end()); + // Unneeded subscriptions is the difference between the two: + std::vector unneeded_subscriptions; -+ base::ranges::set_difference(installed_subscriptions, demanded_subscriptions, ++ std::ranges::set_difference(installed_subscriptions, demanded_subscriptions, + std::back_inserter(unneeded_subscriptions)); + for (const auto& url : unneeded_subscriptions) { + UninstallSubscription(url); @@ -14596,7 +14577,7 @@ new file mode 100644 + // of installing an update. + const auto& url = subscription->GetSourceUrl(); + if (persistent_metadata_->IsExpired(url) && -+ base::ranges::find(ongoing_installations_, url, ++ std::ranges::find(ongoing_installations_, url, + &Subscription::GetSourceUrl) == + ongoing_installations_.end()) { + VLOG(1) << "[eyeo] Updating expired subscription " << url; @@ -14614,7 +14595,7 @@ new file mode 100644 + // downloading it. + // This is to support legacy behavior. + if (configuration_->GetName() == "adblock" && -+ base::ranges::none_of(GetCurrentSubscriptions(), ++ std::ranges::none_of(GetCurrentSubscriptions(), + [](const auto& subscription) { + return subscription->GetSourceUrl() == + AcceptableAdsUrl(); @@ -14629,7 +14610,7 @@ new file mode 100644 + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + DCHECK(IsInitialized()); + const bool is_an_update = -+ base::ranges::any_of(current_state_, [&](const auto candidate) { ++ std::ranges::any_of(current_state_, [&](const auto candidate) { + return candidate->GetSourceUrl() == subscription_url; + }); + @@ -14754,7 +14735,7 @@ new file mode 100644 + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + DCHECK(IsInitialized()); + bool subscription_removed = false; -+ auto it = base::ranges::find(current_state_, subscription_url, ++ auto it = std::ranges::find(current_state_, subscription_url, + &Subscription::GetSourceUrl); + if (it != current_state_.end()) { + storage_->RemoveSubscription(*it); @@ -14762,7 +14743,7 @@ new file mode 100644 + subscription_removed = true; + } + -+ auto ongoing_installation_it = base::ranges::find( ++ auto ongoing_installation_it = std::ranges::find( + ongoing_installations_, subscription_url, &Subscription::GetSourceUrl); + if (ongoing_installation_it != ongoing_installations_.end()) { + ongoing_installations_.erase(ongoing_installation_it); @@ -14780,7 +14761,7 @@ new file mode 100644 + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + + std::vector filters = configuration_->GetCustomFilters(); -+ base::ranges::transform(configuration_->GetAllowedDomains(), ++ std::ranges::transform(configuration_->GetAllowedDomains(), + std::back_inserter(filters), + &utils::CreateDomainAllowlistingFilter); + for (const auto& filter : filters) { @@ -14805,7 +14786,7 @@ new file mode 100644 + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + std::vector result; + result.reserve(current_state_.size()); -+ base::ranges::transform(current_state_, std::back_inserter(result), ++ std::ranges::transform(current_state_, std::back_inserter(result), + &Subscription::GetSourceUrl); + return result; +} @@ -14815,7 +14796,7 @@ new file mode 100644 + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + std::vector result; + result.reserve(ongoing_installations_.size()); -+ base::ranges::transform(ongoing_installations_, std::back_inserter(result), ++ std::ranges::transform(ongoing_installations_, std::back_inserter(result), + &Subscription::GetSourceUrl); + return result; +} @@ -15138,7 +15119,7 @@ diff --git a/components/adblock/core/subscription/installed_subscription_impl.cc new file mode 100644 --- /dev/null +++ b/components/adblock/core/subscription/installed_subscription_impl.cc -@@ -0,0 +1,552 @@ +@@ -0,0 +1,551 @@ +/* + * This file is part of eyeo Chromium SDK, + * Copyright (C) 2006-present eyeo GmbH @@ -15164,7 +15145,6 @@ new file mode 100644 + +#include "absl/types/optional.h" +#include "base/logging.h" -+#include "base/ranges/algorithm.h" +#include "base/strings/string_util.h" +#include "base/trace_event/trace_event.h" +#include "components/adblock/core/common/adblock_constants.h" @@ -15184,7 +15164,7 @@ new file mode 100644 +namespace { + +bool NeedsLowercasing(const std::string& input) { -+ return base::ranges::any_of( ++ return std::ranges::any_of( + input, [](const char c) { return base::IsAsciiUpper(c); }); +} + @@ -16178,7 +16158,7 @@ diff --git a/components/adblock/core/subscription/pattern_matcher.cc b/component new file mode 100644 --- /dev/null +++ b/components/adblock/core/subscription/pattern_matcher.cc -@@ -0,0 +1,264 @@ +@@ -0,0 +1,263 @@ +/* + * This file is part of eyeo Chromium SDK, + * Copyright (C) 2006-present eyeo GmbH @@ -16201,7 +16181,6 @@ new file mode 100644 +#include "absl/types/optional.h" +#include "base/logging.h" +#include "base/notreached.h" -+#include "base/ranges/algorithm.h" +#include "base/strings/string_util.h" +#include "components/adblock/core/common/regex_filter_pattern.h" + @@ -16546,7 +16525,7 @@ diff --git a/components/adblock/core/subscription/preloaded_subscription_provide new file mode 100644 --- /dev/null +++ b/components/adblock/core/subscription/preloaded_subscription_provider_impl.cc -@@ -0,0 +1,120 @@ +@@ -0,0 +1,119 @@ +/* + * This file is part of eyeo Chromium SDK, + * Copyright (C) 2006-present eyeo GmbH @@ -16569,7 +16548,6 @@ new file mode 100644 +#include "base/functional/bind.h" +#include "base/logging.h" +#include "base/memory/scoped_refptr.h" -+#include "base/ranges/algorithm.h" +#include "base/strings/pattern.h" +#include "base/trace_event/trace_event.h" +#include "components/adblock/core/common/adblock_utils.h" @@ -17185,7 +17163,7 @@ diff --git a/components/adblock/core/subscription/subscription_collection_impl.c new file mode 100644 --- /dev/null +++ b/components/adblock/core/subscription/subscription_collection_impl.cc -@@ -0,0 +1,353 @@ +@@ -0,0 +1,352 @@ +/* + * This file is part of eyeo Chromium SDK, + * Copyright (C) 2006-present eyeo GmbH @@ -17210,7 +17188,6 @@ new file mode 100644 +#include +#include + -+#include "base/ranges/algorithm.h" +#include "components/adblock/core/common/adblock_utils.h" + +namespace adblock { @@ -17480,7 +17457,7 @@ new file mode 100644 + + // Last chance to avoid blocking: maybe there is a Genericblock filter and + // we should re-search for domain-specific filters only? -+ if (base::ranges::any_of(subscriptions_, [&](const auto& sub) { ++ if (std::ranges::any_of(subscriptions_, [&](const auto& sub) { + return HasSpecialFilter(sub, SpecialFilterType::Genericblock, + request_url, frame_hierarchy, SiteKey()); + })) { @@ -18184,7 +18161,7 @@ diff --git a/components/adblock/core/subscription/subscription_downloader_impl.c new file mode 100644 --- /dev/null +++ b/components/adblock/core/subscription/subscription_downloader_impl.cc -@@ -0,0 +1,288 @@ +@@ -0,0 +1,287 @@ +/* + * This file is part of eyeo Chromium SDK, + * Copyright (C) 2006-present eyeo GmbH @@ -18211,7 +18188,6 @@ new file mode 100644 + +#include "base/files/file_path.h" +#include "base/functional/bind.h" -+#include "base/ranges/algorithm.h" +#include "base/strings/escape.h" +#include "base/strings/strcat.h" +#include "base/strings/string_number_conversions.h" @@ -19393,7 +19369,7 @@ diff --git a/components/adblock/core/subscription/subscription_service_impl.cc b new file mode 100644 --- /dev/null +++ b/components/adblock/core/subscription/subscription_service_impl.cc -@@ -0,0 +1,211 @@ +@@ -0,0 +1,210 @@ +/* + * This file is part of eyeo Chromium SDK, + * Copyright (C) 2006-present eyeo GmbH @@ -19423,7 +19399,6 @@ new file mode 100644 +#include "base/memory/scoped_refptr.h" +#include "base/memory/weak_ptr.h" +#include "base/parameter_pack.h" -+#include "base/ranges/algorithm.h" +#include "base/trace_event/common/trace_event_common.h" +#include "base/trace_event/trace_event.h" +#include "components/adblock/core/common/adblock_constants.h" @@ -19473,7 +19448,7 @@ new file mode 100644 +SubscriptionServiceImpl::GetCurrentSubscriptions( + FilteringConfiguration* configuration) const { + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -+ auto it = base::ranges::find_if(maintainers_, [&](const auto& entry) { ++ auto it = std::ranges::find_if(maintainers_, [&](const auto& entry) { + return entry.first.get() == configuration; + }); + DCHECK(it != maintainers_.end()) << "Cannot get Subscriptions from an " @@ -19482,7 +19457,7 @@ new file mode 100644 + // Configuration is disabled + auto urls = it->first->GetFilterLists(); + std::vector> result; -+ base::ranges::transform( ++ std::ranges::transform( + urls, std::back_inserter(result), [](const auto& url) { + return base::MakeRefCounted(url); + }); @@ -19515,7 +19490,7 @@ new file mode 100644 + const std::string& configuration_name) { + VLOG(1) << "[eyeo] FilteringConfiguration uninstalled: " + << configuration_name; -+ auto it = base::ranges::find_if(maintainers_, [&](const auto& entry) { ++ auto it = std::ranges::find_if(maintainers_, [&](const auto& entry) { + return entry.first.get()->GetName() == configuration_name; + }); + if (it == maintainers_.end()) { @@ -19532,14 +19507,14 @@ new file mode 100644 +std::vector +SubscriptionServiceImpl::GetInstalledFilteringConfigurations() { + std::vector result; -+ base::ranges::transform(maintainers_, std::back_inserter(result), ++ std::ranges::transform(maintainers_, std::back_inserter(result), + [](const auto& pair) { return pair.first.get(); }); + return result; +} + +FilteringConfiguration* +SubscriptionServiceImpl::GetAdblockFilteringConfiguration() const { -+ const auto it = base::ranges::find_if(maintainers_, [](const auto& pair) { ++ const auto it = std::ranges::find_if(maintainers_, [](const auto& pair) { + return pair.first->GetName() == kAdblockFilteringConfigurationName; + }); + DCHECK(it != maintainers_.end()); @@ -19569,7 +19544,7 @@ new file mode 100644 + +void SubscriptionServiceImpl::OnEnabledStateChanged( + FilteringConfiguration* config) { -+ auto it = base::ranges::find_if(maintainers_, [&](const auto& entry) { ++ auto it = std::ranges::find_if(maintainers_, [&](const auto& entry) { + return entry.first.get() == config; + }); + DCHECK(it != maintainers_.end()) << "Received OnEnabledStateChanged from " @@ -20149,7 +20124,7 @@ diff --git a/components/adblock/core/subscription/url_keyword_extractor.cc b/com new file mode 100644 --- /dev/null +++ b/components/adblock/core/subscription/url_keyword_extractor.cc -@@ -0,0 +1,67 @@ +@@ -0,0 +1,66 @@ +/* + * This file is part of eyeo Chromium SDK, + * Copyright (C) 2006-present eyeo GmbH @@ -20172,7 +20147,6 @@ new file mode 100644 +#include +#include + -+#include "base/ranges/algorithm.h" +#include "base/strings/string_util.h" +#include "components/adblock/core/common/keyword_extractor_utils.h" + @@ -20210,7 +20184,7 @@ new file mode 100644 + // null-terminated. + // This isn't elegant, but it's a valid workaround for the limitations of + // the flatbuffers generated API. -+ base::ranges::replace_if(url_with_nulls_, &IsSeparatorCharacter, '\0'); ++ std::ranges::replace_if(url_with_nulls_, &IsSeparatorCharacter, '\0'); + input_ = url_with_nulls_; +} + @@ -31341,7 +31315,7 @@ new file mode 100644 diff --git a/components/resources/BUILD.gn b/components/resources/BUILD.gn --- a/components/resources/BUILD.gn +++ b/components/resources/BUILD.gn -@@ -88,6 +88,11 @@ grit("components_resources") { +@@ -97,6 +97,11 @@ grit("components_resources") { if (is_android && safe_browsing_mode == 2) { deps += [ "//components/safe_browsing/content/resources/real_time_url_checks_allowlist:make_real_time_url_allowlist_protobuf" ] } @@ -52297,7 +52271,7 @@ diff --git a/content/browser/loader/navigation_url_loader_impl.cc b/content/brow #include "content/browser/loader/navigation_url_loader_impl.h" #include -@@ -1190,7 +1194,7 @@ void NavigationURLLoaderImpl::OnReceiveRedirect( +@@ -1208,7 +1212,7 @@ void NavigationURLLoaderImpl::OnReceiveRedirect( LogQueueTimeHistogram("Navigation.QueueTime.OnReceiveRedirect", resource_request_->is_outermost_main_frame); net::Error error = net::OK; @@ -52320,7 +52294,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" -@@ -3169,6 +3173,12 @@ void RenderFrameHostImpl::ExecuteJavaScriptMethod( +@@ -3458,6 +3462,12 @@ void RenderFrameHostImpl::ExecuteJavaScriptMethod( std::move(callback)); } @@ -52347,7 +52321,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_ -@@ -482,6 +486,10 @@ class CONTENT_EXPORT RenderFrameHostImpl +@@ -494,6 +498,10 @@ class CONTENT_EXPORT RenderFrameHostImpl const std::u16string& method_name, base::Value::List arguments, JavaScriptResultCallback callback) override; @@ -52372,7 +52346,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_ -@@ -540,6 +544,9 @@ class CONTENT_EXPORT RenderFrameHost : public IPC::Listener, +@@ -551,6 +555,9 @@ class CONTENT_EXPORT RenderFrameHost : public IPC::Listener, virtual void AddMessageToConsole(blink::mojom::ConsoleMessageLevel level, const std::string& message) = 0; @@ -52421,7 +52395,7 @@ diff --git a/extensions/browser/api/web_request/web_request_proxying_url_loader_ #include "extensions/browser/api/web_request/web_request_proxying_url_loader_factory.h" #include -@@ -469,6 +473,7 @@ void WebRequestProxyingURLLoaderFactory::InProgressRequest::OnReceiveRedirect( +@@ -453,6 +457,7 @@ void WebRequestProxyingURLLoaderFactory::InProgressRequest::OnReceiveRedirect( TRACE_EVENT_FLAG_FLOW_IN | TRACE_EVENT_FLAG_FLOW_OUT); if (redirect_url_ != redirect_info.new_url && @@ -52515,7 +52489,7 @@ diff --git a/third_party/blink/public/web/web_document.h b/third_party/blink/pub #ifndef THIRD_PARTY_BLINK_PUBLIC_WEB_WEB_DOCUMENT_H_ #define THIRD_PARTY_BLINK_PUBLIC_WEB_WEB_DOCUMENT_H_ -@@ -142,6 +146,14 @@ class BLINK_EXPORT WebDocument : public WebNode { +@@ -143,6 +147,14 @@ class BLINK_EXPORT WebDocument : public WebNode { WebCssOrigin = WebCssOrigin::kAuthor, BackForwardCacheAware = BackForwardCacheAware::kAllow); @@ -52533,18 +52507,7 @@ diff --git a/third_party/blink/public/web/web_document.h b/third_party/blink/pub diff --git a/third_party/blink/renderer/core/exported/web_document.cc b/third_party/blink/renderer/core/exported/web_document.cc --- a/third_party/blink/renderer/core/exported/web_document.cc +++ b/third_party/blink/renderer/core/exported/web_document.cc -@@ -28,6 +28,10 @@ - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -+// This source code is a part of eyeo Chromium SDK. -+// Use of this source code is governed by the GPLv3 that can be found in the -+// components/adblock/LICENSE file. -+ - #include "third_party/blink/public/web/web_document.h" - - #include "base/memory/scoped_refptr.h" -@@ -267,6 +271,54 @@ WebStyleSheetKey WebDocument::InsertStyleSheet( +@@ -266,6 +266,54 @@ WebStyleSheetKey WebDocument::InsertStyleSheet( return injection_key; } @@ -53111,7 +53074,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 -@@ -1421,7 +1425,12 @@ +@@ -1469,7 +1473,12 @@ "<(SHARED_INTERMEDIATE_DIR)/third_party/blink/public/strings/permission_element_generated_strings.grd": { "META": {"sizes": {"messages": [2000],}}, "messages": [10080], diff --git a/build/cromite_patches/eyeo-beta-118.0.5993.48-chrome_integration.patch b/build/cromite_patches/eyeo-beta-118.0.5993.48-chrome_integration.patch index 2740c95f592d32c71f133c0b479dcfd440bb4c9d..295e778000453779a4ef4cb91cbb90783927f809 100644 --- a/build/cromite_patches/eyeo-beta-118.0.5993.48-chrome_integration.patch +++ b/build/cromite_patches/eyeo-beta-118.0.5993.48-chrome_integration.patch @@ -9,7 +9,7 @@ Pre-requisites: eyeo Browser Ad filtering Solution: Base Module chrome/app/chrome_main_delegate.cc | 7 +- chrome/browser/BUILD.gn | 26 ++ chrome/browser/adblock/README.md | 3 + - .../adblock/adblock_content_browser_client.cc | 320 ++++++++++++++++++ + .../adblock/adblock_content_browser_client.cc | 319 ++++++++++++++++++ .../adblock/adblock_content_browser_client.h | 101 ++++++ ...adblock_content_browser_client_unittest.cc | 203 +++++++++++ .../adblock/adblock_controller_factory.cc | 67 ++++ @@ -54,7 +54,7 @@ Pre-requisites: eyeo Browser Ad filtering Solution: Base Module chrome/common/BUILD.gn | 3 + chrome/common/webui_url_constants.cc | 4 + chrome/common/webui_url_constants.h | 5 + - 48 files changed, 2299 insertions(+), 2 deletions(-) + 48 files changed, 2298 insertions(+), 2 deletions(-) create mode 100644 chrome/browser/adblock/README.md create mode 100644 chrome/browser/adblock/adblock_content_browser_client.cc create mode 100644 chrome/browser/adblock/adblock_content_browser_client.h @@ -103,14 +103,14 @@ diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegat #ifdef UNSAFE_BUFFERS_BUILD // TODO(crbug.com/40285824): Remove this and convert code to safer constructs. @@ -42,6 +46,7 @@ + #include "base/timer/timer.h" #include "base/trace_event/trace_event_impl.h" #include "build/build_config.h" - #include "build/chromeos_buildflags.h" +#include "chrome/browser/adblock/adblock_content_browser_client.h" #include "chrome/browser/buildflags.h" #include "chrome/browser/chrome_content_browser_client.h" #include "chrome/browser/chrome_resource_bundle_helper.h" -@@ -1749,7 +1754,7 @@ content::ContentClient* ChromeMainDelegate::CreateContentClient() { +@@ -1619,7 +1624,7 @@ content::ContentClient* ChromeMainDelegate::CreateContentClient() { content::ContentBrowserClient* ChromeMainDelegate::CreateContentBrowserClient() { chrome_content_browser_client_ = @@ -132,7 +132,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn import("//base/allocator/allocator.gni") import("//build/buildflag_header.gni") -@@ -161,6 +164,26 @@ static_library("browser") { +@@ -170,6 +173,26 @@ static_library("browser") { "accessibility/prefers_default_scrollbar_styles_prefs.h", "affiliations/affiliation_service_factory.cc", "affiliations/affiliation_service_factory.h", @@ -159,7 +159,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "after_startup_task_utils.cc", "after_startup_task_utils.h", "app_mode/app_mode_utils.cc", -@@ -1970,6 +1993,9 @@ static_library("browser") { +@@ -2005,6 +2028,9 @@ static_library("browser") { "//chrome/common/notifications", "//chrome/installer/util:with_no_strings", "//chrome/services/speech/buildflags", @@ -181,7 +181,7 @@ diff --git a/chrome/browser/adblock/adblock_content_browser_client.cc b/chrome/b new file mode 100644 --- /dev/null +++ b/chrome/browser/adblock/adblock_content_browser_client.cc -@@ -0,0 +1,320 @@ +@@ -0,0 +1,319 @@ +/* + * This file is part of eyeo Chromium SDK, + * Copyright (C) 2006-present eyeo GmbH @@ -202,7 +202,6 @@ new file mode 100644 +#include "chrome/browser/adblock/adblock_content_browser_client.h" + +#include "base/containers/unique_ptr_adapters.h" -+#include "base/ranges/algorithm.h" +#include "chrome/browser/adblock/content_security_policy_injector_factory.h" +#include "chrome/browser/adblock/element_hider_factory.h" +#include "chrome/browser/adblock/resource_classification_runner_factory.h" @@ -2030,7 +2029,7 @@ diff --git a/chrome/browser/chrome_browser_interface_binders.cc b/chrome/browser #include "chrome/browser/ui/webui/browsing_topics/browsing_topics_internals_ui.h" #include "chrome/browser/ui/webui/chrome_urls/chrome_urls_ui.h" #include "chrome/browser/ui/webui/data_sharing_internals/data_sharing_internals_ui.h" -@@ -933,6 +938,10 @@ void PopulateChromeWebUIFrameBinders( +@@ -881,6 +886,10 @@ void PopulateChromeWebUIFrameBinders( media::mojom::MediaEngagementScoreDetailsProvider, MediaEngagementUI>( map); @@ -2075,9 +2074,9 @@ diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browse +// Use of this source code is governed by the GPLv3 that can be found in the +// components/adblock/LICENSE file. - #ifdef UNSAFE_BUFFERS_BUILD - // TODO(crbug.com/40285824): Remove this and convert code to safer constructs. -@@ -48,6 +52,7 @@ + #include "chrome/browser/prefs/chrome_pref_service_factory.h" + +@@ -45,6 +49,7 @@ #include "chrome/grit/branded_strings.h" #include "chrome/grit/browser_resources.h" #include "chrome/grit/generated_resources.h" @@ -2085,7 +2084,7 @@ diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browse #include "components/component_updater/pref_names.h" #include "components/policy/core/browser/configuration_policy_pref_store.h" #include "components/pref_registry/pref_registry_syncable.h" -@@ -195,6 +200,12 @@ const prefs::TrackedPreferenceMetadata kTrackedPrefs[] = { +@@ -192,6 +197,12 @@ const auto kTrackedPrefs = std::to_array({ {35, prefs::kExtensionsUIDeveloperMode, EnforcementLevel::ENFORCE_ON_LOAD, PrefTrackingStrategy::ATOMIC, ValueType::IMPERSONAL}, #endif @@ -2128,7 +2127,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" #include "chrome/browser/autocomplete/document_suggestions_service_factory.h" #include "chrome/browser/autocomplete/in_memory_url_index_factory.h" -@@ -290,6 +303,8 @@ +@@ -296,6 +309,8 @@ #include "chrome/browser/signin/signin_manager_android_factory.h" #include "components/commerce/core/commerce_feature_list.h" #include "components/commerce/core/proto/merchant_signal_db_content.pb.h" @@ -2137,7 +2136,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc #else #include "chrome/browser/accessibility/live_caption/live_caption_controller_factory.h" #include "chrome/browser/accessibility/live_translate_controller_factory.h" -@@ -876,8 +891,19 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -885,8 +900,19 @@ void ChromeBrowserMainExtraPartsProfiles:: // Makes manual testing possible. FakeSmartCardDeviceServiceFactory::GetInstance(); #endif @@ -2170,7 +2169,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") -@@ -250,6 +253,7 @@ if (!is_android) { +@@ -253,6 +256,7 @@ if (!is_android) { group("dev_ui_resources") { public_deps = [ "accessibility:resources", @@ -2178,7 +2177,7 @@ diff --git a/chrome/browser/resources/BUILD.gn b/chrome/browser/resources/BUILD. "bluetooth_internals:resources", "browsing_topics:resources", "components:resources", -@@ -317,6 +321,7 @@ repack("dev_ui_paks") { +@@ -318,6 +322,7 @@ repack("dev_ui_paks") { sources = [ "$root_gen_dir/chrome/accessibility_resources.pak", @@ -2379,8 +2378,8 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn + import("//build/config/buildflags_paint_preview.gni") - import("//build/config/chromeos/ui_mode.gni") -@@ -152,6 +156,10 @@ static_library("ui") { + import("//build/config/compiler/compiler.gni") +@@ -146,6 +150,10 @@ static_library("ui") { "webui/about/about_ui.h", "webui/accessibility/accessibility_ui.cc", "webui/accessibility/accessibility_ui.h", @@ -2391,7 +2390,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn "webui/autofill_and_password_manager_internals/autofill_internals_ui.cc", "webui/autofill_and_password_manager_internals/autofill_internals_ui.h", "webui/autofill_and_password_manager_internals/internals_ui_handler.cc", -@@ -386,6 +394,7 @@ static_library("ui") { +@@ -382,6 +390,7 @@ static_library("ui") { "//chrome/browser/signin", "//chrome/browser/signin:identity_manager_provider", "//chrome/browser/signin:impl", @@ -2399,7 +2398,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn "//chrome/browser/storage_access_api", "//chrome/browser/sync", "//chrome/browser/task_manager:impl", -@@ -435,6 +444,7 @@ static_library("ui") { +@@ -430,6 +439,7 @@ static_library("ui") { "//components/access_code_cast/common:metrics", "//components/account_id", "//components/affiliations/core/browser:affiliations", @@ -2410,7 +2409,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn diff --git a/chrome/browser/ui/prefs/pref_watcher.cc b/chrome/browser/ui/prefs/pref_watcher.cc --- a/chrome/browser/ui/prefs/pref_watcher.cc +++ b/chrome/browser/ui/prefs/pref_watcher.cc -@@ -23,6 +23,7 @@ +@@ -22,6 +22,7 @@ #include "chrome/browser/ui/prefs/prefs_tab_helper.h" #include "chrome/common/pref_names.h" #include "components/keyed_service/core/keyed_service.h" @@ -2418,7 +2417,7 @@ diff --git a/chrome/browser/ui/prefs/pref_watcher.cc b/chrome/browser/ui/prefs/p #include "components/language/core/browser/pref_names.h" #include "components/live_caption/pref_names.h" #include "components/prefs/pref_change_registrar.h" -@@ -83,6 +84,13 @@ const char* const kWebPrefsToObserve[] = { +@@ -82,6 +83,13 @@ const char* const kWebPrefsToObserve[] = { prefs::kAccessibilityFocusHighlightEnabled, #endif prefs::kPageColorsBlockList, @@ -2446,17 +2445,17 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc #include "chrome/browser/ui/tab_helpers.h" -@@ -14,6 +18,9 @@ +@@ -13,6 +17,9 @@ + #include "base/time/default_tick_clock.h" #include "base/trace_event/trace_event.h" #include "build/build_config.h" - #include "build/chromeos_buildflags.h" +#include "chrome/browser/adblock/element_hider_factory.h" +#include "chrome/browser/adblock/sitekey_storage_factory.h" +#include "chrome/browser/adblock/subscription_service_factory.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/breadcrumbs/breadcrumb_manager_tab_helper.h" #include "chrome/browser/browser_process.h" -@@ -112,6 +119,7 @@ +@@ -111,6 +118,7 @@ #include "chrome/common/chrome_features.h" #include "chrome/common/chrome_isolated_world_ids.h" #include "chrome/common/chrome_switches.h" @@ -2464,7 +2463,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" -@@ -341,6 +349,16 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { +@@ -332,6 +340,16 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { optimization_guide_decider); } } @@ -2836,7 +2835,7 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_configs.cc b/chrome/browser/u #include "chrome/browser/ui/webui/proxy_config_ui.h" #if BUILDFLAG(IS_ANDROID) -@@ -419,4 +421,5 @@ void RegisterChromeWebUIConfigs() { +@@ -406,4 +408,5 @@ void RegisterChromeWebUIConfigs() { #if BUILDFLAG(IS_ANDROID) map.AddWebUIConfig(std::make_unique()); #endif // BUILDFLAG(IS_ANDROID) diff --git a/build/cromite_patches/eyeo-beta-118.0.5993.48-extension_api.patch b/build/cromite_patches/eyeo-beta-118.0.5993.48-extension_api.patch index d79e4159d8380669201752d87f62ca31f27911ec..20e488415e8c7b40251b28364243a391ef3655be 100644 --- a/build/cromite_patches/eyeo-beta-118.0.5993.48-extension_api.patch +++ b/build/cromite_patches/eyeo-beta-118.0.5993.48-extension_api.patch @@ -55,7 +55,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") -@@ -95,6 +99,8 @@ source_set("extensions") { +@@ -109,6 +113,8 @@ source_set("extensions") { # here. "api/automation_internal/chrome_automation_internal_api_delegate.cc", "api/automation_internal/chrome_automation_internal_api_delegate.h", @@ -64,7 +64,7 @@ diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUIL "api/bookmark_manager_private/bookmark_manager_private_api.cc", "api/bookmark_manager_private/bookmark_manager_private_api.h", "api/bookmarks/bookmark_api_helpers.cc", -@@ -150,6 +156,8 @@ source_set("extensions") { +@@ -158,6 +164,8 @@ source_set("extensions") { "api/enterprise_reporting_private/conversion_utils.h", "api/enterprise_reporting_private/enterprise_reporting_private_api.cc", "api/enterprise_reporting_private/enterprise_reporting_private_api.h", @@ -73,7 +73,7 @@ diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUIL "api/feedback_private/chrome_feedback_private_delegate.cc", "api/feedback_private/chrome_feedback_private_delegate.h", "api/file_system/chrome_file_system_delegate.cc", -@@ -795,6 +803,7 @@ source_set("extensions") { +@@ -792,6 +800,7 @@ source_set("extensions") { "//chrome/browser/ui/safety_hub", "//chrome/browser/ui/tabs:tab_enums", "//chrome/browser/web_applications", @@ -95,7 +95,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") -@@ -135,6 +139,7 @@ function_registration("api_registration") { +@@ -134,6 +138,7 @@ function_registration("api_registration") { # include generated headers from these targets. # TODO(brettw) this should be made unnecessary if possible. "//chrome/common/extensions/api", @@ -535,7 +535,7 @@ new file mode 100644 + << "adblock_private expects \"adblock\" configuration"; + return RespondNow(ArgumentList( + api::adblock_private::IsAcceptableAdsEnabled::Results::Create( -+ base::ranges::any_of(adblock_configuration->GetFilterLists(), ++ std::ranges::any_of(adblock_configuration->GetFilterLists(), + [&](const auto& url) { + return url == adblock::AcceptableAdsUrl(); + })))); @@ -2133,7 +2133,7 @@ diff --git a/chrome/browser/extensions/api/api_browser_context_keyed_service_fac #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" -@@ -80,6 +86,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt() { +@@ -76,6 +82,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt() { #if BUILDFLAG(ENABLE_EXTENSIONS) extensions::ActivityLogAPI::GetFactoryInstance(); @@ -2141,7 +2141,7 @@ diff --git a/chrome/browser/extensions/api/api_browser_context_keyed_service_fac extensions::AutofillPrivateEventRouterFactory::GetInstance(); extensions::BluetoothLowEnergyAPI::GetFactoryInstance(); extensions::BookmarksAPI::GetFactoryInstance(); -@@ -91,6 +98,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt() { +@@ -87,6 +94,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt() { #if BUILDFLAG(IS_CHROMEOS) extensions::DocumentScanAPIHandler::GetFactoryInstance(); #endif @@ -2209,7 +2209,7 @@ new file mode 100644 + const auto installed_configurations = + subscription_service->GetInstalledFilteringConfigurations(); + auto configuration_it = -+ base::ranges::find(installed_configurations, config_name, ++ std::ranges::find(installed_configurations, config_name, + &adblock::FilteringConfiguration::GetName); + return configuration_it != installed_configurations.end() ? *configuration_it + : nullptr; @@ -2560,7 +2560,7 @@ new file mode 100644 + const auto installed_configurations = + subscription_service->GetInstalledFilteringConfigurations(); + auto configuration_it = -+ base::ranges::find(installed_configurations, params->config_name, ++ std::ranges::find(installed_configurations, params->config_name, + &adblock::FilteringConfiguration::GetName); + if (configuration_it == installed_configurations.end()) { + auto new_filtering_configuration = @@ -2593,7 +2593,7 @@ new file mode 100644 + const auto installed_configurations = + subscription_service->GetInstalledFilteringConfigurations(); + auto configuration_it = -+ base::ranges::find(installed_configurations, params->config_name, ++ std::ranges::find(installed_configurations, params->config_name, + &adblock::FilteringConfiguration::GetName); + if (configuration_it != installed_configurations.end()) { + subscription_service->UninstallFilteringConfiguration( @@ -2616,7 +2616,7 @@ new file mode 100644 + const auto installed_configurations = + subscription_service->GetInstalledFilteringConfigurations(); + std::vector configurations; -+ base::ranges::transform(installed_configurations, ++ std::ranges::transform(installed_configurations, + std::back_inserter(configurations), + [](adblock::FilteringConfiguration* config) { + return config->GetName(); @@ -3479,7 +3479,7 @@ diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chro #include "components/autofill/core/common/autofill_prefs.h" #include "components/bookmarks/common/bookmark_pref_names.h" #include "components/browsing_data/core/pref_names.h" -@@ -177,6 +182,20 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() { +@@ -175,6 +180,20 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() { } s_allowlist = new PrefsUtil::TypedPrefMap(); @@ -4120,15 +4120,15 @@ diff --git a/extensions/common/mojom/api_permission_id.mojom b/extensions/common diff --git a/tools/metrics/histograms/metadata/extensions/enums.xml b/tools/metrics/histograms/metadata/extensions/enums.xml --- a/tools/metrics/histograms/metadata/extensions/enums.xml +++ b/tools/metrics/histograms/metadata/extensions/enums.xml -@@ -764,6 +764,7 @@ Called by update_extension_histograms.py.--> - +@@ -766,6 +766,7 @@ Called by update_extension_histograms.py.--> -+ + ++ -@@ -3170,6 +3171,8 @@ Called by update_extension_permission.py.--> +@@ -3176,6 +3177,8 @@ Called by update_extension_permission.py.--> diff --git a/build/cromite_patches/kill-Auth.patch b/build/cromite_patches/kill-Auth.patch index d82ef7230ca0be23d327732ed8cc3eb3ed3574d6..cac3ae1481c8215336f98d8d16363e710373137f 100644 --- a/build/cromite_patches/kill-Auth.patch +++ b/build/cromite_patches/kill-Auth.patch @@ -4,8 +4,8 @@ Subject: kill Auth License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - .../signin/SystemAccountManagerDelegate.java | 63 +------------------ - 1 file changed, 3 insertions(+), 60 deletions(-) + .../signin/SystemAccountManagerDelegate.java | 65 +------------------ + 1 file changed, 3 insertions(+), 62 deletions(-) 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 @@ -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; -@@ -87,18 +84,6 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { +@@ -88,18 +85,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[] {}; -@@ -109,31 +94,12 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { +@@ -110,31 +95,12 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { throws AuthException { ThreadUtils.assertOnBackgroundThread(); assert AccountUtils.GOOGLE_ACCOUNT_TYPE.equals(account.type); @@ -73,7 +73,7 @@ diff --git a/components/signin/public/android/java/src/org/chromium/components/s } protected boolean hasFeatures(Account account, String[] features) { -@@ -165,24 +131,6 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { +@@ -166,24 +132,6 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { @SuppressLint("MissingPermission") @Override public void createAddAccountIntent(Callback callback) { @@ -98,12 +98,14 @@ 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 -@@ -217,12 +165,7 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { +@@ -218,14 +166,7 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { @Nullable @Override - public String getAccountGaiaId(String accountEmail) { + public GaiaId getAccountGaiaId(String accountEmail) { - try { -- return GoogleAuthUtil.getAccountId(ContextUtils.getApplicationContext(), accountEmail); +- return new GaiaId( +- GoogleAuthUtil.getAccountId( +- ContextUtils.getApplicationContext(), accountEmail)); - } catch (IOException | GoogleAuthException ex) { - Log.e(TAG, "SystemAccountManagerDelegate.getAccountGaiaId", ex); - return null; diff --git a/build/cromite_patches/sharing-hub-always-use-visible-URL.patch b/build/cromite_patches/sharing-hub-always-use-visible-URL.patch index b90076d75d33cfcf5c194bd2b4ebc64800caad6d..2912beb0a70338b18b5dc9070d244d4d3f4d0d69 100644 --- a/build/cromite_patches/sharing-hub-always-use-visible-URL.patch +++ b/build/cromite_patches/sharing-hub-always-use-visible-URL.patch @@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/ShareDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/share/ShareDelegateImpl.java --- a/chrome/android/java/src/org/chromium/chrome/browser/share/ShareDelegateImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/share/ShareDelegateImpl.java -@@ -223,14 +223,8 @@ public class ShareDelegateImpl implements ShareDelegate { +@@ -230,14 +230,8 @@ public class ShareDelegateImpl implements ShareDelegate { @VisibleForTesting static boolean shouldFetchCanonicalUrl(final Tab currentTab) { diff --git a/build/cromite_patches/ungoogled-chromium-Disable-profile-avatar.patch b/build/cromite_patches/ungoogled-chromium-Disable-profile-avatar.patch index d75a48d8829b306789aca9f55e9280319418165a..1c27d3a9415a3fe747617432a779752e11fc6010 100644 --- a/build/cromite_patches/ungoogled-chromium-Disable-profile-avatar.patch +++ b/build/cromite_patches/ungoogled-chromium-Disable-profile-avatar.patch @@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -1255,8 +1255,6 @@ static_library("browser") { +@@ -1286,8 +1286,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", @@ -26,7 +26,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn diff --git a/chrome/browser/profiles/profile_attributes_entry.cc b/chrome/browser/profiles/profile_attributes_entry.cc --- a/chrome/browser/profiles/profile_attributes_entry.cc +++ b/chrome/browser/profiles/profile_attributes_entry.cc -@@ -364,12 +364,6 @@ gfx::Image ProfileAttributesEntry::GetAvatarIcon( +@@ -374,12 +374,6 @@ gfx::Image ProfileAttributesEntry::GetAvatarIcon( int size_for_placeholder_avatar, bool use_high_res_file, const PlaceholderAvatarIconParams& icon_params) const { @@ -42,7 +42,7 @@ diff --git a/chrome/browser/profiles/profile_attributes_entry.cc b/chrome/browse diff --git a/chrome/browser/profiles/profile_attributes_storage.cc b/chrome/browser/profiles/profile_attributes_storage.cc --- a/chrome/browser/profiles/profile_attributes_storage.cc +++ b/chrome/browser/profiles/profile_attributes_storage.cc -@@ -972,7 +972,7 @@ void ProfileAttributesStorage::DownloadHighResAvatarIfNeeded( +@@ -962,7 +962,7 @@ void ProfileAttributesStorage::DownloadHighResAvatarIfNeeded( void ProfileAttributesStorage::DownloadHighResAvatar( size_t icon_index, const base::FilePath& profile_path) { diff --git a/build/cromite_patches/ungoogled-chromium-Disable-translate-integration.patch b/build/cromite_patches/ungoogled-chromium-Disable-translate-integration.patch index ef77985408a002c3fe02e8c2895e63fc6aee00ef..15d26e99f063c0675d43c0dd34529b823fc49d9f 100644 --- a/build/cromite_patches/ungoogled-chromium-Disable-translate-integration.patch +++ b/build/cromite_patches/ungoogled-chromium-Disable-translate-integration.patch @@ -173,7 +173,7 @@ diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browse diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -2087,9 +2087,6 @@ Your Google account may have other forms of browsing history like searches and a +@@ -2059,9 +2059,6 @@ Your Google account may have other forms of browsing history like searches and a Let websites know the languages you speak. They’ll show content in those languages, when possible. diff --git a/build/cromite_patches/ungoogled-chromium-Disable-webRTC-log-uploader.patch b/build/cromite_patches/ungoogled-chromium-Disable-webRTC-log-uploader.patch index 69dc5cffce87a6462c9ff46ba2d134069ba9401d..ce8ec8604f098aae3850cdecf940d223052f175f 100644 --- a/build/cromite_patches/ungoogled-chromium-Disable-webRTC-log-uploader.patch +++ b/build/cromite_patches/ungoogled-chromium-Disable-webRTC-log-uploader.patch @@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc --- a/chrome/browser/ui/browser_ui_prefs.cc +++ b/chrome/browser/ui/browser_ui_prefs.cc -@@ -114,7 +114,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) { +@@ -113,7 +113,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) { registry->RegisterStringPref(prefs::kWebRTCUDPPortRange, std::string()); registry->RegisterBooleanPref(prefs::kWebRtcEventLogCollectionAllowed, false); registry->RegisterListPref(prefs::kWebRtcLocalIpsAllowedUrls); diff --git a/build/cromite_patches/ungoogled-chromium-no-special-hosts-domains.patch b/build/cromite_patches/ungoogled-chromium-no-special-hosts-domains.patch index 947cf7b16b81414391ba7debfa3221c8741cd184..d4caa215b73fc8e7a39aa3aa53709b7143fdfcd1 100644 --- a/build/cromite_patches/ungoogled-chromium-no-special-hosts-domains.patch +++ b/build/cromite_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 -@@ -100,7 +100,6 @@ import org.chromium.chrome.browser.messages.MessageContainerObserver; +@@ -104,7 +104,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; @@ -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 -@@ -860,10 +860,6 @@ static_library("browser") { +@@ -887,10 +887,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", -@@ -872,10 +868,6 @@ static_library("browser") { +@@ -899,10 +895,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", -@@ -1518,8 +1510,6 @@ static_library("browser") { +@@ -1548,8 +1540,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,17 +124,18 @@ 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", -@@ -1701,9 +1691,6 @@ static_library("browser") { - "//chrome/browser/commerce:impl", +@@ -1732,10 +1722,7 @@ static_library("browser") { + "//chrome/browser/content_settings:impl", "//chrome/browser/devtools", "//chrome/browser/favicon", - "//chrome/browser/feedback", - "//chrome/browser/feedback:feedback_impl", + "//chrome/browser/file_system_access:impl", - "//chrome/browser/google", + "//chrome/browser/ip_protection", "//chrome/browser/media/webrtc", "//chrome/browser/navigation_predictor:impl", - "//chrome/browser/file_system_access:impl", -@@ -1781,7 +1768,6 @@ static_library("browser") { +@@ -1814,7 +1801,6 @@ static_library("browser") { # New dependencies inside of //chrome/browser that generate header files # should be added to browser_generated_files. ":browser_public_dependencies", @@ -165,7 +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 -@@ -1211,7 +1211,6 @@ BrowserProcessImpl::component_updater() { +@@ -1231,7 +1231,6 @@ BrowserProcessImpl::component_updater() { std::make_unique(); std::string brand; @@ -203,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 -@@ -2959,7 +2959,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( +@@ -2967,7 +2967,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( switches::kForcePNaClSubzero, #endif switches::kForceUIDirection, @@ -211,7 +212,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch switches::kJavaScriptHarmony, switches::kEnableExperimentalWebAssemblyFeatures, embedder_support::kOriginTrialDisabledFeatures, -@@ -5338,9 +5337,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( +@@ -5356,9 +5355,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( &throttles); #endif @@ -219,9 +220,9 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch - SupervisedUserGoogleAuthNavigationThrottle::MaybeCreate(handle), - &throttles); - if (base::FeatureList::IsEnabled( - supervised_user::kClassifyUrlOnProcessResponseEvent)) { -@@ -5942,7 +5938,8 @@ GetClientDataHeader(content::FrameTreeNodeId frame_tree_node_id) { + MaybeAddThrottle( + supervised_user::MaybeCreateClassifyUrlNavigationThrottleFor(handle), +@@ -5963,7 +5959,8 @@ GetClientDataHeader(content::FrameTreeNodeId frame_tree_node_id) { } #endif @@ -231,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 -@@ -5982,7 +5979,7 @@ std::unique_ptr CreateGoogleURLLoaderThrottle( +@@ -6003,7 +6000,7 @@ std::unique_ptr CreateGoogleURLLoaderThrottle( std::move(bound_session_request_throttled_handler), #endif std::move(dynamic_params)); @@ -240,7 +241,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch std::vector> ChromeContentBrowserClient::CreateURLLoaderThrottles( -@@ -6039,15 +6036,6 @@ ChromeContentBrowserClient::CreateURLLoaderThrottles( +@@ -6060,15 +6057,6 @@ ChromeContentBrowserClient::CreateURLLoaderThrottles( GetClientDataHeader(frame_tree_node_id); #endif @@ -256,7 +257,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch { auto* factory = ProtocolHandlerRegistryFactory::GetForBrowserContext(browser_context); -@@ -6102,20 +6090,6 @@ ChromeContentBrowserClient::CreateURLLoaderThrottlesForKeepAlive( +@@ -6123,20 +6111,6 @@ ChromeContentBrowserClient::CreateURLLoaderThrottlesForKeepAlive( } #endif @@ -326,7 +327,7 @@ diff --git a/chrome/browser/domain_reliability/service_factory.cc b/chrome/brows diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn -@@ -783,7 +783,6 @@ source_set("extensions") { +@@ -780,7 +780,6 @@ source_set("extensions") { "//chrome/browser/devtools", "//chrome/browser/extensions:cws_item_service_proto", "//chrome/browser/favicon", @@ -348,15 +349,15 @@ diff --git a/chrome/browser/feedback/BUILD.gn b/chrome/browser/feedback/BUILD.gn diff --git a/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc b/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc --- a/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc +++ b/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc -@@ -122,7 +122,6 @@ constexpr char kOsVersionTag[] = "OS VERSION"; +@@ -124,7 +124,6 @@ constexpr char kOsVersionTag[] = "OS VERSION"; #if BUILDFLAG(IS_WIN) constexpr char kUsbKeyboardDetected[] = "usb_keyboard_detected"; constexpr char kIsEnrolledToDomain[] = "enrolled_to_domain"; -constexpr char kInstallerBrandCode[] = "installer_brand_code"; #if BUILDFLAG(GOOGLE_CHROME_BRANDING) - constexpr char kUpdateErrorCode[] = "update_error_code"; - constexpr char kUpdateHresult[] = "update_hresult"; -@@ -636,10 +635,6 @@ void ChromeInternalLogSource::PopulateEnrolledToDomain( + constexpr char kInstallResultCode[] = "install_result_code"; + constexpr char kInstallLocation[] = "install_location"; +@@ -656,10 +655,6 @@ void ChromeInternalLogSource::PopulateEnrolledToDomain( void ChromeInternalLogSource::PopulateInstallerBrandCode( SystemLogsResponse* response) { @@ -453,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 -@@ -602,7 +602,7 @@ ChromeMetricsServiceClient::GetNetworkTimeTracker() { +@@ -606,7 +606,7 @@ ChromeMetricsServiceClient::GetNetworkTimeTracker() { } bool ChromeMetricsServiceClient::GetBrand(std::string* brand_code) { @@ -583,7 +584,7 @@ diff --git a/chrome/browser/metrics/metrics_reporting_state.cc b/chrome/browser/ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc --- a/chrome/browser/net/system_network_context_manager.cc +++ b/chrome/browser/net/system_network_context_manager.cc -@@ -866,7 +866,6 @@ void SystemNetworkContextManager::AddSSLConfigToNetworkContextParams( +@@ -849,7 +849,6 @@ void SystemNetworkContextManager::AddSSLConfigToNetworkContextParams( void SystemNetworkContextManager::ConfigureDefaultNetworkContextParams( network::mojom::NetworkContextParams* network_context_params) { variations::UpdateCorsExemptHeaderForVariations(network_context_params); @@ -594,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 -@@ -316,10 +316,11 @@ bool OneGoogleBarLoaderImpl::SetAdditionalQueryParams( +@@ -327,10 +327,11 @@ bool OneGoogleBarLoaderImpl::SetAdditionalQueryParams( } GURL OneGoogleBarLoaderImpl::GetApiUrl() const { @@ -610,7 +611,7 @@ diff --git a/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_im diff --git a/chrome/browser/new_tab_page/promos/promo_service.cc b/chrome/browser/new_tab_page/promos/promo_service.cc --- a/chrome/browser/new_tab_page/promos/promo_service.cc +++ b/chrome/browser/new_tab_page/promos/promo_service.cc -@@ -80,11 +80,7 @@ bool CanBlockPromos() { +@@ -85,11 +85,7 @@ bool CanBlockPromos() { } GURL GetGoogleBaseUrl() { @@ -638,7 +639,7 @@ diff --git a/chrome/browser/page_load_metrics/observers/from_gws_page_load_metri diff --git a/chrome/browser/page_load_metrics/page_load_metrics_initialize.cc b/chrome/browser/page_load_metrics/page_load_metrics_initialize.cc --- a/chrome/browser/page_load_metrics/page_load_metrics_initialize.cc +++ b/chrome/browser/page_load_metrics/page_load_metrics_initialize.cc -@@ -165,12 +165,7 @@ void PageLoadMetricsEmbedder::RegisterObservers( +@@ -166,12 +166,7 @@ void PageLoadMetricsEmbedder::RegisterObservers( tracker->AddObserver(std::make_unique()); tracker->AddObserver(std::make_unique()); tracker->AddObserver(std::make_unique()); @@ -665,7 +666,7 @@ diff --git a/chrome/browser/profile_resetter/BUILD.gn b/chrome/browser/profile_r diff --git a/chrome/browser/profile_resetter/profile_resetter.cc b/chrome/browser/profile_resetter/profile_resetter.cc --- a/chrome/browser/profile_resetter/profile_resetter.cc +++ b/chrome/browser/profile_resetter/profile_resetter.cc -@@ -104,8 +104,7 @@ ProfileResetter::ProfileResetter(Profile* profile) +@@ -100,8 +100,7 @@ ProfileResetter::ProfileResetter(Profile* profile) DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); DCHECK(profile_); @@ -678,7 +679,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 -@@ -26,7 +26,6 @@ static_library("safe_browsing") { +@@ -27,7 +27,6 @@ static_library("safe_browsing") { "//build:branding_buildflags", "//chrome/app:generated_resources", "//chrome/browser:browser_process", @@ -736,7 +737,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 -@@ -356,7 +356,6 @@ static_library("ui") { +@@ -352,7 +352,6 @@ static_library("ui") { "//chrome/browser/feedback:feedback_impl", "//chrome/browser/file_system_access", "//chrome/browser/fingerprinting_protection", @@ -759,7 +760,7 @@ diff --git a/chrome/browser/ui/android/omnibox/BUILD.gn b/chrome/browser/ui/andr 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 -@@ -33,7 +33,6 @@ import org.chromium.chrome.browser.locale.LocaleManager; +@@ -32,7 +32,6 @@ import org.chromium.chrome.browser.locale.LocaleManager; import org.chromium.chrome.browser.merchant_viewer.MerchantTrustSignalsCoordinator; import org.chromium.chrome.browser.omnibox.LocationBarMediator.OmniboxUma; import org.chromium.chrome.browser.omnibox.LocationBarMediator.SaveOfflineButtonState; @@ -767,7 +768,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow import org.chromium.chrome.browser.omnibox.status.StatusCoordinator; import org.chromium.chrome.browser.omnibox.status.StatusCoordinator.PageInfoAction; import org.chromium.chrome.browser.omnibox.status.StatusView; -@@ -395,7 +394,6 @@ public class LocationBarCoordinator +@@ -380,7 +379,6 @@ public class LocationBarCoordinator mLocationBarMediator.destroy(); mLocationBarMediator = null; @@ -778,7 +779,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java -@@ -50,7 +50,6 @@ import org.chromium.chrome.browser.lifecycle.PauseResumeWithNativeObserver; +@@ -52,7 +52,6 @@ import org.chromium.chrome.browser.lifecycle.PauseResumeWithNativeObserver; import org.chromium.chrome.browser.locale.LocaleManager; import org.chromium.chrome.browser.omnibox.UrlBar.UrlBarDelegate; import org.chromium.chrome.browser.omnibox.UrlBarCoordinator.SelectionState; @@ -786,7 +787,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow import org.chromium.chrome.browser.omnibox.status.StatusCoordinator; import org.chromium.chrome.browser.omnibox.styles.OmniboxResourceProvider; import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteCoordinator; -@@ -307,24 +306,6 @@ class LocationBarMediator +@@ -312,24 +311,6 @@ class LocationBarMediator if (!mUrlFocusedWithoutAnimations) handleUrlFocusAnimation(hasFocus); @@ -811,7 +812,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow if (!hasFocus && mLocationBarDataProvider.hasTab()) { setUrl( mLocationBarDataProvider.getCurrentGurl(), -@@ -340,8 +321,6 @@ class LocationBarMediator +@@ -345,8 +326,6 @@ class LocationBarMediator templateUrlService.addObserver(this); if (OmniboxFeatures.sUseFusedLocationProvider.isEnabled() && templateUrlService.isDefaultSearchEngineGoogle()) { @@ -820,7 +821,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow } }); -@@ -574,7 +553,6 @@ class LocationBarMediator +@@ -579,7 +558,6 @@ class LocationBarMediator LoadUrlParams loadUrlParams = new LoadUrlParams(url); try (TimingMetric record = TimingMetric.shortUptime("Android.Omnibox.SetGeolocationHeadersTime")) { @@ -828,7 +829,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow } loadUrlParams.setTransitionType( omniboxLoadUrlParams.transitionType | PageTransition.FROM_ADDRESS_BAR); -@@ -1564,8 +1542,6 @@ class LocationBarMediator +@@ -1576,8 +1554,6 @@ class LocationBarMediator if (OmniboxFeatures.sUseFusedLocationProvider.isEnabled() && mProfileSupplier.hasValue() && mTemplateUrlServiceSupplier.hasValue()) { @@ -837,7 +838,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow } } -@@ -1573,7 +1549,6 @@ class LocationBarMediator +@@ -1585,7 +1561,6 @@ class LocationBarMediator public void onPauseWithNative() { OmniboxFeatures.updateLastExitTimestamp(); if (OmniboxFeatures.sUseFusedLocationProvider.isEnabled()) { @@ -864,7 +865,7 @@ diff --git a/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc b/chrome/br diff --git a/chrome/browser/upgrade_detector/upgrade_detector_impl.cc b/chrome/browser/upgrade_detector/upgrade_detector_impl.cc --- a/chrome/browser/upgrade_detector/upgrade_detector_impl.cc +++ b/chrome/browser/upgrade_detector/upgrade_detector_impl.cc -@@ -72,12 +72,6 @@ constexpr auto kOutdatedBuildAge = base::Days(7) * 8; +@@ -69,12 +69,6 @@ constexpr auto kOutdatedBuildAge = base::Days(7) * 8; bool ShouldDetectOutdatedBuilds() { #if BUILDFLAG(ENABLE_UPDATE_NOTIFICATIONS) && !BUILDFLAG(IS_CHROMEOS) @@ -880,7 +881,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 -@@ -147,8 +147,6 @@ static_library("common_lib") { +@@ -144,8 +144,6 @@ static_library("common_lib") { "content_restriction.h", "crash_keys.cc", "crash_keys.h", @@ -926,7 +927,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 -@@ -6322,7 +6322,6 @@ test("unit_tests") { +@@ -6408,7 +6408,6 @@ test("unit_tests") { "//chrome/browser/file_system_access:unit_tests", "//chrome/browser/fingerprinting_protection", "//chrome/browser/first_party_sets", @@ -1161,7 +1162,7 @@ diff --git a/components/domain_reliability/uploader.cc b/components/domain_relia diff --git a/components/google/core/common/google_util.cc b/components/google/core/common/google_util.cc --- a/components/google/core/common/google_util.cc +++ b/components/google/core/common/google_util.cc -@@ -36,65 +36,6 @@ namespace google_util { +@@ -32,65 +32,6 @@ namespace google_util { namespace { @@ -1227,7 +1228,7 @@ diff --git a/components/google/core/common/google_util.cc b/components/google/co // True if |url| is a valid URL with HTTP or HTTPS scheme. If |port_permission| // is DISALLOW_NON_STANDARD_PORTS, this also requires |url| to use the standard // port for its scheme (80 for HTTP, 443 for HTTPS). -@@ -109,60 +50,14 @@ bool IsValidURL(const GURL& url, PortPermission port_permission) { +@@ -105,60 +46,14 @@ bool IsValidURL(const GURL& url, PortPermission port_permission) { bool IsCanonicalHostGoogleHostname(std::string_view canonical_host, SubdomainPermission subdomain_permission) { @@ -1290,7 +1291,7 @@ diff --git a/components/google/core/common/google_util.cc b/components/google/co std::string GetGoogleLocale(const std::string& application_locale) { // Google does not recognize "nb" for Norwegian Bokmal; it uses "no". -@@ -171,34 +66,11 @@ std::string GetGoogleLocale(const std::string& application_locale) { +@@ -167,34 +62,11 @@ std::string GetGoogleLocale(const std::string& application_locale) { GURL AppendGoogleLocaleParam(const GURL& url, const std::string& application_locale) { @@ -1327,7 +1328,7 @@ diff --git a/components/google/core/common/google_util.cc b/components/google/co } GURL GetGoogleSearchURL(const GURL& google_homepage_url) { -@@ -245,208 +117,25 @@ bool IsGoogleDomainUrl(const GURL& url, +@@ -241,208 +113,25 @@ bool IsGoogleDomainUrl(const GURL& url, bool IsGoogleHostname(std::string_view host, SubdomainPermission subdomain_permission) { @@ -1393,7 +1394,7 @@ diff --git a/components/google/core/common/google_util.cc b/components/google/co - - // Some domains don't have international TLD extensions, so testing for them - // is very straightforward. -- static const char* kSuffixesToSetHeadersFor[] = { +- static auto kSuffixesToSetHeadersFor = std::to_array({ - ".android.com", - ".doubleclick.com", - ".doubleclick.net", @@ -1407,7 +1408,7 @@ diff --git a/components/google/core/common/google_util.cc b/components/google/co - ".litepages.googlezip.net", - ".youtubekids.com", - ".ytimg.com", -- }; +- }); - const std::string host = url.host(); - for (auto* i : kSuffixesToSetHeadersFor) { - if (base::EndsWith(host, i, base::CompareCase::INSENSITIVE_ASCII)) { @@ -1416,9 +1417,9 @@ diff --git a/components/google/core/common/google_util.cc b/components/google/co - } - - // Exact hostnames in lowercase to set headers for. -- static const char* kHostsToSetHeadersFor[] = { +- static auto kHostsToSetHeadersFor = std::to_array({ - "googleweblight.com", -- }; +- }); - for (auto* i : kHostsToSetHeadersFor) { - if (base::EqualsCaseInsensitiveASCII(host, i)) { - return true; @@ -1638,15 +1639,15 @@ diff --git a/components/search_engines/search_terms_data.cc b/components/search_ 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 -@@ -609,11 +609,7 @@ std::u16string TemplateURLRef::SearchTermToString16( +@@ -613,11 +613,7 @@ std::u16string TemplateURLRef::SearchTermToString16( + bool TemplateURLRef::HasGoogleBaseURLs( const SearchTermsData& search_terms_data) const { - ParseIfNecessary(search_terms_data); -- return base::ranges::any_of( -- replacements_, [](const Replacement& replacement) { -- return replacement.type == GOOGLE_BASE_URL || -- replacement.type == GOOGLE_BASE_SUGGEST_URL; -- }); +- ParseIfNecessary(search_terms_data); +- return std::ranges::any_of(replacements_, [](const Replacement& replacement) { +- return replacement.type == GOOGLE_BASE_URL || +- replacement.type == GOOGLE_BASE_SUGGEST_URL; +- }); + return false; } @@ -1674,9 +1675,9 @@ diff --git a/components/search_provider_logos/logo_service_impl.cc b/components/ - template_url_service_->search_terms_data()); + const bool is_google = false; if (is_google) { - // TODO(treib): Put the Google doodle URL into prepopulated_engines.json. - base_url = -@@ -272,23 +271,12 @@ void LogoServiceImpl::GetLogo(LogoCallbacks callbacks, bool for_webui_ntp) { + // Note: Ideally the Google doodle URL would be specified in + // prepopulated_engines.json, but there is some custom logic in +@@ -274,23 +273,12 @@ void LogoServiceImpl::GetLogo(LogoCallbacks callbacks, bool for_webui_ntp) { clock_ = base::DefaultClock::GetInstance(); } @@ -1704,7 +1705,7 @@ diff --git a/components/search_provider_logos/logo_service_impl.cc b/components/ diff --git a/components/url_matcher/url_util.cc b/components/url_matcher/url_util.cc --- a/components/url_matcher/url_util.cc +++ b/components/url_matcher/url_util.cc -@@ -37,27 +37,15 @@ namespace { +@@ -42,27 +42,15 @@ namespace { // Host/regex pattern for Google AMP Cache URLs. // See https://developers.google.com/amp/cache/overview#amp-cache-url-format // for a definition of the format of AMP Cache URLs. @@ -1732,7 +1733,7 @@ diff --git a/components/url_matcher/url_util.cc b/components/url_matcher/url_uti void ProcessQueryToConditions( url_matcher::URLMatcherConditionFactory* condition_factory, const std::string& query, -@@ -115,87 +103,10 @@ class EmbeddedURLExtractor { +@@ -120,87 +108,10 @@ class EmbeddedURLExtractor { // Implements url_filter::GetEmbeddedURL(). GURL GetEmbeddedURL(const GURL& url) { @@ -1836,7 +1837,7 @@ new file mode 100644 --- /dev/null +++ b/cromite_flags/content/public/common/content_features_cc/ungoogled-chromium-no-special-hosts-domains.inc @@ -0,0 +1 @@ -+SET_CROMITE_FEATURE_DISABLED(kFedCmIdpSigninStatusEnabled); ++// none 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 @@ -1879,7 +1880,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 -@@ -2961,7 +2961,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( +@@ -2965,7 +2965,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( } #endif // BUILDFLAG(IS_CT_SUPPORTED) diff --git a/build/cromite_patches/updater-disable-updater-pings.patch b/build/cromite_patches/updater-disable-updater-pings.patch deleted file mode 100644 index 92b47af37e14c4f58dad781d2027aefe656209ad..0000000000000000000000000000000000000000 --- a/build/cromite_patches/updater-disable-updater-pings.patch +++ /dev/null @@ -1,81 +0,0 @@ -From: Jan Engelhardt -Date: Tue, 2 Jun 2015 11:01:50 +0200 -Subject: updater: disable updater pings - -Despite auto-updater being arguably disabled (see previous commit), -Chromium would still send background requests. Kill it. -(trk:170, trk:171) - -License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html ---- - .../component_updater/component_updater_url_constants.cc | 4 ++-- - components/component_updater/configurator_impl.cc | 9 +++------ - components/component_updater/configurator_impl.h | 2 -- - 3 files changed, 5 insertions(+), 10 deletions(-) - -diff --git a/components/component_updater/component_updater_url_constants.cc b/components/component_updater/component_updater_url_constants.cc ---- a/components/component_updater/component_updater_url_constants.cc -+++ b/components/component_updater/component_updater_url_constants.cc -@@ -15,9 +15,9 @@ namespace component_updater { - // The value of |kDefaultUrlSource| can be overridden with - // --component-updater=url-source=someurl. - const char kUpdaterJSONDefaultUrl[] = -- "https://update.googleapis.com/service/update2/json"; -+ "about:blank"; - - const char kUpdaterJSONFallbackUrl[] = -- "http://update.googleapis.com/service/update2/json"; -+ "about:blank"; - - } // namespace component_updater -diff --git a/components/component_updater/configurator_impl.cc b/components/component_updater/configurator_impl.cc ---- a/components/component_updater/configurator_impl.cc -+++ b/components/component_updater/configurator_impl.cc -@@ -40,8 +40,6 @@ ConfiguratorImpl::ConfiguratorImpl( - : background_downloads_enabled_(config_policy.BackgroundDownloadsEnabled()), - deltas_enabled_(config_policy.DeltaUpdatesEnabled()), - fast_update_(config_policy.FastUpdate()), -- pings_enabled_(config_policy.PingsEnabled()), -- require_encryption_(require_encryption), - url_source_override_(config_policy.UrlSourceOverride()), - initial_delay_(config_policy.InitialDelay()) { - if (config_policy.TestRequest()) { -@@ -77,22 +75,21 @@ base::TimeDelta ConfiguratorImpl::UpdateDelay() const { - - std::vector ConfiguratorImpl::UpdateUrl() const { - DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -+ if ((true)) return std::vector(); - if (url_source_override_.is_valid()) { - return {GURL(url_source_override_)}; - } - - std::vector urls{GURL(kUpdaterJSONDefaultUrl), - GURL(kUpdaterJSONFallbackUrl)}; -- if (require_encryption_) { -- update_client::RemoveUnsecureUrls(&urls); -- } -+ update_client::RemoveUnsecureUrls(&urls); - - return urls; - } - - std::vector ConfiguratorImpl::PingUrl() const { - DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -- return pings_enabled_ ? UpdateUrl() : std::vector(); -+ return std::vector(); - } - - const base::Version& ConfiguratorImpl::GetBrowserVersion() const { -diff --git a/components/component_updater/configurator_impl.h b/components/component_updater/configurator_impl.h ---- a/components/component_updater/configurator_impl.h -+++ b/components/component_updater/configurator_impl.h -@@ -106,8 +106,6 @@ class ConfiguratorImpl { - const bool background_downloads_enabled_; - const bool deltas_enabled_; - const bool fast_update_; -- const bool pings_enabled_; -- const bool require_encryption_; - const GURL url_source_override_; - const base::TimeDelta initial_delay_; - }; --- diff --git a/build/cromite_patches/webRTC-do-not-expose-local-IP-addresses.patch b/build/cromite_patches/webRTC-do-not-expose-local-IP-addresses.patch index bb19b145a37d357c4909e2630e0b4117e247528b..ff2a7e28747259a314560b47d653e2cea6433dee 100644 --- a/build/cromite_patches/webRTC-do-not-expose-local-IP-addresses.patch +++ b/build/cromite_patches/webRTC-do-not-expose-local-IP-addresses.patch @@ -18,7 +18,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc --- a/chrome/browser/ui/browser_ui_prefs.cc +++ b/chrome/browser/ui/browser_ui_prefs.cc -@@ -109,7 +109,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) { +@@ -108,7 +108,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) { false); #endif registry->RegisterStringPref(prefs::kWebRTCIPHandlingPolicy, diff --git a/build/cromite_patches/webview-Hard-no-to-persistent-histograms.patch b/build/cromite_patches/webview-Hard-no-to-persistent-histograms.patch index 36db46f94682d5dbef7cd2a9b98007d7d6c258c2..0d7ea00b31fd4e27adfeca7bb417f4aa89ee5218 100644 --- a/build/cromite_patches/webview-Hard-no-to-persistent-histograms.patch +++ b/build/cromite_patches/webview-Hard-no-to-persistent-histograms.patch @@ -18,7 +18,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/android_webview/browser/aw_field_trials.cc b/android_webview/browser/aw_field_trials.cc --- a/android_webview/browser/aw_field_trials.cc +++ b/android_webview/browser/aw_field_trials.cc -@@ -78,13 +78,6 @@ void AwFeatureOverrides::OverrideFeatureWithFieldTrial( +@@ -79,13 +79,6 @@ void AwFeatureOverrides::OverrideFeatureWithFieldTrial( } // namespace internal void AwFieldTrials::OnVariationsSetupComplete() { diff --git a/build/cromite_patches_list.txt b/build/cromite_patches_list.txt index 5b11da957739c3a17812ef1212cb88c1a76ef060..a324576df03f4833c51cf243cf7a84678cd89705 100644 --- a/build/cromite_patches_list.txt +++ b/build/cromite_patches_list.txt @@ -24,7 +24,6 @@ Restore-classic-new-tab-page.patch Always-use-new-tab-page-for-default-home-page.patch disable-battery-status-updater.patch Battery-API-return-nothing.patch -updater-disable-updater-pings.patch Disable-omission-of-URL-elements.patch Modify-default-preferences.patch Do-not-store-passwords-by-default.patch diff --git a/build/e_patches/Browser-Add-provider-to-share-default-search-engine.patch b/build/e_patches/Browser-Add-provider-to-share-default-search-engine.patch index ccae7e0bdccbf75bdf915b820124cef17761df3a..f7c9d2a38cfb5f0336c43e13e65b82bdf7fb8c31 100644 --- a/build/e_patches/Browser-Add-provider-to-share-default-search-engine.patch +++ b/build/e_patches/Browser-Add-provider-to-share-default-search-engine.patch @@ -1,4 +1,4 @@ -From 50e11576844d59a5c90b8c6f2d5afdb3c7930f2d Mon Sep 17 00:00:00 2001 +From c96b4063b13a9a1d38c0063a6250fea145d8db7b Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Fri, 26 Nov 2021 08:03:13 +0000 Subject: Browser: Add provider to share default search engine @@ -12,11 +12,11 @@ Signed-off-by: Aayush Gupta create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/provider/SearchEngineProvider.java diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml -index de52e4416e2fe..fed30360f4a8f 100644 +index 46ddd924dae7e..e9f1ce7e50ed9 100644 --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml -@@ -1301,6 +1301,12 @@ by a child template that "extends" this file. - android:grantUriPermissions="true"> +@@ -1326,6 +1326,12 @@ by a child template that "extends" this file. + tools:ignore="ExportedContentProvider"> + @@ -114,10 +114,10 @@ index 0000000000000..299562413fe05 + } +} diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni -index 8b061b9741a97..185f08c123009 100644 +index 9c175c0d24804..eccb0847f7cd6 100644 --- a/chrome/android/java_sources.gni +++ b/chrome/android/java_sources.gni -@@ -58,3 +58,4 @@ if (enable_cardboard) { +@@ -29,3 +29,4 @@ if (enable_cardboard) { } chrome_java_sources += userscripts_java_sources diff --git a/build/e_patches/Browser-Change-adblock-url-to-ours.patch b/build/e_patches/Browser-Change-adblock-url-to-ours.patch index e26a088f8358abb1411dcc64de355f256bea295b..742d82c899a2ead4ffbbf50cc15c1691aa91c86e 100644 --- a/build/e_patches/Browser-Change-adblock-url-to-ours.patch +++ b/build/e_patches/Browser-Change-adblock-url-to-ours.patch @@ -1,4 +1,4 @@ -From 05a6a9e82966b75ae557e6851dffc9d9a9b77c30 Mon Sep 17 00:00:00 2001 +From f0dee9e987e3b3b61ceec0752207c586fccb227c Mon Sep 17 00:00:00 2001 From: althafvly Date: Tue, 10 Sep 2024 12:17:23 +0530 Subject: Browser: Change adblock url to ours @@ -43,10 +43,10 @@ index ef6d1652c97f0..24cd56084827d 100644 mAdBlockFiltersUrlEdit.setText(AdBlockNativeGateway.getAdBlockFiltersURL()); mAdBlockFiltersUrlEdit.addTextChangedListener(this); diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc -index bf0cf434bb966..f2bd21a6dbd93 100644 +index f7213b3c8777f..85d715c53ff41 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc -@@ -1231,11 +1231,11 @@ BrowserProcessImpl::adblock_updater() { +@@ -1251,11 +1251,11 @@ BrowserProcessImpl::adblock_updater() { std::unique_ptr scheduler = std::make_unique(); @@ -63,7 +63,7 @@ index bf0cf434bb966..f2bd21a6dbd93 100644 } adblock_updater_ = std::make_unique( -@@ -1243,7 +1243,7 @@ BrowserProcessImpl::adblock_updater() { +@@ -1263,7 +1263,7 @@ BrowserProcessImpl::adblock_updater() { std::move(scheduler), g_browser_process->subresource_filter_ruleset_service(), local_state()->GetBoolean(prefs::kAdBlockEnabled), @@ -73,10 +73,10 @@ index bf0cf434bb966..f2bd21a6dbd93 100644 return adblock_updater_.get(); } diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc -index 414d6b7e350ce..3393bd2a958c5 100644 +index 75be09b615fca..6eec2f773af01 100644 --- a/chrome/browser/net/system_network_context_manager.cc +++ b/chrome/browser/net/system_network_context_manager.cc -@@ -656,7 +656,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) { +@@ -645,7 +645,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) { registry->RegisterBooleanPref(prefs::kAdBlockEnabled, false); registry->RegisterStringPref(prefs::kAdBlockFiltersURL, diff --git a/build/e_patches/Browser-Disable-Android-native-autofill-by-default.patch b/build/e_patches/Browser-Disable-Android-native-autofill-by-default.patch index ed7cf28f70a29fa301cf24c015316663a8a032f8..0519234e6380621eaf7f86909a35ad478be6ad2c 100644 --- a/build/e_patches/Browser-Disable-Android-native-autofill-by-default.patch +++ b/build/e_patches/Browser-Disable-Android-native-autofill-by-default.patch @@ -1,4 +1,4 @@ -From e3fcca87fce700d046a091e891b456372b04c8c4 Mon Sep 17 00:00:00 2001 +From f6430b15ca89e4c6370ddf0515bd0b4f5ad10687 Mon Sep 17 00:00:00 2001 From: althafvly Date: Tue, 22 Aug 2023 06:16:40 +0000 Subject: Browser: Disable Android native autofill by default @@ -8,7 +8,7 @@ Subject: Browser: Disable Android native autofill by default 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/autofill/core/common/autofill_prefs.cc b/components/autofill/core/common/autofill_prefs.cc -index d375848541192..4cb69e4acdbfa 100644 +index 8e5113f7318cd..3d48d92a09d17 100644 --- a/components/autofill/core/common/autofill_prefs.cc +++ b/components/autofill/core/common/autofill_prefs.cc @@ -46,7 +46,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { diff --git a/build/e_patches/Browser-Enable-custom-tabs-by-default.patch b/build/e_patches/Browser-Enable-custom-tabs-by-default.patch index 1ce9804e119ef66a75ae38f0a1ddb1669fef6558..c579c829f42c8c369058d34cd357f27b392e00be 100644 --- a/build/e_patches/Browser-Enable-custom-tabs-by-default.patch +++ b/build/e_patches/Browser-Enable-custom-tabs-by-default.patch @@ -1,4 +1,4 @@ -From 07b2846726d1897a822da717b357e6d6b02e6c1c Mon Sep 17 00:00:00 2001 +From 15df80328edbd3593e59b077753585f377dfd48a Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Mon, 29 Nov 2021 03:37:37 +0000 Subject: Browser: Enable custom tabs by default @@ -11,10 +11,10 @@ Signed-off-by: althafvly 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml -index bff9d3bee4eb8..a256c92115cff 100644 +index acf2f399ef151..32672a37830e3 100644 --- a/chrome/android/java/res/xml/privacy_preferences.xml +++ b/chrome/android/java/res/xml/privacy_preferences.xml -@@ -67,7 +67,7 @@ found in the LICENSE file. +@@ -61,7 +61,7 @@ found in the LICENSE file. android:key="allow_custom_tab_intents" android:title="@string/allow_custom_tab_intents_title" android:summary="@string/allow_custom_tab_intents_summary" diff --git a/build/e_patches/Browser-Enable-external-intent-requests.patch b/build/e_patches/Browser-Enable-external-intent-requests.patch index 19a628b50459253ebebd721f60be2c99041928e9..17b8882e3e2939790e8ba31604434be3c466c810 100644 --- a/build/e_patches/Browser-Enable-external-intent-requests.patch +++ b/build/e_patches/Browser-Enable-external-intent-requests.patch @@ -1,4 +1,4 @@ -From 9c795d12032aef6093e246f9bb70e91beece3c7b Mon Sep 17 00:00:00 2001 +From 934dfd8ebc541920fd20cf9a49d239af00949c4f Mon Sep 17 00:00:00 2001 From: althafvly Date: Tue, 5 Nov 2024 10:08:21 +0530 Subject: Browser: Enable external intent requests @@ -17,10 +17,10 @@ Subject: Browser: Enable external intent requests delete mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Add-flag-to-disable-external-intent-requests.inc diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml -index a256c92115cff..c38eb74ff06f2 100644 +index 32672a37830e3..b2329f2646d16 100644 --- a/chrome/android/java/res/xml/privacy_preferences.xml +++ b/chrome/android/java/res/xml/privacy_preferences.xml -@@ -92,8 +92,7 @@ found in the LICENSE file. +@@ -86,8 +86,7 @@ found in the LICENSE file. android:key="allow_external_intent_requests" android:title="@string/allow_external_intent_requests_title" android:summary="@string/allow_external_intent_requests_summary" @@ -31,7 +31,7 @@ index a256c92115cff..c38eb74ff06f2 100644 android:key="security_section" android:title="@string/security_section_title" /> diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabDelegateFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabDelegateFactory.java -index 3aa592e78abfa..35c5970cb157b 100644 +index 270eb6a4750de..f056bb3900541 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabDelegateFactory.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabDelegateFactory.java @@ -17,6 +17,7 @@ import androidx.annotation.VisibleForTesting; @@ -91,10 +91,10 @@ index f293f54b31b00..a6b3082e44cfe 100644 @Override diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java -index 228944ae9d304..5d45545a8b404 100644 +index 6f878c3199cd0..8a2e2793018d3 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java -@@ -129,6 +129,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment +@@ -124,6 +124,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment private ChromeSwitchPreference allowCustomTabIntentsPref; private ChromeSwitchPreference openExternalLinksPref; @@ -102,7 +102,7 @@ index 228944ae9d304..5d45545a8b404 100644 private static final String PREF_HISTORY_EXPIRE_DAYS_THRESHOLD = "history_expire_days_threshold"; -@@ -409,6 +410,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment +@@ -396,6 +397,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment public static final String PREF_ALLOW_CUSTOM_TAB_INTENTS = "allow_custom_tab_intents"; public static final String PREF_OPEN_EXTERNAL_LINKS_INCOGNITO = "open_external_links_incognito"; @@ -110,7 +110,7 @@ index 228944ae9d304..5d45545a8b404 100644 @Override public boolean onPreferenceChange(Preference preference, Object newValue) { -@@ -455,6 +457,10 @@ public class PrivacySettings extends ChromeBaseSettingsFragment +@@ -442,6 +444,10 @@ public class PrivacySettings extends ChromeBaseSettingsFragment SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit(); sharedPreferencesEditor.putBoolean(PREF_OPEN_EXTERNAL_LINKS_INCOGNITO, (boolean)newValue); sharedPreferencesEditor.apply(); @@ -121,7 +121,7 @@ index 228944ae9d304..5d45545a8b404 100644 } return true; } -@@ -497,6 +503,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment +@@ -484,6 +490,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment openExternalLinksPref.setOnPreferenceChangeListener(this); openExternalLinksPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate); diff --git a/build/e_patches/Browser-Enable-unified-autoplay-by-default.patch b/build/e_patches/Browser-Enable-unified-autoplay-by-default.patch index ae24853ba41bb215c112127915571ad998209173..fa025d74d08a19d0f238b34e9fb2351fddc0d6d4 100644 --- a/build/e_patches/Browser-Enable-unified-autoplay-by-default.patch +++ b/build/e_patches/Browser-Enable-unified-autoplay-by-default.patch @@ -1,4 +1,4 @@ -From 4eaf6bc6d7b9335f2efaa9d942184576397edbfa Mon Sep 17 00:00:00 2001 +From 522711c75db96e749bc59cc961e48e39ad24e95b Mon Sep 17 00:00:00 2001 From: althafvly Date: Fri, 29 Sep 2023 16:30:17 +0530 Subject: Browser: Enable unified autoplay by default @@ -9,7 +9,7 @@ Subject: Browser: Enable unified autoplay by default 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc -index 1b20542a7b968..4b00fa0f1c92d 100644 +index faf5d8a5eae14..11561e8ec1a95 100644 --- a/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc @@ -248,7 +248,7 @@ void ContentSettingsRegistry::Init() { @@ -22,7 +22,7 @@ index 1b20542a7b968..4b00fa0f1c92d 100644 /*valid_settings=*/{CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK}, WebsiteSettingsInfo::TOP_ORIGIN_ONLY_SCOPE, diff --git a/third_party/blink/renderer/core/html/media/autoplay_policy.cc b/third_party/blink/renderer/core/html/media/autoplay_policy.cc -index 34fb2b20ba46e..cc3b118ed79f4 100644 +index ef64ebec77cd6..22dbfa2224201 100644 --- a/third_party/blink/renderer/core/html/media/autoplay_policy.cc +++ b/third_party/blink/renderer/core/html/media/autoplay_policy.cc @@ -458,7 +458,7 @@ bool AutoplayPolicy::IsAutoplayAllowedPerSettings() const { diff --git a/build/e_patches/Browser-Enable-webRTC-by-default.patch b/build/e_patches/Browser-Enable-webRTC-by-default.patch index f8bee02f9956058510b3c33b5667519bf2c67641..c057ae065ba783a3016d78f4acc52c33a8eea4d1 100644 --- a/build/e_patches/Browser-Enable-webRTC-by-default.patch +++ b/build/e_patches/Browser-Enable-webRTC-by-default.patch @@ -1,4 +1,4 @@ -From fe0359f4b6f423cb444e620365a3abd14d709917 Mon Sep 17 00:00:00 2001 +From af79ad0d42ce9797860e1aa432e58487496d1a7b Mon Sep 17 00:00:00 2001 From: althafvly Date: Fri, 20 Oct 2023 18:49:36 +0530 Subject: Browser: Enable webRTC by default @@ -34,10 +34,10 @@ index 2115efdf09b96..b195bea754ba6 100644 } diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver.cc b/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver.cc -index 510f7edc01674..eb52018a6df09 100644 +index 2c7e095d217bb..c2c0157f0f217 100644 --- a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver.cc +++ b/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver.cc -@@ -290,7 +290,7 @@ RTCRtpCapabilities* RTCRtpReceiver::getCapabilities(ScriptState* state, +@@ -292,7 +292,7 @@ RTCRtpCapabilities* RTCRtpReceiver::getCapabilities(ScriptState* state, auto* web_frame = static_cast(WebFrame::FromCoreFrame(window->GetFrame())); blink::WebContentSettingsClient* settings = web_frame->GetContentSettingsClient(); @@ -47,10 +47,10 @@ index 510f7edc01674..eb52018a6df09 100644 } diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc b/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc -index 72a0b65b16925..be4f7434b0304 100644 +index d6984a258d198..667ed5551a7f6 100644 --- a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc +++ b/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc -@@ -1037,7 +1037,7 @@ RTCRtpCapabilities* RTCRtpSender::getCapabilities(ScriptState* state, +@@ -1039,7 +1039,7 @@ RTCRtpCapabilities* RTCRtpSender::getCapabilities(ScriptState* state, auto* web_frame = static_cast(WebFrame::FromCoreFrame(window->GetFrame())); blink::WebContentSettingsClient* settings = web_frame->GetContentSettingsClient(); diff --git a/build/e_patches/Browser-Enable-webgl-by-default.patch b/build/e_patches/Browser-Enable-webgl-by-default.patch index d3d7cf4174630031f42330430c97e2a183dec494..5c8fee1e54cb43b1a226772f8ff610dc80394b89 100644 --- a/build/e_patches/Browser-Enable-webgl-by-default.patch +++ b/build/e_patches/Browser-Enable-webgl-by-default.patch @@ -1,4 +1,4 @@ -From 55619c3f9ba0ec42c54c752ee0926c4ac1049e12 Mon Sep 17 00:00:00 2001 +From 3c400ea77a22abd4f0a6dcf3317b8faed15570b3 Mon Sep 17 00:00:00 2001 From: althafvly Date: Tue, 24 Oct 2023 14:39:06 +0530 Subject: Browser: Enable webgl by default @@ -19,7 +19,7 @@ index 3ff01832baef4..dd88ffeab7bbb 100644 /*allowlisted_schemes=*/{}, /*valid_settings=*/{CONTENT_SETTING_ALLOW, diff --git a/third_party/blink/renderer/core/execution_context/execution_context.cc b/third_party/blink/renderer/core/execution_context/execution_context.cc -index fa21990391083..7f4b904f39744 100644 +index 5c1af10f6b940..6e0105c8a36fd 100644 --- a/third_party/blink/renderer/core/execution_context/execution_context.cc +++ b/third_party/blink/renderer/core/execution_context/execution_context.cc @@ -88,8 +88,8 @@ blink::WebContentSettingsClient* GetContentSettingsClientFor( diff --git a/build/e_patches/Browser-Hide-settings-when-parental-control-is-active.patch b/build/e_patches/Browser-Hide-settings-when-parental-control-is-active.patch index d8da65b44cc6d74c152a9b835a5a97daa04a2b29..8b4c7c02f4fe4a35e9df9c51910e8f8308e4252a 100644 --- a/build/e_patches/Browser-Hide-settings-when-parental-control-is-active.patch +++ b/build/e_patches/Browser-Hide-settings-when-parental-control-is-active.patch @@ -1,4 +1,4 @@ -From d1366fda07b609faf4f87dac70659d8c03a005a0 Mon Sep 17 00:00:00 2001 +From beb9674b8cb78b05db8b6c32869ad7ee80544afd Mon Sep 17 00:00:00 2001 From: althafvly Date: Thu, 11 Jul 2024 11:11:15 +0530 Subject: Browser: Hide settings when parental control is active @@ -11,10 +11,10 @@ Subject: Browser: Hide settings when parental control is active 4 files changed, 40 insertions(+), 1 deletion(-) diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java -index 29223f77f093e..f1cefde0360b0 100644 +index 9016fe25aad08..509e1e254b06d 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java -@@ -72,6 +72,7 @@ import org.chromium.chrome.browser.PlayServicesVersionInfo; +@@ -71,6 +71,7 @@ import org.chromium.chrome.browser.PlayServicesVersionInfo; import org.chromium.chrome.browser.WarmupManager; import org.chromium.chrome.browser.app.appmenu.AppMenuPropertiesDelegateImpl; import org.chromium.chrome.browser.app.download.DownloadMessageUiDelegate; @@ -22,7 +22,7 @@ index 29223f77f093e..f1cefde0360b0 100644 import org.chromium.chrome.browser.app.metrics.LaunchCauseMetrics; import org.chromium.chrome.browser.app.tab_activity_glue.ReparentingDelegateFactory; import org.chromium.chrome.browser.app.tab_activity_glue.TabReparentingController; -@@ -2375,7 +2376,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity +@@ -2372,7 +2373,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity @BrowserProfileType int type = Profile.getBrowserProfileTypeFromProfile(getCurrentTabModel().getProfile()); @@ -32,7 +32,7 @@ index 29223f77f093e..f1cefde0360b0 100644 SettingsNavigationFactory.createSettingsNavigation(); settingsNavigation.startSettings(this); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java -index 9369caa87e9b2..7d49877e2ee14 100644 +index 3b04979dba79f..e676bf22c49bf 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java @@ -37,6 +37,7 @@ import org.chromium.base.supplier.OneshotSupplier; @@ -43,7 +43,7 @@ index 9369caa87e9b2..7d49877e2ee14 100644 import org.chromium.chrome.browser.ActivityTabProvider; import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor; import org.chromium.chrome.browser.profiles.ProfileManager; -@@ -662,6 +663,10 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -664,6 +665,10 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate item.setEnabled(isIncognitoEnabled() && !isIncognitoReauthShowing); } @@ -55,7 +55,7 @@ index 9369caa87e9b2..7d49877e2ee14 100644 item.setEnabled(false); } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java b/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java -index af16aeda82320..25ff7b2caf6db 100644 +index 6040e96c47e0d..23a9a0d8dfdf4 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java @@ -26,6 +26,7 @@ import org.chromium.components.cached_flags.CachedFlagUtils; @@ -66,7 +66,7 @@ index af16aeda82320..25ff7b2caf6db 100644 import java.util.ArrayList; import java.util.List; -@@ -151,4 +152,32 @@ public class ChromeCachedFlags { +@@ -177,4 +178,32 @@ public class ChromeCachedFlags { return cachedFlag.isEnabled(); } @@ -100,10 +100,10 @@ index af16aeda82320..25ff7b2caf6db 100644 + } } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java -index fb5a73cceccb6..37164d465b007 100644 +index fa591514927fa..e9f6dd252b502 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java -@@ -25,6 +25,7 @@ import org.chromium.base.supplier.ObservableSupplierImpl; +@@ -24,6 +24,7 @@ import org.chromium.base.supplier.ObservableSupplierImpl; import org.chromium.base.task.PostTask; import org.chromium.base.task.TaskTraits; import org.chromium.chrome.R; @@ -111,7 +111,7 @@ index fb5a73cceccb6..37164d465b007 100644 import org.chromium.chrome.browser.autofill.options.AutofillOptionsFragment; import org.chromium.chrome.browser.autofill.options.AutofillOptionsFragment.AutofillOptionsReferrer; import org.chromium.chrome.browser.autofill.settings.SettingsNavigationHelper; -@@ -173,6 +174,9 @@ public class MainSettings extends ChromeBaseSettingsFragment +@@ -168,6 +169,9 @@ public class MainSettings extends ChromeBaseSettingsFragment @Override public void onStart() { diff --git a/build/e_patches/Browser-Modify-default-search-engines.patch b/build/e_patches/Browser-Modify-default-search-engines.patch index 080a16aa0a88bdd03fca5cffe73b40297574550b..ae323ba55cb6ddd8e90018a92acf8e3b2b120fd1 100644 --- a/build/e_patches/Browser-Modify-default-search-engines.patch +++ b/build/e_patches/Browser-Modify-default-search-engines.patch @@ -1,26 +1,34 @@ -From a5f43ac2e773a86eb8b119d0560d1fb79dd43479 Mon Sep 17 00:00:00 2001 +From a583aa33914da82d3a76a5cb71da25f105b0dc32 Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Thu, 18 Mar 2021 13:42:44 +0100 Subject: Browser: Modify default search engines Signed-off-by: althafvly --- - .../locale/locale_template_url_loader.cc | 41 +------------------ + .../locale/locale_template_url_loader.cc | 42 ++----------------- .../locale/locale_template_url_loader.h | 1 - .../browser/locale/LocaleManagerDelegate.java | 1 - .../locale/LocaleTemplateUrlLoader.java | 8 ---- - .../search_engines/prepopulated_engines.json | 10 +++++ - .../search_engine_countries-inc.cc | 8 ++-- + .../cromite/cromite_prepopulated_engines.json | 10 +++++ + .../search_engine_countries-inc.cc | 7 ++-- .../search_engines/search_engine_type.h | 3 +- .../search_engines/search_engine_utils.cc | 12 +----- .../template_url_prepopulate_data.cc | 7 +++- - 9 files changed, 25 insertions(+), 66 deletions(-) + 9 files changed, 26 insertions(+), 65 deletions(-) diff --git a/chrome/browser/android/locale/locale_template_url_loader.cc b/chrome/browser/android/locale/locale_template_url_loader.cc -index 1abc2c4b67c1b..2d50c9c9ab29a 100644 +index 1cb4b8bd94469..412d2a7b29faf 100644 --- a/chrome/browser/android/locale/locale_template_url_loader.cc +++ b/chrome/browser/android/locale/locale_template_url_loader.cc -@@ -82,19 +82,6 @@ jboolean LocaleTemplateUrlLoader::LoadTemplateUrls(JNIEnv* env) { +@@ -11,6 +11,7 @@ + #include "base/debug/dump_without_crashing.h" + #include "chrome/browser/profiles/profile.h" + #include "chrome/browser/search_engines/template_url_service_factory.h" ++#include "components/search_engines/cromite/cromite_prepopulated_engines.h" + #include "components/search_engines/template_url_data.h" + #include "components/search_engines/template_url_prepopulate_data.h" + #include "components/search_engines/template_url_service.h" +@@ -82,19 +83,6 @@ jboolean LocaleTemplateUrlLoader::LoadTemplateUrls(JNIEnv* env) { const TemplateURL* matching_url = template_url_service_->GetTemplateURLForKeyword(data_url->keyword()); bool exists = matching_url != nullptr; @@ -40,7 +48,7 @@ index 1abc2c4b67c1b..2d50c9c9ab29a 100644 if (exists) { continue; -@@ -138,8 +125,7 @@ void LocaleTemplateUrlLoader::OverrideDefaultSearchProvider(JNIEnv* env) { +@@ -138,8 +126,7 @@ void LocaleTemplateUrlLoader::OverrideDefaultSearchProvider(JNIEnv* env) { // If the user has changed their default search provider, no-op. const TemplateURL* current_dsp = template_url_service_->GetDefaultSearchProvider(); @@ -50,7 +58,7 @@ index 1abc2c4b67c1b..2d50c9c9ab29a 100644 return; } -@@ -151,29 +137,6 @@ void LocaleTemplateUrlLoader::OverrideDefaultSearchProvider(JNIEnv* env) { +@@ -151,29 +138,6 @@ void LocaleTemplateUrlLoader::OverrideDefaultSearchProvider(JNIEnv* env) { } } @@ -80,7 +88,7 @@ index 1abc2c4b67c1b..2d50c9c9ab29a 100644 std::vector> LocaleTemplateUrlLoader::GetLocalPrepopulatedEngines() { if (!template_url_service_) { -@@ -186,7 +149,7 @@ LocaleTemplateUrlLoader::GetLocalPrepopulatedEngines() { +@@ -186,7 +150,7 @@ LocaleTemplateUrlLoader::GetLocalPrepopulatedEngines() { } int LocaleTemplateUrlLoader::GetDesignatedSearchEngineForChina() { @@ -138,36 +146,35 @@ index a5ba6b961e6b0..52295c0b59e19 100644 - void setGoogleAsDefaultSearch(long nativeLocaleTemplateUrlLoader); } } -diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json -index 09447c2946c0b..5abd72936f920 100644 ---- a/components/search_engines/prepopulated_engines.json -+++ b/components/search_engines/prepopulated_engines.json -@@ -140,6 +140,16 @@ - "id": 12 - }, - -+ "espot": { -+ "name": "/e/ spot", -+ "keyword": "spot.murena.io", -+ "favicon_url": "https://spot.murena.io/favicon.ico", -+ "search_url": "https://spot.murena.io/?q={searchTerms}", -+ "suggest_url": "https://ac.duckduckgo.com/ac/?q={searchTerms}&type=list", -+ "type": "SEARCH_ENGINE_ESPOT", -+ "id": 11 -+ }, +diff --git a/components/search_engines/cromite/cromite_prepopulated_engines.json b/components/search_engines/cromite/cromite_prepopulated_engines.json +index 0d2ebbf08bfc7..d40c9982737d2 100644 +--- a/components/search_engines/cromite/cromite_prepopulated_engines.json ++++ b/components/search_engines/cromite/cromite_prepopulated_engines.json +@@ -13,6 +13,16 @@ + "id": 12 + }, + ++ "espot": { ++ "name": "/e/ spot", ++ "keyword": "spot.murena.io", ++ "favicon_url": "https://spot.murena.io/favicon.ico", ++ "search_url": "https://spot.murena.io/?q={searchTerms}", ++ "suggest_url": "https://ac.duckduckgo.com/ac/?q={searchTerms}&type=list", ++ "type": "SEARCH_ENGINE_ESPOT", ++ "id": 11 ++ }, + - "ecosia": { - "name": "Ecosia", - "keyword": "ecosia.org", + "googleen": { + "name": "Google in English", + "keyword": "googleen", diff --git a/components/search_engines/search_engine_countries-inc.cc b/components/search_engines/search_engine_countries-inc.cc -index 53f87a2ab8086..38964682da20f 100644 +index 235377432cf9c..38964682da20f 100644 --- a/components/search_engines/search_engine_countries-inc.cc +++ b/components/search_engines/search_engine_countries-inc.cc -@@ -38,10 +38,10 @@ struct EngineAndTier { +@@ -38,9 +38,10 @@ struct EngineAndTier { // Default (for countries with no better engine set) constexpr EngineAndTier engines_default[] = { -- {SearchEngineTier::kTopEngines, &googleen}, - {SearchEngineTier::kTopEngines, &google}, - {SearchEngineTier::kTopEngines, &bing}, - {SearchEngineTier::kTopEngines, &yahoo}, @@ -197,7 +204,7 @@ index 18413c59ccdfd..2a53f07d642d8 100644 // Enum to record the type of search engine a user used in keyword mode. This diff --git a/components/search_engines/search_engine_utils.cc b/components/search_engines/search_engine_utils.cc -index 559e63c6c543c..5d61dd5895bb8 100644 +index 4b32c2424922b..9808a5e92ff3a 100644 --- a/components/search_engines/search_engine_utils.cc +++ b/components/search_engines/search_engine_utils.cc @@ -28,17 +28,7 @@ SearchEngineType GetEngineType(const GURL& url) { @@ -220,10 +227,10 @@ index 559e63c6c543c..5d61dd5895bb8 100644 if (SameDomain(url, GURL(engine->search_url))) { return engine->type; diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc -index 2882651b9a923..835f994a74dbb 100644 +index 5738c4f9853c7..e3dc518996051 100644 --- a/components/search_engines/template_url_prepopulate_data.cc +++ b/components/search_engines/template_url_prepopulate_data.cc -@@ -84,6 +84,11 @@ GetPrepopulatedEnginesForEeaRegionCountries(int country_id, +@@ -86,6 +86,11 @@ GetPrepopulatedEnginesForEeaRegionCountries(int country_id, std::vector> GetPrepopulatedTemplateURLData( int country_id, PrefService* prefs) { @@ -235,7 +242,7 @@ index 2882651b9a923..835f994a74dbb 100644 std::vector> t_urls; if (!prefs) { -@@ -317,7 +322,7 @@ std::unique_ptr GetPrepopulatedFallbackSearch( +@@ -320,7 +325,7 @@ std::unique_ptr GetPrepopulatedFallbackSearch( PrefService* prefs, search_engines::SearchEngineChoiceService* search_engine_choice_service) { return FindPrepopulatedEngineInternal(prefs, search_engine_choice_service, diff --git a/build/e_patches/Browser-Remove-logo-from-chromeversion.patch b/build/e_patches/Browser-Remove-logo-from-chromeversion.patch index 6cbbbbaefa854ad906f3fdef66acb01b767eb765..d6e5529b419cf090ab0fc45eedab3f4755823a1c 100644 --- a/build/e_patches/Browser-Remove-logo-from-chromeversion.patch +++ b/build/e_patches/Browser-Remove-logo-from-chromeversion.patch @@ -1,16 +1,16 @@ -From defa47507b77ba38b6f65ca879b6980c846a0a84 Mon Sep 17 00:00:00 2001 +From 5d4ebb0bbc6bd4a585757ed2d744c900fafe7506 Mon Sep 17 00:00:00 2001 From: A Mak Date: Sat, 25 Jul 2020 17:56:47 -0700 Subject: Browser: Remove logo from chrome://version --- - components/version_ui/resources/about_version.html | 7 ------- + components/webui/version/resources/about_version.html | 7 ------- 1 file changed, 7 deletions(-) -diff --git a/components/version_ui/resources/about_version.html b/components/version_ui/resources/about_version.html +diff --git a/components/webui/version/resources/about_version.html b/components/webui/version/resources/about_version.html index 1243b0cb31f59..197ffeb47b626 100644 ---- a/components/version_ui/resources/about_version.html -+++ b/components/version_ui/resources/about_version.html +--- a/components/webui/version/resources/about_version.html ++++ b/components/webui/version/resources/about_version.html @@ -39,13 +39,6 @@ about:version template page media="(prefers-color-scheme: light), (prefers-color-scheme: no-preference)"> $i18n{logo_alt_text} diff --git a/build/e_patches/Browser-Remove-send-to-devices-option.patch b/build/e_patches/Browser-Remove-send-to-devices-option.patch index 8b0d646fb9d566954887f3e14a822a56ab40acfe..26eb2619e3a015986c6c918fd9de31d741b084d6 100644 --- a/build/e_patches/Browser-Remove-send-to-devices-option.patch +++ b/build/e_patches/Browser-Remove-send-to-devices-option.patch @@ -1,4 +1,4 @@ -From 519a705cb0f32bedf93cac1b07764e79717af4b7 Mon Sep 17 00:00:00 2001 +From 0346dfed9faa0e81cdf6b62e8bf151b633dc2752 Mon Sep 17 00:00:00 2001 From: althafvly Date: Fri, 20 Oct 2023 18:23:09 +0530 Subject: Browser: Remove send to devices option @@ -8,10 +8,10 @@ Subject: Browser: Remove send to devices option 1 file changed, 34 deletions(-) diff --git a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/ChromeProvidedSharingOptionsProviderBase.java b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/ChromeProvidedSharingOptionsProviderBase.java -index 782a73d49ca2a..5bbe442181520 100644 +index a3fb55b84de0e..e3b5dd7bc4bad 100644 --- a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/ChromeProvidedSharingOptionsProviderBase.java +++ b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/ChromeProvidedSharingOptionsProviderBase.java -@@ -271,7 +271,6 @@ public abstract class ChromeProvidedSharingOptionsProviderBase { +@@ -275,7 +275,6 @@ public abstract class ChromeProvidedSharingOptionsProviderBase { maybeAddLongScreenshotFirstPartyOption(); maybeAddPrintFirstPartyOption(); } @@ -19,7 +19,7 @@ index 782a73d49ca2a..5bbe442181520 100644 maybeAddQrCodeFirstPartyOption(); } -@@ -282,14 +281,6 @@ public abstract class ChromeProvidedSharingOptionsProviderBase { +@@ -296,14 +295,6 @@ public abstract class ChromeProvidedSharingOptionsProviderBase { } } @@ -34,7 +34,7 @@ index 782a73d49ca2a..5bbe442181520 100644 private void maybeAddQrCodeFirstPartyOption() { } -@@ -399,31 +390,6 @@ public abstract class ChromeProvidedSharingOptionsProviderBase { +@@ -413,31 +404,6 @@ public abstract class ChromeProvidedSharingOptionsProviderBase { .build(); } diff --git a/build/e_patches/Browser-Rename-strings-to-browser.patch b/build/e_patches/Browser-Rename-strings-to-browser.patch index 2400ddc52cc04f4eac467a19541517152fba3cfa..9869c908298c2767543ecf8c3877aaa129986153 100644 --- a/build/e_patches/Browser-Rename-strings-to-browser.patch +++ b/build/e_patches/Browser-Rename-strings-to-browser.patch @@ -1,4 +1,4 @@ -From c188517d8f03b6c00087a0ffa0f98e6032af6bb4 Mon Sep 17 00:00:00 2001 +From 9a2f09c23d0c166ec9b3d6bdbeb8ff24189e4a51 Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Fri, 26 Nov 2021 07:12:30 +0000 Subject: Browser: Rename strings to browser @@ -53,7 +53,7 @@ index 45645bf509f4d..c42374eac7404 100644 @Override diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd -index 5ceb7d4308778..f2bfc60f61517 100644 +index 78c68195aa835..9e6001628d75b 100644 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd @@ -202,6 +202,8 @@ CHAR_LIMIT guidelines: diff --git a/build/e_patches/Browser-Spoof-as-Pixel-4a-by-default.patch b/build/e_patches/Browser-Spoof-as-Pixel-4a-by-default.patch index 84b8cb232fe0dbcd07d91c12c8367df8d6fb06ce..8f0f5b0aee1968bfcdcdf0ffb6b21603775bddc7 100644 --- a/build/e_patches/Browser-Spoof-as-Pixel-4a-by-default.patch +++ b/build/e_patches/Browser-Spoof-as-Pixel-4a-by-default.patch @@ -1,4 +1,4 @@ -From c76f1144d1144464214f10b46d2cdd31d4a96c7c Mon Sep 17 00:00:00 2001 +From 0573d2dbf39e4b73f0f0ff8e6bb489feb8936314 Mon Sep 17 00:00:00 2001 From: althafvly Date: Thu, 19 Jan 2023 05:41:58 +0000 Subject: Browser: Spoof as Pixel 4a by default @@ -9,7 +9,7 @@ Subject: Browser: Spoof as Pixel 4a by default 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/base/system/sys_info_android.cc b/base/system/sys_info_android.cc -index d50e12c0a80b4..7c515a5d4cea4 100644 +index e3ead5db46ca0..02de4db4d752c 100644 --- a/base/system/sys_info_android.cc +++ b/base/system/sys_info_android.cc @@ -22,7 +22,7 @@ namespace { @@ -69,7 +69,7 @@ index d50e12c0a80b4..7c515a5d4cea4 100644 + return "QD4A.200805.003"; } - std::string SysInfo::GetAndroidHardwareEGL() { + std::string SysInfo::GetAndroidHardware() { -- 2.48.1 diff --git a/build/e_patches/Browser-Use-adaptive-icon-for-recents-UI.patch b/build/e_patches/Browser-Use-adaptive-icon-for-recents-UI.patch index 209e6c658d36e8328b847f76558372c2058e583a..b3d830852d280a240e9869fd7b77d381b6d08d64 100644 --- a/build/e_patches/Browser-Use-adaptive-icon-for-recents-UI.patch +++ b/build/e_patches/Browser-Use-adaptive-icon-for-recents-UI.patch @@ -1,4 +1,4 @@ -From c8ba8596d115607b037a9c2eb57e35b4d3289732 Mon Sep 17 00:00:00 2001 +From 2779a7c2faaa76168983f028bf1602a69b14ebf5 Mon Sep 17 00:00:00 2001 From: althafvly Date: Wed, 14 Dec 2022 12:18:50 +0530 Subject: Browser: Use adaptive icon for recents UI @@ -8,7 +8,7 @@ Subject: Browser: Use adaptive icon for recents UI 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java -index 3569e7bc49032..1f2864221d5c8 100644 +index 3694e68b204b3..b654d24300ee1 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java @@ -14,6 +14,8 @@ import android.app.ActivityManager.TaskDescription; @@ -20,7 +20,7 @@ index 3569e7bc49032..1f2864221d5c8 100644 import android.os.Build; import android.os.Build.VERSION; import android.os.Build.VERSION_CODES; -@@ -454,11 +456,15 @@ public class ChromeBaseAppCompatActivity extends AppCompatActivity +@@ -488,11 +490,15 @@ public class ChromeBaseAppCompatActivity extends AppCompatActivity /** Sets the default task description that will appear in the recents UI. */ protected void setDefaultTaskDescription() { diff --git a/build/e_patches/Browser-Use-correct-switch-scale.patch b/build/e_patches/Browser-Use-correct-switch-scale.patch index 4cc4b5d79a3d0c219b2761aeca4fbcd33652da53..f5d91ebf159ac6b5a140634cec675d2b7bec67cd 100644 --- a/build/e_patches/Browser-Use-correct-switch-scale.patch +++ b/build/e_patches/Browser-Use-correct-switch-scale.patch @@ -1,4 +1,4 @@ -From 7568f72bcafd508bbc55c7dc83f680ad2e5c6f19 Mon Sep 17 00:00:00 2001 +From 7984d39d3b1c5b394cc3ff3af80aafc67d5453aa Mon Sep 17 00:00:00 2001 From: althafvly Date: Wed, 7 Aug 2024 14:05:16 +0530 Subject: Browser: Use correct switch scale @@ -8,7 +8,7 @@ Subject: Browser: Use correct switch scale 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/browser_ui/widget/android/java/res/values/dimens.xml b/components/browser_ui/widget/android/java/res/values/dimens.xml -index 675a27c7ee75e..6fb89c1891296 100644 +index 6092501463614..7746e411747a2 100644 --- a/components/browser_ui/widget/android/java/res/values/dimens.xml +++ b/components/browser_ui/widget/android/java/res/values/dimens.xml @@ -218,7 +218,7 @@ found in the LICENSE file. diff --git a/build/e_patches/Browser-Use-our-custom-icon-for-browser.patch b/build/e_patches/Browser-Use-our-custom-icon-for-browser.patch index 839697ab3133e206782123302e5921beeca8748e..922843258c0b239c1ccda794912f4cb4075b2ebd 100644 --- a/build/e_patches/Browser-Use-our-custom-icon-for-browser.patch +++ b/build/e_patches/Browser-Use-our-custom-icon-for-browser.patch @@ -1,4 +1,4 @@ -From 8ce16c408a45bb8b46ff12ff61ebea498791a776 Mon Sep 17 00:00:00 2001 +From 6b67f1d17b3b63a6d2126edee73177792e4e0b53 Mon Sep 17 00:00:00 2001 From: althafvly Date: Fri, 18 Nov 2022 10:07:39 +0000 Subject: Browser: Use our custom icon for browser @@ -60,10 +60,10 @@ Subject: Browser: Use our custom icon for browser delete mode 100644 chrome/android/java/res_chromium_base/mipmap-xxxhdpi/layered_app_icon_background.png diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn -index adab8ac7a16d0..ca43229a4277a 100644 +index 6aa78bbbf2bcd..bd9c7455c18d1 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -177,22 +177,24 @@ if (current_toolchain == default_toolchain) { +@@ -174,22 +174,24 @@ if (current_toolchain == default_toolchain) { "java/res_base/values/ic_launcher_round_alias.xml", "java/res_base/values/values.xml", "java/res_base/xml/network_security_config.xml", @@ -98,7 +98,7 @@ index adab8ac7a16d0..ca43229a4277a 100644 "java/res_chromium_base/values/channel_constants.xml", ] } -@@ -2312,22 +2314,24 @@ if (current_toolchain == default_toolchain) { +@@ -1584,22 +1586,24 @@ if (current_toolchain == default_toolchain) { android_resources("chrome_public_apk_base_module_resources") { resource_overlay = true sources = [ diff --git a/build/e_patches/Browser-disable-first-run-welcome-page.patch b/build/e_patches/Browser-disable-first-run-welcome-page.patch index efa189588a812de678f2ac004e6c45de8f32650a..7234b1eea6f8efa9b93e213196ac1558dbcc3aa8 100644 --- a/build/e_patches/Browser-disable-first-run-welcome-page.patch +++ b/build/e_patches/Browser-disable-first-run-welcome-page.patch @@ -1,4 +1,4 @@ -From 5dc73a7213dd28c20ca6f2f22dc51d30aa53dc9b Mon Sep 17 00:00:00 2001 +From 64a76316a9c7d865e689d0443ce25ef3f8c720c1 Mon Sep 17 00:00:00 2001 From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Sun, 26 Nov 2017 22:51:43 +0100 Subject: Browser: disable first run welcome page @@ -29,10 +29,10 @@ index 6a83155e04e70..fd45dda7d78c8 100644 /** diff --git a/chrome/browser/first_run/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java b/chrome/browser/first_run/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java -index 4aedb8a0f1d95..d10c15f0fad1c 100644 +index d9ad00c856f6d..9a57484a9b7f8 100644 --- a/chrome/browser/first_run/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java +++ b/chrome/browser/first_run/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java -@@ -50,8 +50,12 @@ public class FirstRunStatus { +@@ -52,8 +52,12 @@ public class FirstRunStatus { * includes ToS and Sign In pages if necessary. */ public static boolean getFirstRunFlowComplete() { diff --git a/build/e_patches/Browser-disable-price-shopping-commerce-integration.patch b/build/e_patches/Browser-disable-price-shopping-commerce-integration.patch index 28ea5ea56256e9ef4f5351ff324950058f1c4602..2afacea5acb10e2adec1be63c2335da3f06cde72 100644 --- a/build/e_patches/Browser-disable-price-shopping-commerce-integration.patch +++ b/build/e_patches/Browser-disable-price-shopping-commerce-integration.patch @@ -1,4 +1,4 @@ -From 59defffb02cd28c34bdf4e87d2358e930bf38fff Mon Sep 17 00:00:00 2001 +From 0691a525040be3f754b3e44a2c46764f97aa4d32 Mon Sep 17 00:00:00 2001 From: althafvly Date: Wed, 4 Oct 2023 19:36:24 +0530 Subject: Browser: disable price shopping commerce integration @@ -9,10 +9,10 @@ Subject: Browser: disable price shopping commerce integration 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java -index c43b889f5da18..9369caa87e9b2 100644 +index 405a5509a86d1..3b04979dba79f 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java -@@ -1229,7 +1229,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -1241,7 +1241,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate } Profile profile = currentTab.getProfile(); @@ -21,7 +21,7 @@ index c43b889f5da18..9369caa87e9b2 100644 ShoppingService.ProductInfo info = null; if (service != null) { info = service.getAvailableProductInfoForUrl(currentTab.getUrl()); -@@ -1262,7 +1262,9 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -1274,7 +1274,9 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate } else { startPriceTrackingMenuItem.setVisible(true); stopPriceTrackingMenuItem.setVisible(false); @@ -33,7 +33,7 @@ index c43b889f5da18..9369caa87e9b2 100644 /** diff --git a/components/commerce/core/commerce_feature_list.cc b/components/commerce/core/commerce_feature_list.cc -index 7c0dbc082067d..79c3c30bebcc3 100644 +index 1047fa376d888..07274f39eb157 100644 --- a/components/commerce/core/commerce_feature_list.cc +++ b/components/commerce/core/commerce_feature_list.cc @@ -120,7 +120,7 @@ BASE_FEATURE(kCommerceAllowLocalImages, @@ -43,9 +43,9 @@ index 7c0dbc082067d..79c3c30bebcc3 100644 - base::FEATURE_ENABLED_BY_DEFAULT); + base::FEATURE_DISABLED_BY_DEFAULT); - BASE_FEATURE(kCommerceAllowOnDemandBookmarkBatchUpdates, - "CommerceAllowOnDemandBookmarkBatchUpdates", -@@ -358,7 +358,7 @@ BASE_FEATURE(kShoppingPageTypesRegionLaunched, + BASE_FEATURE(kCommerceMerchantViewer, + "CommerceMerchantViewer", +@@ -342,7 +342,7 @@ BASE_FEATURE(kShoppingPageTypesRegionLaunched, "ShoppingPageTypesRegionLaunched", base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/build/e_patches/Browser-disable-search-provider-logo.patch b/build/e_patches/Browser-disable-search-provider-logo.patch index f7dda881b618fb8cf0c0515636e1a937e4d865b2..f45b4ce39c4e24cb616b70e46bd88675be9cdfc0 100644 --- a/build/e_patches/Browser-disable-search-provider-logo.patch +++ b/build/e_patches/Browser-disable-search-provider-logo.patch @@ -1,4 +1,4 @@ -From 0031aa947f9bf5dd214771f5cb708b8695ebb0b5 Mon Sep 17 00:00:00 2001 +From 5cec55e2b5ec8d34456b30fe3149c088e290fe8e Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Mon, 17 Jun 2019 12:03:52 -0400 Subject: Browser: disable search provider logo @@ -8,7 +8,7 @@ Subject: Browser: disable search provider logo 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/components/search_engines/android/template_url_service_android.cc b/components/search_engines/android/template_url_service_android.cc -index 3602bfc20e4d0..437b868e4ed9a 100644 +index 4d5fc91d347ff..b50533bbe332b 100644 --- a/components/search_engines/android/template_url_service_android.cc +++ b/components/search_engines/android/template_url_service_android.cc @@ -184,28 +184,7 @@ jboolean TemplateUrlServiceAndroid::IsSearchByImageAvailable( diff --git a/build/e_patches/Change-accent-and-switch-to-match-our-palette.patch b/build/e_patches/Change-accent-and-switch-to-match-our-palette.patch index c0b3509fd5436b745b8dfb146e8313ec6f2475a9..ce490d948e92eb2c8b3a9a4bbff5dd479d95175e 100644 --- a/build/e_patches/Change-accent-and-switch-to-match-our-palette.patch +++ b/build/e_patches/Change-accent-and-switch-to-match-our-palette.patch @@ -1,4 +1,4 @@ -From 905efe3d803541f284ed4a4c5832b9677597c131 Mon Sep 17 00:00:00 2001 +From 7fcd94677c868e4788cb6b5eb04e79ae5eedbb63 Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Tue, 20 Feb 2024 20:35:25 +0530 Subject: Change accent and switch to match our palette @@ -185,10 +185,10 @@ index ecc6bc6b9b150..175082479e551 100644 - app:drawableTint="?attr/colorPrimary" /> + app:drawableTint="@color/default_control_color_active_baseline" /> diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBarViewBinder.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBarViewBinder.java -index 8d17efe86438c..d2574f63c9f52 100644 +index 141a674ec162e..86da486c4a949 100644 --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBarViewBinder.java +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBarViewBinder.java -@@ -142,7 +142,7 @@ class UrlBarViewBinder { +@@ -144,7 +144,7 @@ class UrlBarViewBinder { final int color = useIncognitoColors ? view.getContext().getColor(R.color.default_control_color_active_dark) @@ -198,10 +198,10 @@ index 8d17efe86438c..d2574f63c9f52 100644 textSelectHandle.mutate().setTint(color); textSelectHandleLeft.mutate().setTint(color); diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/styles/OmniboxResourceProvider.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/styles/OmniboxResourceProvider.java -index acddf13fb2e56..aa8bd91b64951 100644 +index c9fea8e3cbb84..c52583ee654e3 100644 --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/styles/OmniboxResourceProvider.java +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/styles/OmniboxResourceProvider.java -@@ -352,7 +352,7 @@ public class OmniboxResourceProvider { +@@ -355,7 +355,7 @@ public class OmniboxResourceProvider { if (brandedColorScheme == BrandedColorScheme.INCOGNITO) { return context.getColor(R.color.locationbar_status_preview_color_incognito); } @@ -307,12 +307,12 @@ index 0000000000000..f5b1eed6f2e6f + + diff --git a/components/browser_ui/styles/android/java/res/values/semantic_colors_dynamic.xml b/components/browser_ui/styles/android/java/res/values/semantic_colors_dynamic.xml -index bc6c50211415c..6cbf076d32ae9 100644 +index 3355579948d4d..c77354a73b353 100644 --- a/components/browser_ui/styles/android/java/res/values/semantic_colors_dynamic.xml +++ b/components/browser_ui/styles/android/java/res/values/semantic_colors_dynamic.xml -@@ -8,18 +8,18 @@ found in the LICENSE file. - ?attr/colorSurface +@@ -9,18 +9,18 @@ found in the LICENSE file. ?attr/colorSurface + ?attr/colorSurfaceInverse - ?attr/colorPrimary + @color/default_control_color_active_baseline @@ -364,7 +364,7 @@ index 0fc8e8e6559ff..fcea0bb5b51d1 100644 diff --git a/components/browser_ui/theme/android/java/res/values/themes.xml b/components/browser_ui/theme/android/java/res/values/themes.xml -index 67b06a563c14c..94529265b017d 100644 +index 547fab112eacf..ec7313150b87e 100644 --- a/components/browser_ui/theme/android/java/res/values/themes.xml +++ b/components/browser_ui/theme/android/java/res/values/themes.xml @@ -46,7 +46,7 @@ found in the LICENSE file. @@ -439,10 +439,10 @@ index 209d2a1568df5..c615ca94ceffa 100644 android:layout_width="wrap_content" android:layout_height="wrap_content" /> diff --git a/ui/android/java/res/values/color_palette.xml b/ui/android/java/res/values/color_palette.xml -index d7a0f8fea13ad..cab2b40e28ead 100644 +index 43dbabd12dc90..8b66a2573ec56 100644 --- a/ui/android/java/res/values/color_palette.xml +++ b/ui/android/java/res/values/color_palette.xml -@@ -11,13 +11,13 @@ found in the LICENSE file. +@@ -11,14 +11,14 @@ found in the LICENSE file. @android:color/white #ECF3FE #D3E3FD @@ -451,6 +451,7 @@ index d7a0f8fea13ad..cab2b40e28ead 100644 #19A8C7FA #33A8C7FA #80A8C7FA + #7CACF8 #4C8DF6 #1B6EF3 - #0B57D0 @@ -458,8 +459,8 @@ index d7a0f8fea13ad..cab2b40e28ead 100644 #0F0B57D0 #190B57D0 #1F0B57D0 -@@ -142,4 +142,9 @@ found in the LICENSE file. - @color/baseline_primary_40 +@@ -145,4 +145,9 @@ found in the LICENSE file. + @color/baseline_primary_30 @color/baseline_primary_20 @color/baseline_primary_10 + diff --git a/build/e_patches/Disable-AGSA-by-default.patch b/build/e_patches/Disable-AGSA-by-default.patch index f0930010d593d8ea067c648c70218febc44e8658..56e018ffa76040bedd6947717ad558e6ac171f14 100644 --- a/build/e_patches/Disable-AGSA-by-default.patch +++ b/build/e_patches/Disable-AGSA-by-default.patch @@ -1,11 +1,11 @@ -From 6f541b3017e1da25edc28cd368068ff15d516d0d Mon Sep 17 00:00:00 2001 +From 2305bcf20d0c3e59edb1957ce4e6f09b51256e44 Mon Sep 17 00:00:00 2001 From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Sun, 26 Sep 2021 11:17:53 +0200 Subject: Disable AGSA by default License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - chrome/android/BUILD.gn | 2 -- + chrome/android/BUILD.gn | 1 - .../chromium/chrome/browser/IntentHandler.java | 8 -------- .../contextmenu/ChromeContextMenuPopulator.java | 7 ------- ...CustomTabActivityClientConnectionKeeper.java | 16 ++++------------ @@ -13,13 +13,13 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../chrome/browser/share/LensUtils.java | 17 ++--------------- .../chrome/browser/ui/RootUiCoordinator.java | 17 ----------------- .../flags/android/chrome_feature_list.cc | 4 ++-- - 8 files changed, 8 insertions(+), 65 deletions(-) + 8 files changed, 8 insertions(+), 64 deletions(-) diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn -index ca43229a4277a..af6c048c81d75 100644 +index bd9c7455c18d1..774c88f571b23 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -401,7 +401,6 @@ if (current_toolchain == default_toolchain) { +@@ -404,7 +404,6 @@ if (current_toolchain == default_toolchain) { "//chrome/browser/flags:java", "//chrome/browser/fullscreen/android:java", "//chrome/browser/gesturenav/android:java", @@ -27,14 +27,6 @@ index ca43229a4277a..af6c048c81d75 100644 "//chrome/browser/history:java", "//chrome/browser/history_clusters:java", "//chrome/browser/hub:factory_java", -@@ -1074,7 +1073,6 @@ if (current_toolchain == default_toolchain) { - "//chrome/browser/flags:flags_junit_tests", - "//chrome/browser/flags:java", - "//chrome/browser/fullscreen/android:java", -- "//chrome/browser/gsa:java", - "//chrome/browser/history:java", - "//chrome/browser/history_clusters:java", - "//chrome/browser/hub:factory_java", diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java index 7f2039e0d8130..ddbb1bab0c669 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java @@ -83,7 +75,7 @@ index 7f2039e0d8130..ddbb1bab0c669 100644 return ExternalAppId.CHROME; } else if (packageName.startsWith(WEBAPK_PACKAGE_PREFIX)) { diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java -index 996a540c80df1..ea14854e5cbb6 100644 +index 3007aa264750d..26d36d2576328 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java @@ -38,7 +38,6 @@ import org.chromium.chrome.browser.ephemeraltab.EphemeralTabCoordinator; @@ -94,7 +86,7 @@ index 996a540c80df1..ea14854e5cbb6 100644 import org.chromium.chrome.browser.lens.LensController; import org.chromium.chrome.browser.lens.LensEntryPoint; import org.chromium.chrome.browser.lens.LensIntentParams; -@@ -959,12 +958,6 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { +@@ -972,12 +971,6 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { LensMetrics.LensSupportStatus.ACTIVITY_NOT_ACCESSIBLE); return false; } @@ -141,10 +133,10 @@ index 3f20edd697978..c3a1f7882591b 100644 } } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingReferringAppBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingReferringAppBridge.java -index ad4d6cd7025cd..ccf4f046812db 100644 +index 820a8004e2d23..035ee195169e3 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingReferringAppBridge.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingReferringAppBridge.java -@@ -139,8 +139,6 @@ public class SafeBrowsingReferringAppBridge { +@@ -189,8 +189,6 @@ public class SafeBrowsingReferringAppBridge { return "line"; case ExternalAppId.WHATSAPP: return "whatsapp"; @@ -196,10 +188,10 @@ index d28f7ade3313c..8ff94a355de29 100644 public static boolean isGoogleLensFeatureEnabled(boolean isIncognito) { diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java -index f3579f2c4469f..794007631ffaf 100644 +index 6f2a59310728b..4088b4a7b1d6c 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java -@@ -924,23 +924,6 @@ public class RootUiCoordinator +@@ -923,23 +923,6 @@ public class RootUiCoordinator mLayoutStateProviderOneShotSupplier, mFullscreenManager); mReadAloudControllerSupplier.set(controller); @@ -224,10 +216,10 @@ index f3579f2c4469f..794007631ffaf 100644 if (BuildInfo.getInstance().isAutomotive && ChromeFeatureList.isEnabled( diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc -index 3e12753ed6a63..86ed7c21fb286 100644 +index a589c22f74b92..155935ec710d4 100644 --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -804,8 +804,8 @@ BASE_FEATURE(kEnableXAxisActivityTransition, +@@ -833,8 +833,8 @@ BASE_FEATURE(kEnableXAxisActivityTransition, base::FEATURE_DISABLED_BY_DEFAULT); BASE_FEATURE(kExperimentsForAgsa, diff --git a/build/e_patches/Disable-adding-a-signed-out-avatar-on-new-tab-pages-by-default.patch b/build/e_patches/Disable-adding-a-signed-out-avatar-on-new-tab-pages-by-default.patch index e757f1d9efb8a02044ff446a32046c0c55bf5471..12716a603e220d83d2e2162c0ec8dac32dc88eb0 100644 --- a/build/e_patches/Disable-adding-a-signed-out-avatar-on-new-tab-pages-by-default.patch +++ b/build/e_patches/Disable-adding-a-signed-out-avatar-on-new-tab-pages-by-default.patch @@ -1,4 +1,4 @@ -From cada2deb924365ce29eca8821e97f018dc7e1016 Mon Sep 17 00:00:00 2001 +From a2260c8b820d2ee426a2b437dcf79c8eba27eb55 Mon Sep 17 00:00:00 2001 From: fgei Date: Tue, 8 Aug 2023 09:10:36 +0000 Subject: Disable adding a signed out avatar on new tab pages by default @@ -8,12 +8,12 @@ Subject: Disable adding a signed out avatar on new tab pages by default 1 file changed, 12 insertions(+) diff --git a/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/IdentityDiscController.java b/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/IdentityDiscController.java -index ffcce1887f7ca..7bd86929f1a66 100644 +index 1c23291823910..4fb7434759ff8 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/IdentityDiscController.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/IdentityDiscController.java -@@ -62,6 +62,9 @@ public class IdentityDiscController - ProfileDataCache.Observer, +@@ -68,6 +68,9 @@ public class IdentityDiscController IdentityManager.Observer, + SyncService.SyncStateChangedListener, ButtonDataProvider { + + private static final boolean ALLOW_NTP_AVATAR = false; @@ -21,7 +21,7 @@ index ffcce1887f7ca..7bd86929f1a66 100644 // Context is used for fetching resources and launching preferences page. private final Context mContext; private ActivityLifecycleDispatcher mActivityLifecycleDispatcher; -@@ -150,6 +153,11 @@ public class IdentityDiscController +@@ -162,6 +165,11 @@ public class IdentityDiscController return; } @@ -33,7 +33,7 @@ index ffcce1887f7ca..7bd86929f1a66 100644 String email = CoreAccountInfo.getEmailFrom(getSignedInAccountInfo()); ensureProfileDataCache(); -@@ -325,6 +333,10 @@ public class IdentityDiscController +@@ -383,6 +391,10 @@ public class IdentityDiscController } private String getContentDescription(@Nullable String email) { diff --git a/build/e_patches/Enable-SPPI-for-devices-with-enough-memory.patch b/build/e_patches/Enable-SPPI-for-devices-with-enough-memory.patch index 111818fd32941d456b698777327e62b5c4f7df74..4970e23502c3bb31f5e5dd20691d536ecc46fa18 100644 --- a/build/e_patches/Enable-SPPI-for-devices-with-enough-memory.patch +++ b/build/e_patches/Enable-SPPI-for-devices-with-enough-memory.patch @@ -1,4 +1,4 @@ -From 65b523b7b526fb96cc2b78a0f5467dd66b026755 Mon Sep 17 00:00:00 2001 +From ca7e69c91a1fcddd7b344b5f6cbc849461c914d2 Mon Sep 17 00:00:00 2001 From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Sun, 17 Mar 2019 19:09:00 +0100 Subject: Enable SPPI for devices with enough memory @@ -9,7 +9,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/site_isolation/features.cc b/components/site_isolation/features.cc -index b45a6e9f43d84..ef677a54c9e7b 100644 +index ddb1f9e6f6268..ab185da7fa474 100644 --- a/components/site_isolation/features.cc +++ b/components/site_isolation/features.cc @@ -60,8 +60,8 @@ BASE_FEATURE(kSiteIsolationForOAuthSites, diff --git a/build/e_patches/Enable-sensors-by-default.patch b/build/e_patches/Enable-sensors-by-default.patch index 1e82a94a300af4841819928ce60a729880cb180d..039f30087608e86b75139754fa7b7659d511ce4c 100644 --- a/build/e_patches/Enable-sensors-by-default.patch +++ b/build/e_patches/Enable-sensors-by-default.patch @@ -1,4 +1,4 @@ -From 7334e6860abb2cbc18805fa3d58b0118308769c4 Mon Sep 17 00:00:00 2001 +From ceb1efe62471b4a537af15b56c873b90d09428eb Mon Sep 17 00:00:00 2001 From: althafvly Date: Mon, 12 Feb 2024 15:07:39 +0530 Subject: Enable sensors by default @@ -8,7 +8,7 @@ Subject: Enable sensors by default 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc -index 4b00fa0f1c92d..67c22c4b2bd03 100644 +index 11561e8ec1a95..3abbbc5adf304 100644 --- a/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc @@ -384,7 +384,7 @@ void ContentSettingsRegistry::Init() { diff --git a/build/e_patches/Handle-web-search-action-in-browser.patch b/build/e_patches/Handle-web-search-action-in-browser.patch index 524c9bcc3899c0d4df127a7fdae887a47056de50..649086e4622b319bd21718c5d6ce54acc4ca9497 100644 --- a/build/e_patches/Handle-web-search-action-in-browser.patch +++ b/build/e_patches/Handle-web-search-action-in-browser.patch @@ -1,4 +1,4 @@ -From a8d8919fccbc3bc541fb5ed311a5dc0d32973a6b Mon Sep 17 00:00:00 2001 +From c81109cb8db17017aa0da89d250b4a6e3c76c295 Mon Sep 17 00:00:00 2001 From: fgei Date: Wed, 28 Sep 2022 05:37:00 +0200 Subject: Handle web search action in browser @@ -31,7 +31,7 @@ index 65a120550836a..0ce705561751b 100644 public static boolean hasSystemFeature(String feature) { PackageManager pm = ContextUtils.getApplicationContext().getPackageManager(); diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml -index fed30360f4a8f..6699b9028e00f 100644 +index e9f1ce7e50ed9..41726bb269bca 100644 --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml @@ -343,6 +343,10 @@ by a child template that "extends" this file. diff --git a/build/e_patches/Hide-Sign-In-preference-when-disallowed.patch b/build/e_patches/Hide-Sign-In-preference-when-disallowed.patch index 5ceab3fe9a79c246c2a8d112c7a3c8bb4ea58618..f57c5e4384b40daedc3ef91735407b550c9a2ae0 100644 --- a/build/e_patches/Hide-Sign-In-preference-when-disallowed.patch +++ b/build/e_patches/Hide-Sign-In-preference-when-disallowed.patch @@ -1,4 +1,4 @@ -From 201aea217fade20bceec637390e0bf73e0185fbc Mon Sep 17 00:00:00 2001 +From 85400e70f1b207b4e8c8877355d3a5f7d683e425 Mon Sep 17 00:00:00 2001 From: fgei Date: Sun, 29 Aug 2021 19:31:00 +0000 Subject: Hide Sign In preference when disallowed @@ -8,10 +8,10 @@ Subject: Hide Sign In preference when disallowed 1 file changed, 1 insertion(+) diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SignInPreference.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SignInPreference.java -index bcb60e5567e0e..d0472d0720a3e 100644 +index 73a6e628c6bd1..da093d2e9f036 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SignInPreference.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SignInPreference.java -@@ -181,6 +181,7 @@ public class SignInPreference extends Preference +@@ -172,6 +172,7 @@ public class SignInPreference extends Preference } private void setupSigninDisallowed() { diff --git a/build/e_patches/Multiple-fingerprinting-mitigations.patch b/build/e_patches/Multiple-fingerprinting-mitigations.patch index 636a4de3dea2e96372bac1e7edeb2223ebaa8398..cccbcbf322971c7d29f8b8670114e3e22bcb7f74 100644 --- a/build/e_patches/Multiple-fingerprinting-mitigations.patch +++ b/build/e_patches/Multiple-fingerprinting-mitigations.patch @@ -1,4 +1,4 @@ -From 27995be2c442e481f7b501261f2d34bf0e12c4e6 Mon Sep 17 00:00:00 2001 +From 3f8beea28a6439d6f364e23d9fde8dd9754388da Mon Sep 17 00:00:00 2001 From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Fri, 30 Mar 2018 10:09:03 +0200 Subject: Multiple fingerprinting mitigations @@ -61,10 +61,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html create mode 100644 third_party/ungoogled/ungoogled_switches.h diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index 98d94697f2c47..b4a03a24791f4 100644 +index da9c0a16cc4f4..5ac58b00cad2d 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2428,6 +2428,7 @@ static_library("browser") { +@@ -2465,6 +2465,7 @@ static_library("browser") { "//services/device/public/cpp:device_features", "//services/device/public/cpp/geolocation", "//services/device/public/cpp/usb", @@ -73,10 +73,10 @@ index 98d94697f2c47..b4a03a24791f4 100644 "//services/device/public/mojom:usb", "//services/image_annotation:service", diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc -index 293e9aff42b9a..4859f382f9ec9 100644 +index fd318c00cf7ee..6ce02bdaa365d 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -257,6 +257,8 @@ +@@ -259,6 +259,8 @@ #include "extensions/common/extension_features.h" #endif @@ -86,10 +86,10 @@ index 293e9aff42b9a..4859f382f9ec9 100644 #include "base/allocator/buildflags.h" #endif diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn -index 046be0a01b26c..d052a83ae605e 100644 +index fcb315726a70b..80c8c6b027dfd 100644 --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn -@@ -281,6 +281,7 @@ source_set("browser") { +@@ -283,6 +283,7 @@ source_set("browser") { "//third_party/re2", "//third_party/snappy", "//third_party/sqlite", @@ -98,10 +98,10 @@ index 046be0a01b26c..d052a83ae605e 100644 "//third_party/zlib", "//tools/v8_context_snapshot:buildflags", diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc -index 1c2050fc0f5b1..28ed58f6dee1e 100644 +index aac718fdd1741..1bc2340a81077 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc -@@ -213,6 +213,7 @@ +@@ -214,6 +214,7 @@ #include "url/gurl.h" #include "url/origin.h" @@ -109,7 +109,7 @@ index 1c2050fc0f5b1..28ed58f6dee1e 100644 #if BUILDFLAG(IS_ANDROID) #include "base/android/child_process_binding_types.h" #include "content/browser/font_unique_name_lookup/font_unique_name_lookup_service.h" -@@ -3317,6 +3318,9 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( +@@ -3376,6 +3377,9 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( switches::kDisableBreakpad, switches::kDisableDatabases, switches::kDisableFileSystem, @@ -120,7 +120,7 @@ index 1c2050fc0f5b1..28ed58f6dee1e 100644 switches::kDisableGpuMemoryBufferVideoFrames, switches::kDisableHistogramCustomizer, diff --git a/content/child/BUILD.gn b/content/child/BUILD.gn -index 079956c527035..0cfda4a45d3fb 100644 +index f89259d511ef1..fcdbd8a37ad8a 100644 --- a/content/child/BUILD.gn +++ b/content/child/BUILD.gn @@ -109,6 +109,7 @@ target(link_target_type, "child") { @@ -132,7 +132,7 @@ index 079956c527035..0cfda4a45d3fb 100644 "//ui/base", "//ui/events/blink", diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc -index bf0caaf4e78ac..d8461dfeadccd 100644 +index 3d2a4f4f6d205..7a52933c1e5a2 100644 --- a/content/child/runtime_features.cc +++ b/content/child/runtime_features.cc @@ -48,6 +48,8 @@ @@ -144,7 +144,7 @@ index bf0caaf4e78ac..d8461dfeadccd 100644 #if BUILDFLAG(IS_ANDROID) #include "base/android/build_info.h" #endif -@@ -527,6 +529,12 @@ void SetRuntimeFeaturesFromCommandLine(const base::CommandLine& command_line) { +@@ -517,6 +519,12 @@ void SetRuntimeFeaturesFromCommandLine(const base::CommandLine& command_line) { // as a last resort. void SetCustomizedRuntimeFeaturesFromCombinedArgs( const base::CommandLine& command_line) { @@ -194,10 +194,10 @@ index d7d110b9f8f30..136b67c51f120 100644 static void EnableFluentOverlayScrollbars(bool); static void EnableVibration(bool); diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc -index 9c77853b1eaab..d3612bda56444 100644 +index 8213627591d1b..116a6255d5f33 100644 --- a/third_party/blink/renderer/core/dom/document.cc +++ b/third_party/blink/renderer/core/dom/document.cc -@@ -38,6 +38,7 @@ +@@ -39,6 +39,7 @@ #include "base/containers/contains.h" #include "base/debug/dump_without_crashing.h" #include "base/i18n/time_formatting.h" @@ -205,7 +205,7 @@ index 9c77853b1eaab..d3612bda56444 100644 #include "base/metrics/histogram_functions.h" #include "base/not_fatal_until.h" #include "base/notreached.h" -@@ -863,6 +864,17 @@ Document::Document(const DocumentInit& initializer, +@@ -866,6 +867,17 @@ Document::Document(const DocumentInit& initializer, TRACE_EVENT_WITH_FLOW0("blink", "Document::Document", TRACE_ID_LOCAL(this), TRACE_EVENT_FLAG_FLOW_OUT); DCHECK(agent_); @@ -223,7 +223,7 @@ index 9c77853b1eaab..d3612bda56444 100644 if (base::FeatureList::IsEnabled(features::kDelayAsyncScriptExecution) && features::kDelayAsyncScriptExecutionDelayByDefaultParam.Get()) { script_runner_delayer_->Activate(); -@@ -2480,6 +2492,14 @@ void Document::UpdateStyleAndLayoutTreeForThisDocument() { +@@ -2492,6 +2504,14 @@ void Document::UpdateStyleAndLayoutTreeForThisDocument() { #endif } @@ -239,10 +239,10 @@ index 9c77853b1eaab..d3612bda56444 100644 DCHECK(IsActive()); DCHECK(IsMainThread()); diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/renderer/core/dom/document.h -index 5c75dc1b26e98..d5ef655a25757 100644 +index 107b145f58486..280337088dc2f 100644 --- a/third_party/blink/renderer/core/dom/document.h +++ b/third_party/blink/renderer/core/dom/document.h -@@ -541,6 +541,10 @@ class CORE_EXPORT Document : public ContainerNode, +@@ -540,6 +540,10 @@ class CORE_EXPORT Document : public ContainerNode, return static_cast(xml_standalone_); } bool HasXMLDeclaration() const { return has_xml_declaration_; } @@ -253,7 +253,7 @@ index 5c75dc1b26e98..d5ef655a25757 100644 void SetXMLEncoding(const String& encoding) { xml_encoding_ = encoding; -@@ -2632,6 +2636,9 @@ class CORE_EXPORT Document : public ContainerNode, +@@ -2641,6 +2645,9 @@ class CORE_EXPORT Document : public ContainerNode, base::ElapsedTimer start_time_; @@ -264,10 +264,10 @@ index 5c75dc1b26e98..d5ef655a25757 100644 Member script_runner_delayer_; diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/renderer/core/dom/element.cc -index c69097df7e24d..b868d69a0f189 100644 +index e6cc380be7c6f..d94efdc1d575d 100644 --- a/third_party/blink/renderer/core/dom/element.cc +++ b/third_party/blink/renderer/core/dom/element.cc -@@ -2633,6 +2633,7 @@ void Element::ClientQuads(Vector& quads) const { +@@ -2723,6 +2723,7 @@ void Element::ClientQuads(Vector& quads) const { quads.push_back(element_layout_object->LocalToAbsoluteQuad( gfx::QuadF(element_layout_object->ObjectBoundingBox()))); } @@ -275,7 +275,7 @@ index c69097df7e24d..b868d69a0f189 100644 return; } -@@ -2641,6 +2642,10 @@ void Element::ClientQuads(Vector& quads) const { +@@ -2731,6 +2732,10 @@ void Element::ClientQuads(Vector& quads) const { element_layout_object->IsBR()) { element_layout_object->AbsoluteQuads(quads); } @@ -286,7 +286,7 @@ index c69097df7e24d..b868d69a0f189 100644 } DOMRectList* Element::getClientRects() { -@@ -2686,6 +2691,9 @@ gfx::RectF Element::GetBoundingClientRectNoLifecycleUpdate() const { +@@ -2776,6 +2781,9 @@ gfx::RectF Element::GetBoundingClientRectNoLifecycleUpdate() const { DCHECK(element_layout_object); GetDocument().AdjustRectForScrollAndAbsoluteZoom(result, *element_layout_object); @@ -297,10 +297,10 @@ index c69097df7e24d..b868d69a0f189 100644 } diff --git a/third_party/blink/renderer/core/dom/range.cc b/third_party/blink/renderer/core/dom/range.cc -index 7aaddebd5251c..7b95fcf9371bf 100644 +index b0e1831b283b4..f79e0316d9120 100644 --- a/third_party/blink/renderer/core/dom/range.cc +++ b/third_party/blink/renderer/core/dom/range.cc -@@ -1617,6 +1617,12 @@ DOMRectList* Range::getClientRects() const { +@@ -1632,6 +1632,12 @@ DOMRectList* Range::getClientRects() const { Vector quads; GetBorderAndTextQuads(quads); @@ -313,7 +313,7 @@ index 7aaddebd5251c..7b95fcf9371bf 100644 return MakeGarbageCollected(quads); } -@@ -1755,7 +1761,11 @@ gfx::RectF Range::BoundingRect() const { +@@ -1770,7 +1776,11 @@ gfx::RectF Range::BoundingRect() const { // If all rects are empty, return the first rect. if (result.IsEmpty() && !quads.empty()) @@ -349,7 +349,7 @@ index c7c80baf54b8d..fc688c75d492f 100644 } diff --git a/third_party/blink/renderer/core/html/canvas/text_metrics.cc b/third_party/blink/renderer/core/html/canvas/text_metrics.cc -index 8454356ab11e9..e6c3a679e732e 100644 +index ebe1e6095cf28..e31186ff1b4d5 100644 --- 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) { @@ -404,7 +404,7 @@ index ed8e6f5b855bf..a97783e63bc16 100644 UseCounter::Count(GetDocument(), WebFeature::kGetBBoxForText); } diff --git a/third_party/blink/renderer/core/svg/svg_text_content_element.cc b/third_party/blink/renderer/core/svg/svg_text_content_element.cc -index d7b23df22b372..3cc190f7e9239 100644 +index 5a99fbc971f44..1132b34307b5a 100644 --- a/third_party/blink/renderer/core/svg/svg_text_content_element.cc +++ b/third_party/blink/renderer/core/svg/svg_text_content_element.cc @@ -111,11 +111,16 @@ float SVGTextContentElement::getComputedTextLength() { @@ -484,10 +484,10 @@ index d7b23df22b372..3cc190f7e9239 100644 return -1; } diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc -index 19303bebe9ac1..8ad60546951bb 100644 +index 21d7d9e9fd521..b6b195ba94fbb 100644 --- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc +++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc -@@ -193,6 +193,11 @@ +@@ -197,6 +197,11 @@ #include "ui/gfx/geometry/size.h" #include "ui/gfx/geometry/size_f.h" #include "ui/gfx/geometry/skia_conversions.h" @@ -499,7 +499,7 @@ index 19303bebe9ac1..8ad60546951bb 100644 #include "ui/gfx/geometry/vector2d.h" #include "ui/gfx/geometry/vector2d_f.h" #include "v8/include/v8-local-handle.h" -@@ -2966,6 +2971,10 @@ ImageData* BaseRenderingContext2D::getImageDataInternal( +@@ -2970,6 +2975,10 @@ ImageData* BaseRenderingContext2D::getImageDataInternal( snapshot->PaintImageForCurrentFrame().GetSkImageInfo().bounds(); DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh))); } @@ -510,9 +510,9 @@ index 19303bebe9ac1..8ad60546951bb 100644 } return image_data; -@@ -3718,8 +3727,22 @@ TextMetrics* BaseRenderingContext2D::measureText(const String& text) { - const CanvasRenderingContext2DState& state = GetState(); - TextDirection direction = ToTextDirection(state.GetDirection(), canvas); +@@ -3705,8 +3714,22 @@ TextMetrics* BaseRenderingContext2D::measureText(const String& text) { + TextDirection direction = ToTextDirection( + state.GetDirection(), GetCanvasRenderingContextHost(), computed_style); - return MakeGarbageCollected( + auto* text_metrics = MakeGarbageCollected( @@ -535,10 +535,10 @@ index 19303bebe9ac1..8ad60546951bb 100644 void BaseRenderingContext2D::SnapshotStateForFilter() { diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn -index 9c966a2530959..e9e51fc95b56f 100644 +index 871916a18d58d..d7a192f5f7381 100644 --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -1715,7 +1715,9 @@ component("platform") { +@@ -1706,7 +1706,9 @@ component("platform") { "//third_party/blink/renderer:non_test_config", ] @@ -549,7 +549,7 @@ index 9c966a2530959..e9e51fc95b56f 100644 allow_circular_includes_from = [ "//third_party/blink/renderer/platform/blob", -@@ -1800,6 +1802,7 @@ component("platform") { +@@ -1791,6 +1793,7 @@ component("platform") { "//third_party/blink/public/strings", "//third_party/blink/renderer/platform/wtf", "//third_party/ced", @@ -785,7 +785,7 @@ index 0a575fd624b4b..9d39aca95278e 100644 + } // namespace blink diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h b/third_party/blink/renderer/platform/graphics/static_bitmap_image.h -index 182958b991418..8b5ed71c34df5 100644 +index 5125aac465daa..6ab07060932f4 100644 --- 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 { @@ -798,7 +798,7 @@ index 182958b991418..8b5ed71c34df5 100644 // Methods overridden by all sub-classes diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -index c3d3c15ac2af7..c2782880641ea 100644 +index d4b5b73702b8e..db236f0330354 100644 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 @@ -2993,6 +2993,15 @@ diff --git a/build/e_patches/Reintroduce-kWebAuthCable.patch b/build/e_patches/Reintroduce-kWebAuthCable.patch index 4bef5c0325cc149745c352fa9b2730e6bade9dc0..56cc4d50a2857c36f998e4f3b6a9b4a2531d0bb6 100644 --- a/build/e_patches/Reintroduce-kWebAuthCable.patch +++ b/build/e_patches/Reintroduce-kWebAuthCable.patch @@ -1,4 +1,4 @@ -From 279a6b1d77fe99114d64e83c8c35472ec8029f96 Mon Sep 17 00:00:00 2001 +From cf3bf72c6505c7288bd1bf92f4cc2433a2ac0cef Mon Sep 17 00:00:00 2001 From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Sun, 4 Sep 2022 18:47:58 +0200 Subject: Re-introduce kWebAuthCable @@ -18,10 +18,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 6 files changed, 30 insertions(+), 1 deletion(-) diff --git a/chrome/browser/ui/views/webauthn/authenticator_dialog_view_browsertest.cc b/chrome/browser/ui/views/webauthn/authenticator_dialog_view_browsertest.cc -index 5a9201d66664c..dad05a3f9cbd5 100644 +index 826860213ee00..aeb91d3a89438 100644 --- a/chrome/browser/ui/views/webauthn/authenticator_dialog_view_browsertest.cc +++ b/chrome/browser/ui/views/webauthn/authenticator_dialog_view_browsertest.cc -@@ -109,6 +109,12 @@ class StepTransitionObserver +@@ -110,6 +110,12 @@ class StepTransitionObserver class AuthenticatorDialogViewTest : public DialogBrowserTest { public: @@ -32,22 +32,22 @@ index 5a9201d66664c..dad05a3f9cbd5 100644 + } + // DialogBrowserTest: - void ShowUi(const std::string& name) override { - dialog_model_ = -@@ -147,6 +153,7 @@ class AuthenticatorDialogViewTest : public DialogBrowserTest { - dialog_model_->RemoveObserver(&step_transition_observer); - } - + void TearDownOnMainThread() override { + view_controller_.reset(); +@@ -141,6 +147,7 @@ class AuthenticatorDialogViewTest : public DialogBrowserTest { + // devices" button to be shown. + dialog_model_->mechanisms.emplace_back( + AuthenticatorRequestDialogModel::Mechanism::Phone("Phone"), u"Phone", + base::test::ScopedFeatureList scoped_feature_list_; - scoped_refptr dialog_model_; - }; - + u"Phone", kSmartphoneIcon, base::DoNothing()); + dialog_model_->SetStep( + AuthenticatorRequestDialogModel::Step::kMechanismSelection); diff --git a/chrome/browser/ui/webauthn/authenticator_dialog_browsertest.cc b/chrome/browser/ui/webauthn/authenticator_dialog_browsertest.cc -index b66c78ff53b5f..c152e986d278f 100644 +index b35cb4db63825..f955638f4e9bc 100644 --- a/chrome/browser/ui/webauthn/authenticator_dialog_browsertest.cc +++ b/chrome/browser/ui/webauthn/authenticator_dialog_browsertest.cc -@@ -70,6 +70,12 @@ class AuthenticatorDialogTest : public DialogBrowserTest { - "user@example.com", signin::ConsentLevel::kSync); +@@ -98,6 +98,12 @@ class AuthenticatorDialogTest : public DialogBrowserTest { + DialogBrowserTest::TearDownOnMainThread(); } + void SetUp() override { @@ -59,7 +59,7 @@ index b66c78ff53b5f..c152e986d278f 100644 // DialogBrowserTest: void ShowUi(const std::string& name) override { // Web modal dialogs' bounds may exceed the display's work area. -@@ -377,6 +383,7 @@ class AuthenticatorDialogTest : public DialogBrowserTest { +@@ -405,6 +411,7 @@ class AuthenticatorDialogTest : public DialogBrowserTest { std::unique_ptr controller_; base::RepeatingTimer timer_; int bio_samples_remaining_ = 5; @@ -68,10 +68,10 @@ index b66c78ff53b5f..c152e986d278f 100644 IN_PROC_BROWSER_TEST_F(AuthenticatorDialogTest, InvokeUi_default) { diff --git a/chrome/browser/webauthn/chrome_webauthn_browsertest.cc b/chrome/browser/webauthn/chrome_webauthn_browsertest.cc -index 6db2309d4a48b..f7d770bc6c01a 100644 +index b0bad6d998d45..04a53db5809fb 100644 --- a/chrome/browser/webauthn/chrome_webauthn_browsertest.cc +++ b/chrome/browser/webauthn/chrome_webauthn_browsertest.cc -@@ -1159,6 +1159,7 @@ IN_PROC_BROWSER_TEST_F(WebAuthnCableExtension, ServerLink) { +@@ -1158,6 +1158,7 @@ IN_PROC_BROWSER_TEST_F(WebAuthnCableExtension, ServerLink) { class WebAuthnCableSecondFactor : public WebAuthnBrowserTest { public: WebAuthnCableSecondFactor() { @@ -79,7 +79,7 @@ index 6db2309d4a48b..f7d770bc6c01a 100644 // This makes it a little easier to compare against. trace_ << std::endl; } -@@ -1407,6 +1408,7 @@ class WebAuthnCableSecondFactor : public WebAuthnBrowserTest { +@@ -1406,6 +1407,7 @@ class WebAuthnCableSecondFactor : public WebAuthnBrowserTest { }; protected: @@ -88,7 +88,7 @@ index 6db2309d4a48b..f7d770bc6c01a 100644 raw_ptr controller_ = nullptr; diff --git a/content/browser/webauth/authenticator_impl_unittest.cc b/content/browser/webauth/authenticator_impl_unittest.cc -index e5e4fe8242569..b144c726e167b 100644 +index dca681a3f79ff..2689e3024f11f 100644 --- a/content/browser/webauth/authenticator_impl_unittest.cc +++ b/content/browser/webauth/authenticator_impl_unittest.cc @@ -1512,7 +1512,12 @@ TEST_F(AuthenticatorImplTest, OversizedCredentialId) { @@ -106,10 +106,10 @@ index e5e4fe8242569..b144c726e167b 100644 NavigateAndCommit(GURL(kTestOrigin1)); diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc -index bef3b6b8256d7..7f450d1287e8f 100644 +index 666267bff0159..084b7f68aca8a 100644 --- a/content/public/common/content_features.cc +++ b/content/public/common/content_features.cc -@@ -1219,6 +1219,13 @@ BASE_FEATURE(kWebAssemblyTrapHandler, +@@ -1217,6 +1217,13 @@ BASE_FEATURE(kWebAssemblyTrapHandler, #endif ); @@ -124,10 +124,10 @@ index bef3b6b8256d7..7f450d1287e8f 100644 // https://webbluetoothcg.github.io/web-bluetooth/ BASE_FEATURE(kWebBluetooth, "WebBluetooth", base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/content/public/common/content_features.h b/content/public/common/content_features.h -index d048bb7bf3c81..21478d40fd00a 100644 +index 89a8e1ce97965..f823c26d37502 100644 --- a/content/public/common/content_features.h +++ b/content/public/common/content_features.h -@@ -273,6 +273,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebAssemblyLazyCompilation); +@@ -270,6 +270,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebAssemblyLazyCompilation); CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebAssemblyMemory64); CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebAssemblyTiering); CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebAssemblyTrapHandler); diff --git a/build/e_patches/Remove-google-pref-from-main-menu.patch b/build/e_patches/Remove-google-pref-from-main-menu.patch index 6e9d0b454327a2db535b583db4c5c8842c86b137..5e7f4e906255541431c1ab222d7a01e9c3118324 100644 --- a/build/e_patches/Remove-google-pref-from-main-menu.patch +++ b/build/e_patches/Remove-google-pref-from-main-menu.patch @@ -1,4 +1,4 @@ -From 9ff28277c9cac89585c29933c6dc86046670088b Mon Sep 17 00:00:00 2001 +From 4d495392f7eac03468b521442f6294faf874e88e Mon Sep 17 00:00:00 2001 From: althafvly Date: Mon, 12 Feb 2024 13:41:11 +0530 Subject: Remove google pref from main menu @@ -8,10 +8,10 @@ Subject: Remove google pref from main menu 1 file changed, 3 insertions(+) diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java -index 40077a1379ce2..fb5a73cceccb6 100644 +index 2f65cc21433f5..fa591514927fa 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java -@@ -262,6 +262,9 @@ public class MainSettings extends ChromeBaseSettingsFragment +@@ -259,6 +259,9 @@ public class MainSettings extends ChromeBaseSettingsFragment TemplateUrlService templateUrlService = TemplateUrlServiceFactory.getForProfile(getProfile()); diff --git a/build/e_patches/Remove-mremap-from-seccomp-baseline-policy.patch b/build/e_patches/Remove-mremap-from-seccomp-baseline-policy.patch index 9b27b2e16b95b3474392bb63aced683b849d8fe4..1c16cd439e6d527c1894f888da59ad3b27abb744 100644 --- a/build/e_patches/Remove-mremap-from-seccomp-baseline-policy.patch +++ b/build/e_patches/Remove-mremap-from-seccomp-baseline-policy.patch @@ -1,4 +1,4 @@ -From 8c551ae3c407c59fbf6b7885caffc19749a1e7f1 Mon Sep 17 00:00:00 2001 +From ec15aa6e5fa52b48fb064b860d6dec0c083c8c74 Mon Sep 17 00:00:00 2001 From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Sat, 16 Apr 2022 10:14:28 +0200 Subject: Remove mremap from seccomp baseline policy @@ -13,10 +13,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 1 file changed, 1 deletion(-) diff --git a/sandbox/linux/seccomp-bpf-helpers/baseline_policy_android.cc b/sandbox/linux/seccomp-bpf-helpers/baseline_policy_android.cc -index 34be26bb5448e..aef55c75f436c 100644 +index 16e5bda64130c..05cc6256e2407 100644 --- a/sandbox/linux/seccomp-bpf-helpers/baseline_policy_android.cc +++ b/sandbox/linux/seccomp-bpf-helpers/baseline_policy_android.cc -@@ -179,7 +179,6 @@ bool IsBaselinePolicyAllowed(int sysno) { +@@ -193,7 +193,6 @@ bool IsBaselinePolicyAllowed(int sysno) { // Used on pre-N to initialize threads in ART. case __NR_modify_ldt: #endif diff --git a/build/e_patches/Remove-some-privacy-UI-pref.patch b/build/e_patches/Remove-some-privacy-UI-pref.patch index 7bd0eef8a3e552bb273501f7b22bbcac2b0596c7..a673c6aeadc99f79c4e24f63bfd784b85a6b40d1 100644 --- a/build/e_patches/Remove-some-privacy-UI-pref.patch +++ b/build/e_patches/Remove-some-privacy-UI-pref.patch @@ -1,4 +1,4 @@ -From 4962a7db373233ab5957e296e23a76e037fc8b4b Mon Sep 17 00:00:00 2001 +From 923acfb3ad9853c61d75c39a909cba45f5c9520e Mon Sep 17 00:00:00 2001 From: althafvly Date: Mon, 12 Feb 2024 14:21:50 +0530 Subject: Remove some privacy UI pref @@ -8,10 +8,10 @@ Subject: Remove some privacy UI pref 1 file changed, 4 insertions(+) diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java -index 702a8b21b9396..228944ae9d304 100644 +index 56ab06c2296ea..6f878c3199cd0 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java -@@ -232,6 +232,8 @@ public class PrivacySettings extends ChromeBaseSettingsFragment +@@ -227,6 +227,8 @@ public class PrivacySettings extends ChromeBaseSettingsFragment mContextualSearch.setSummary( isContextualSearchEnabled ? R.string.text_on : R.string.text_off); @@ -20,7 +20,7 @@ index 702a8b21b9396..228944ae9d304 100644 ChromeSwitchPreference canMakePaymentPref = (ChromeSwitchPreference) findPreference(PREF_CAN_MAKE_PAYMENT); canMakePaymentPref.setOnPreferenceChangeListener(this); -@@ -286,6 +288,8 @@ public class PrivacySettings extends ChromeBaseSettingsFragment +@@ -281,6 +283,8 @@ public class PrivacySettings extends ChromeBaseSettingsFragment Preference syncAndServicesLink = findPreference(PREF_SYNC_AND_SERVICES_LINK); syncAndServicesLink.setSummary(buildFooterString()); diff --git a/build/e_patches/Revert-TM-Add-themed-app-icons.patch b/build/e_patches/Revert-TM-Add-themed-app-icons.patch index 9f1d1d08ab2c5d62e1abd394f25c00faebcd139b..e11f24e27dc592f1ddfda780d078cdc9c702e514 100644 --- a/build/e_patches/Revert-TM-Add-themed-app-icons.patch +++ b/build/e_patches/Revert-TM-Add-themed-app-icons.patch @@ -1,4 +1,4 @@ -From d64ed8ac7e7b08bad0355ed56099434f5097ed39 Mon Sep 17 00:00:00 2001 +From fcd5260fea1ee12edf5ac7a9bcfd03492912bfa4 Mon Sep 17 00:00:00 2001 From: althafvly Date: Fri, 18 Nov 2022 09:48:02 +0000 Subject: Revert "[TM] Add themed app icons" @@ -13,10 +13,10 @@ This reverts commit 9faa242a0c09838268d7c969acdf493f29ef3db5. delete mode 100644 chrome/android/java/res_chromium_base/drawable/themed_app_icon.xml diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn -index 69722502be6ea..adab8ac7a16d0 100644 +index aad386a8ece8c..6aa78bbbf2bcd 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -177,7 +177,6 @@ if (current_toolchain == default_toolchain) { +@@ -174,7 +174,6 @@ if (current_toolchain == default_toolchain) { "java/res_base/values/ic_launcher_round_alias.xml", "java/res_base/values/values.xml", "java/res_base/xml/network_security_config.xml", @@ -24,7 +24,7 @@ index 69722502be6ea..adab8ac7a16d0 100644 "java/res_chromium_base/mipmap-hdpi/app_icon.png", "java/res_chromium_base/mipmap-hdpi/layered_app_icon.png", "java/res_chromium_base/mipmap-hdpi/layered_app_icon_background.png", -@@ -2313,7 +2312,6 @@ if (current_toolchain == default_toolchain) { +@@ -1585,7 +1584,6 @@ if (current_toolchain == default_toolchain) { android_resources("chrome_public_apk_base_module_resources") { resource_overlay = true sources = [ diff --git a/build/e_patches/Update-i18n-zhCN-support.patch b/build/e_patches/Update-i18n-zhCN-support.patch index 439e075c3c0d7b82da0ca7adeccaaec3764129f3..2409d1dbec0b4b061ff4cfc788428f2e667624a8 100644 --- a/build/e_patches/Update-i18n-zhCN-support.patch +++ b/build/e_patches/Update-i18n-zhCN-support.patch @@ -1,4 +1,4 @@ -From 33dc92bc0ebe30f05cbcc358467e215e3600be63 Mon Sep 17 00:00:00 2001 +From 440ed03f9b22e8437a0e135adb2ce86a4d7163c5 Mon Sep 17 00:00:00 2001 From: mars Date: Sun, 2 Aug 2020 00:37:49 +0800 Subject: Update i18n zh_CN support @@ -14,10 +14,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 6 files changed, 133 insertions(+), 6 deletions(-) diff --git a/chrome/app/resources/generated_resources_zh-CN.xtb b/chrome/app/resources/generated_resources_zh-CN.xtb -index 20b6e8b7e9161..cf09c1eeb5f0d 100644 +index 851825359e742..d4b732e63be1e 100644 --- a/chrome/app/resources/generated_resources_zh-CN.xtb +++ b/chrome/app/resources/generated_resources_zh-CN.xtb -@@ -11656,4 +11656,6 @@ +@@ -11680,4 +11680,6 @@ 您需要开启 Chrome 同步才能使用 Wi-Fi 同步功能。了解详情 同步标签页分组 检查(&N) @@ -27,10 +27,10 @@ index 20b6e8b7e9161..cf09c1eeb5f0d 100644 +配置广告拦截和过滤规则地址 + diff --git a/chrome/app/resources/google_chrome_strings_zh-CN.xtb b/chrome/app/resources/google_chrome_strings_zh-CN.xtb -index a4cd62d9d149b..582194268adec 100644 +index 40142311b6f71..e58f50e00abfd 100644 --- a/chrome/app/resources/google_chrome_strings_zh-CN.xtb +++ b/chrome/app/resources/google_chrome_strings_zh-CN.xtb -@@ -668,4 +668,5 @@ +@@ -655,4 +655,5 @@ 更新服务器没有应用的任何哈希数据，因此安装失败。 Google Chrome 是您的默认浏览器 可用于切换 Chrome 个人资料 @@ -39,10 +39,10 @@ index a4cd62d9d149b..582194268adec 100644 +关于 Bromite + diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb -index 12a5710bb4562..89be5e7b1666e 100644 +index 90be8f85089d7..269fa9cbc38cf 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-CN.xtb -@@ -1866,4 +1866,74 @@ +@@ -1854,4 +1854,74 @@ 若要删除您设备中的无痕浏览记录，请关闭所有无痕式标签页。 个标签页 动态卡片上的菜单已关闭 @@ -120,10 +120,10 @@ index 12a5710bb4562..89be5e7b1666e 100644 +全选 + diff --git a/components/browser_ui/strings/android/translations/browser_ui_strings_zh-CN.xtb b/components/browser_ui/strings/android/translations/browser_ui_strings_zh-CN.xtb -index 5e5d6086f5d85..dbaf813adddb7 100644 +index 5fd5f5e80f337..e5afe781ddb83 100644 --- a/components/browser_ui/strings/android/translations/browser_ui_strings_zh-CN.xtb +++ b/components/browser_ui/strings/android/translations/browser_ui_strings_zh-CN.xtb -@@ -566,4 +566,28 @@ +@@ -574,4 +574,28 @@ 让各项内容井井有条 已存储的数据 禁止网站使用 V8 优化工具。 @@ -155,10 +155,10 @@ index 5e5d6086f5d85..dbaf813adddb7 100644 +WebRTC + diff --git a/components/strings/components_strings_zh-CN.xtb b/components/strings/components_strings_zh-CN.xtb -index 08b999fadf358..c807dea7d312e 100644 +index 702e6d0810909..80ea7d4b54f6f 100644 --- a/components/strings/components_strings_zh-CN.xtb +++ b/components/strings/components_strings_zh-CN.xtb -@@ -4647,4 +4647,33 @@ +@@ -4694,4 +4694,33 @@ 添加 IBAN YouTube 来自 Google Pay diff --git a/build/e_patches/add-trichrome-browser-apk-targets.patch b/build/e_patches/add-trichrome-browser-apk-targets.patch index 730fac7a6fdd139cf60fafd1360533931190f63f..98cb660b26b2fe44548e8f24da8f113e36d9f1f9 100644 --- a/build/e_patches/add-trichrome-browser-apk-targets.patch +++ b/build/e_patches/add-trichrome-browser-apk-targets.patch @@ -1,4 +1,4 @@ -From 6e5687f73b24238076d9c535744b369bcce4ea8e Mon Sep 17 00:00:00 2001 +From 247a706451d3eeb77cee4ae6b292397e1929a66f Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Thu, 27 May 2021 07:30:02 -0400 Subject: add trichrome browser apk targets @@ -9,10 +9,10 @@ Subject: add trichrome browser apk targets 2 files changed, 37 insertions(+) diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn -index f3f0e16e2182d..69722502be6ea 100644 +index 5fc9fb6826c67..aad386a8ece8c 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -2571,6 +2571,10 @@ if (current_toolchain == default_toolchain) { +@@ -1843,6 +1843,10 @@ if (current_toolchain == default_toolchain) { is_trichrome = true is_bundle_module = true } @@ -23,7 +23,7 @@ index f3f0e16e2182d..69722502be6ea 100644 # Exists separately from chrome_public_base_module_java_for_test to allow # downstream to depend on test support packages without needing to depend on -@@ -2939,6 +2943,37 @@ if (current_toolchain == default_toolchain) { +@@ -2211,6 +2215,37 @@ if (current_toolchain == default_toolchain) { } } } diff --git a/build/e_patches/disable-fetching-variations.patch b/build/e_patches/disable-fetching-variations.patch index 3ff1f78140ce80f49e6fb6de5e0a38224a2d7882..c6f0243643ce98c8f8b270e249cb43a294a6a2a3 100644 --- a/build/e_patches/disable-fetching-variations.patch +++ b/build/e_patches/disable-fetching-variations.patch @@ -1,4 +1,4 @@ -From d3fccbfef93f2e33ac49d9ec7a0a9d51b1e9cc64 Mon Sep 17 00:00:00 2001 +From 7df0bc91e1cdfeda41f48651d5362ee1bb3d3025 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Wed, 18 Nov 2020 19:08:58 -0500 Subject: disable fetching variations @@ -8,7 +8,7 @@ Subject: disable fetching variations 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitTaskRunner.java b/chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitTaskRunner.java -index e4f52fd24f65a..62545c0a6804f 100644 +index d0b05aa67320e..373771e3cf12f 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitTaskRunner.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitTaskRunner.java @@ -39,7 +39,7 @@ public abstract class AsyncInitTaskRunner { diff --git a/build/e_patches/disable-navigation-error-correction-by-default.patch b/build/e_patches/disable-navigation-error-correction-by-default.patch index 02cc7f978534125d29667e1abffccd61cf721826..af38b63838dca971b98fbcb135fa80e7c5cccda1 100644 --- a/build/e_patches/disable-navigation-error-correction-by-default.patch +++ b/build/e_patches/disable-navigation-error-correction-by-default.patch @@ -1,4 +1,4 @@ -From a29ff88798dac45df9cb5718ff49899fdc7e3ffe Mon Sep 17 00:00:00 2001 +From 9e2fd6568ae5e6ff575a52c5d04278314f309d68 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Wed, 23 Nov 2016 08:29:58 -0500 Subject: disable navigation error correction by default @@ -8,10 +8,10 @@ Subject: disable navigation error correction by default 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/browser/net/profile_network_context_service.cc b/chrome/browser/net/profile_network_context_service.cc -index 6dfd4a52f770b..71f4171e154fb 100644 +index 856b50b8b319f..6e6aeb6aa5619 100644 --- a/chrome/browser/net/profile_network_context_service.cc +++ b/chrome/browser/net/profile_network_context_service.cc -@@ -511,7 +511,7 @@ void ProfileNetworkContextService::ConfigureNetworkContextParams( +@@ -504,7 +504,7 @@ void ProfileNetworkContextService::ConfigureNetworkContextParams( void ProfileNetworkContextService::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref(embedder_support::kAlternateErrorPagesEnabled, diff --git a/build/e_patches/disable-seedbased-field-trials.patch b/build/e_patches/disable-seedbased-field-trials.patch index bf8c1b192bd536ce14f26b6ed1aeaa3c9457c225..dae1c8da46d2f17c38f0aab69113d883e34887e6 100644 --- a/build/e_patches/disable-seedbased-field-trials.patch +++ b/build/e_patches/disable-seedbased-field-trials.patch @@ -1,4 +1,4 @@ -From 54661ef3de3cf5e055caa3a15d61fe23109cf28e Mon Sep 17 00:00:00 2001 +From fcdc7a174455aa22c3daca095ed6f865dd110483 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Tue, 25 Dec 2018 16:19:51 -0500 Subject: disable seed-based field trials @@ -8,18 +8,18 @@ Subject: disable seed-based field trials 1 file changed, 2 insertions(+) diff --git a/components/variations/service/variations_field_trial_creator_base.cc b/components/variations/service/variations_field_trial_creator_base.cc -index 93ccc6a3a9aba..4a553c20d758c 100644 +index 8ef4305f81736..06f923dcbc559 100644 --- a/components/variations/service/variations_field_trial_creator_base.cc +++ b/components/variations/service/variations_field_trial_creator_base.cc -@@ -319,9 +319,11 @@ bool VariationsFieldTrialCreatorBase::SetUpFieldTrials( +@@ -333,9 +333,11 @@ bool VariationsFieldTrialCreatorBase::SetUpFieldTrials( bool used_seed = false; - if (!used_testing_config) { -+#if defined(FIELDTRIAL_SEED_ENABLED) - used_seed = - CreateTrialsFromSeed(entropy_providers, feature_list.get(), - safe_seed_manager, synthetic_trial_registry); -+#endif + if (!used_testing_config && client_filterable_state) { ++ #if defined(FIELDTRIAL_SEED_ENABLED) + used_seed = CreateTrialsFromSeed( + entropy_providers, feature_list.get(), safe_seed_manager, + synthetic_trial_registry, std::move(client_filterable_state)); ++ #endif } platform_field_trials->RegisterFeatureOverrides(feature_list.get()); diff --git a/build/e_patches/fixup-Bromite-subresource-adblocker.patch b/build/e_patches/fixup-Bromite-subresource-adblocker.patch index c81b8fcc394d632aa18ffafd803a16019825b05c..98f96a9b6454cf9cdbb2dc8754968f52907b779e 100644 --- a/build/e_patches/fixup-Bromite-subresource-adblocker.patch +++ b/build/e_patches/fixup-Bromite-subresource-adblocker.patch @@ -1,4 +1,4 @@ -From 34cfca45c23af468d38a2b77b64fbcd63fb12df0 Mon Sep 17 00:00:00 2001 +From f0f0e095d9b5e51d48f932aca316cf276f99e95c Mon Sep 17 00:00:00 2001 From: althafvly Date: Thu, 11 Apr 2024 19:45:52 +0530 Subject: fixup Bromite subresource adblocker @@ -8,7 +8,7 @@ Subject: fixup Bromite subresource adblocker 1 file changed, 1 deletion(-) diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn -index 1d71d0bc3a233..f3f0e16e2182d 100644 +index 3c3f3eb23b491..5fc9fb6826c67 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn @@ -334,7 +334,6 @@ if (current_toolchain == default_toolchain) { diff --git a/build/e_patches/fixup-Disable-fetching-of-all-field-trials.patch b/build/e_patches/fixup-Disable-fetching-of-all-field-trials.patch index 23533355194cf50923e1b8b8983c02bc8e31591f..65010e0995946cd247a7330609aa2afc06e77645 100644 --- a/build/e_patches/fixup-Disable-fetching-of-all-field-trials.patch +++ b/build/e_patches/fixup-Disable-fetching-of-all-field-trials.patch @@ -1,4 +1,4 @@ -From 8d24a14721e83109964061e377d54d178a1d6015 Mon Sep 17 00:00:00 2001 +From b0f447736d895a7a400b143a01d7e1faffd1015a Mon Sep 17 00:00:00 2001 From: althafvly Date: Wed, 20 Sep 2023 09:48:52 +0530 Subject: fixup Disable fetching of all field trials @@ -29,10 +29,10 @@ index ad626ddfe4ef8..d6b55d4be62e4 100644 @Override diff --git a/build/android/gyp/proguard.py b/build/android/gyp/proguard.py -index bf8c1d0cc3327..5e6775e12e7ba 100755 +index c1e6b2bbd929b..fbbb26c634e48 100755 --- a/build/android/gyp/proguard.py +++ b/build/android/gyp/proguard.py -@@ -54,6 +54,8 @@ _IGNORE_WARNINGS = ( +@@ -55,6 +55,8 @@ _IGNORE_WARNINGS = ( r'PaymentRequest[BH]', # com.google.android.gms.cast is stripped down from the build r'class com\.google\.android\.gms\.', @@ -42,10 +42,10 @@ index bf8c1d0cc3327..5e6775e12e7ba 100755 # TODO(agrieve): Remove once we update to U SDK. r'OnBackAnimationCallback', diff --git a/components/variations/service/variations_field_trial_creator_base.cc b/components/variations/service/variations_field_trial_creator_base.cc -index e509bdc748ee0..93ccc6a3a9aba 100644 +index a2b965170aeca..8ef4305f81736 100644 --- a/components/variations/service/variations_field_trial_creator_base.cc +++ b/components/variations/service/variations_field_trial_creator_base.cc -@@ -326,6 +326,8 @@ bool VariationsFieldTrialCreatorBase::SetUpFieldTrials( +@@ -340,6 +340,8 @@ bool VariationsFieldTrialCreatorBase::SetUpFieldTrials( platform_field_trials->RegisterFeatureOverrides(feature_list.get()); diff --git a/build/e_patches/fixup-eyeo-Browser-Ad-filtering-Solution-Chrome-Integration-Module.patch b/build/e_patches/fixup-eyeo-Browser-Ad-filtering-Solution-Chrome-Integration-Module.patch index 9485278d21565ec66807c71c232b0cb8d3dace73..9ce3b3ba1f81ceac39cc4dfc09836211af28ca8f 100644 --- a/build/e_patches/fixup-eyeo-Browser-Ad-filtering-Solution-Chrome-Integration-Module.patch +++ b/build/e_patches/fixup-eyeo-Browser-Ad-filtering-Solution-Chrome-Integration-Module.patch @@ -1,4 +1,4 @@ -From 787d14d94769ca60d03b647154c2bf8019e50d8d Mon Sep 17 00:00:00 2001 +From 8999d325225b4de7fd740fc3440cf2c92c10d9ea Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Fri, 24 Jan 2025 14:13:51 +0530 Subject: fixup: eyeo Browser Ad filtering Solution: Chrome Integration Module @@ -8,10 +8,10 @@ Subject: fixup: eyeo Browser Ad filtering Solution: Chrome Integration Module 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/browser/ui/webui/chrome_web_ui_configs.cc b/chrome/browser/ui/webui/chrome_web_ui_configs.cc -index 9f0d984bfbc8f..8db0416f51bd0 100644 +index 67ef42c7139a3..2cc468e0173cc 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_configs.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_configs.cc -@@ -413,5 +413,5 @@ void RegisterChromeWebUIConfigs() { +@@ -400,5 +400,5 @@ void RegisterChromeWebUIConfigs() { #if BUILDFLAG(IS_ANDROID) map.AddWebUIConfig(std::make_unique()); #endif diff --git a/build/e_patches/openH264-enable-ARMARM64-optimizations.patch b/build/e_patches/openH264-enable-ARMARM64-optimizations.patch index bfddf056b9556743d0e9d286937f78cbbe278b10..665f823dfc923a31507379c8f51c28841d355a03 100644 --- a/build/e_patches/openH264-enable-ARMARM64-optimizations.patch +++ b/build/e_patches/openH264-enable-ARMARM64-optimizations.patch @@ -1,4 +1,4 @@ -From f65c5a94a2e5917c19e59c7537e433f8153d5de8 Mon Sep 17 00:00:00 2001 +From 6a5248e37c5a6b48ba84f2ff79f28f71e1f30931 Mon Sep 17 00:00:00 2001 From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Sat, 20 Jan 2018 21:17:27 +0100 Subject: openH264: enable ARM/ARM64 optimizations @@ -13,10 +13,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/third_party/blink/renderer/modules/mediarecorder/h264_encoder.cc b/third_party/blink/renderer/modules/mediarecorder/h264_encoder.cc -index d69fa92c9de97..213f503a901f0 100644 +index dcd8a4fcc3ac3..28c18e2e0afc4 100644 --- a/third_party/blink/renderer/modules/mediarecorder/h264_encoder.cc +++ b/third_party/blink/renderer/modules/mediarecorder/h264_encoder.cc -@@ -236,11 +236,11 @@ bool H264Encoder::ConfigureEncoder(const gfx::Size& size) { +@@ -237,11 +237,11 @@ bool H264Encoder::ConfigureEncoder(const gfx::Size& size) { init_params.iRCMode = RC_OFF_MODE; } diff --git a/build/e_patches/ungoogledchromium-Disable-Gaia.patch b/build/e_patches/ungoogledchromium-Disable-Gaia.patch index 8eecb3ed35979be0b4ba767e7d9f72312ac91c77..b804b25893e00602db1a94ee8882d97355200bdb 100644 --- a/build/e_patches/ungoogledchromium-Disable-Gaia.patch +++ b/build/e_patches/ungoogledchromium-Disable-Gaia.patch @@ -1,4 +1,4 @@ -From f3126472a36de1e9f4c42528752d6bfa8975f9f4 Mon Sep 17 00:00:00 2001 +From 8c39380c3b683e4248c6b7b4daef59c415e1434f Mon Sep 17 00:00:00 2001 From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Mon, 12 Feb 2018 21:37:52 +0100 Subject: ungoogled-chromium: Disable Gaia @@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 1 file changed, 2 insertions(+) diff --git a/google_apis/gaia/gaia_auth_fetcher.cc b/google_apis/gaia/gaia_auth_fetcher.cc -index f2655601f16cc..0077c4430555f 100644 +index 2c0caab95ba2b..cf7734fe61419 100644 --- a/google_apis/gaia/gaia_auth_fetcher.cc +++ b/google_apis/gaia/gaia_auth_fetcher.cc @@ -252,6 +252,7 @@ void GaiaAuthFetcher::CreateAndStartGaiaFetcher( diff --git a/domain_substitution/_extraction.py b/domain_substitution/_extraction.py index 93a735facaa5e38b799f21e908185073e1372102..ab93107a411b848e5db5ebf70f051b2e7596f095 100644 --- a/domain_substitution/_extraction.py +++ b/domain_substitution/_extraction.py @@ -14,7 +14,6 @@ import tarfile from pathlib import Path, PurePosixPath from _common import (USE_REGISTRY, PlatformEnum, ExtractorEnum, get_logger, get_running_platform) -from prune_binaries import CONTINGENT_PATHS DEFAULT_EXTRACTORS = { ExtractorEnum.SEVENZIP: USE_REGISTRY, @@ -88,7 +87,7 @@ def _process_relative_to(unpack_root, relative_to): relative_root.rmdir() -def _extract_tar_with_7z(binary, archive_path, output_dir, relative_to, skip_unused, sysroot): +def _extract_tar_with_7z(binary, archive_path, output_dir, relative_to): get_logger().debug('Using 7-zip extractor') if not relative_to is None and (output_dir / relative_to).exists(): get_logger().error('Temporary unpacking directory already exists: %s', @@ -96,11 +95,6 @@ def _extract_tar_with_7z(binary, archive_path, output_dir, relative_to, skip_unu raise Exception() cmd1 = (binary, 'x', str(archive_path), '-so') cmd2 = (binary, 'x', '-si', '-aoa', '-ttar', '-o{}'.format(str(output_dir))) - if skip_unused: - for cpath in CONTINGENT_PATHS: - if sysroot and f'{sysroot}-sysroot' in cpath: - continue - cmd2 += ('-x!%s/%s' % (str(relative_to), cpath[:-1]), ) get_logger().debug('7z command line: %s | %s', ' '.join(cmd1), ' '.join(cmd2)) proc1 = subprocess.Popen(cmd1, stdout=subprocess.PIPE) @@ -116,15 +110,10 @@ def _extract_tar_with_7z(binary, archive_path, output_dir, relative_to, skip_unu _process_relative_to(output_dir, relative_to) -def _extract_tar_with_tar(binary, archive_path, output_dir, relative_to, skip_unused, sysroot): +def _extract_tar_with_tar(binary, archive_path, output_dir, relative_to): get_logger().debug('Using BSD or GNU tar extractor') output_dir.mkdir(exist_ok=True) cmd = (binary, '-xf', str(archive_path), '-C', str(output_dir)) - if skip_unused: - for cpath in CONTINGENT_PATHS: - if sysroot and f'{sysroot}-sysroot' in cpath: - continue - cmd += ('--exclude=%s/%s' % (str(relative_to), cpath[:-1]), ) get_logger().debug('tar command line: %s', ' '.join(cmd)) result = subprocess.run(cmd, check=False) if result.returncode != 0: @@ -136,15 +125,10 @@ def _extract_tar_with_tar(binary, archive_path, output_dir, relative_to, skip_un _process_relative_to(output_dir, relative_to) -def _extract_tar_with_winrar(binary, archive_path, output_dir, relative_to, skip_unused, sysroot): +def _extract_tar_with_winrar(binary, archive_path, output_dir, relative_to): get_logger().debug('Using WinRAR extractor') output_dir.mkdir(exist_ok=True) cmd = (binary, 'x', '-o+', str(archive_path), str(output_dir)) - if skip_unused: - for cpath in CONTINGENT_PATHS: - if sysroot and f'{sysroot}-sysroot' in cpath: - continue - cmd += ('-x%s%s%s' % (str(relative_to), os.sep, cpath[:-1].replace('/')), ) get_logger().debug('WinRAR command line: %s', ' '.join(cmd)) result = subprocess.run(cmd, check=False) if result.returncode != 0: @@ -154,7 +138,7 @@ def _extract_tar_with_winrar(binary, archive_path, output_dir, relative_to, skip _process_relative_to(output_dir, relative_to) -def _extract_tar_with_python(archive_path, output_dir, relative_to, skip_unused, sysroot): +def _extract_tar_with_python(archive_path, output_dir, relative_to): get_logger().debug('Using pure Python tar extractor') class NoAppendList(list): @@ -181,12 +165,6 @@ def _extract_tar_with_python(archive_path, output_dir, relative_to, skip_unused, tar_file_obj.members = NoAppendList() for tarinfo in tar_file_obj: try: - if skip_unused and [ - cpath for cpath in CONTINGENT_PATHS - if tarinfo.name.startswith(str(relative_to) + '/' + cpath) - and not (sysroot and f'{sysroot}-sysroot' in cpath) - ]: - continue if relative_to is None: destination = output_dir / PurePosixPath(tarinfo.name) else: @@ -210,7 +188,7 @@ def _extract_tar_with_python(archive_path, output_dir, relative_to, skip_unused, raise -def extract_tar_file(archive_path, output_dir, relative_to, skip_unused, sysroot, extractors=None): +def extract_tar_file(archive_path, output_dir, relative_to, extractors=None): """ Extract regular or compressed tar archive into the output directory. @@ -233,8 +211,7 @@ def extract_tar_file(archive_path, output_dir, relative_to, skip_unused, sysroot sevenzip_cmd = str(_find_7z_by_registry()) sevenzip_bin = _find_extractor_by_cmd(sevenzip_cmd) if sevenzip_bin is not None: - _extract_tar_with_7z(sevenzip_bin, archive_path, output_dir, relative_to, skip_unused, - sysroot) + _extract_tar_with_7z(sevenzip_bin, archive_path, output_dir, relative_to) return # Use WinRAR if 7-zip is not found @@ -243,8 +220,7 @@ def extract_tar_file(archive_path, output_dir, relative_to, skip_unused, sysroot winrar_cmd = str(_find_winrar_by_registry()) winrar_bin = _find_extractor_by_cmd(winrar_cmd) if winrar_bin is not None: - _extract_tar_with_winrar(winrar_bin, archive_path, output_dir, relative_to, skip_unused, - sysroot) + _extract_tar_with_winrar(winrar_bin, archive_path, output_dir, relative_to) return get_logger().warning( 'Neither 7-zip nor WinRAR were found. Falling back to Python extractor...') @@ -252,17 +228,16 @@ def extract_tar_file(archive_path, output_dir, relative_to, skip_unused, sysroot # NOTE: 7-zip isn't an option because it doesn't preserve file permissions tar_bin = _find_extractor_by_cmd(extractors.get(ExtractorEnum.TAR)) if not tar_bin is None: - _extract_tar_with_tar(tar_bin, archive_path, output_dir, relative_to, skip_unused, - sysroot) + _extract_tar_with_tar(tar_bin, archive_path, output_dir, relative_to) return else: # This is not a normal code path, so make it clear. raise NotImplementedError(current_platform) # Fallback to Python-based extractor on all platforms - _extract_tar_with_python(archive_path, output_dir, relative_to, skip_unused, sysroot) + _extract_tar_with_python(archive_path, output_dir, relative_to) -def extract_with_7z(archive_path, output_dir, relative_to, skip_unused, sysroot, extractors=None): +def extract_with_7z(archive_path, output_dir, relative_to, extractors=None): """ Extract archives with 7-zip into the output directory. Only supports archives with one layer of unpacking, so compressed tar archives don't work. @@ -292,11 +267,6 @@ def extract_with_7z(archive_path, output_dir, relative_to, skip_unused, sysroot, output_dir / relative_to) raise Exception() cmd = (sevenzip_bin, 'x', str(archive_path), '-aoa', '-o{}'.format(str(output_dir))) - if skip_unused: - for cpath in CONTINGENT_PATHS: - if sysroot and f'{sysroot}-sysroot' in cpath: - continue - cmd += ('-x!%s/%s' % (str(relative_to), cpath[:-1]), ) get_logger().debug('7z command line: %s', ' '.join(cmd)) result = subprocess.run(cmd, check=False) @@ -307,12 +277,7 @@ def extract_with_7z(archive_path, output_dir, relative_to, skip_unused, sysroot, _process_relative_to(output_dir, relative_to) -def extract_with_winrar(archive_path, - output_dir, - relative_to, - skip_unused, - sysroot, - extractors=None): +def extract_with_winrar(archive_path, output_dir, relative_to, extractors=None): """ Extract archives with WinRAR into the output directory. Only supports archives with one layer of unpacking, so compressed tar archives don't work. @@ -340,11 +305,6 @@ def extract_with_winrar(archive_path, output_dir / relative_to) raise Exception() cmd = (winrar_bin, 'x', '-o+', str(archive_path), str(output_dir)) - if skip_unused: - for cpath in CONTINGENT_PATHS: - if sysroot and f'{sysroot}-sysroot' in cpath: - continue - cmd += ('-x%s%s%s' % (str(relative_to), os.sep, cpath[:-1].replace('/', os.sep)), ) get_logger().debug('WinRAR command line: %s', ' '.join(cmd)) result = subprocess.run(cmd, check=False) diff --git a/domain_substitution/domain_regex.list b/domain_substitution/domain_regex.list index dd4d52ac97173ff28b7215b5b7b6aa954594a37d..9af635e5e3c66a99136002372d39cc00012b9244 100644 --- a/domain_substitution/domain_regex.list +++ b/domain_substitution/domain_regex.list @@ -1,7 +1,7 @@ fonts(\\*?)\.googleapis(\\*?)\.com#f0ntz\g<1>.9oo91e8p1\g<2>.qjz9zk google([A-Za-z\-]*?\\*?)\.com(?!mon)#9oo91e\g<1>.qjz9zk gstatic([A-Za-z\-]*?\\*?)\.com#95tat1c\g<1>.qjz9zk -chrome([A-Za-z\-]*?\\*?)\.com#ch40me\g<1>.qjz9zk +chrome([A-Za-z\-]*?\\*?)\.com(?!ponent)#ch40me\g<1>.qjz9zk chromium([A-Za-z\-]*?\\*?)\.org#ch40m1um\g<1>.qjz9zk mozilla([A-Za-z\-]*?\\*?)\.org#m0z111a\g<1>.qjz9zk facebook([A-Za-z\-]*?\\*?)\.com#f8c3b00k\g<1>.qjz9zk diff --git a/domain_substitution/domain_substitution.list b/domain_substitution/domain_substitution.list index e0e3d835b156d1677e4b0632ee586cc21bc3466a..beead751534767bb48399b8716e55a0fc0da7fcf 100644 --- a/domain_substitution/domain_substitution.list +++ b/domain_substitution/domain_substitution.list @@ -32,14 +32,6 @@ ash/capture_mode/capture_mode_unittests.cc ash/child_accounts/parent_access_controller_impl_unittest.cc ash/clipboard/clipboard_history_controller_unittest.cc ash/clipboard/clipboard_history_menu_model_adapter_unittest.cc -ash/components/arc/arc_util.h -ash/components/arc/intent_helper/arc_intent_helper_bridge_unittest.cc -ash/components/arc/intent_helper/link_handler_model_unittest.cc -ash/components/arc/net/arc_net_host_impl_unittest.cc -ash/components/arc/net/passpoint_dialog_view.cc -ash/components/arc/session/arc_upgrade_params.h -ash/components/arc/session/serial_number_util_unittest.cc -ash/components/arc/volume_mounter/arc_volume_mounter_bridge_unittest.cc ash/constants/ash_features.cc ash/constants/ash_switches.cc ash/constants/url_constants.cc @@ -60,6 +52,7 @@ ash/glanceables/tasks/glanceables_tasks_view_unittest.cc ash/glanceables/tasks/test/glanceables_tasks_test_util.cc ash/login/ui/auth_icon_view.cc ash/login/ui/login_remove_account_dialog_unittest.cc +ash/metrics/demo_session_metrics_recorder_unittest.cc ash/projector/projector_metadata_model.cc ash/public/cpp/android_intent_helper_unittest.cc ash/public/cpp/child_accounts/parent_access_controller.h @@ -98,7 +91,6 @@ ash/resources/PRESUBMIT.py ash/scanner/scanner_action_handler.cc ash/scanner/scanner_action_handler_unittest.cc ash/scanner/scanner_controller_unittest.cc -ash/scanner/scanner_session_unittest.cc ash/session/fullscreen_controller_unittest.cc ash/shelf/home_to_overview_nudge_controller_unittest.cc ash/shelf/launcher_nudge_controller_unittest.cc @@ -130,7 +122,6 @@ ash/system/input_device_settings/input_device_settings_notification_controller.c ash/system/input_device_settings/input_device_settings_notification_controller_unittest.cc ash/system/mahi/mahi_content_source_button_unittest.cc ash/system/mahi/mahi_panel_view_unittest.cc -ash/system/nearby_share/nearby_share_detailed_view_impl.cc ash/system/notification_center/message_center_test_util.cc ash/system/notification_center/notification_grouping_controller_unittest.cc ash/system/notification_center/views/ash_notification_view_unittest.cc @@ -163,6 +154,7 @@ ash/wallpaper/wallpaper_image_downloader.cc ash/webui/boca_ui/boca_app_page_handler_unittest.cc ash/webui/boca_ui/boca_ui.cc ash/webui/boca_ui/provider/classroom_page_handler_impl.cc +ash/webui/boca_ui/webview_auth_handler_unittest.cc ash/webui/camera_app_ui/camera_app_untrusted_ui.cc ash/webui/camera_app_ui/resources/js/externs/types.d.ts ash/webui/camera_app_ui/resources/js/geometry.ts @@ -240,7 +232,6 @@ ash/webui/system_apps/public/system_web_app_type.h ash/wm/coral/coral_controller_unittest.cc ash/wm/desks/desks_unittests.cc ash/wm/desks/templates/admin_template_unittest.cc -ash/wm/desks/templates/saved_desk_test_helper.cc ash/wm/desks/templates/saved_desk_unittest.cc ash/wm/overview/birch/birch_bar_unittest.cc ash/wm/overview/birch/birch_chip_context_menu_model.cc @@ -253,8 +244,10 @@ base/allocator/partition_allocator/PRESUBMIT.py base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h base/allocator/partition_allocator/src/partition_alloc/build_config.h base/allocator/partition_allocator/src/partition_alloc/in_slot_metadata.h +base/allocator/partition_allocator/src/partition_alloc/lightweight_quarantine.h base/allocator/partition_allocator/src/partition_alloc/oom.cc base/allocator/partition_allocator/src/partition_alloc/oom.h +base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_win.h base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/logging.h @@ -369,6 +362,7 @@ base/third_party/nspr/prtime.cc base/third_party/nspr/prtime.h base/third_party/symbolize/symbolize.cc base/threading/platform_thread.h +base/threading/platform_thread_android.cc base/threading/platform_thread_unittest.cc base/threading/platform_thread_win.cc base/threading/sequence_local_storage_slot_unittest.cc @@ -411,10 +405,10 @@ build/android/fast_local_dev_server.py build/android/gradle/generate_gradle.py build/android/gyp/assert_static_initializers.py build/android/gyp/bundletool.py -build/android/gyp/compile_java.py build/android/gyp/create_app_bundle.py build/android/gyp/create_java_binary_script.py build/android/gyp/dex.py +build/android/gyp/errorprone.py build/android/gyp/lint.py build/android/gyp/merge_manifest.py build/android/gyp/util/build_utils.py @@ -465,7 +459,6 @@ build/config/nacl/rules.gni build/config/ozone.gni build/config/rust.gni build/config/sanitizers/sanitizers.gni -build/config/unsafe_buffers_paths.txt build/config/win/BUILD.gn build/config/win/control_flow_guard.gni build/fuchsia/PRESUBMIT.py @@ -478,7 +471,6 @@ build/gn_ast/json_gn_editor.py build/install-build-deps.py build/ios/presubmit_support.py build/linux/install-chromeos-fonts.py -build/linux/sysroot_scripts/sysroots.json build/linux/unbundle/remove_bundled_libraries.py build/mac_toolchain.py build/nocompile.gni @@ -515,20 +507,6 @@ cc/trees/layer_tree_host_unittest_animation.cc cc/trees/proxy_main.cc chrome/BUILD.gn chrome/PRESUBMIT.py -chrome/android/chrome_public_apk_tmpl.gni -chrome/android/expectations/lint-baseline.xml -chrome/android/expectations/lint-suppressions.xml -chrome/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd -chrome/android/java/res/values-sw600dp/values.xml -chrome/android/java/res/values/dimens.xml -chrome/android/java/res/values/strings.xml -chrome/android/java/res/values/values.xml -chrome/android/java/src/PRESUBMIT.py -chrome/android/javatests/src/org/chromium/chrome/test/smoke/AndroidManifest_bundle.xml -chrome/android/trichrome.gni -chrome/android/webapk/PRESUBMIT.py -chrome/android/webapk/shell_apk/manifest/javatest_manifest_config_delta.json -chrome/android/webapk/shell_apk/res/values/dimens.xml chrome/app/PRESUBMIT.py chrome/app/app_management_strings.grdp chrome/app/chrome_command_ids.h @@ -555,6 +533,7 @@ chrome/browser/about_flags.cc chrome/browser/accessibility/live_caption/live_caption_speech_recognition_host_browsertest.cc chrome/browser/ai/ai_data_keyed_service.cc chrome/browser/ai/ai_language_model.cc +chrome/browser/ai/ai_language_model_unittest.cc chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.cc chrome/browser/android/cookies/cookies_fetcher_restore_util_browsertest.cc chrome/browser/android/customtabs/custom_tabs_browsertest.cc @@ -679,7 +658,8 @@ chrome/browser/ash/attestation/tpm_challenge_key_subtle_unittest.cc chrome/browser/ash/bluetooth/bluetooth_log_controller_unittest.cc chrome/browser/ash/bluetooth/debug_logs_manager_unittest.cc chrome/browser/ash/boca/on_task/on_task_locked_session_navigation_throttle.cc -chrome/browser/ash/boca/on_task/on_task_locked_session_window_tracker_unittest.cc +chrome/browser/ash/boca/on_task/on_task_locked_session_navigation_throttle_browsertest.cc +chrome/browser/ash/boca/on_task/on_task_locked_session_window_tracker_browsertest.cc chrome/browser/ash/boca/spotlight/spotlight_crd_manager_impl_unittest.cc chrome/browser/ash/bruschetta/bruschetta_download.cc chrome/browser/ash/calendar/calendar_client_impl.cc @@ -693,10 +673,8 @@ chrome/browser/ash/child_accounts/family_user_device_metrics_browsertest.cc chrome/browser/ash/child_accounts/parent_access_code/parent_access_service_browsertest.cc chrome/browser/ash/child_accounts/time_limits/app_time_limit_utils_unittest.cc chrome/browser/ash/child_accounts/website_approval_notifier_unittest.cc -chrome/browser/ash/crosapi/browser_util_unittest.cc chrome/browser/ash/crosapi/local_printer_ash_unittest.cc chrome/browser/ash/crosapi/one_drive_integration_service_ash_unittest.cc -chrome/browser/ash/crosapi/search_controller_ash_unittest.cc chrome/browser/ash/crostini/crostini_installer.h chrome/browser/ash/crostini/crostini_simple_types.h chrome/browser/ash/crostini/crostini_util.h @@ -709,6 +687,7 @@ chrome/browser/ash/drive/drivefs_test_support.cc chrome/browser/ash/drive/file_system_util_unittest.cc chrome/browser/ash/extensions/file_manager/system_notification_manager_unittest.cc chrome/browser/ash/extensions/users_private/users_private_apitest.cc +chrome/browser/ash/file_manager/external_filesystem_apitest.cc chrome/browser/ash/file_manager/file_browser_handlers.h chrome/browser/ash/file_manager/file_manager_browsertest_base.cc chrome/browser/ash/file_manager/file_manager_policy_browsertest.cc @@ -743,6 +722,7 @@ chrome/browser/ash/login/app_mode/test/kiosk_enterprise_browsertest.cc chrome/browser/ash/login/ash_hud_login_browsertest.cc chrome/browser/ash/login/demo_mode/demo_login_controller.cc chrome/browser/ash/login/demo_mode/demo_login_controller_unittest.cc +chrome/browser/ash/login/demo_mode/demo_mode_idle_handler_unittest.cc chrome/browser/ash/login/device_family_link_allowed_policy_browsertest.cc chrome/browser/ash/login/encryption_migration_browsertest.cc chrome/browser/ash/login/existing_user_controller_browsertest.cc @@ -843,7 +823,6 @@ chrome/browser/ash/scalable_iph/scalable_iph_browsertest.cc chrome/browser/ash/scalable_iph/scalable_iph_delegate_impl.cc chrome/browser/ash/scanner/scanner_keyed_service.cc chrome/browser/ash/scanning/chrome_scanning_app_delegate_unittest.cc -chrome/browser/ash/scheduler_config/scheduler_configuration_manager.h chrome/browser/ash/settings/cros_settings_unittest.cc chrome/browser/ash/settings/device_settings_provider_unittest.cc chrome/browser/ash/smb_client/smb_service_helper.h @@ -941,6 +920,7 @@ chrome/browser/content_settings/content_settings_policy_provider_unittest.cc chrome/browser/content_settings/content_settings_pref_provider_unittest.cc chrome/browser/content_settings/host_content_settings_map_unittest.cc chrome/browser/content_settings/sound_content_setting_observer_unittest.cc +chrome/browser/contextual_cueing/contextual_cueing_helper_interactive_uitest.cc chrome/browser/custom_handlers/protocol_handler_registry_browsertest.cc chrome/browser/data_sharing/desktop/data_sharing_conversion_utils_unittest.cc chrome/browser/data_sharing/desktop/data_sharing_service_browsertest.cc @@ -1036,6 +1016,7 @@ chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_ chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api_unittest.cc chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_apitest.cc chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_unittest.cc +chrome/browser/extensions/api/experimental_ai_data/experimental_ai_data_api.cc chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc chrome/browser/extensions/api/extension_action/extension_action_apitest.cc chrome/browser/extensions/api/feedback_private/feedback_browsertest.cc @@ -1142,8 +1123,15 @@ chrome/browser/flag-metadata.json chrome/browser/flag_descriptions.cc chrome/browser/flags/android/chrome_session_state.h chrome/browser/font_prewarmer_tab_helper_browsertest.cc +chrome/browser/glic/border_view_interactive_uitest.cc +chrome/browser/glic/glic_cookie_synchronizer.cc chrome/browser/glic/glic_cookie_synchronizer_unittest.cc +chrome/browser/glic/glic_fre_page_handler.cc +chrome/browser/glic/glic_page_handler.cc +chrome/browser/glic/glic_policy_browsertest.cc +chrome/browser/glic/glic_window_resize_animation_browsertest.cc chrome/browser/glic/guest_util_browsertest.cc +chrome/browser/glic/interactive_glic_test.h chrome/browser/google/google_update_win.cc chrome/browser/guest_view/web_view/context_menu_content_type_web_view.cc chrome/browser/hid/chrome_hid_delegate_unittest.cc @@ -1191,7 +1179,6 @@ chrome/browser/media/router/providers/cast/cast_media_route_provider_unittest.cc chrome/browser/media/router/providers/dial/dial_activity_manager_unittest.cc chrome/browser/media/router/providers/dial/dial_media_route_provider.cc chrome/browser/media/router/providers/dial/dial_media_route_provider_unittest.cc -chrome/browser/media/router/providers/openscreen/discovery/open_screen_listener.h chrome/browser/media/webrtc/capture_policy_utils_browsertest.cc chrome/browser/media/webrtc/capture_policy_utils_unittest.cc chrome/browser/media/webrtc/display_media_access_handler_unittest.cc @@ -1245,6 +1232,8 @@ chrome/browser/net/stub_resolver_config_reader_browsertest.cc chrome/browser/net/system_network_context_manager_browsertest.cc chrome/browser/new_tab_page/modules/file_suggestion/drive_service.cc chrome/browser/new_tab_page/modules/file_suggestion/drive_service_unittest.cc +chrome/browser/new_tab_page/modules/file_suggestion/microsoft_files_page_handler.cc +chrome/browser/new_tab_page/modules/file_suggestion/microsoft_files_page_handler_unittest.cc chrome/browser/new_tab_page/modules/new_tab_page_modules_interactive_uitest.cc chrome/browser/new_tab_page/modules/new_tab_page_modules_unittest.cc chrome/browser/new_tab_page/modules/v2/calendar/calendar_fake_data_helper.cc @@ -1317,6 +1306,7 @@ chrome/browser/password_manager/android/password_store_android_backend_bridge_he chrome/browser/password_manager/android/password_store_backend_migration_decorator_unittest.cc chrome/browser/password_manager/android/unified_password_manager_proto_utils_unittest.cc chrome/browser/password_manager/chrome_password_manager_client_unittest.cc +chrome/browser/password_manager/password_change_delegate_impl_unittest.cc chrome/browser/password_manager/password_manager_browsertest.cc chrome/browser/password_manager/password_manager_signin_intercept_test_helper.cc chrome/browser/password_manager/password_manager_util_win.cc @@ -1376,7 +1366,6 @@ chrome/browser/preloading/prefetch/no_state_prefetch/prerender_nostate_prefetch_ chrome/browser/preloading/prefetch/no_state_prefetch/tools/prerender_test_server/index.html chrome/browser/preloading/prefetch/no_state_prefetch/tools/prerender_test_server/prerender_test_server.py chrome/browser/preloading/prefetch/prefetch_service/chrome_prefetch_service_delegate.cc -chrome/browser/preloading/prefetch/search_prefetch/search_prefetch_service_browsertest.cc chrome/browser/preloading/prefetch/zero_suggest_prefetch/zero_suggest_prefetch_tab_helper_browsertest.cc chrome/browser/preloading/preview/preview_navigation_throttle.h chrome/browser/preloading/preview/preview_zoom_controller.h @@ -1385,6 +1374,7 @@ chrome/browser/privacy/secure_dns_bridge.cc chrome/browser/privacy_sandbox/privacy_sandbox_activity_types_service.h chrome/browser/privacy_sandbox/privacy_sandbox_service_impl.cc chrome/browser/privacy_sandbox/privacy_sandbox_service_impl_unittest.cc +chrome/browser/privacy_sandbox/privacy_sandbox_utils_unittest.cc chrome/browser/private_network_access/private_network_device_chooser_controller_unittest.cc chrome/browser/process_singleton_posix.cc chrome/browser/process_singleton_posix_unittest.cc @@ -1431,6 +1421,8 @@ chrome/browser/resources/accessibility/embedded_a11y_helper_manifest.json.jinja2 chrome/browser/resources/accessibility/reading_mode_gdocs_helper_manifest.json.jinja2 chrome/browser/resources/app_home/app_home_empty_page.html.ts chrome/browser/resources/app_settings/icons.html +chrome/browser/resources/ash/print_preview/data/destination_store.ts +chrome/browser/resources/ash/print_preview/ui/icons.html chrome/browser/resources/ash/settings/app_management_icons.html chrome/browser/resources/ash/settings/controls/v2/settings_row.ts chrome/browser/resources/ash/settings/crostini_page/crostini_disk_resize_dialog.html @@ -1479,8 +1471,10 @@ chrome/browser/resources/chromeos/accessibility/select_to_speak/select_to_speak_ chrome/browser/resources/chromeos/accessibility/select_to_speak/select_to_speak_unittest.js chrome/browser/resources/chromeos/accessibility/select_to_speak_manifest.json.jinja2 chrome/browser/resources/chromeos/accessibility/strings/chromevox_strings.grdp -chrome/browser/resources/chromeos/accessibility/switch_access/item_scan_manager_test.js -chrome/browser/resources/chromeos/accessibility/switch_access/switch_access_predicate_test.js +chrome/browser/resources/chromeos/accessibility/switch_access/mv2/item_scan_manager_test.js +chrome/browser/resources/chromeos/accessibility/switch_access/mv2/switch_access_predicate_test.js +chrome/browser/resources/chromeos/accessibility/switch_access/mv3/item_scan_manager_test.js +chrome/browser/resources/chromeos/accessibility/switch_access/mv3/switch_access_predicate_test.js chrome/browser/resources/chromeos/accessibility/switch_access_manifest.json.jinja2 chrome/browser/resources/chromeos/add_supervision/add_supervision_ui.ts chrome/browser/resources/chromeos/app_install/app_install_dialog.html @@ -1522,6 +1516,8 @@ chrome/browser/resources/gaia_auth_host/authenticator.js chrome/browser/resources/gaia_auth_host/password_change_authenticator.js chrome/browser/resources/gaia_auth_host/saml_handler.js chrome/browser/resources/gaia_auth_host/saml_password_attributes.js +chrome/browser/resources/glic/glic_api/glic_api.ts +chrome/browser/resources/glic/glic_app_controller.ts chrome/browser/resources/hangout_services/manifest_v2.json chrome/browser/resources/hangout_services/manifest_v3.json chrome/browser/resources/inspect/inspect.html @@ -1696,7 +1692,8 @@ chrome/browser/subresource_filter/subresource_filter_browsertest.cc chrome/browser/subresource_filter/subresource_filter_fenced_frame_browsertest.cc chrome/browser/supervised_user/android/java/res/drawable/ic_family_link.xml chrome/browser/supervised_user/android/supervised_user_settings_test_bridge.cc -chrome/browser/supervised_user/linux_mac_windows/parent_access_view.cc +chrome/browser/supervised_user/kids_profile_interactive_uitest.cc +chrome/browser/supervised_user/linux_mac_windows/parent_access_dialog_web_contents_observer_browsertest.cc chrome/browser/supervised_user/supervised_user_browser_utils.cc chrome/browser/supervised_user/supervised_user_browser_utils_unittest.cc chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc @@ -1712,6 +1709,7 @@ chrome/browser/sync/test/integration/cookie_helper.cc chrome/browser/sync/test/integration/password_manager_sync_test.cc chrome/browser/sync/test/integration/password_sharing_invitation_helper.cc chrome/browser/sync/test/integration/passwords_helper.cc +chrome/browser/sync/test/integration/select_type_and_migrate_local_data_items_when_active_sync_test.cc chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc chrome/browser/sync/test/integration/single_client_common_sync_test.cc chrome/browser/sync/test/integration/single_client_custom_passphrase_sync_test.cc @@ -1747,7 +1745,6 @@ chrome/browser/themes/theme_syncable_service.cc chrome/browser/translate/translate_manager_browsertest.cc chrome/browser/trusted_vault/trusted_vault_encryption_keys_tab_helper_browsertest.cc chrome/browser/ui/android/plus_addresses/all_plus_addresses_bottom_sheet_view_browsertest.cc -chrome/browser/ui/android/plus_addresses/plus_address_creation_controller_android_unittest.cc chrome/browser/ui/android/strings/android_chrome_strings.grd chrome/browser/ui/ash/app_list/app_list_interactive_uitest.cc chrome/browser/ui/ash/arc/arc_open_url_delegate_impl_browsertest.cc @@ -1796,7 +1793,6 @@ chrome/browser/ui/ash/wallpaper/wallpaper_controller_client_impl.cc chrome/browser/ui/ash/web_view/ash_web_view_impl_browsertest.cc chrome/browser/ui/ash/wm/coral_browsertest.cc chrome/browser/ui/autofill/address_editor_controller_unittest.cc -chrome/browser/ui/autofill/autofill_bubble_signin_promo_controller_unittest.cc chrome/browser/ui/autofill/autofill_signin_promo_tab_helper_browsertest.cc chrome/browser/ui/autofill/delete_address_profile_dialog_controller_impl_unittest.cc chrome/browser/ui/autofill/payments/offer_notification_bubble_controller_impl_unittest.cc @@ -1860,10 +1856,10 @@ chrome/browser/ui/managed_ui_browsertest.cc chrome/browser/ui/media_router/media_router_ui_helper_unittest.cc chrome/browser/ui/media_router/media_router_ui_unittest.cc chrome/browser/ui/media_router/query_result_manager.h +chrome/browser/ui/omnibox/omnibox_metrics_browsertest.cc chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc chrome/browser/ui/omnibox/omnibox_view_browsertest.cc chrome/browser/ui/page_info/chrome_page_info_ui_delegate.cc -chrome/browser/ui/passwords/account_storage_auth_helper_unittest.cc chrome/browser/ui/passwords/bubble_controllers/move_to_account_store_bubble_controller_unittest.cc chrome/browser/ui/passwords/display_account_info_unittest.cc chrome/browser/ui/passwords/manage_passwords_state_unittest.cc @@ -1881,7 +1877,6 @@ chrome/browser/ui/search/ntp_user_data_logger_unittest.cc chrome/browser/ui/search/search_tab_helper.h chrome/browser/ui/search/third_party_ntp_browsertest.cc chrome/browser/ui/signin/cookie_clear_on_exit_migration_notice_browsertest.cc -chrome/browser/ui/signin/signin_reauth_view_controller_browsertest.cc chrome/browser/ui/signin/signin_view_controller.cc chrome/browser/ui/signin/signin_view_controller_browsertest.cc chrome/browser/ui/signin/signin_view_controller_interactive_uitest.cc @@ -1920,13 +1915,14 @@ chrome/browser/ui/views/autofill/popup/popup_row_factory_utils_browsertest.cc chrome/browser/ui/views/autofill/popup/popup_separator_view.h chrome/browser/ui/views/autofill/popup/popup_view_views_browsertest.cc chrome/browser/ui/views/autofill/popup/popup_view_views_unittest.cc -chrome/browser/ui/views/bookmarks/bookmark_account_storage_move_dialog_browsertest.cc chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc chrome/browser/ui/views/bookmarks/bookmark_bubble_view_browsertest.cc chrome/browser/ui/views/bookmarks/bookmark_bubble_view_unittest.cc chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc chrome/browser/ui/views/bookmarks/bookmark_menu_delegate_unittest.cc +chrome/browser/ui/views/bookmarks/bookmark_test_utils.cc +chrome/browser/ui/views/bookmarks/saved_tab_groups/shared_tab_group_interactive_uitest.cc chrome/browser/ui/views/borealis/borealis_disallowed_dialog.cc chrome/browser/ui/views/commerce/price_tracking_bubble_dialog_view_unittest.cc chrome/browser/ui/views/commerce/price_tracking_email_dialog_view.cc @@ -1956,6 +1952,7 @@ chrome/browser/ui/views/omnibox/omnibox_view_views.h chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc chrome/browser/ui/views/omnibox/omnibox_view_views_unittest.cc chrome/browser/ui/views/overlay/video_overlay_window_views_unittest.cc +chrome/browser/ui/views/page_action/pwa_install.cc chrome/browser/ui/views/page_info/about_this_site_side_panel_coordinator.cc chrome/browser/ui/views/page_info/about_this_site_side_panel_coordinator_browsertest.cc chrome/browser/ui/views/page_info/merchant_trust_side_panel_coordinator.cc @@ -1965,6 +1962,7 @@ chrome/browser/ui/views/page_info/page_info_history_controller.h chrome/browser/ui/views/page_info/safety_tip_page_info_bubble_view_browsertest.cc chrome/browser/ui/views/passwords/password_bubble_browsertest.cc chrome/browser/ui/views/passwords/password_bubble_interactive_uitest.cc +chrome/browser/ui/views/passwords/password_change/successful_password_change_view_unittest.cc chrome/browser/ui/views/passwords/password_dialog_view_browsertest.cc chrome/browser/ui/views/passwords/password_generation_popup_view_views_browsertest.cc chrome/browser/ui/views/payments/payment_method_view_controller_browsertest.cc @@ -1991,7 +1989,9 @@ chrome/browser/ui/views/site_data/page_specific_site_data_dialog_unittest.cc chrome/browser/ui/views/sync/inline_login_ui_browsertest.cc chrome/browser/ui/views/tabs/collaboration_messaging_page_action_icon_view_interactive_uitest.cc chrome/browser/ui/views/tabs/recent_activity_bubble_dialog_view_browsertest.cc +chrome/browser/ui/views/tabs/recent_activity_bubble_dialog_view_interactive_uitest.cc chrome/browser/ui/views/tabs/tab_hover_card_controller_interactive_uitest.cc +chrome/browser/ui/views/tabs/tab_strip_action_container_browsertest.cc chrome/browser/ui/views/translate/translate_bubble_view_interactive_uitest.cc chrome/browser/ui/views/user_education/browser_user_education_service.cc chrome/browser/ui/views/user_education/low_usage_promo.cc @@ -2089,7 +2089,6 @@ chrome/browser/ui/webui/signin/ash/user_cloud_signin_restriction_policy_fetcher. chrome/browser/ui/webui/signin/ash/user_cloud_signin_restriction_policy_fetcher_unittest.cc chrome/browser/ui/webui/signin/batch_upload_ui.cc chrome/browser/ui/webui/signin/signin_error_handler_unittest.cc -chrome/browser/ui/webui/signin/signin_reauth_ui.h chrome/browser/ui/webui/signin/sync_confirmation_handler_unittest.cc chrome/browser/ui/webui/signin/sync_confirmation_ui.cc chrome/browser/ui/webui/signin/turn_sync_on_helper_browsertest.cc @@ -2151,6 +2150,7 @@ chrome/browser/webauthn/challenge_url_fetcher.cc chrome/browser/webauthn/chrome_authenticator_request_delegate.cc chrome/browser/webauthn/chrome_authenticator_request_delegate_unittest.cc chrome/browser/webauthn/chrome_web_authentication_delegate.cc +chrome/browser/webauthn/chrome_web_authentication_delegate_unittest.cc chrome/browser/webauthn/chrome_webauthn_autofill_interactive_uitest.cc chrome/browser/webauthn/enclave_authenticator_browsertest.cc chrome/browser/webauthn/enclave_manager.cc @@ -2397,6 +2397,7 @@ chrome/test/enterprise/e2e/policy/allow_deleting_browser_history/allow_deleting_ chrome/test/enterprise/e2e/policy/allow_deleting_browser_history/allow_deleting_browser_history_webdriver_test.py chrome/test/enterprise/e2e/policy/apps_shortcut/apps_shortcut.py chrome/test/enterprise/e2e/policy/bookmarkbar_enabled/bookmarkbar_enabled.py +chrome/test/enterprise/e2e/policy/chrome_data_region_setting/chrome_data_region_setting.py chrome/test/enterprise/e2e/policy/cloud_management_enrollment_token/cloud_management_enrollment_token.py chrome/test/enterprise/e2e/policy/cloud_reporting_enabled/cloud_reporting_enabled.py chrome/test/enterprise/e2e/policy/default_search_provider/default_search_provider.py @@ -2450,8 +2451,6 @@ chrome/updater/certificate_tag_unittest.cc chrome/updater/crash_reporter.cc chrome/updater/enterprise/win/google/build_group_policy_template_unittest.py chrome/updater/enterprise/win/google/public_apps.py -chrome/updater/external_constants_builder_unittest.cc -chrome/updater/external_constants_override_unittest.cc chrome/updater/fix_licenses.py chrome/updater/mac/launcher_main.c chrome/updater/mac/setup/ks_tickets.mm @@ -2481,6 +2480,7 @@ chrome/utility/importer/nss_decryptor.cc chrome/utility/importer/nss_decryptor_system_nss.cc chrome/utility/importer/nss_decryptor_win.h chrome/version.gni +chrome/windows_services/service_program/crash_reporting.cc chrome/windows_services/service_program/service.cc chromeos/BUILD.gn chromeos/ash/components/attestation/attestation_flow_adaptive_unittest.cc @@ -2557,11 +2557,20 @@ chromeos/ash/components/quick_start/quick_start_requests_unittest.cc chromeos/ash/components/report/device_metrics/use_case/use_case.cc chromeos/ash/components/report/utils/network_utils.cc chromeos/ash/components/report/utils/network_utils_unittest.cc +chromeos/ash/components/scheduler_config/scheduler_configuration_manager.h chromeos/ash/components/specialized_features/feature_access_checker_unittest.cc chromeos/ash/components/string_matching/tokenized_string_unittest.cc chromeos/ash/components/timezone/timezone_request.cc chromeos/ash/components/tpm/tpm_token_info_getter_unittest.cc chromeos/ash/components/trial_group/trial_group_checker.cc +chromeos/ash/experiences/arc/arc_util.h +chromeos/ash/experiences/arc/intent_helper/arc_intent_helper_bridge_unittest.cc +chromeos/ash/experiences/arc/intent_helper/link_handler_model_unittest.cc +chromeos/ash/experiences/arc/net/arc_net_host_impl_unittest.cc +chromeos/ash/experiences/arc/net/passpoint_dialog_view.cc +chromeos/ash/experiences/arc/session/arc_upgrade_params.h +chromeos/ash/experiences/arc/session/serial_number_util_unittest.cc +chromeos/ash/experiences/arc/volume_mounter/arc_volume_mounter_bridge_unittest.cc chromeos/ash/services/assistant/assistant_manager_service_impl.cc chromeos/ash/services/assistant/service.cc chromeos/ash/services/assistant/service_unittest.cc @@ -2584,7 +2593,6 @@ chromeos/ash/services/quick_pair/public/cpp/account_key_filter.h chromeos/ash/services/quick_pair/public/cpp/battery_notification.h chromeos/ash/services/quick_pair/public/cpp/not_discoverable_advertisement.h chromeos/chromeos_strings.grd -chromeos/components/quick_answers/public/cpp/quick_answers_state_unittest.cc chromeos/components/quick_answers/translation_result_loader.cc chromeos/components/quick_answers/translation_result_loader_unittest.cc chromeos/components/quick_answers/utils/spell_check_language.cc @@ -2645,7 +2653,6 @@ components/autofill/core/browser/metrics/autofill_metrics_unittest.cc components/autofill/core/browser/metrics/form_interactions_ukm_logger.cc components/autofill/core/browser/metrics/form_interactions_ukm_logger_unittest.cc components/autofill/core/browser/metrics/prediction_quality_metrics_unittest.cc -components/autofill/core/browser/metrics/profile_deduplication_metrics_unittest.cc components/autofill/core/browser/metrics/quality_metrics_unittest.cc components/autofill/core/browser/ml_model/field_classification_model_handler.cc components/autofill/core/browser/payments/autofill_offer_manager_unittest.cc @@ -2716,6 +2723,7 @@ components/cloud_devices/common/cloud_device_description.h components/cloud_devices/common/printer_description.h components/collaboration/internal/android/messaging/messaging_backend_service_bridge_unittest.cc components/collaboration/internal/messaging/messaging_backend_service_impl_unittest.cc +components/collaboration_strings.grdp components/commerce/core/account_checker.cc components/commerce/core/account_checker_unittest.cc components/commerce/core/commerce_constants.h @@ -2802,6 +2810,7 @@ components/drive/service/drive_service_interface.h components/drive/service/fake_drive_service.cc components/embedder_support/android/BUILD.gn components/endpoint_fetcher/endpoint_fetcher_unittest.cc +components/enterprise/connectors/core/reporting_utils_unittest.cc components/enterprise/connectors/core/service_provider_config.cc components/enterprise/connectors/core/service_provider_config_unittest.cc components/enterprise/data_controls/core/browser/conditions/attributes_condition_unittest.cc @@ -2843,6 +2852,7 @@ components/feedback/redaction_tool/redaction_tool_unittest.cc components/feedback/redaction_tool/url_parse.h components/fingerprinting_protection_filter/browser/fingerprinting_protection_web_contents_helper.cc components/fingerprinting_protection_filter/common/fingerprinting_protection_breakage_exception_unittest.cc +components/fingerprinting_protection_filter/common/fingerprinting_protection_filter_constants.h components/fingerprinting_protection_filter/interventions/browser/interventions_web_contents_helper_unittest.cc components/flags_ui/flags_test_helpers.cc components/flags_ui/resources/app.html.ts @@ -2911,6 +2921,7 @@ components/invalidation/impl/fcm_invalidation_service_unittest.cc components/invalidation/impl/per_user_topic_subscription_manager.cc components/invalidation/impl/per_user_topic_subscription_manager_unittest.cc components/ip_protection/common/ip_protection_config_http.cc +components/ip_protection/common/ip_protection_issuer_token_direct_fetcher.cc components/ip_protection/common/ip_protection_proxy_config_direct_fetcher.cc components/ip_protection/common/ip_protection_token_manager_impl.cc components/ip_protection/common/masked_domain_list_manager_unittest.cc @@ -2948,7 +2959,9 @@ components/media_router/common/providers/cast/cast_media_source_unittest.cc components/media_router/common/providers/cast/certificate/net_trust_store.cc components/media_router/common/providers/cast/channel/BUILD.gn components/media_router/common/providers/cast/channel/enum_table.h +components/metrics/content/dwa_web_contents_observer_unittest.cc components/metrics/debug/app.ts +components/metrics/dwa/dwa_entry_builder_unittest.cc components/metrics/metrics_state_manager.h components/metrics/metrics_state_manager_unittest.cc components/metrics/net/net_metrics_log_uploader.cc @@ -2988,8 +3001,8 @@ components/omnibox/browser/autocomplete_controller.h components/omnibox/browser/autocomplete_controller_metrics_unittest.cc components/omnibox/browser/autocomplete_controller_unittest.cc components/omnibox/browser/autocomplete_input.cc -components/omnibox/browser/autocomplete_match.cc components/omnibox/browser/autocomplete_match.h +components/omnibox/browser/autocomplete_match_test_util.cc components/omnibox/browser/autocomplete_match_type_unittest.cc components/omnibox/browser/autocomplete_match_unittest.cc components/omnibox/browser/autocomplete_result.cc @@ -3002,7 +3015,8 @@ components/omnibox/browser/document_provider.cc components/omnibox/browser/document_provider_unittest.cc components/omnibox/browser/document_suggestions_service.cc components/omnibox/browser/document_suggestions_service_unittest.cc -components/omnibox/browser/enterprise_search_aggregator_provider.cc +components/omnibox/browser/enterprise_search_aggregator_suggestions_service.cc +components/omnibox/browser/enterprise_search_aggregator_suggestions_service_unittest.cc components/omnibox/browser/fake_autocomplete_provider_client.cc components/omnibox/browser/featured_search_provider_unittest.cc components/omnibox/browser/history_match.h @@ -3043,7 +3057,6 @@ components/omnibox/browser/titled_url_match_utils_unittest.cc components/omnibox/browser/zero_suggest_cache_service_unittest.cc components/omnibox/browser/zero_suggest_provider_unittest.cc components/omnibox/browser/zero_suggest_verbatim_match_provider_unittest.cc -components/omnibox/common/omnibox_feature_configs.h components/omnibox/resources/omnibox_pedal_synonyms.grd components/omnibox_pedal_ui_strings.grdp components/omnibox_strings.grdp @@ -3348,6 +3361,7 @@ components/policy/test/data/pref_mapping/ThirdPartyStoragePartitioningBlockedFor components/policy/test/data/pref_mapping/URLAllowlist.json components/policy/test/data/pref_mapping/URLBlocklist.json components/policy/test/data/pref_mapping/VideoCaptureAllowedUrls.json +components/policy/test/data/pref_mapping/WebAuthenticationRemoteDesktopAllowedOrigins.json components/policy/test/data/pref_mapping/WebHidAllowAllDevicesForUrls.json components/policy/test/data/pref_mapping/WebHidAllowDevicesForUrls.json components/policy/test/data/pref_mapping/WebHidAllowDevicesWithHidUsagesForUrls.json @@ -3499,7 +3513,6 @@ components/saved_tab_groups/internal/shared_tab_group_data_sync_bridge_unittest. components/saved_tab_groups/internal/tab_group_sync_bridge_mediator_unittest.cc components/saved_tab_groups/internal/tab_group_sync_service_unittest.cc components/saved_tab_groups/public/saved_tab_group_unittest.cc -components/saved_tab_groups/test_support/fake_tab_group_sync_service.cc components/saved_tab_groups/test_support/saved_tab_group_test_utils.cc components/search_engines/PRESUBMIT.py components/search_engines/android/template_url_service_android_unittest.cc @@ -3577,6 +3590,7 @@ components/sharing_message/vapid_key_manager.h components/sharing_message/web_push/json_web_token_util_unittest.cc components/sharing_message/web_push/web_push_sender.cc components/sharing_message/web_push/web_push_sender_unittest.cc +components/signin/core/browser/account_management_type_metrics_recorder_unittest.cc components/signin/core/browser/account_reconcilor_unittest.cc components/signin/core/browser/chrome_connected_header_helper.cc components/signin/core/browser/dice_account_reconcilor_delegate_unittest.cc @@ -3644,6 +3658,7 @@ components/supervised_user/core/browser/supervised_user_settings_service_unittes components/supervised_user/core/browser/supervised_user_url_filter.cc components/supervised_user/core/browser/supervised_user_url_filter.h components/supervised_user/core/browser/supervised_user_url_filter_unittest.cc +components/supervised_user/core/browser/supervised_user_utils.cc components/supervised_user/core/common/supervised_user_constants.cc components/supervised_user/core/common/supervised_user_constants.h components/supervised_user/test_support/account_repository.h @@ -3668,7 +3683,9 @@ components/sync/test/mock_connection_manager.cc components/sync_bookmarks/PRESUBMIT.py components/sync_preferences/pref_service_syncable_unittest.cc components/sync_sessions/PRESUBMIT.py +components/sync_sessions/session_store_unittest.cc components/sync_sessions/session_sync_bridge.h +components/sync_sessions/synced_session_unittest.cc components/system_cpu/cpu_probe_win.cc components/tpcd/enterprise_reporting/enterprise_reporting_tab_helper_unittest.cc components/tpcd/metadata/browser/parser_unittest.cc @@ -3726,7 +3743,6 @@ components/user_manager/account_id_util_unittest.cc components/user_manager/known_user_unittest.cc components/user_manager/user.h components/user_manager/user_type.h -components/user_notes/browser/user_note_utils_unittest.cc components/variations/entropy_provider.h components/variations/net/variations_http_headers.cc components/variations/net/variations_http_headers_unittest.cc @@ -3777,7 +3793,6 @@ content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm content/browser/accessibility/accessibility_action_browsertest.cc content/browser/accessibility/accessibility_auralinux_browsertest.cc content/browser/accessibility/browser_accessibility_manager_android.cc -content/browser/accessibility/dump_accessibility_tree_browsertest.cc content/browser/accessibility/hit_testing_browsertest.cc content/browser/android/nfc_host_unittest.cc content/browser/attribution_reporting/attribution_os_level_manager_android.cc @@ -3798,6 +3813,7 @@ content/browser/browsing_data/browsing_data_filter_builder_impl_unittest.cc content/browser/browsing_topics/browsing_topics_url_loader_unittest.cc content/browser/buckets/bucket_manager_host_unittest.cc content/browser/cache_storage/cache_storage_context_unittest.cc +content/browser/child_process_sandbox_support_win_unittest.cc content/browser/child_process_security_policy_unittest.cc content/browser/client_hints/client_hints.cc content/browser/content_security_policy_browsertest.cc @@ -3874,6 +3890,7 @@ content/browser/preloading/prefetch/prefetch_match_resolver.cc content/browser/preloading/prefetch/prefetch_service.cc content/browser/preloading/prefetch/prefetch_status.h content/browser/preloading/prefetch/prefetch_url_loader_interceptor.cc +content/browser/preloading/preloading_decider.cc content/browser/preloading/preloading_decider_unittest.cc content/browser/preloading/prerender/prerender_browsertest.cc content/browser/preloading/prerender/prerender_final_status.h @@ -3888,6 +3905,7 @@ content/browser/renderer_host/clipboard_host_impl_unittest.cc content/browser/renderer_host/direct_manipulation_test_helper_win.cc content/browser/renderer_host/dwrite_font_proxy_impl_win.cc content/browser/renderer_host/frame_tree_unittest.cc +content/browser/renderer_host/input/input_transfer_handler_android.h content/browser/renderer_host/legacy_render_widget_host_win.cc content/browser/renderer_host/media/media_devices_dispatcher_host_unittest.cc content/browser/renderer_host/mixed_content_checker_unittest.cc @@ -3918,6 +3936,7 @@ content/browser/resources/PRESUBMIT.py content/browser/resources/gpu/info_view.ts content/browser/resources/traces_internals/icons.html content/browser/sandbox_ipc_linux.h +content/browser/sandbox_support_win_impl.cc content/browser/screen_orientation/screen_orientation_provider_unittest.cc content/browser/security/dip/document_isolation_policy_browsertest.cc content/browser/serial/serial_unittest.cc @@ -4024,6 +4043,91 @@ content/services/auction_worklet/webidl_compat.cc content/shell/browser/shell_browser_main_parts.cc content/shell/browser/shell_platform_delegate_ios.mm content/test/PRESUBMIT.py +content/test/data/attribution_reporting/aggregatable_debug_report_goldens/latest/report_1.json +content/test/data/attribution_reporting/aggregatable_debug_report_goldens/latest/report_2.json +content/test/data/attribution_reporting/aggregatable_debug_report_goldens/latest/report_3.json +content/test/data/attribution_reporting/aggregatable_debug_report_goldens/latest/report_gcp_1.json +content/test/data/attribution_reporting/aggregatable_debug_report_goldens/latest/report_gcp_2.json +content/test/data/attribution_reporting/aggregatable_debug_report_goldens/latest/report_gcp_3.json +content/test/data/attribution_reporting/aggregatable_debug_report_goldens/version_0.1/report_1.json +content/test/data/attribution_reporting/aggregatable_debug_report_goldens/version_0.1/report_2.json +content/test/data/attribution_reporting/aggregatable_debug_report_goldens/version_0.1/report_3.json +content/test/data/attribution_reporting/aggregatable_debug_report_goldens/version_0.1/report_gcp_1.json +content/test/data/attribution_reporting/aggregatable_debug_report_goldens/version_0.1/report_gcp_2.json +content/test/data/attribution_reporting/aggregatable_debug_report_goldens/version_0.1/report_gcp_3.json +content/test/data/attribution_reporting/aggregatable_report_goldens/latest/report_1.json +content/test/data/attribution_reporting/aggregatable_report_goldens/latest/report_10.json +content/test/data/attribution_reporting/aggregatable_report_goldens/latest/report_2.json +content/test/data/attribution_reporting/aggregatable_report_goldens/latest/report_3.json +content/test/data/attribution_reporting/aggregatable_report_goldens/latest/report_4.json +content/test/data/attribution_reporting/aggregatable_report_goldens/latest/report_5.json +content/test/data/attribution_reporting/aggregatable_report_goldens/latest/report_6.json +content/test/data/attribution_reporting/aggregatable_report_goldens/latest/report_7.json +content/test/data/attribution_reporting/aggregatable_report_goldens/latest/report_8.json +content/test/data/attribution_reporting/aggregatable_report_goldens/latest/report_9.json +content/test/data/attribution_reporting/aggregatable_report_goldens/latest/report_gcp_1.json +content/test/data/attribution_reporting/aggregatable_report_goldens/latest/report_gcp_2.json +content/test/data/attribution_reporting/aggregatable_report_goldens/latest/report_gcp_3.json +content/test/data/attribution_reporting/aggregatable_report_goldens/latest/report_gcp_4.json +content/test/data/attribution_reporting/aggregatable_report_goldens/latest/report_gcp_5.json +content/test/data/attribution_reporting/aggregatable_report_goldens/latest/report_gcp_6.json +content/test/data/attribution_reporting/aggregatable_report_goldens/latest/report_gcp_7.json +content/test/data/attribution_reporting/aggregatable_report_goldens/latest/report_gcp_8.json +content/test/data/attribution_reporting/aggregatable_report_goldens/latest/report_gcp_9.json +content/test/data/attribution_reporting/aggregatable_report_goldens/version_0.1/report_1.json +content/test/data/attribution_reporting/aggregatable_report_goldens/version_0.1/report_2.json +content/test/data/attribution_reporting/aggregatable_report_goldens/version_0.1/report_3.json +content/test/data/attribution_reporting/aggregatable_report_goldens/version_0.1/report_4.json +content/test/data/attribution_reporting/aggregatable_report_goldens/version_0.1/report_5.json +content/test/data/attribution_reporting/aggregatable_report_goldens/version_0.1/report_6.json +content/test/data/attribution_reporting/aggregatable_report_goldens/version_0.1/report_7.json +content/test/data/attribution_reporting/aggregatable_report_goldens/version_0.1/report_8.json +content/test/data/attribution_reporting/aggregatable_report_goldens/version_0.1/report_9.json +content/test/data/attribution_reporting/aggregatable_report_goldens/version_0.1/report_gcp_1.json +content/test/data/attribution_reporting/aggregatable_report_goldens/version_0.1/report_gcp_2.json +content/test/data/attribution_reporting/aggregatable_report_goldens/version_0.1/report_gcp_3.json +content/test/data/attribution_reporting/aggregatable_report_goldens/version_0.1/report_gcp_4.json +content/test/data/attribution_reporting/aggregatable_report_goldens/version_0.1/report_gcp_5.json +content/test/data/attribution_reporting/aggregatable_report_goldens/version_0.1/report_gcp_6.json +content/test/data/attribution_reporting/aggregatable_report_goldens/version_0.1/report_gcp_7.json +content/test/data/attribution_reporting/aggregatable_report_goldens/version_0.1/report_gcp_8.json +content/test/data/attribution_reporting/aggregatable_report_goldens/version_0.1/report_gcp_9.json +content/test/data/dom_serializer/html_doc_has_base_tag.htm +content/test/data/dom_serializer/youtube_1.htm +content/test/data/dom_serializer/youtube_2.htm +content/test/data/fedcm/accounts_endpoint.json +content/test/data/private_aggregation/aggregatable_report_goldens/latest/report_1.json +content/test/data/private_aggregation/aggregatable_report_goldens/latest/report_10.json +content/test/data/private_aggregation/aggregatable_report_goldens/latest/report_11.json +content/test/data/private_aggregation/aggregatable_report_goldens/latest/report_12.json +content/test/data/private_aggregation/aggregatable_report_goldens/latest/report_13.json +content/test/data/private_aggregation/aggregatable_report_goldens/latest/report_14.json +content/test/data/private_aggregation/aggregatable_report_goldens/latest/report_15.json +content/test/data/private_aggregation/aggregatable_report_goldens/latest/report_16.json +content/test/data/private_aggregation/aggregatable_report_goldens/latest/report_17.json +content/test/data/private_aggregation/aggregatable_report_goldens/latest/report_18.json +content/test/data/private_aggregation/aggregatable_report_goldens/latest/report_19.json +content/test/data/private_aggregation/aggregatable_report_goldens/latest/report_2.json +content/test/data/private_aggregation/aggregatable_report_goldens/latest/report_3.json +content/test/data/private_aggregation/aggregatable_report_goldens/latest/report_4.json +content/test/data/private_aggregation/aggregatable_report_goldens/latest/report_5.json +content/test/data/private_aggregation/aggregatable_report_goldens/latest/report_6.json +content/test/data/private_aggregation/aggregatable_report_goldens/latest/report_7.json +content/test/data/private_aggregation/aggregatable_report_goldens/latest/report_8.json +content/test/data/private_aggregation/aggregatable_report_goldens/latest/report_9.json +content/test/data/private_aggregation/aggregatable_report_goldens/version_0.1/report_1.json +content/test/data/private_aggregation/aggregatable_report_goldens/version_0.1/report_10.json +content/test/data/private_aggregation/aggregatable_report_goldens/version_0.1/report_2.json +content/test/data/private_aggregation/aggregatable_report_goldens/version_0.1/report_3.json +content/test/data/private_aggregation/aggregatable_report_goldens/version_0.1/report_4.json +content/test/data/private_aggregation/aggregatable_report_goldens/version_0.1/report_5.json +content/test/data/private_aggregation/aggregatable_report_goldens/version_0.1/report_6.json +content/test/data/private_aggregation/aggregatable_report_goldens/version_0.1/report_7.json +content/test/data/private_aggregation/aggregatable_report_goldens/version_0.1/report_8.json +content/test/data/private_aggregation/aggregatable_report_goldens/version_0.1/report_9.json +content/test/data/site_isolation/json-prefixed-3.js +content/test/data/site_isolation/json-prefixed-4.js +content/test/data/web_ui_mojo_ts_test.ts content/test/gpu/PRESUBMIT.py content/test/gpu/find_unknown_typ_tags.py content/test/gpu/flake_suppressor/gpu_results_unittest.py @@ -4091,6 +4195,7 @@ docs/website/scripts/fetch_lobs.py docs/website/scripts/fetch_node_modules.py docs/website/site/Home/google-ssl.xml docs/website/site/administrators/err_ssl_weak_server_ephemeral_dh_key/redirect-dh.xml +docs/website/site/chromium-os/developer-library/reference/upstart-cookbook/index.html docs/website/site/developers/design-documents/accessibility/tracker/CSUN_Accessibility_in_the_Cloud.txt docs/website/site/developers/design-documents/accessibility/tracker/CSUN_Improving_Access_To_Web_Platforms_Content_and_Applications.txt docs/website/site/sts/redirect.xml @@ -4243,7 +4348,6 @@ google_apis/gaia/oauth2_api_call_flow_unittest.cc google_apis/gaia/oauth_multilogin_result_unittest.cc google_apis/gcm/base/mcs_util.cc google_apis/gcm/engine/account_mapping_unittest.cc -google_apis/gcm/engine/checkin_request_unittest.cc google_apis/gcm/engine/gcm_store_impl_unittest.cc google_apis/gcm/engine/gservices_settings.cc google_apis/gcm/engine/gservices_settings_unittest.cc @@ -4320,259 +4424,6 @@ infra/config/generated/health-specs/health-specs.json infra/config/migration/PRESUBMIT.py infra/config/scripts/PRESUBMIT.py infra/config/scripts/sync-pyl-files.py -ios/PRESUBMIT.py -ios/build/bots/scripts/PRESUBMIT.py -ios/build/bots/scripts/plugin/PRESUBMIT.py -ios/build/bots/scripts/result_sink_util.py -ios/build/bots/scripts/result_sink_util_test.py -ios/build/bots/scripts/test_result_util.py -ios/build/bots/scripts/test_runner.py -ios/build/bots/scripts/xcode_util.py -ios/chrome/app/application_delegate/url_opener_unittest.mm -ios/chrome/app/startup/chrome_app_startup_parameters_unittest.mm -ios/chrome/app/strings/ios_chromium_strings.grd -ios/chrome/app/strings/ios_google_chrome_strings.grd -ios/chrome/app/strings/ios_strings.grd -ios/chrome/browser/app_launcher/model/app_launcher_abuse_detector_unittest.mm -ios/chrome/browser/app_launcher/model/app_launcher_tab_helper_unittest.mm -ios/chrome/browser/authentication/ui_bundled/account_menu/account_menu_egtest.mm -ios/chrome/browser/authentication/ui_bundled/account_menu/account_menu_mediator_delegate.h -ios/chrome/browser/authentication/ui_bundled/account_menu/account_menu_mutator.h -ios/chrome/browser/authentication/ui_bundled/authentication_flow/authentication_flow_unittest.mm -ios/chrome/browser/authentication/ui_bundled/authentication_flow_unittest.mm -ios/chrome/browser/authentication/ui_bundled/history_sync/history_sync_capabilities_fetcher_unittest.mm -ios/chrome/browser/authentication/ui_bundled/signin/add_account_signin/add_account_signin_manager_unittest.mm -ios/chrome/browser/authentication/ui_bundled/signin_earl_grey_ui_test_util.mm -ios/chrome/browser/autofill/model/automation/automation_action.mm -ios/chrome/browser/autofill/model/form_suggestion_controller_unittest.mm -ios/chrome/browser/autofill/ui_bundled/authentication/authentication_egtest_util.mm -ios/chrome/browser/autofill/ui_bundled/authentication/card_unmask_authentication_egtest.mm -ios/chrome/browser/autofill/ui_bundled/bottom_sheet/virtual_card_enrollment_bottom_sheet_egtest.mm -ios/chrome/browser/autofill/ui_bundled/cells/target_account_item_unittest.mm -ios/chrome/browser/autofill/ui_bundled/manual_fill/form_observer_helper_unittest.mm -ios/chrome/browser/autofill/ui_bundled/manual_fill/manual_fill_password_mediator_unittest.mm -ios/chrome/browser/autofill/ui_bundled/save_card_infobar_egtest.mm -ios/chrome/browser/autofill/ui_bundled/save_profile_egtest.mm -ios/chrome/browser/bookmarks/ui_bundled/bookmark_earl_grey.mm -ios/chrome/browser/bookmarks/ui_bundled/bookmark_earl_grey_ui.h -ios/chrome/browser/bookmarks/ui_bundled/bookmark_mediator_unittest.mm -ios/chrome/browser/bookmarks/ui_bundled/bookmarks_egtest.mm -ios/chrome/browser/bookmarks/ui_bundled/folder_chooser/bookmarks_folder_chooser_egtest.mm -ios/chrome/browser/bring_android_tabs/ui_bundled/tab_list_from_android_mediator_unittest.mm -ios/chrome/browser/commerce/model/shopping_persisted_data_tab_helper_unittest.mm -ios/chrome/browser/context_menu/ui_bundled/context_menu_configuration_provider_unittest.mm -ios/chrome/browser/crash_report/model/breadcrumbs/breadcrumb_manager_tab_helper_unittest.mm -ios/chrome/browser/credential_provider/model/credential_provider_service_unittest.mm -ios/chrome/browser/credential_provider/model/ios_credential_provider_infobar_delegate_unittest.mm -ios/chrome/browser/credential_provider_promo/ui_bundled/resources/CPE_promo_animation_edu_autofill.json -ios/chrome/browser/credential_provider_promo/ui_bundled/resources/CPE_promo_animation_edu_autofill_darkmode.json -ios/chrome/browser/dialogs/ui_bundled/nsurl_protection_space_util_unittest.mm -ios/chrome/browser/download/model/ar_quick_look_tab_helper_unittest.mm -ios/chrome/browser/drive/model/drive_list.h -ios/chrome/browser/drive/model/manage_storage_url_util.mm -ios/chrome/browser/drive_file_picker/coordinator/drive_file_picker_mediator.mm -ios/chrome/browser/drive_file_picker/coordinator/drive_file_picker_mediator_helper.mm -ios/chrome/browser/first_run/ui_bundled/first_run_search_engine_choice_egtest.mm -ios/chrome/browser/flags/about_flags.mm -ios/chrome/browser/history/model/history_tab_helper_unittest.mm -ios/chrome/browser/home_customization/utils/home_customization_constants.mm -ios/chrome/browser/infobars/ui_bundled/modals/autofill_address_profile/infobar_save_address_profile_table_view_controller_unittest.mm -ios/chrome/browser/infobars/ui_bundled/test/test_infobar_password_delegate.mm -ios/chrome/browser/intents/user_activity_browser_agent_unittest.mm -ios/chrome/browser/lens_overlay/coordinator/lens_omnibox_client_unittest.mm -ios/chrome/browser/lens_overlay/coordinator/lens_overlay_mediator_unittest.mm -ios/chrome/browser/lens_overlay/coordinator/lens_result_page_mediator.mm -ios/chrome/browser/lens_overlay/coordinator/lens_result_page_mediator_unittest.mm -ios/chrome/browser/link_to_text/model/link_to_text_java_script_feature_unittest.mm -ios/chrome/browser/link_to_text/ui_bundled/link_to_text_mediator_unittest.mm -ios/chrome/browser/location_bar/ui_bundled/location_bar_coordinator_unittest.mm -ios/chrome/browser/metrics/model/ios_family_link_user_metrics_provider_unittest.mm -ios/chrome/browser/metrics/model/tab_usage_recorder_browser_agent_unittest.mm -ios/chrome/browser/net/model/retryable_url_fetcher_unittest.mm -ios/chrome/browser/ntp/model/browser_policy_new_tab_page_rewriter_unittest.mm -ios/chrome/browser/ntp/ui_bundled/discover_feed_constants.mm -ios/chrome/browser/ntp/ui_bundled/incognito/incognito_view_util.mm -ios/chrome/browser/ntp/ui_bundled/new_tab_page_coordinator_unittest.mm -ios/chrome/browser/ntp/ui_bundled/new_tab_page_mediator.mm -ios/chrome/browser/ntp/ui_bundled/new_tab_page_mediator_unittest.mm -ios/chrome/browser/omaha/model/omaha_service.mm -ios/chrome/browser/omnibox/ui_bundled/omnibox_egtest.mm -ios/chrome/browser/omnibox/ui_bundled/zero_suggest_prefetch_helper_unittest.mm -ios/chrome/browser/optimization_guide/model/optimization_guide_validation_tab_helper_unittest.mm -ios/chrome/browser/overlays/ui_bundled/infobar_banner/passwords/password_infobar_banner_overlay_mediator_unittest.mm -ios/chrome/browser/overlays/ui_bundled/infobar_modal/passwords/password_infobar_modal_overlay_mediator_unittest.mm -ios/chrome/browser/page_info/about_this_site_tab_helper_unittest.mm -ios/chrome/browser/page_info/ui_bundled/page_info_security_egtest.mm -ios/chrome/browser/passwords/model/password_controller_js_unittest.mm -ios/chrome/browser/passwords/model/password_controller_unittest.mm -ios/chrome/browser/plus_addresses/ui/plus_address_bottom_sheet_constants.h -ios/chrome/browser/policy/model/cloud/user_policy_signin_service_unittest.mm -ios/chrome/browser/policy/model/new_tab_page_location_policy_handler_unittest.cc -ios/chrome/browser/policy/model/restrict_accounts_policy_handler_unittest.cc -ios/chrome/browser/prerender/model/preload_controller_unittest.mm -ios/chrome/browser/prerender/model/prerender_service_impl_unittest.mm -ios/chrome/browser/profile/model/profile_ios_impl.h -ios/chrome/browser/reading_list/model/reading_list_browser_agent_unittest.mm -ios/chrome/browser/reading_list/ui_bundled/reading_list_list_item_factory_unittest.mm -ios/chrome/browser/reading_list/ui_bundled/reading_list_mediator_unittest.mm -ios/chrome/browser/reading_list/ui_bundled/reading_list_table_view_item_unittest.mm -ios/chrome/browser/safe_browsing/model/safe_browsing_client_impl_unittest.mm -ios/chrome/browser/safe_browsing/model/tailored_security/tailored_security_tab_helper_unittest.mm -ios/chrome/browser/safety_check/model/ios_chrome_safety_check_manager_unittest.mm -ios/chrome/browser/save_to_photos/ui_bundled/save_to_photos_mediator.mm -ios/chrome/browser/saved_tab_groups/model/ios_tab_group_sync_util_unittest.mm -ios/chrome/browser/saved_tab_groups/model/tab_group_local_update_observer_unittest.mm -ios/chrome/browser/search_engines/model/extension_search_engine_data_updater_unittest.mm -ios/chrome/browser/search_engines/model/resources/search_engine.ts -ios/chrome/browser/search_engines/model/search_engine_js_unittest.mm -ios/chrome/browser/search_engines/model/search_engine_tab_helper.h -ios/chrome/browser/search_engines/model/search_engine_tab_helper.mm -ios/chrome/browser/settings/ui_bundled/autofill/autofill_profile_settings_egtest.mm -ios/chrome/browser/settings/ui_bundled/clear_browsing_data/clear_browsing_data_egtest.mm -ios/chrome/browser/settings/ui_bundled/clear_browsing_data/quick_delete_egtest.mm -ios/chrome/browser/settings/ui_bundled/google_services/manage_sync_settings_command_handler.h -ios/chrome/browser/settings/ui_bundled/password/password_checkup/password_checkup_constants.mm -ios/chrome/browser/settings/ui_bundled/password/password_checkup/password_checkup_mediator_unittest.mm -ios/chrome/browser/settings/ui_bundled/password/password_checkup/password_checkup_view_controller_unittest.mm -ios/chrome/browser/settings/ui_bundled/password/password_details/add_password_view_controller_unittest.mm -ios/chrome/browser/settings/ui_bundled/password/password_details/password_details_mediator_unittest.mm -ios/chrome/browser/settings/ui_bundled/password/password_details/password_details_table_view_controller_unittest.mm -ios/chrome/browser/settings/ui_bundled/password/password_exporter_unittest.mm -ios/chrome/browser/settings/ui_bundled/password/password_issues/password_issues_table_view_controller_unittest.mm -ios/chrome/browser/settings/ui_bundled/password/password_manager_egtest.mm -ios/chrome/browser/settings/ui_bundled/password/password_manager_view_controller_unittest.mm -ios/chrome/browser/settings/ui_bundled/password/password_settings/password_settings_mediator_unittest.mm -ios/chrome/browser/settings/ui_bundled/password/password_sharing/family_picker_coordinator_unittest.mm -ios/chrome/browser/settings/ui_bundled/password/password_sharing/family_picker_view_controller_unittest.mm -ios/chrome/browser/settings/ui_bundled/password/password_sharing/family_promo_coordinator_unittest.mm -ios/chrome/browser/settings/ui_bundled/password/password_sharing/password_picker_view_controller_unittest.mm -ios/chrome/browser/settings/ui_bundled/password/password_sharing/password_sharing_constants.mm -ios/chrome/browser/settings/ui_bundled/password/password_sharing/password_sharing_egtest.mm -ios/chrome/browser/settings/ui_bundled/password/password_sharing/password_sharing_first_run_coordinator_unittest.mm -ios/chrome/browser/settings/ui_bundled/password/password_sharing/sharing_status_mediator_unittest.mm -ios/chrome/browser/settings/ui_bundled/password/passwords_mediator_unittest.mm -ios/chrome/browser/settings/ui_bundled/safety_check/safety_check_mediator_unittest.mm -ios/chrome/browser/settings/ui_bundled/search_engine_table_view_controller_unittest.mm -ios/chrome/browser/settings/ui_bundled/supervised_user_settings_app_interface.mm -ios/chrome/browser/settings/ui_bundled/table_cell_catalog_view_controller.mm -ios/chrome/browser/settings/ui_bundled/translate_table_view_controller.mm -ios/chrome/browser/shared/coordinator/scene/scene_controller.mm -ios/chrome/browser/shared/coordinator/scene/scene_controller_unittest.mm -ios/chrome/browser/shared/model/url/chrome_url_constants.cc -ios/chrome/browser/shared/model/web_state_list/order_controller_source_from_web_state_list_unittest.mm -ios/chrome/browser/shared/model/web_state_list/web_state_list_unittest.mm -ios/chrome/browser/shared/ui/table_view/cells/table_view_detail_icon_item_unittest.mm -ios/chrome/browser/shared/ui/table_view/cells/table_view_url_item_unittest.mm -ios/chrome/browser/shared/ui/util/pasteboard_util_unittest.mm -ios/chrome/browser/sharing/ui_bundled/activity_services/activities/copy_activity_unittest.mm -ios/chrome/browser/sharing/ui_bundled/activity_services/activities/find_in_page_activity_unittest.mm -ios/chrome/browser/sharing/ui_bundled/activity_services/activities/print_activity_unittest.mm -ios/chrome/browser/sharing/ui_bundled/activity_services/activities/send_tab_to_self_activity_unittest.mm -ios/chrome/browser/sharing/ui_bundled/activity_services/activity_service_mediator_unittest.mm -ios/chrome/browser/sharing/ui_bundled/activity_services/activity_type_util.mm -ios/chrome/browser/sharing/ui_bundled/qr_generator/qr_generator_coordinator_unittest.mm -ios/chrome/browser/sharing/ui_bundled/qr_generator/qr_generator_util_unittest.mm -ios/chrome/browser/signin/model/account_capabilities_fetcher_ios_unittest.mm -ios/chrome/browser/signin/model/account_profile_mapper_unittest.mm -ios/chrome/browser/signin/model/authentication_service_unittest.mm -ios/chrome/browser/signin/model/chrome_account_manager_service_unittest.mm -ios/chrome/browser/signin/model/fake_system_identity.mm -ios/chrome/browser/signin/model/fake_system_identity_manager.mm -ios/chrome/browser/signin/model/gaia_auth_fetcher_ios_unittest.mm -ios/chrome/browser/signin/model/pattern_account_restriction_unittest.mm -ios/chrome/browser/signin/model/system_identity_manager.h -ios/chrome/browser/signin/model/test_account_info.mm -ios/chrome/browser/snapshots/model/snapshot_generator_unittest.mm -ios/chrome/browser/ssl/model/ios_ssl_error_handler_unittest.mm -ios/chrome/browser/start_surface/ui_bundled/start_surface_scene_agent_unittest.mm -ios/chrome/browser/supervised_user/model/supervised_user_url_filter_tab_helper_unittest.mm -ios/chrome/browser/tab_switcher/ui_bundled/tab_grid/grid/base_grid_mediator_unittest.mm -ios/chrome/browser/tab_switcher/ui_bundled/tab_grid/tab_grid_egtest.mm -ios/chrome/browser/tab_switcher/ui_bundled/tab_grid/tab_groups/tab_group_sync_earl_grey_app_interface.mm -ios/chrome/browser/tab_switcher/ui_bundled/tab_strip/coordinator/tab_strip_mediator_unittest.mm -ios/chrome/browser/toolbar/ui_bundled/adaptive_toolbar_mediator_unittest.mm -ios/chrome/browser/ui/content_suggestions/cells/most_visited_tiles_mediator_unittest.mm -ios/chrome/browser/ui/content_suggestions/ntp_home_egtest.mm -ios/chrome/browser/ui/content_suggestions/parcel_tracking/parcel_tracking_mediator_unittest.mm -ios/chrome/browser/ui/content_suggestions/tab_resumption/tab_resumption_mediator.mm -ios/chrome/browser/ui/popup_menu/overflow_menu/overflow_menu_mediator_unittest.mm -ios/chrome/browser/ui/popup_menu/popup_menu_mediator_unittest.mm -ios/chrome/browser/url_loading/model/image_search_param_generator_unittest.mm -ios/chrome/browser/web/model/chrome_web_client_unittest.mm -ios/chrome/browser/web/model/font_size/font_size_tab_helper_unittest.mm -ios/chrome/browser/web_state_list/model/web_usage_enabler/web_usage_enabler_browser_agent_unittest.mm -ios/chrome/browser/webui/ui_bundled/interstitials/interstitial_ui_util.mm -ios/chrome/common/ns_regular_expression_unittest.mm -ios/chrome/common/string_util_unittest.mm -ios/chrome/common/x_callback_url_unittest.cc -ios/chrome/credential_provider_extension/strings/ios_credential_provider_extension_strings.grd -ios/chrome/credential_provider_extension/ui/passkey_welcome_screen_view_controller_unittest.mm -ios/chrome/test/data/policy/PRESUBMIT.py -ios/chrome/test/data/policy/pref_mapping/ManagedBookmarks.json -ios/chrome/test/data/policy/pref_mapping/NewTabPageLocation.json -ios/chrome/test/data/policy/pref_mapping/PopupsAllowedForUrls.json -ios/chrome/test/data/policy/pref_mapping/PopupsBlockedForUrls.json -ios/chrome/test/data/policy/pref_mapping/RestrictAccountsToPatterns.json -ios/chrome/test/data/policy/pref_mapping/URLAllowlist.json -ios/chrome/test/data/policy/pref_mapping/URLBlocklist.json -ios/chrome/test/earl_grey/chrome_earl_grey_ui.h -ios/chrome/test/earl_grey/device_check_egtest.mm -ios/chrome/test/providers/omaha/test_omaha.cc -ios/chrome/test/xcuitest/device_check_xctest.mm -ios/components/cookie_util/cookie_util_unittest.mm -ios/components/credential_provider_extension/password_spec_fetcher.mm -ios/components/credential_provider_extension/password_util_unittest.mm -ios/components/security_interstitials/https_only_mode/https_only_mode_blocking_page.mm -ios/net/cookies/cookie_cache_unittest.cc -ios/net/cookies/cookie_store_ios_test_util.mm -ios/net/cookies/cookie_store_ios_unittest.mm -ios/net/cookies/system_cookie_store_unittest_template.h -ios/net/crn_http_protocol_handler.mm -ios/net/nsurlrequest_util_unittest.mm -ios/testing/PRESUBMIT.py -ios/testing/data/http_server_files/opensearch.xml -ios/testing/data/http_server_files/window_open.html -ios/testing/earl_grey/base_earl_grey_test_case.mm -ios/web/browsing_data/browsing_data_removing_util_unittest.mm -ios/web/browsing_data/system_cookie_store_util_unittest.mm -ios/web/favicon/favicon_util_unittest.mm -ios/web/js_features/context_menu/context_menu_js_unittest.mm -ios/web/navigation/history_state_operations_inttest.mm -ios/web/navigation/navigation_manager_impl.mm -ios/web/navigation/navigation_manager_util_unittest.mm -ios/web/net/cookies/crw_wk_http_cookie_store_unittest.mm -ios/web/public/init/web_main_parts.h -ios/web/shell/test/earl_grey/shell_earl_grey.h -ios/web/util/wk_security_origin_util_unittest.mm -ios/web/web_state/permissions_inttest.mm -ios/web/web_state/ui/crw_web_controller_unittest.mm -ios/web/web_state/ui/wk_content_rule_list_util.mm -ios/web/web_state/web_state_context_menu_bridge_unittest.mm -ios/web/web_state/web_state_unittest.mm -ios/web_view/PRESUBMIT.py -ios/web_view/internal/autofill/cwv_autofill_controller_unittest.mm -ios/web_view/internal/autofill/cwv_autofill_data_manager_unittest.mm -ios/web_view/internal/autofill/cwv_credit_card_saver_unittest.mm -ios/web_view/internal/cwv_favicon_unittest.mm -ios/web_view/internal/cwv_flags.mm -ios/web_view/internal/cwv_lookalike_url_handler_unittest.mm -ios/web_view/internal/cwv_ssl_error_handler_unittest.mm -ios/web_view/internal/cwv_web_view.mm -ios/web_view/internal/passwords/cwv_credential_provider_extension_utils_unittest.mm -ios/web_view/internal/passwords/cwv_leak_check_credential_unittest.mm -ios/web_view/internal/passwords/cwv_password_unittest.mm -ios/web_view/internal/passwords/cwv_reuse_check_service_unittest.mm -ios/web_view/internal/safe_browsing/cwv_unsafe_url_handler_unittest.mm -ios/web_view/internal/signin/account_capabilities_fetcher_ios_web_view_unittest.mm -ios/web_view/internal/signin/cwv_identity_unittest.mm -ios/web_view/internal/signin/web_view_device_accounts_provider_impl_unittest.mm -ios/web_view/internal/sync/cwv_sync_controller_unittest.mm -ios/web_view/internal/translate/cwv_translation_controller_unittest.mm -ios/web_view/public/cwv_autofill_data_manager.h -ios/web_view/public/cwv_credential_provider_extension_utils.h -ios/web_view/public/cwv_identity.h -ios/web_view/public/cwv_translation_language.h -ios/web_view/public/cwv_web_view.h ipc/ipc_channel.h media/PRESUBMIT.py media/audio/android/audio_track_output_stream.cc @@ -4617,11 +4468,11 @@ media/capture/video/win/video_capture_device_mf_win.cc media/capture/video/win/video_capture_device_utils_win.cc media/capture/video/win/video_capture_device_utils_win.h media/capture/video/win/video_capture_device_win.cc -media/cast/encoding/video_encoder_unittest.cc +media/cast/encoding/media_video_encoder_wrapper_unittest.cc media/cast/encoding/vpx_encoder.cc +media/cast/encoding/vpx_quantizer_parser_unittest.cc media/cast/sender/openscreen_frame_sender.h media/cast/sender/video_bitrate_suggester.h -media/cast/sender/video_sender_unittest.cc media/cdm/win/media_foundation_cdm.cc media/cdm/win/test/media_foundation_clear_key_decryptor.cc media/cdm/win/test/mock_media_protection_pmp_server.h @@ -4665,6 +4516,7 @@ media/gpu/vaapi/vaapi_jpeg_decoder_unittest.cc media/gpu/vaapi/vaapi_unittest.cc media/gpu/vaapi/vaapi_webp_decoder_unittest.cc media/gpu/windows/d3d11_video_decoder_wrapper.cc +media/gpu/windows/d3d12_copy_command_list_wrapper.cc media/gpu/windows/media_foundation_video_encode_accelerator_win.cc media/gpu/windows/mf_audio_encoder.cc media/gpu/windows/mf_audio_encoder.h @@ -4827,9 +4679,11 @@ net/http/http_server_properties_unittest.cc net/http/http_stream_factory_job_controller_unittest.cc net/http/http_stream_factory_unittest.cc net/http/http_stream_parser.cc +net/http/http_stream_pool_attempt_manager.cc net/http/http_transaction_test_util.cc net/http/http_util.cc net/http/http_util_unittest.cc +net/http/no_vary_search_cache.h net/http/transport_security_state.cc net/http/transport_security_state.h net/http/transport_security_state_unittest.cc @@ -5118,13 +4972,15 @@ services/network/orb/orb_impl_unittest.cc services/network/orb/orb_sniffers.cc services/network/proxy_resolver_factory_mojo_unittest.cc services/network/public/cpp/content_security_policy/content_security_policy_unittest.cc +services/network/public/cpp/cors/cors_error_status.h services/network/public/cpp/cors/cors_unittest.cc services/network/public/cpp/cors/origin_access_entry_unittest.cc services/network/public/cpp/cors/origin_access_list_unittest.cc -services/network/public/cpp/cross_origin_resource_policy.cc services/network/public/cpp/is_potentially_trustworthy.cc services/network/public/cpp/network_switches.cc +services/network/public/cpp/resource_request.h services/network/public/cpp/transferable_socket.cc +services/network/public/mojom/permissions_policy/PRESUBMIT.py services/network/sct_auditing/sct_auditing_reporter.cc services/network/trust_tokens/trust_token_client_data_canonicalization.h services/network/trust_tokens/trust_token_key_commitment_parser.h @@ -5171,7 +5027,6 @@ skia/ext/SkMemory_new_handler.cpp skia/ext/skia_utils_ios_unittest.mm skia/rusty_png_feature.h sql/database.cc -sql/database.h storage/browser/blob/blob_reader.h storage/browser/file_system/external_mount_points_unittest.cc storage/browser/file_system/file_system_backend.h @@ -5416,6 +5271,7 @@ third_party/angle/scripts/update_extension_data.py third_party/angle/src/common/aligned_memory.cpp third_party/angle/src/common/android_util.cpp third_party/angle/src/common/android_util.h +third_party/angle/src/common/apple_platform_utils.mm third_party/angle/src/common/linux/dma_buf_utils.h third_party/angle/src/common/mathutil.h third_party/angle/src/common/system_utils_posix.cpp @@ -5494,9 +5350,9 @@ third_party/angle/src/tests/restricted_traces/sync_restricted_traces_to_cipd.py third_party/angle/src/tests/run_perf_tests.py third_party/angle/src/tests/test_utils/runner/TestSuite.cpp third_party/angle/src/tests/test_utils/runner/android/java/AndroidManifest.xml.jinja2 +third_party/angle/src/tests/test_utils/runner/android/java/StandaloneBenchmarkAndroidManifest.xml.jinja2 third_party/angle/src/third_party/volk/volk.h third_party/angle/third_party/BUILD.gn -third_party/angle/third_party/glmark2/src/src/include/dirent.h third_party/angle/third_party/glmark2/src/src/native-state-dispmanx.cpp third_party/angle/third_party/glmark2/src/src/native-state-dispmanx.h third_party/angle/third_party/glmark2/src/src/native-state-wayland.cpp @@ -5526,6 +5382,7 @@ third_party/blink/common/page_state/page_state_serialization.cc third_party/blink/common/page_state/page_state_serialization_unittest.cc third_party/blink/common/permissions_policy/origin_with_possible_wildcards_unittest.cc third_party/blink/common/shared_storage/module_script_downloader.cc +third_party/blink/common/webid/federated_auth_request_mojom_traits_unittest.cc third_party/blink/public/common/custom_handlers/protocol_handler_utils.h third_party/blink/public/common/frame/delegated_capability_request_token.h third_party/blink/public/common/frame/user_activation_state.h @@ -5592,6 +5449,7 @@ third_party/blink/renderer/core/dom/abort_controller.h third_party/blink/renderer/core/dom/attr.idl third_party/blink/renderer/core/dom/cdata_section.idl third_party/blink/renderer/core/dom/child_node.idl +third_party/blink/renderer/core/dom/child_node_part.cc third_party/blink/renderer/core/dom/class_collection.cc third_party/blink/renderer/core/dom/class_collection.h third_party/blink/renderer/core/dom/comment.idl @@ -5638,7 +5496,6 @@ third_party/blink/renderer/core/editing/dom_selection.cc third_party/blink/renderer/core/editing/editing_behavior.cc third_party/blink/renderer/core/editing/editing_utilities.cc third_party/blink/renderer/core/editing/editing_utilities_test.cc -third_party/blink/renderer/core/editing/finder/find_buffer.cc third_party/blink/renderer/core/editing/finder/find_buffer.h third_party/blink/renderer/core/editing/finder/find_buffer_test.cc third_party/blink/renderer/core/editing/serializers/serialization.cc @@ -5790,8 +5647,10 @@ third_party/blink/renderer/core/layout/layout_text.cc third_party/blink/renderer/core/layout/layout_theme_default.h third_party/blink/renderer/core/layout/layout_view.cc third_party/blink/renderer/core/layout/layout_view.h +third_party/blink/renderer/core/layout/layout_view_test.cc third_party/blink/renderer/core/layout/length_utils.cc third_party/blink/renderer/core/layout/map_coordinates_test.cc +third_party/blink/renderer/core/layout/physical_box_fragment.cc third_party/blink/renderer/core/layout/scroll_anchor_test.cc third_party/blink/renderer/core/layout/svg/layout_svg_path.cc third_party/blink/renderer/core/layout/svg/layout_svg_shape.cc @@ -5815,6 +5674,7 @@ third_party/blink/renderer/core/loader/resource/xsl_style_sheet_resource.cc third_party/blink/renderer/core/loader/resource/xsl_style_sheet_resource.h third_party/blink/renderer/core/loader/subresource_filter.cc third_party/blink/renderer/core/loader/web_bundle/script_web_bundle.cc +third_party/blink/renderer/core/page/drag_controller_test.cc third_party/blink/renderer/core/page/print_context_test.cc third_party/blink/renderer/core/page/scrolling/element_fragment_anchor_test.cc third_party/blink/renderer/core/page/validation_message_client_impl.cc @@ -6095,7 +5955,7 @@ third_party/boringssl/src/crypto/fipsmodule/aes/internal.h third_party/boringssl/src/crypto/internal.h third_party/boringssl/src/crypto/pkcs7/pkcs7_test.cc third_party/boringssl/src/crypto/pkcs8/pkcs8_x509.cc -third_party/boringssl/src/crypto/rand_extra/windows.cc +third_party/boringssl/src/crypto/rand/windows.cc third_party/boringssl/src/crypto/test/abi_test.h third_party/boringssl/src/crypto/test/file_util.cc third_party/boringssl/src/crypto/thread_win.cc @@ -6120,7 +5980,6 @@ third_party/boringssl/src/third_party/googletest/googletest/test/gtest_list_outp third_party/boringssl/src/third_party/googletest/googletest/test/gtest_skip_test.cc third_party/boringssl/src/tool/fd.cc third_party/boringssl/src/tool/internal.h -third_party/boringssl/src/util/bot/update_clang.py third_party/breakpad/BUILD.gn third_party/breakpad/breakpad/default.xml third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc @@ -7264,47 +7123,6 @@ third_party/cld_3/src/src/script_span/getonescriptspan.h third_party/cld_3/src/src/script_span/offsetmap.cc third_party/cld_3/src/src/script_span/offsetmap.h third_party/cld_3/src/src/script_span/utf8statetable.h -third_party/closure_compiler/externs/accessibility_features.js -third_party/closure_compiler/externs/accessibility_private.js -third_party/closure_compiler/externs/arc_apps_private.js -third_party/closure_compiler/externs/audio.js -third_party/closure_compiler/externs/bluetooth.js -third_party/closure_compiler/externs/bluetooth_private.js -third_party/closure_compiler/externs/braille_display_private.js -third_party/closure_compiler/externs/chrome.js -third_party/closure_compiler/externs/chrome_extensions.js -third_party/closure_compiler/externs/chromeos_info_private.js -third_party/closure_compiler/externs/clipboard.js -third_party/closure_compiler/externs/command_line_private.js -third_party/closure_compiler/externs/crash_report_private.js -third_party/closure_compiler/externs/events.js -third_party/closure_compiler/externs/extension_types.js -third_party/closure_compiler/externs/file_system_provider.js -third_party/closure_compiler/externs/image_loader_private.js -third_party/closure_compiler/externs/input_method_private.js -third_party/closure_compiler/externs/language_settings_private.js -third_party/closure_compiler/externs/login_state.js -third_party/closure_compiler/externs/metrics_private.js -third_party/closure_compiler/externs/metrics_private_individual_apis.js -third_party/closure_compiler/externs/mojo_private.js -third_party/closure_compiler/externs/networking_private.js -third_party/closure_compiler/externs/pending.js -third_party/closure_compiler/externs/quick_unlock_private.js -third_party/closure_compiler/externs/runtime.js -third_party/closure_compiler/externs/settings_private.js -third_party/closure_compiler/externs/speech_recognition_private.js -third_party/closure_compiler/externs/tabs.js -third_party/closure_compiler/externs/terminal_private.js -third_party/closure_compiler/externs/test.js -third_party/closure_compiler/externs/tts.js -third_party/closure_compiler/externs/ttsEngine.js -third_party/closure_compiler/externs/virtual_keyboard_private.js -third_party/closure_compiler/externs/webview_tag.js -third_party/closure_compiler/externs/windows.js -third_party/closure_compiler/interfaces/bluetooth_interface.js -third_party/closure_compiler/interfaces/networking_private_interface.js -third_party/closure_compiler/interfaces/settings_private_interface.js -third_party/closure_compiler/interfaces/system_display_interface.js third_party/colorama/src/demos/demo09.py third_party/content_analysis_sdk/src/agent/src/scoped_print_handle_win.cc third_party/content_analysis_sdk/src/common/utils_win.cc @@ -7410,9 +7228,11 @@ third_party/cros_system_api/dbus/bluetooth/dbus-constants.h third_party/cros_system_api/dbus/shill/dbus-constants.h third_party/crossbench/chrome-extension-replay/devtools-recorder/crossbench.html third_party/crossbench/crossbench/action_runner/action/enums.py +third_party/crossbench/crossbench/action_runner/default_bond_action_runner.py third_party/crossbench/crossbench/benchmarks/loading/config/login/google.py third_party/crossbench/crossbench/benchmarks/loading/loading_benchmark.py third_party/crossbench/crossbench/benchmarks/loading/page/live.py +third_party/crossbench/crossbench/bond/bond.py third_party/crossbench/crossbench/browsers/chrome/downloader.py third_party/crossbench/crossbench/browsers/chromium/applescript.py third_party/crossbench/crossbench/browsers/chromium/driver_finder.py @@ -7426,7 +7246,7 @@ third_party/crossbench/crossbench/probes/chrome_histograms.py third_party/crossbench/crossbench/probes/perfetto/downloader.py third_party/crossbench/crossbench/probes/performance_entries.py third_party/crossbench/crossbench/probes/profiling/browser_profiling.py -third_party/crossbench/crossbench/probes/profiling/context/android.py +third_party/crossbench/crossbench/probes/profiling/context/base.py third_party/crossbench/crossbench/probes/profiling/enum.py third_party/crossbench/crossbench/probes/web_page_replay/recorder.py third_party/crossbench/tests/crossbench/benchmarks/loading/config/test_example_configs.py @@ -7473,9 +7293,9 @@ third_party/dawn/src/dawn/native/d3d12/ResourceAllocatorManagerD3D12.h third_party/dawn/src/dawn/native/d3d12/SamplerD3D12.cpp third_party/dawn/src/dawn/native/d3d12/SharedTextureMemoryD3D12.cpp third_party/dawn/src/dawn/native/d3d12/TextureD3D12.cpp +third_party/dawn/src/dawn/native/d3d12/UtilsD3D12.cpp third_party/dawn/src/dawn/native/metal/MultiDrawEncoder.mm third_party/dawn/src/dawn/native/metal/QueueMTL.h -third_party/dawn/src/dawn/native/metal/SharedTextureMemoryMTL.mm third_party/dawn/src/dawn/native/opengl/CommandBufferGL.cpp third_party/dawn/src/dawn/native/opengl/ContextEGL.cpp third_party/dawn/src/dawn/native/opengl/TextureGL.cpp @@ -7723,6 +7543,7 @@ third_party/depot_tools/git_cl.py third_party/depot_tools/git_common.py third_party/depot_tools/git_number.py third_party/depot_tools/git_retry.py +third_party/depot_tools/gn_helper.py third_party/depot_tools/gsutil.py third_party/depot_tools/infra_lib/telemetry/__init__.py third_party/depot_tools/infra_lib/telemetry/clearcut_span_exporter.py @@ -7748,7 +7569,10 @@ third_party/depot_tools/man/html/git-squash-branch.html third_party/depot_tools/man/html/git-thaw.html third_party/depot_tools/man/html/git-upstream-diff.html third_party/depot_tools/man/src/depot_tools_tutorial.txt +third_party/depot_tools/metadata/dependency_metadata.py third_party/depot_tools/metadata/fields/custom/license.py +third_party/depot_tools/metadata/fields/custom/license_allowlist.py +third_party/depot_tools/metadata/tests/parse_test.py third_party/depot_tools/metrics_utils.py third_party/depot_tools/my_activity.py third_party/depot_tools/ninja.py @@ -7874,6 +7698,7 @@ third_party/depot_tools/tests/git_cache_test.py third_party/depot_tools/tests/git_cl_creds_check_report.txt third_party/depot_tools/tests/git_cl_test.py third_party/depot_tools/tests/metrics_test.py +third_party/depot_tools/tests/presubmit_support_test.py third_party/depot_tools/tests/presubmit_unittest.py third_party/depot_tools/tests/reclient_helper_test.py third_party/depot_tools/tests/roll_dep_test.py @@ -7981,6 +7806,7 @@ third_party/devtools-frontend/src/front_end/core/sdk/NetworkManager.ts third_party/devtools-frontend/src/front_end/core/sdk/NetworkRequest.ts third_party/devtools-frontend/src/front_end/core/sdk/ResourceTreeModel.ts third_party/devtools-frontend/src/front_end/core/sdk/SourceMap.ts +third_party/devtools-frontend/src/front_end/design_system_tokens.css third_party/devtools-frontend/src/front_end/entrypoint_template.html third_party/devtools-frontend/src/front_end/entrypoints/inspector_main/RenderingOptions.ts third_party/devtools-frontend/src/front_end/entrypoints/inspector_main/inspector_main-meta.ts @@ -8011,7 +7837,6 @@ third_party/devtools-frontend/src/front_end/models/persistence/NetworkPersistenc third_party/devtools-frontend/src/front_end/models/persistence/NetworkPersistenceManager.ts third_party/devtools-frontend/src/front_end/models/persistence/PersistenceImpl.test.ts third_party/devtools-frontend/src/front_end/models/trace/ModelImpl.test.ts -third_party/devtools-frontend/src/front_end/models/trace/extras/ThirdParties.test.ts third_party/devtools-frontend/src/front_end/models/trace/handlers/MetaHandler.test.ts third_party/devtools-frontend/src/front_end/models/trace/handlers/MetaHandler.ts third_party/devtools-frontend/src/front_end/models/trace/handlers/NetworkRequestsHandler.test.ts @@ -8025,8 +7850,10 @@ third_party/devtools-frontend/src/front_end/models/trace/insights/DOMSize.ts third_party/devtools-frontend/src/front_end/models/trace/insights/DocumentLatency.ts third_party/devtools-frontend/src/front_end/models/trace/insights/FontDisplay.test.ts third_party/devtools-frontend/src/front_end/models/trace/insights/FontDisplay.ts +third_party/devtools-frontend/src/front_end/models/trace/insights/ForcedReflow.ts third_party/devtools-frontend/src/front_end/models/trace/insights/ImageDelivery.ts third_party/devtools-frontend/src/front_end/models/trace/insights/InteractionToNextPaint.ts +third_party/devtools-frontend/src/front_end/models/trace/insights/LongCriticalNetworkTree.ts third_party/devtools-frontend/src/front_end/models/trace/insights/RenderBlocking.test.ts third_party/devtools-frontend/src/front_end/models/trace/insights/SlowCSSSelector.ts third_party/devtools-frontend/src/front_end/models/trace/insights/ThirdParties.test.ts @@ -8044,6 +7871,7 @@ third_party/devtools-frontend/src/front_end/panels/accessibility/AccessibilityNo third_party/devtools-frontend/src/front_end/panels/accessibility/AccessibilityStrings.ts third_party/devtools-frontend/src/front_end/panels/ai_assistance/AiAssistancePanel.ts third_party/devtools-frontend/src/front_end/panels/ai_assistance/agents/FileAgent.ts +third_party/devtools-frontend/src/front_end/panels/ai_assistance/agents/PerformanceAgent.test.ts third_party/devtools-frontend/src/front_end/panels/ai_assistance/agents/PerformanceAgent.ts third_party/devtools-frontend/src/front_end/panels/ai_assistance/components/ChatView.ts third_party/devtools-frontend/src/front_end/panels/ai_assistance/components/UserActionRow.ts @@ -8055,6 +7883,7 @@ third_party/devtools-frontend/src/front_end/panels/application/InterestGroupTree third_party/devtools-frontend/src/front_end/panels/application/ReportingApiReportsView.test.ts third_party/devtools-frontend/src/front_end/panels/application/ReportingApiReportsView.ts third_party/devtools-frontend/src/front_end/panels/application/ServiceWorkerCacheTreeElement.ts +third_party/devtools-frontend/src/front_end/panels/application/StorageBucketsTreeElement.ts third_party/devtools-frontend/src/front_end/panels/application/StorageView.ts third_party/devtools-frontend/src/front_end/panels/application/components/EndpointsGrid.ts third_party/devtools-frontend/src/front_end/panels/application/components/FrameDetailsView.ts @@ -8065,6 +7894,8 @@ third_party/devtools-frontend/src/front_end/panels/application/preloading/compon third_party/devtools-frontend/src/front_end/panels/application/preloading/components/UsedPreloadingView.test.ts third_party/devtools-frontend/src/front_end/panels/application/preloading/components/UsedPreloadingView.ts third_party/devtools-frontend/src/front_end/panels/autofill/AutofillView.ts +third_party/devtools-frontend/src/front_end/panels/browser_debugger/DOMBreakpointsSidebarPane.ts +third_party/devtools-frontend/src/front_end/panels/changes/ChangesView.ts third_party/devtools-frontend/src/front_end/panels/console/ConsoleViewMessage.ts third_party/devtools-frontend/src/front_end/panels/console/ErrorStackParser.test.ts third_party/devtools-frontend/src/front_end/panels/css_overview/components/CSSOverviewStartView.ts @@ -8079,6 +7910,7 @@ third_party/devtools-frontend/src/front_end/panels/issues/AffectedDirectivesView third_party/devtools-frontend/src/front_end/panels/issues/AffectedMetadataAllowedSitesView.ts third_party/devtools-frontend/src/front_end/panels/issues/AffectedTrackingSitesView.ts third_party/devtools-frontend/src/front_end/panels/lighthouse/LighthouseController.ts +third_party/devtools-frontend/src/front_end/panels/mobile_throttling/CalibrationController.ts third_party/devtools-frontend/src/front_end/panels/network/NetworkConfigView.ts third_party/devtools-frontend/src/front_end/panels/network/NetworkDataGridNode.ts third_party/devtools-frontend/src/front_end/panels/network/NetworkLogView.ts @@ -8092,7 +7924,6 @@ third_party/devtools-frontend/src/front_end/panels/network/network-meta.ts third_party/devtools-frontend/src/front_end/panels/profiler/HeapSnapshotGridNodes.ts third_party/devtools-frontend/src/front_end/panels/recorder/RecorderController.ts third_party/devtools-frontend/src/front_end/panels/recorder/components/CreateRecordingView.ts -third_party/devtools-frontend/src/front_end/panels/recorder/components/StartView.ts third_party/devtools-frontend/src/front_end/panels/security/CookieControlsView.ts third_party/devtools-frontend/src/front_end/panels/security/CookieReportView.ts third_party/devtools-frontend/src/front_end/panels/settings/AISettingsTab.ts @@ -8118,6 +7949,7 @@ third_party/devtools-frontend/src/front_end/panels/timeline/components/DetailsVi third_party/devtools-frontend/src/front_end/panels/timeline/components/FieldSettingsDialog.ts third_party/devtools-frontend/src/front_end/panels/timeline/components/LiveMetricsView.ts third_party/devtools-frontend/src/front_end/panels/timeline/components/SidebarInsightsTab.test.ts +third_party/devtools-frontend/src/front_end/panels/timeline/components/SidebarSingleInsightSet.ts third_party/devtools-frontend/src/front_end/panels/timeline/overlays/components/EntriesLinkOverlay.ts third_party/devtools-frontend/src/front_end/panels/timeline/track_appenders/ThreadAppender.test.ts third_party/devtools-frontend/src/front_end/panels/timeline/utils/AICallTree.test.ts @@ -8243,8 +8075,6 @@ third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/cj third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/cjs/puppeteer/api/WebWorker.d.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/cjs/puppeteer/api/WebWorker.js third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/cjs/puppeteer/bidi/Frame.js -third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/cjs/puppeteer/cdp/FirefoxTargetManager.d.ts -third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/cjs/puppeteer/cdp/FirefoxTargetManager.js third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/cjs/puppeteer/cdp/Input.js third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/cjs/puppeteer/cdp/PredefinedNetworkConditions.d.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/cjs/puppeteer/cdp/PredefinedNetworkConditions.js @@ -8281,8 +8111,6 @@ third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/es third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/puppeteer/api/WebWorker.d.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/puppeteer/api/WebWorker.js third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/puppeteer/bidi/Frame.js -third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/puppeteer/cdp/FirefoxTargetManager.d.ts -third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/puppeteer/cdp/FirefoxTargetManager.js third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/puppeteer/cdp/Input.js third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/puppeteer/cdp/PredefinedNetworkConditions.d.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/puppeteer/cdp/PredefinedNetworkConditions.js @@ -8313,7 +8141,6 @@ third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/src/ap third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/src/api/Target.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/src/api/WebWorker.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/src/bidi/Frame.ts -third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/src/cdp/FirefoxTargetManager.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/src/cdp/Input.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/src/cdp/PredefinedNetworkConditions.ts third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/src/cdp/Tracing.ts @@ -8362,7 +8189,6 @@ third_party/devtools-frontend/src/front_end/ui/legacy/components/object_ui/Custo third_party/devtools-frontend/src/front_end/ui/legacy/components/perf_ui/FlameChart.ts third_party/devtools-frontend/src/front_end/ui/legacy/components/utils/JSPresentationUtils.test.ts third_party/devtools-frontend/src/front_end/ui/legacy/components/utils/Linkifier.test.ts -third_party/devtools-frontend/src/front_end/ui/legacy/themeColors.css third_party/devtools-frontend/src/front_end/ui/legacy/theme_support/ThemeSupport.ts third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/source-map/dist/source-map.debug.js third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/source-map/dist/source-map.js @@ -8397,6 +8223,8 @@ third_party/devtools-frontend/src/node_modules/@puppeteer/browsers/lib/esm/brows third_party/devtools-frontend/src/node_modules/@puppeteer/browsers/lib/esm/browser-data/firefox.js third_party/devtools-frontend/src/node_modules/@puppeteer/browsers/lib/esm/install.d.ts third_party/devtools-frontend/src/node_modules/@puppeteer/browsers/node_modules/ansi-regex/package.json +third_party/devtools-frontend/src/node_modules/@puppeteer/browsers/node_modules/debug/package.json +third_party/devtools-frontend/src/node_modules/@puppeteer/browsers/node_modules/debug/src/browser.js third_party/devtools-frontend/src/node_modules/@puppeteer/browsers/node_modules/strip-ansi/package.json third_party/devtools-frontend/src/node_modules/@puppeteer/browsers/src/browser-data/browser-data.ts third_party/devtools-frontend/src/node_modules/@puppeteer/browsers/src/browser-data/chrome-headless-shell.ts @@ -8461,7 +8289,6 @@ third_party/devtools-frontend/src/node_modules/acorn/package.json third_party/devtools-frontend/src/node_modules/ajv/dist/ajv.bundle.js third_party/devtools-frontend/src/node_modules/ansi-regex/package.json third_party/devtools-frontend/src/node_modules/ansi-styles/package.json -third_party/devtools-frontend/src/node_modules/aria-query/package.json third_party/devtools-frontend/src/node_modules/array-buffer-byte-length/package.json third_party/devtools-frontend/src/node_modules/array-find-index/package.json third_party/devtools-frontend/src/node_modules/array-includes/package.json @@ -8474,9 +8301,6 @@ third_party/devtools-frontend/src/node_modules/arraybuffer.prototype.slice/packa third_party/devtools-frontend/src/node_modules/asap/browser-raw.js third_party/devtools-frontend/src/node_modules/astral-regex/package.json third_party/devtools-frontend/src/node_modules/available-typed-arrays/package.json -third_party/devtools-frontend/src/node_modules/axe-core/axe.js -third_party/devtools-frontend/src/node_modules/axe-core/axe.min.js -third_party/devtools-frontend/src/node_modules/axobject-query/package.json third_party/devtools-frontend/src/node_modules/base64-js/package.json third_party/devtools-frontend/src/node_modules/basic-ftp/package.json third_party/devtools-frontend/src/node_modules/binary-extensions/package.json @@ -8484,7 +8308,6 @@ third_party/devtools-frontend/src/node_modules/body-parser/node_modules/debug/pa third_party/devtools-frontend/src/node_modules/body-parser/node_modules/debug/src/browser.js third_party/devtools-frontend/src/node_modules/buffer-crc32/package.json third_party/devtools-frontend/src/node_modules/buffer/index.js -third_party/devtools-frontend/src/node_modules/builtin-modules/package.json third_party/devtools-frontend/src/node_modules/bytes/package.json third_party/devtools-frontend/src/node_modules/call-bind/package.json third_party/devtools-frontend/src/node_modules/callsites/package.json @@ -8515,7 +8338,6 @@ third_party/devtools-frontend/src/node_modules/chromium-bidi/lib/esm/utils/uuid. third_party/devtools-frontend/src/node_modules/chromium-bidi/lib/iife/mapperTab.js third_party/devtools-frontend/src/node_modules/cliui/node_modules/ansi-regex/package.json third_party/devtools-frontend/src/node_modules/cliui/node_modules/strip-ansi/package.json -third_party/devtools-frontend/src/node_modules/clone/package.json third_party/devtools-frontend/src/node_modules/color-convert/package.json third_party/devtools-frontend/src/node_modules/color-name/package.json third_party/devtools-frontend/src/node_modules/colord/constants.d.ts @@ -8529,13 +8351,6 @@ third_party/devtools-frontend/src/node_modules/colors/lib/system/supports-colors third_party/devtools-frontend/src/node_modules/connect/node_modules/debug/package.json third_party/devtools-frontend/src/node_modules/connect/node_modules/debug/src/browser.js third_party/devtools-frontend/src/node_modules/cookie/package.json -third_party/devtools-frontend/src/node_modules/core-js-pure/modules/es.array.reduce-right.js -third_party/devtools-frontend/src/node_modules/core-js-pure/modules/es.array.reduce.js -third_party/devtools-frontend/src/node_modules/core-js-pure/modules/es.math.acosh.js -third_party/devtools-frontend/src/node_modules/core-js-pure/modules/es.math.hypot.js -third_party/devtools-frontend/src/node_modules/core-js-pure/modules/es.promise.js -third_party/devtools-frontend/src/node_modules/core-js-pure/modules/es.symbol.js -third_party/devtools-frontend/src/node_modules/core-js-pure/modules/web.url.js third_party/devtools-frontend/src/node_modules/cors/package.json third_party/devtools-frontend/src/node_modules/cosmiconfig/package.json third_party/devtools-frontend/src/node_modules/css-functions-list/package.json @@ -8574,16 +8389,6 @@ third_party/devtools-frontend/src/node_modules/diff/lib/convert/dmp.js third_party/devtools-frontend/src/node_modules/diff/lib/index.es6.js third_party/devtools-frontend/src/node_modules/diff/package.json third_party/devtools-frontend/src/node_modules/dir-glob/package.json -third_party/devtools-frontend/src/node_modules/doctrine/lib/doctrine.js -third_party/devtools-frontend/src/node_modules/doctrine/lib/typed.js -third_party/devtools-frontend/src/node_modules/doctrine/lib/utility.js -third_party/devtools-frontend/src/node_modules/doctrine/package.json -third_party/devtools-frontend/src/node_modules/dom5/lib/util.d.ts -third_party/devtools-frontend/src/node_modules/dom5/lib/util.js -third_party/devtools-frontend/src/node_modules/dom5/node_modules/parse5/lib/index.d.ts -third_party/devtools-frontend/src/node_modules/dom5/node_modules/parse5/lib/tokenizer/index.js -third_party/devtools-frontend/src/node_modules/dom5/node_modules/parse5/package.json -third_party/devtools-frontend/src/node_modules/dom5/src/util.ts third_party/devtools-frontend/src/node_modules/end-of-stream/package.json third_party/devtools-frontend/src/node_modules/engine.io-parser/build/cjs/index.js third_party/devtools-frontend/src/node_modules/engine.io-parser/build/esm/index.js @@ -8602,10 +8407,6 @@ third_party/devtools-frontend/src/node_modules/es-shim-unscopables/package.json third_party/devtools-frontend/src/node_modules/es-to-primitive/package.json third_party/devtools-frontend/src/node_modules/escalade/package.json third_party/devtools-frontend/src/node_modules/escape-string-regexp/package.json -third_party/devtools-frontend/src/node_modules/escodegen/bin/escodegen.js -third_party/devtools-frontend/src/node_modules/escodegen/bin/esgenerate.js -third_party/devtools-frontend/src/node_modules/escodegen/escodegen.js -third_party/devtools-frontend/src/node_modules/escodegen/package.json third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/debug/package.json third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/debug/src/browser.js third_party/devtools-frontend/src/node_modules/eslint-module-utils/node_modules/debug/package.json @@ -8618,31 +8419,25 @@ third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/lib/typed.js third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/lib/utility.js third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/package.json -third_party/devtools-frontend/src/node_modules/eslint-plugin-jsdoc/dist/tagNames.js third_party/devtools-frontend/src/node_modules/eslint-plugin-jsdoc/node_modules/escape-string-regexp/package.json -third_party/devtools-frontend/src/node_modules/eslint-plugin-lit-a11y/node_modules/eslint-plugin-lit/node_modules/parse5/lib/tokenizer/index.js -third_party/devtools-frontend/src/node_modules/eslint-plugin-lit-a11y/node_modules/eslint-plugin-lit/node_modules/parse5/package.json +third_party/devtools-frontend/src/node_modules/eslint-plugin-jsdoc/src/tagNames.js third_party/devtools-frontend/src/node_modules/eslint-plugin-mocha/node_modules/globals/package.json third_party/devtools-frontend/src/node_modules/eslint-plugin-mocha/package.json -third_party/devtools-frontend/src/node_modules/eslint/lib/cli-engine/formatters/formatters-meta.json +third_party/devtools-frontend/src/node_modules/eslint-scope/lib/definition.js +third_party/devtools-frontend/src/node_modules/eslint-scope/lib/index.js +third_party/devtools-frontend/src/node_modules/eslint-scope/lib/pattern-visitor.js +third_party/devtools-frontend/src/node_modules/eslint-scope/lib/reference.js +third_party/devtools-frontend/src/node_modules/eslint-scope/lib/referencer.js +third_party/devtools-frontend/src/node_modules/eslint-scope/lib/scope-manager.js +third_party/devtools-frontend/src/node_modules/eslint-scope/lib/scope.js +third_party/devtools-frontend/src/node_modules/eslint-scope/lib/variable.js third_party/devtools-frontend/src/node_modules/eslint/lib/rules/max-lines-per-function.js -third_party/devtools-frontend/src/node_modules/eslint/node_modules/ansi-regex/package.json third_party/devtools-frontend/src/node_modules/eslint/node_modules/ansi-styles/package.json third_party/devtools-frontend/src/node_modules/eslint/node_modules/color-convert/package.json third_party/devtools-frontend/src/node_modules/eslint/node_modules/color-name/package.json third_party/devtools-frontend/src/node_modules/eslint/node_modules/escape-string-regexp/package.json -third_party/devtools-frontend/src/node_modules/eslint/node_modules/eslint-scope/lib/definition.js -third_party/devtools-frontend/src/node_modules/eslint/node_modules/eslint-scope/lib/index.js -third_party/devtools-frontend/src/node_modules/eslint/node_modules/eslint-scope/lib/pattern-visitor.js -third_party/devtools-frontend/src/node_modules/eslint/node_modules/eslint-scope/lib/reference.js -third_party/devtools-frontend/src/node_modules/eslint/node_modules/eslint-scope/lib/referencer.js -third_party/devtools-frontend/src/node_modules/eslint/node_modules/eslint-scope/lib/scope-manager.js -third_party/devtools-frontend/src/node_modules/eslint/node_modules/eslint-scope/lib/scope.js -third_party/devtools-frontend/src/node_modules/eslint/node_modules/eslint-scope/lib/variable.js third_party/devtools-frontend/src/node_modules/eslint/node_modules/glob-parent/package.json -third_party/devtools-frontend/src/node_modules/eslint/node_modules/globals/package.json third_party/devtools-frontend/src/node_modules/eslint/node_modules/has-flag/package.json -third_party/devtools-frontend/src/node_modules/eslint/node_modules/strip-ansi/package.json third_party/devtools-frontend/src/node_modules/eslint/node_modules/supports-color/package.json third_party/devtools-frontend/src/node_modules/espree/espree.js third_party/devtools-frontend/src/node_modules/esprima/package.json @@ -8679,8 +8474,6 @@ third_party/devtools-frontend/src/node_modules/gensync/package.json third_party/devtools-frontend/src/node_modules/get-intrinsic/package.json third_party/devtools-frontend/src/node_modules/get-stream/package.json third_party/devtools-frontend/src/node_modules/get-symbol-description/package.json -third_party/devtools-frontend/src/node_modules/get-uri/node_modules/fs-extra/lib/mkdirs/utils.js -third_party/devtools-frontend/src/node_modules/get-uri/node_modules/fs-extra/package.json third_party/devtools-frontend/src/node_modules/glob-parent/package.json third_party/devtools-frontend/src/node_modules/globals/package.json third_party/devtools-frontend/src/node_modules/globalthis/package.json @@ -8708,7 +8501,6 @@ third_party/devtools-frontend/src/node_modules/is-async-function/package.json third_party/devtools-frontend/src/node_modules/is-bigint/package.json third_party/devtools-frontend/src/node_modules/is-binary-path/package.json third_party/devtools-frontend/src/node_modules/is-boolean-object/package.json -third_party/devtools-frontend/src/node_modules/is-builtin-module/package.json third_party/devtools-frontend/src/node_modules/is-callable/package.json third_party/devtools-frontend/src/node_modules/is-core-module/package.json third_party/devtools-frontend/src/node_modules/is-data-view/package.json @@ -8718,7 +8510,6 @@ third_party/devtools-frontend/src/node_modules/is-generator-function/package.jso third_party/devtools-frontend/src/node_modules/is-map/package.json third_party/devtools-frontend/src/node_modules/is-negative-zero/package.json third_party/devtools-frontend/src/node_modules/is-number-object/package.json -third_party/devtools-frontend/src/node_modules/is-path-inside/package.json third_party/devtools-frontend/src/node_modules/is-plain-obj/package.json third_party/devtools-frontend/src/node_modules/is-regex/package.json third_party/devtools-frontend/src/node_modules/is-set/package.json @@ -8820,12 +8611,8 @@ third_party/devtools-frontend/src/node_modules/p-locate/package.json third_party/devtools-frontend/src/node_modules/pac-proxy-agent/dist/index.js third_party/devtools-frontend/src/node_modules/pac-resolver/dist/myIpAddress.js third_party/devtools-frontend/src/node_modules/parent-module/package.json +third_party/devtools-frontend/src/node_modules/parse-imports/package.json third_party/devtools-frontend/src/node_modules/parse-json/package.json -third_party/devtools-frontend/src/node_modules/parse5-htmlparser2-tree-adapter/node_modules/parse5/lib/tokenizer/index.js -third_party/devtools-frontend/src/node_modules/parse5-htmlparser2-tree-adapter/node_modules/parse5/package.json -third_party/devtools-frontend/src/node_modules/parse5-htmlparser2-tree-adapter/package.json -third_party/devtools-frontend/src/node_modules/parse5/lib/tokenizer/index.js -third_party/devtools-frontend/src/node_modules/parse5/package.json third_party/devtools-frontend/src/node_modules/path-exists/package.json third_party/devtools-frontend/src/node_modules/path-is-absolute/package.json third_party/devtools-frontend/src/node_modules/path-key/package.json @@ -8877,8 +8664,6 @@ third_party/devtools-frontend/src/node_modules/puppeteer-core/lib/cjs/puppeteer/ third_party/devtools-frontend/src/node_modules/puppeteer-core/lib/cjs/puppeteer/api/WebWorker.d.ts third_party/devtools-frontend/src/node_modules/puppeteer-core/lib/cjs/puppeteer/api/WebWorker.js third_party/devtools-frontend/src/node_modules/puppeteer-core/lib/cjs/puppeteer/bidi/Frame.js -third_party/devtools-frontend/src/node_modules/puppeteer-core/lib/cjs/puppeteer/cdp/FirefoxTargetManager.d.ts -third_party/devtools-frontend/src/node_modules/puppeteer-core/lib/cjs/puppeteer/cdp/FirefoxTargetManager.js third_party/devtools-frontend/src/node_modules/puppeteer-core/lib/cjs/puppeteer/cdp/Input.js third_party/devtools-frontend/src/node_modules/puppeteer-core/lib/cjs/puppeteer/cdp/PredefinedNetworkConditions.d.ts third_party/devtools-frontend/src/node_modules/puppeteer-core/lib/cjs/puppeteer/cdp/PredefinedNetworkConditions.js @@ -8915,8 +8700,6 @@ third_party/devtools-frontend/src/node_modules/puppeteer-core/lib/esm/puppeteer/ third_party/devtools-frontend/src/node_modules/puppeteer-core/lib/esm/puppeteer/api/WebWorker.d.ts third_party/devtools-frontend/src/node_modules/puppeteer-core/lib/esm/puppeteer/api/WebWorker.js third_party/devtools-frontend/src/node_modules/puppeteer-core/lib/esm/puppeteer/bidi/Frame.js -third_party/devtools-frontend/src/node_modules/puppeteer-core/lib/esm/puppeteer/cdp/FirefoxTargetManager.d.ts -third_party/devtools-frontend/src/node_modules/puppeteer-core/lib/esm/puppeteer/cdp/FirefoxTargetManager.js third_party/devtools-frontend/src/node_modules/puppeteer-core/lib/esm/puppeteer/cdp/Input.js third_party/devtools-frontend/src/node_modules/puppeteer-core/lib/esm/puppeteer/cdp/PredefinedNetworkConditions.d.ts third_party/devtools-frontend/src/node_modules/puppeteer-core/lib/esm/puppeteer/cdp/PredefinedNetworkConditions.js @@ -8937,6 +8720,8 @@ third_party/devtools-frontend/src/node_modules/puppeteer-core/lib/esm/puppeteer/ third_party/devtools-frontend/src/node_modules/puppeteer-core/lib/esm/puppeteer/node/PuppeteerNode.d.ts third_party/devtools-frontend/src/node_modules/puppeteer-core/lib/esm/puppeteer/node/PuppeteerNode.js third_party/devtools-frontend/src/node_modules/puppeteer-core/lib/types.d.ts +third_party/devtools-frontend/src/node_modules/puppeteer-core/node_modules/debug/package.json +third_party/devtools-frontend/src/node_modules/puppeteer-core/node_modules/debug/src/browser.js third_party/devtools-frontend/src/node_modules/puppeteer-core/src/api/Browser.ts third_party/devtools-frontend/src/node_modules/puppeteer-core/src/api/BrowserContext.ts third_party/devtools-frontend/src/node_modules/puppeteer-core/src/api/ElementHandle.ts @@ -8947,7 +8732,6 @@ third_party/devtools-frontend/src/node_modules/puppeteer-core/src/api/Page.ts third_party/devtools-frontend/src/node_modules/puppeteer-core/src/api/Target.ts third_party/devtools-frontend/src/node_modules/puppeteer-core/src/api/WebWorker.ts third_party/devtools-frontend/src/node_modules/puppeteer-core/src/bidi/Frame.ts -third_party/devtools-frontend/src/node_modules/puppeteer-core/src/cdp/FirefoxTargetManager.ts third_party/devtools-frontend/src/node_modules/puppeteer-core/src/cdp/Input.ts third_party/devtools-frontend/src/node_modules/puppeteer-core/src/cdp/PredefinedNetworkConditions.ts third_party/devtools-frontend/src/node_modules/puppeteer-core/src/cdp/Tracing.ts @@ -8969,7 +8753,6 @@ third_party/devtools-frontend/src/node_modules/regenerator-runtime/runtime.js third_party/devtools-frontend/src/node_modules/regexp.prototype.flags/package.json third_party/devtools-frontend/src/node_modules/require-directory/package.json third_party/devtools-frontend/src/node_modules/require-from-string/package.json -third_party/devtools-frontend/src/node_modules/requireindex/package.json third_party/devtools-frontend/src/node_modules/requires-port/test.js third_party/devtools-frontend/src/node_modules/resolve-from/package.json third_party/devtools-frontend/src/node_modules/resolve/lib/caller.js @@ -9105,6 +8888,7 @@ third_party/devtools-frontend/src/node_modules/typed-array-buffer/package.json third_party/devtools-frontend/src/node_modules/typed-array-byte-length/package.json third_party/devtools-frontend/src/node_modules/typed-array-byte-offset/package.json third_party/devtools-frontend/src/node_modules/typed-array-length/package.json +third_party/devtools-frontend/src/node_modules/typescript/lib/_tsc.js third_party/devtools-frontend/src/node_modules/typescript/lib/cs/diagnosticMessages.generated.json third_party/devtools-frontend/src/node_modules/typescript/lib/de/diagnosticMessages.generated.json third_party/devtools-frontend/src/node_modules/typescript/lib/es/diagnosticMessages.generated.json @@ -9119,13 +8903,14 @@ third_party/devtools-frontend/src/node_modules/typescript/lib/lib.es2020.bigint. third_party/devtools-frontend/src/node_modules/typescript/lib/lib.es2020.intl.d.ts third_party/devtools-frontend/src/node_modules/typescript/lib/lib.es2021.intl.d.ts third_party/devtools-frontend/src/node_modules/typescript/lib/lib.es2022.intl.d.ts +third_party/devtools-frontend/src/node_modules/typescript/lib/lib.es2024.arraybuffer.d.ts +third_party/devtools-frontend/src/node_modules/typescript/lib/lib.es2024.sharedmemory.d.ts third_party/devtools-frontend/src/node_modules/typescript/lib/lib.webworker.d.ts third_party/devtools-frontend/src/node_modules/typescript/lib/lib.webworker.iterable.d.ts third_party/devtools-frontend/src/node_modules/typescript/lib/pl/diagnosticMessages.generated.json third_party/devtools-frontend/src/node_modules/typescript/lib/pt-br/diagnosticMessages.generated.json third_party/devtools-frontend/src/node_modules/typescript/lib/ru/diagnosticMessages.generated.json third_party/devtools-frontend/src/node_modules/typescript/lib/tr/diagnosticMessages.generated.json -third_party/devtools-frontend/src/node_modules/typescript/lib/tsc.js third_party/devtools-frontend/src/node_modules/typescript/lib/typescript.js third_party/devtools-frontend/src/node_modules/typescript/lib/zh-cn/diagnosticMessages.generated.json third_party/devtools-frontend/src/node_modules/typescript/lib/zh-tw/diagnosticMessages.generated.json @@ -9347,6 +9132,10 @@ third_party/eigen3/src/Eigen/src/Core/arch/GPU/MathFunctions.h third_party/eigen3/src/Eigen/src/Core/arch/GPU/PacketMath.h third_party/eigen3/src/Eigen/src/Core/arch/GPU/Tuple.h third_party/eigen3/src/Eigen/src/Core/arch/GPU/TypeCasting.h +third_party/eigen3/src/Eigen/src/Core/arch/LSX/Complex.h +third_party/eigen3/src/Eigen/src/Core/arch/LSX/MathFunctions.h +third_party/eigen3/src/Eigen/src/Core/arch/LSX/PacketMath.h +third_party/eigen3/src/Eigen/src/Core/arch/LSX/TypeCasting.h third_party/eigen3/src/Eigen/src/Core/arch/MSA/Complex.h third_party/eigen3/src/Eigen/src/Core/arch/MSA/MathFunctions.h third_party/eigen3/src/Eigen/src/Core/arch/MSA/PacketMath.h @@ -9520,6 +9309,7 @@ third_party/eigen3/src/Eigen/src/SuperLUSupport/SuperLUSupport.h third_party/eigen3/src/Eigen/src/ThreadPool/Barrier.h third_party/eigen3/src/Eigen/src/ThreadPool/CoreThreadPoolDevice.h third_party/eigen3/src/Eigen/src/ThreadPool/EventCount.h +third_party/eigen3/src/Eigen/src/ThreadPool/ForkJoin.h third_party/eigen3/src/Eigen/src/ThreadPool/NonBlockingThreadPool.h third_party/eigen3/src/Eigen/src/ThreadPool/RunQueue.h third_party/eigen3/src/Eigen/src/ThreadPool/ThreadCancel.h @@ -9738,6 +9528,7 @@ third_party/eigen3/src/test/swap.cpp third_party/eigen3/src/test/sycl_basic.cpp third_party/eigen3/src/test/symbolic_index.cpp third_party/eigen3/src/test/threads_eventcount.cpp +third_party/eigen3/src/test/threads_fork_join.cpp third_party/eigen3/src/test/threads_non_blocking_thread_pool.cpp third_party/eigen3/src/test/threads_runqueue.cpp third_party/eigen3/src/test/triangular.cpp @@ -10444,6 +10235,7 @@ third_party/fuchsia-gn-sdk/src/prepare_package_inputs.py third_party/fuzztest/src/centipede/environment.h third_party/fuzztest/src/centipede/runner_fork_server.cc third_party/fuzztest/src/centipede/testing/test_fuzz_target.cc +third_party/fuzztest/src/fuzztest/internal/centipede_adaptor.cc third_party/gemmlowp/src/contrib/CMakeLists.txt third_party/gemmlowp/src/standalone/neon-gemm-kernel-benchmark.cc third_party/glslang/src/glslang/HLSL/hlslParseHelper.cpp @@ -10774,7 +10566,6 @@ third_party/google_input_tools/third_party/closure_library/closure/goog/ui/decor third_party/google_input_tools/third_party/closure_library/closure/goog/ui/menuseparatorrenderer.js third_party/google_input_tools/third_party/closure_library/closure/goog/ui/registry.js third_party/google_input_tools/third_party/closure_library/closure/goog/ui/separator.js -third_party/google_input_tools/third_party/closure_library/closure/goog/uri/utils.js third_party/google_input_tools/third_party/closure_library/closure/goog/useragent/useragent.js third_party/google_input_tools/third_party/closure_library/third_party/closure/goog/mochikit/async/deferred.js third_party/googletest/src/docs/_layouts/default.html @@ -11077,6 +10868,7 @@ third_party/libaddressinput/src/cpp/src/util/string_util.h third_party/libaddressinput/src/cpp/test/testdata_source.cc third_party/libaddressinput/src/cpp/test/util/md5_unittest.cc third_party/libaddressinput/src/cpp/test/util/string_split_unittest.cc +third_party/libaom/source/libaom/CMakeLists.txt third_party/libaom/source/libaom/aom/src/aom_encoder.c third_party/libaom/source/libaom/aom_dsp/x86/variance_impl_avx2.c third_party/libaom/source/libaom/aom_ports/aarch64_cpudetect.c @@ -11125,13 +10917,6 @@ third_party/libaom/source/libaom/tools/diff.py third_party/libaom/source/libaom/tools/inspect-cli.js third_party/libaom/source/libaom/tools/intersect-diffs.py third_party/libaom/source/libaom/tools/wrap-commit-msg.py -third_party/libavif/src/android_jni/avifandroidjni/src/main/jni/libavif_jni.cc -third_party/libavif/src/src/codec_aom.c -third_party/libavif/src/src/colr.c -third_party/libavif/src/src/reformat.c -third_party/libavif/src/src/reformat_libyuv.c -third_party/libavif/src/src/scale.c -third_party/libavif/src/tests/gtest/avifprogressivetest.cc third_party/libc++/src/CREDITS.TXT third_party/libc++/src/src/chrono.cpp third_party/libc++/src/src/experimental/tzdb.cpp @@ -11453,9 +11238,11 @@ third_party/mediapipe/src/mediapipe/calculators/image/scale_image_calculator.cc third_party/mediapipe/src/mediapipe/calculators/tflite/tflite_custom_op_resolver_calculator.cc third_party/mediapipe/src/mediapipe/calculators/util/detection_label_id_to_text_calculator.cc third_party/mediapipe/src/mediapipe/calculators/util/face_to_rect_calculator.cc +third_party/mediapipe/src/mediapipe/calculators/util/resource_provider_calculator.h third_party/mediapipe/src/mediapipe/calculators/video/flow_to_image_calculator.cc third_party/mediapipe/src/mediapipe/calculators/video/opencv_video_encoder_calculator.cc third_party/mediapipe/src/mediapipe/framework/formats/unique_fd.h +third_party/mediapipe/src/mediapipe/framework/resources.h third_party/mediapipe/src/mediapipe/framework/tool/proto_util_lite.cc third_party/mediapipe/src/mediapipe/framework/tool/template_parser.cc third_party/mediapipe/src/mediapipe/gpu/egl_surface_holder.h @@ -11470,32 +11257,6 @@ third_party/minigbm/src/gbm.h third_party/nearby/src/connections/implementation/endpoint_manager.cc third_party/nearby/src/embedded/common/source/nearby_event.h third_party/nearby/src/embedded/common/source/nearby_message_stream.h -third_party/nearby/src/fastpair/common/account_key_filter.cc -third_party/nearby/src/fastpair/common/account_key_filter.h -third_party/nearby/src/fastpair/common/account_key_filter_test.cc -third_party/nearby/src/fastpair/common/battery_notification.h -third_party/nearby/src/fastpair/common/battery_notification_test.cc -third_party/nearby/src/fastpair/common/fast_pair_prefs_test.cc -third_party/nearby/src/fastpair/common/non_discoverable_advertisement.h -third_party/nearby/src/fastpair/crypto/fast_pair_decryption.cc -third_party/nearby/src/fastpair/crypto/fast_pair_decryption_test.cc -third_party/nearby/src/fastpair/crypto/fast_pair_encryption_test.cc -third_party/nearby/src/fastpair/crypto/fast_pair_key_pair_test.cc -third_party/nearby/src/fastpair/dataparser/fast_pair_data_parser.cc -third_party/nearby/src/fastpair/dataparser/fast_pair_data_parser_test.cc -third_party/nearby/src/fastpair/fast_pair_seeker.h -third_party/nearby/src/fastpair/handshake/fast_pair_handshake.h -third_party/nearby/src/fastpair/internal/test/fast_pair_fake_http_client_test.cc -third_party/nearby/src/fastpair/message_stream/medium_test.cc -third_party/nearby/src/fastpair/repository/fast_pair_repository_impl_test.cc -third_party/nearby/src/fastpair/retroactive/retroactive_test.cc -third_party/nearby/src/fastpair/rust/demo/local/525296.json -third_party/nearby/src/fastpair/rust/demo/local/706908.json -third_party/nearby/src/fastpair/rust/demo/windows/runner/win32_window.cpp -third_party/nearby/src/fastpair/scanning/fastpair/fast_pair_discoverable_scanner.h -third_party/nearby/src/fastpair/scanning/fastpair/fast_pair_non_discoverable_scanner.h -third_party/nearby/src/fastpair/server_access/fast_pair_client_impl.cc -third_party/nearby/src/fastpair/server_access/fast_pair_client_impl_test.cc third_party/nearby/src/internal/crypto_cros/hmac_unittest.cc third_party/nearby/src/internal/crypto_cros/rsa_private_key_unittest.cc third_party/nearby/src/internal/crypto_cros/secure_util.h @@ -12398,6 +12159,7 @@ third_party/perfetto/src/trace_processor/importers/proto/statsd_module.cc third_party/perfetto/src/trace_processor/importers/proto/system_probes_parser.cc third_party/perfetto/src/trace_processor/metrics/sql/android/unsymbolized_frames.sql third_party/perfetto/src/trace_processor/metrics/sql/chrome/rail_modes.sql +third_party/perfetto/src/trace_processor/perfetto_sql/stdlib/android/battery/doze.sql third_party/perfetto/src/trace_processor/perfetto_sql/stdlib/android/startup/time_to_display.sql third_party/perfetto/src/trace_processor/perfetto_sql/stdlib/chrome/page_loads.sql third_party/perfetto/src/trace_processor/perfetto_sql/stdlib/export/to_firefox_profile.sql @@ -12435,12 +12197,6 @@ third_party/perfetto/ui/src/frontend/sidebar.ts third_party/perfetto/ui/src/frontend/trace_url_handler.ts third_party/perfetto/ui/src/frontend/viewer_page/wasd_navigation_handler.ts third_party/perfetto/ui/src/open_perfetto_trace/index.html -third_party/perfetto/ui/src/plugins/dev.perfetto.RecordTrace/adb.ts -third_party/perfetto/ui/src/plugins/dev.perfetto.RecordTrace/chrome_proxy_record_controller.ts -third_party/perfetto/ui/src/plugins/dev.perfetto.RecordTrace/record_page.ts -third_party/perfetto/ui/src/plugins/dev.perfetto.RecordTrace/recordingV2/recording_interfaces_v2.ts -third_party/perfetto/ui/src/plugins/dev.perfetto.RecordTrace/recordingV2/recording_page_controller.ts -third_party/perfetto/ui/src/plugins/dev.perfetto.RecordTrace/recordingV2/recording_utils.ts third_party/perfetto/ui/src/plugins/dev.perfetto.RecordTraceV2/adb/adb_msg.ts third_party/perfetto/ui/src/plugins/dev.perfetto.RecordTraceV2/pages/android.ts third_party/perfetto/ui/src/plugins/dev.perfetto.RecordTraceV2/pages/record_page.ts @@ -13227,6 +12983,7 @@ third_party/rust/PRESUBMIT.py third_party/rust/adler2/v2/BUILD.gn third_party/rust/aho_corasick/v1/BUILD.gn third_party/rust/anyhow/v1/BUILD.gn +third_party/rust/autocfg/v1/BUILD.gn third_party/rust/bstr/v1/BUILD.gn third_party/rust/bytemuck/v1/BUILD.gn third_party/rust/bytemuck_derive/v1/BUILD.gn @@ -13235,6 +12992,9 @@ third_party/rust/cxx/v1/BUILD.gn third_party/rust/cxxbridge_cmd/v1/BUILD.gn third_party/rust/cxxbridge_flags/v1/BUILD.gn third_party/rust/cxxbridge_macro/v1/BUILD.gn +third_party/rust/diplomat/v0_9/BUILD.gn +third_party/rust/diplomat_core/v0_9/BUILD.gn +third_party/rust/diplomat_runtime/v0_9/BUILD.gn third_party/rust/foldhash/v0_1/BUILD.gn third_party/rust/heck/v0_4/BUILD.gn third_party/rust/itoa/v1/BUILD.gn @@ -13260,6 +13020,8 @@ third_party/rust/serde/v1/BUILD.gn third_party/rust/serde_derive/v1/BUILD.gn third_party/rust/serde_json/v1/BUILD.gn third_party/rust/serde_json_lenient/v0_2/BUILD.gn +third_party/rust/stable_deref_trait/v1/BUILD.gn +third_party/rust/strck/v1/BUILD.gn third_party/rust/strum/v0_25/BUILD.gn third_party/rust/strum_macros/v0_25/BUILD.gn third_party/rust/syn/v2/BUILD.gn @@ -13269,8 +13031,13 @@ third_party/rust/unicode_ident/v1/BUILD.gn third_party/rust/unicode_linebreak/v0_1/BUILD.gn third_party/rust/unicode_width/v0_1/BUILD.gn third_party/rust/winapi_util/v0_1/BUILD.gn +third_party/rust/yoke/v0_7/BUILD.gn +third_party/rust/yoke_derive/v0_7/BUILD.gn third_party/rust/zerocopy/v0_7/BUILD.gn third_party/rust/zerocopy_derive/v0_7/BUILD.gn +third_party/rust/zerofrom/v0_1/BUILD.gn +third_party/rust/zerofrom_derive/v0_1/BUILD.gn +third_party/rust/zerovec_derive/v0_11/BUILD.gn third_party/s2cellid/src/s2/_fpcontractoff.h third_party/s2cellid/src/s2/r1interval.h third_party/s2cellid/src/s2/r2.h @@ -13543,7 +13310,7 @@ third_party/skia/tools/viewer/ClockSlide.cpp third_party/skia/tools/viewer/MotionMarkSlide.cpp third_party/skia/tools/viewer/PathSlide.cpp third_party/skia/tools/viewer/StringArtSlide.cpp -third_party/smhasher/src/PMurHash.c +third_party/smhasher/src/src/PMurHash.c third_party/snappy/linux/snappy-stubs-public.h third_party/snappy/mac/snappy-stubs-public.h third_party/snappy/src/snappy-test.h @@ -13896,6 +13663,7 @@ third_party/tflite/src/tensorflow/core/platform/cloud/testdata/application_defau third_party/tflite/src/tensorflow/core/platform/cloud/testdata/service_account_credentials.json third_party/tflite/src/tensorflow/core/platform/error_payloads.h third_party/tflite/src/tensorflow/core/profiler/convert/hlo_proto_to_graph_view.cc +third_party/tflite/src/tensorflow/core/profiler/convert/oss/tpu_input_pipeline_analysis_constants.cc third_party/tflite/src/tensorflow/core/tpu/tpu_compile_interface.h third_party/tflite/src/tensorflow/core/tpu/tpu_embedding_errors.h third_party/tflite/src/tensorflow/core/util/ctc/ctc_beam_search.h @@ -14068,12 +13836,10 @@ third_party/tflite/src/tensorflow/tools/android/test/jni/rgb2yuv.cc third_party/tflite/src/tensorflow/tools/compatibility/tf_upgrade_v2_safety_test.py third_party/tflite/src/tensorflow/tools/pip_package/THIRD_PARTY_NOTICES.txt third_party/tflite/src/tensorflow/tools/pip_package/setup.py -third_party/tflite/src/third_party/xla/third_party/tsl/tsl/platform/file_system.cc -third_party/tflite/src/third_party/xla/third_party/tsl/tsl/platform/status.cc +third_party/tflite/src/third_party/xla/xla/backends/gpu/codegen/emitters/transpose.h third_party/tflite/src/third_party/xla/xla/pjrt/c/pjrt_c_api.h third_party/tflite/src/third_party/xla/xla/pjrt/pjrt_api.cc third_party/tflite/src/third_party/xla/xla/python/weakref_lru_cache.cc -third_party/tflite/src/third_party/xla/xla/service/gpu/fusions/transpose_mlir.h third_party/tflite/src/third_party/xla/xla/service/hlo_graph_dumper.cc third_party/tflite/src/third_party/xla/xla/service/hlo_verifier.cc third_party/tflite/src/third_party/xla/xla/tsl/distributed_runtime/coordination/coordination_service_error_util.h @@ -14092,10 +13858,14 @@ third_party/tflite/src/third_party/xla/xla/tsl/platform/cloud/http_request.h third_party/tflite/src/third_party/xla/xla/tsl/platform/cloud/oauth_client_test.cc third_party/tflite/src/third_party/xla/xla/tsl/platform/cloud/testdata/application_default_credentials.json third_party/tflite/src/third_party/xla/xla/tsl/platform/cloud/testdata/service_account_credentials.json +third_party/tflite/src/third_party/xla/xla/tsl/platform/file_system.cc +third_party/tflite/src/third_party/xla/xla/tsl/platform/status.cc third_party/tflite/src/third_party/xla/xla/tsl/platform/windows/env.cc third_party/tflite/src/third_party/xla/xla/tsl/platform/windows/stacktrace.cc third_party/tflite/src/third_party/xla/xla/tsl/platform/windows/stacktrace_handler.cc third_party/tflite_support/src/tensorflow_lite_support/c/task/processor/category.h +third_party/unrar/src/threadmisc.cpp +third_party/unrar/src/threadpool.cpp third_party/updater/chrome_mac_universal/3pp/fetch.py third_party/updater/chrome_mac_universal_prod/3pp/fetch.py third_party/updater/chrome_win_arm64/3pp/fetch.py @@ -14130,9 +13900,11 @@ third_party/vulkan-tools/src/scripts/gn/gn.py third_party/vulkan-tools/src/scripts/mock_icd_generator.py third_party/vulkan-tools/src/scripts/vulkan_tools_helper_file_generator.py third_party/vulkan-utility-libraries/src/scripts/gn/gn.py +third_party/vulkan-validation-layers/src/layers/external/inplace_function.h third_party/vulkan-validation-layers/src/layers/external/xxhash.h -third_party/vulkan-validation-layers/src/layers/gpu/debug_printf/debug_printf.cpp +third_party/vulkan-validation-layers/src/layers/gpuav/debug_printf/debug_printf.cpp third_party/vulkan-validation-layers/src/scripts/android.py +third_party/vulkan-validation-layers/src/scripts/gn/export_targets.py third_party/vulkan-validation-layers/src/scripts/gn/gn.py third_party/wayland-protocols/gtk/.gitlab-ci/pages/fonts.css third_party/wayland-protocols/gtk/.gitlab-ci/pages/index.html @@ -14275,6 +14047,7 @@ third_party/webrtc/pc/peer_connection_end_to_end_unittest.cc third_party/webrtc/pc/peer_connection_factory_unittest.cc third_party/webrtc/pc/peer_connection_field_trial_tests.cc third_party/webrtc/pc/peer_connection_ice_unittest.cc +third_party/webrtc/pc/peer_connection_integrationtest.cc third_party/webrtc/pc/peer_connection_interface_unittest.cc third_party/webrtc/pc/scenario_tests/goog_cc_test.cc third_party/webrtc/pc/sdp_offer_answer.cc @@ -14349,7 +14122,6 @@ third_party/webxr_test_pages/webxr-samples/explainer.html third_party/webxr_test_pages/webxr-samples/gamepad.html third_party/webxr_test_pages/webxr-samples/index.html third_party/webxr_test_pages/webxr-samples/index.published.html -third_party/webxr_test_pages/webxr-samples/js/third-party/dat.gui/dat.gui.min.js third_party/webxr_test_pages/webxr-samples/js/webxr-button.js third_party/webxr_test_pages/webxr-samples/js/webxr-polyfill.js third_party/webxr_test_pages/webxr-samples/js/webxr-polyfill.min.js @@ -14725,6 +14497,8 @@ tools/metrics/histograms/metadata/compositing/histograms.xml tools/metrics/histograms/metadata/content/enums.xml tools/metrics/histograms/metadata/content/histograms.xml tools/metrics/histograms/metadata/content_extraction/histograms.xml +tools/metrics/histograms/metadata/contextual_cueing/enums.xml +tools/metrics/histograms/metadata/contextual_cueing/histograms.xml tools/metrics/histograms/metadata/cookie/enums.xml tools/metrics/histograms/metadata/cookie/histograms.xml tools/metrics/histograms/metadata/cras/enums.xml @@ -14765,6 +14539,7 @@ tools/metrics/histograms/metadata/families/enums.xml tools/metrics/histograms/metadata/families/histograms.xml tools/metrics/histograms/metadata/fastpair/enums.xml tools/metrics/histograms/metadata/fastpair/histograms.xml +tools/metrics/histograms/metadata/favicons/histograms.xml tools/metrics/histograms/metadata/feature_engagement/histograms.xml tools/metrics/histograms/metadata/file/enums.xml tools/metrics/histograms/metadata/file/histograms.xml @@ -14775,6 +14550,8 @@ tools/metrics/histograms/metadata/game_mode/histograms.xml tools/metrics/histograms/metadata/gcm/histograms.xml tools/metrics/histograms/metadata/geolocation/enums.xml tools/metrics/histograms/metadata/geolocation/histograms.xml +tools/metrics/histograms/metadata/glic/enums.xml +tools/metrics/histograms/metadata/glic/histograms.xml tools/metrics/histograms/metadata/google/enums.xml tools/metrics/histograms/metadata/google/histograms.xml tools/metrics/histograms/metadata/gpu/enums.xml @@ -14892,6 +14669,7 @@ tools/metrics/histograms/metadata/search/enums.xml tools/metrics/histograms/metadata/search/histograms.xml tools/metrics/histograms/metadata/security/enums.xml tools/metrics/histograms/metadata/security/histograms.xml +tools/metrics/histograms/metadata/segmentation_platform/enums.xml tools/metrics/histograms/metadata/segmentation_platform/histograms.xml tools/metrics/histograms/metadata/sensitive_content/enums.xml tools/metrics/histograms/metadata/sensitive_content/histograms.xml @@ -14908,6 +14686,7 @@ tools/metrics/histograms/metadata/shortcuts/histograms.xml tools/metrics/histograms/metadata/signin/enums.xml tools/metrics/histograms/metadata/signin/histograms.xml tools/metrics/histograms/metadata/simple/histograms.xml +tools/metrics/histograms/metadata/sql/enums.xml tools/metrics/histograms/metadata/sql/histograms.xml tools/metrics/histograms/metadata/stability/enums.xml tools/metrics/histograms/metadata/stability/histograms.xml @@ -14931,6 +14710,7 @@ tools/metrics/histograms/metadata/translate/enums.xml tools/metrics/histograms/metadata/translate/histograms.xml tools/metrics/histograms/metadata/trusted_vault/enums.xml tools/metrics/histograms/metadata/trusted_vault/histograms.xml +tools/metrics/histograms/metadata/ui/enums.xml tools/metrics/histograms/metadata/ui/histograms.xml tools/metrics/histograms/metadata/ukm/enums.xml tools/metrics/histograms/metadata/ukm/histograms.xml @@ -14971,8 +14751,11 @@ tools/metrics/histograms/pretty_print_test.py tools/metrics/histograms/split_enums.py tools/metrics/histograms/split_xml.py tools/metrics/histograms/test_data/components/histograms.xml +tools/metrics/histograms/test_data/example_valid_enums.xml +tools/metrics/histograms/test_data/example_valid_histograms.xml tools/metrics/histograms/test_data/histograms.xml -tools/metrics/histograms/test_data/tokens/histograms.xml +tools/metrics/histograms/test_data/no_allowlist_entries_histograms.xml +tools/metrics/histograms/test_data/tokens/token_errors_histograms.xml tools/metrics/histograms/test_data/ukm.xml tools/metrics/md2xml.py tools/metrics/structured/PRESUBMIT.py @@ -15167,7 +14950,6 @@ tools/typescript/PRESUBMIT.py tools/typescript/definitions/command_line_private.d.ts tools/typescript/definitions/pending.d.ts tools/typescript/definitions/system_display.d.ts -tools/ubsan/ignorelist.txt tools/usb_gadget/gadget.py tools/usb_gadget/msos20_descriptors.py tools/utr/builders.py @@ -15314,7 +15096,7 @@ ui/gl/gl_display.cc ui/gl/gl_surface_egl.cc ui/gl/gl_surface_presentation_helper.cc ui/gl/hdr_metadata_helper_win.cc -ui/gl/vsync_thread_win.cc +ui/gl/vsync_thread_win_dxgi.cc ui/gtk/printing/print_dialog_gtk.cc ui/latency/latency_info.h ui/native_theme/native_theme_win.cc @@ -15467,9 +15249,6 @@ v8/third_party/inspector_protocol/crdtp/json.cc v8/third_party/inspector_protocol/roll.py v8/third_party/siphash/halfsiphash.cc v8/third_party/siphash/halfsiphash.h -v8/third_party/test262-harness/src/templates/runner.bestPractice.html -v8/third_party/test262-harness/src/templates/runner.intl402.html -v8/third_party/test262-harness/src/templates/runner.test262.html v8/third_party/utf8-decoder/utf8-decoder.h v8/tools/builtins-pgo/download_profiles.py v8/tools/builtins-pgo/profiles/meta.json diff --git a/domain_substitution/domain_substitution.py b/domain_substitution/domain_substitution.py index 91d3034f62bde5e7084c3d5f95c94b3325ad183f..0aa5f577e8b79943322dc6dc3b883a93693b8982 100644 --- a/domain_substitution/domain_substitution.py +++ b/domain_substitution/domain_substitution.py @@ -284,7 +284,7 @@ def revert_substitution(domainsub_cache, source_tree): dir=str(resolved_tree)) as tmp_extract_name: extract_path = Path(tmp_extract_name) get_logger().debug('Extracting domain substitution cache...') - extract_tar_file(domainsub_cache, extract_path, None, False, None) + extract_tar_file(domainsub_cache, extract_path, None) # Validate source tree file hashes match get_logger().debug('Validating substituted files in source tree...') diff --git a/domain_substitution/prune_binaries.py b/domain_substitution/prune_binaries.py index 82e1d564dbdd4753b3b5fba00f0e9bda01e35207..df7bfcec314d0061a502f3ad4fdbc7cf3e7657f3 100644 --- a/domain_substitution/prune_binaries.py +++ b/domain_substitution/prune_binaries.py @@ -16,37 +16,97 @@ from pathlib import Path from _common import ENCODING, get_logger, add_common_params # List of paths to prune if they exist, excluded from domain_substitution and pruning lists -# These allow the lists to be compatible between cloned and tarball sources +# These allow the lists to be compatible between cloned, tarball, and lite tarball sources CONTINGENT_PATHS = ( - # Overridable git sources - 'third_party/angle/third_party/VK-GL-CTS/src/', # CIPD sources + 'buildtools/linux64/', + 'third_party/checkstyle/cipd/', 'third_party/dawn/third_party/ninja/', 'third_party/dawn/tools/golang/', 'third_party/devtools-frontend/src/third_party/esbuild/', 'third_party/google-java-format/', + 'third_party/libei/cipd/', + 'third_party/ninja/', 'third_party/openscreen/src/third_party/ninja/', + 'third_party/siso/cipd/', 'third_party/updater/chrome_linux64/', + 'third_party/updater/chrome_linux64_sans_iid/cipd/', 'third_party/updater/chromium_linux64/', + 'third_party/updater/chromium_linux64_sans_iid/cipd/', + 'tools/luci-go/', + 'tools/resultdb/', + 'tools/skia_goldctl/linux/', # GCS sources + 'buildtools/linux64-format/', + 'third_party/blink/renderer/core/css/perftest_data/', + 'third_party/js_code_coverage/', + 'third_party/openscreen/src/buildtools/linux64-format/', + 'third_party/opus/tests/resources/', + 'third_party/subresource-filter-ruleset/data/', + 'tools/perf/page_sets/maps_perf_test/dataset/', + # Sysroots(GCS), include all arches the clone script is able to obtain 'build/linux/debian_bullseye_amd64-sysroot/', + 'build/linux/debian_bullseye_arm64-sysroot/', + 'build/linux/debian_bullseye_armhf-sysroot/', 'build/linux/debian_bullseye_i386-sysroot/', - 'third_party/js_code_coverage/', - 'third_party/openscreen/src/buildtools/linux64/format/', + 'build/linux/debian_bullseye_mips64el-sysroot/', + 'build/linux/debian_bullseye_mipsel-sysroot/', # other 'third_party/depot_tools/external_bin/', + # Match removals for the tarball: + # https://source.chromium.org/chromium/chromium/tools/build/+/main:recipes/recipe_modules/chromium/resources/export_tarball.py + # nonessential + 'third_party/blink/tools/', + 'third_party/blink/web_tests/', + 'third_party/hunspell_dictionaries/', + 'third_party/hunspell/tests/', + 'third_party/jdk/current/', + 'third_party/jdk/extras/', + 'third_party/liblouis/src/tests/braille-specs/', + 'third_party/xdg-utils/tests/', + 'v8/test/', + # test + 'base/tracing/test/data/', + 'chrome/test/data/', + 'components/test/data/', + 'content/test/data/accessibility/', + 'content/test/data/gpu/', + 'content/test/data/media/', + 'courgette/testdata/', + 'extensions/test/data/', + 'media/test/data/', + 'native_client/src/trusted/service_runtime/testdata/', + 'testing/libfuzzer/fuzzers/wasm_corpus/', + 'third_party/blink/perf_tests/', + 'third_party/breakpad/breakpad/src/processor/testdata/', + 'third_party/catapult/tracing/test_data/', + 'third_party/dawn/test/', + 'third_party/expat/src/testdata/', + 'third_party/harfbuzz-ng/src/test/', + 'third_party/llvm/llvm/test/', + 'third_party/ots/src/tests/fonts/', + 'third_party/rust-src/src/gcc/gcc/testsuite/', + 'third_party/rust-src/src/llvm-project/clang/test/', + 'third_party/rust-src/src/llvm-project/llvm/test/', + 'third_party/screen-ai/linux/resources/', + 'third_party/sqlite/src/test/', + 'third_party/swiftshader/tests/regres/', + 'third_party/test_fonts/test_fonts/', + 'tools/perf/testdata/', # lite tarball paths: # https://source.chromium.org/chromium/chromium/tools/build/+/main:recipes/recipes/publish_tarball.py 'android_webview/', 'buildtools/reclient/', + 'chrome/android/', 'chromecast/', + 'ios/', 'native_client/', 'native_client_sdk/', 'third_party/android_platform/', + 'third_party/angle/third_party/VK-GL-CTS/', 'third_party/apache-linux/', - 'third_party/blink/manual_tests/', - 'third_party/blink/perf_tests/', 'third_party/catapult/third_party/vinn/third_party/v8/', + 'third_party/closure_compiler/', 'third_party/instrumented_libs/', 'third_party/llvm/', 'third_party/llvm-build/', @@ -55,8 +115,20 @@ CONTINGENT_PATHS = ( 'third_party/rust-src/', 'third_party/rust-toolchain/', 'third_party/webgl/', + 'third_party/blink/manual_tests/', + 'third_party/blink/perf_tests/', +) + +# Files that should be excluded when pruning contingent paths. +KEEP_FILES = ( + 'chrome/test/data/webui/i18n_process_css_test.html', + 'chrome/test/data/webui/mojo/foobar.mojom', + 'v8/test/torque/test-torque.tq', ) +# File suffixes that should be excluded when pruning contingent paths. +KEEP_SUFFIXES = ('.gn', '.gni', '.grd', '.grdp', '.isolate', '.pydeps') + def prune_files(unpack_root, prune_list): """ @@ -80,13 +152,17 @@ def prune_files(unpack_root, prune_list): return unremovable_files -def _prune_path(path): +def _prune_path(path, unpack_root=None): """ - Delete all files and directories in path. + Delete files and directories in path. path is a pathlib.Path to the directory to be pruned + unpack_root is a pathlib.Path to the source tree """ for node in sorted(path.rglob('*'), key=lambda l: len(str(l)), reverse=True): + if unpack_root is not None and (node.suffix in KEEP_SUFFIXES + or str(node.relative_to(unpack_root)) in KEEP_FILES): + continue if node.is_file() or node.is_symlink(): try: node.unlink() @@ -120,7 +196,7 @@ def prune_dirs(unpack_root, keep_contingent_paths, sysroot): get_logger().info('%s: %s', 'Exempt', cpath) continue get_logger().info('%s: %s', 'Exists' if Path(cpath).exists() else 'Absent', cpath) - _prune_path(unpack_root / cpath) + _prune_path(unpack_root / cpath, unpack_root) def _callback(args): diff --git a/update_cromite_patches.sh b/update_cromite_patches.sh index 9246bf239f91b67d0c13db91a4ed454850b4e515..0a55c13bd408176c6d157864a471f20f52c5e3a6 100755 --- a/update_cromite_patches.sh +++ b/update_cromite_patches.sh @@ -4,7 +4,7 @@ root_dir=$(dirname "$(readlink -f "$0")") cd $root_dir/build -branch="v133.0.6943.99-f987ea3d750501f851e708a49b2c66e318206e73" +branch="v134.0.6998.89-f13b33b73e22ecaa1ae9a567a8e0c74caf446678" if [ -d cromite ]; then cd cromite git fetch origin $branch diff --git a/update_domain_substitution.sh b/update_domain_substitution.sh index 96aedc2d23f19f5b7f7105934b8786d87acc3932..3841320b6f19a189eb6c911a1ddbb131e270bced 100755 --- a/update_domain_substitution.sh +++ b/update_domain_substitution.sh @@ -4,7 +4,7 @@ root_dir=$(dirname "$(readlink -f "$0")") cd $root_dir/domain_substitution -branch="133.0.6943.98-1" +branch="134.0.6998.88-1" if [ -d ungoogled-chromium ]; then cd ungoogled-chromium git fetch origin $branch