diff --git a/build/bromite_patches_list.txt b/build/bromite_patches_list.txt index 01d3d4d5..d768deb0 100644 --- a/build/bromite_patches_list.txt +++ b/build/bromite_patches_list.txt @@ -207,7 +207,6 @@ Add-kill-switch-for-unsupported-clangd-flags.patch 00User-agent-customization--add-fixup-.patch 00Disable-conversion-measurement-api--add-fixup-.patch 00Disable-safe-browsing--add-fixup-.patch -00Disable-all-predictors-code--add-fixup-.patch 00Timezone-customization--add-fixup-.patch 00Add-webGL-site-setting--add-fixup-.patch 00Add-webRTC-site-settings--add-fixup-.patch diff --git a/build/patches/00109-Fix-Adblock.patch b/build/patches/00109-Fix-Adblock.patch index 63e8f2e2..d532f42f 100644 --- a/build/patches/00109-Fix-Adblock.patch +++ b/build/patches/00109-Fix-Adblock.patch @@ -9,7 +9,7 @@ Subject: 109 Fix Adblock 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 -@@ -335,6 +335,8 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { +@@ -328,6 +328,8 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { } #endif diff --git a/build/patches/00109-Move-navigation-bar-to-bottom-fixup.patch b/build/patches/00109-Move-navigation-bar-to-bottom-fixup.patch index f26d9320..c0caf303 100644 --- a/build/patches/00109-Move-navigation-bar-to-bottom-fixup.patch +++ b/build/patches/00109-Move-navigation-bar-to-bottom-fixup.patch @@ -45,7 +45,7 @@ Subject: 109 Move navigation bar to bottom fixup diff --git a/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java b/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java --- a/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java +++ b/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java -@@ -1112,7 +1112,7 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View. +@@ -1163,7 +1163,7 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View. } private void setTopMargin(int topMargin) { @@ -111,7 +111,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediator.java --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediator.java +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediator.java -@@ -461,7 +461,7 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView +@@ -474,7 +474,7 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView updateTopControlsProperties(); mContainerViewModel.set( BOTTOM_CONTROLS_HEIGHT, browserControlsStateProvider.getBottomControlsHeight()); @@ -120,7 +120,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser mContainerViewModel.set( BOTTOM_CONTROLS_HEIGHT, mContainerViewModel.get(BOTTOM_CONTROLS_HEIGHT) + mBrowserControlsStateProvider.getContentOffset()); -@@ -471,7 +471,7 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView +@@ -484,7 +484,7 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView if (mMode == TabListMode.GRID) { mContainerViewModel.set(BOTTOM_PADDING, (int) context.getResources().getDimension(R.dimen.tab_grid_bottom_padding)); @@ -129,7 +129,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser // adjust the bottom margin so as not to cover the top toolbar at the bottom mContainerViewModel.set( BOTTOM_PADDING, mContainerViewModel.get(BOTTOM_PADDING) + -@@ -604,7 +604,7 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView +@@ -617,7 +617,7 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView final int contentOffset = mBrowserControlsStateProvider.getContentOffset(); mContainerViewModel.set(TOP_MARGIN, contentOffset); @@ -138,7 +138,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser // move the view up since the toolbar is at the bottom mContainerViewModel.set(TOP_MARGIN, 0); } -@@ -764,7 +764,7 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView +@@ -777,7 +777,7 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView private void setInitialScrollIndexOffset() { int offset = mMode == TabListMode.CAROUSEL ? INITIAL_SCROLL_INDEX_OFFSET_CAROUSEL : INITIAL_SCROLL_INDEX_OFFSET_GTS; @@ -162,7 +162,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 -@@ -764,7 +764,7 @@ public abstract class ChromeActivity +@@ -763,7 +763,7 @@ public abstract class ChromeActivity ImageView shadowImage = findViewById(R.id.toolbar_hairline); if (shadowImage != null) { // Invert the shadown if the top toolbar is at the bottom @@ -174,7 +174,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/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 -@@ -319,7 +319,7 @@ public class CompositorViewHolder extends FrameLayout +@@ -323,7 +323,7 @@ public class CompositorViewHolder extends FrameLayout WebContents webContents = mTabVisible.getWebContents(); if (webContents == null) return; EventForwarder forwarder = webContents.getEventForwarder(); @@ -186,7 +186,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/Comp diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChrome.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChrome.java --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChrome.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChrome.java -@@ -213,7 +213,7 @@ public class LayoutManagerChrome +@@ -259,7 +259,7 @@ public class LayoutManagerChrome @Override public SwipeHandler createToolbarSwipeHandler(boolean supportSwipeDown) { boolean move_top_toolbar = @@ -219,7 +219,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/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 -@@ -421,7 +421,7 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa +@@ -420,7 +420,7 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa mWidth, mHeight, orientationChanged, LayoutManagerImpl.time()); float top = 0; @@ -372,7 +372,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsP diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java -@@ -194,7 +194,7 @@ public class SearchActivity extends AsyncInitializationActivity +@@ -195,7 +195,7 @@ public class SearchActivity extends AsyncInitializationActivity mSearchBox = (SearchActivityLocationBarLayout) mContentView.findViewById( R.id.search_location_bar); mAnchorView = mContentView.findViewById(R.id.toolbar); @@ -408,7 +408,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/status_indicato diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java -@@ -1318,7 +1318,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve +@@ -1314,7 +1314,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve private void MoveBottomBarOverTopBar() { if (bottomRoot != null && @@ -417,7 +417,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar // move up the container view of the ui // below there is the toolbar bottomRoot.setTranslationY(-mBrowserControlsSizer.getTopControlsHeight()); -@@ -2123,7 +2123,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve +@@ -2128,7 +2128,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve private void setControlContainerTopMargin(int margin) { final ViewGroup.MarginLayoutParams layoutParams = ((ViewGroup.MarginLayoutParams) mControlContainer.getLayoutParams()); @@ -457,10 +457,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/BottomContai diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/system/StatusBarColorController.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/system/StatusBarColorController.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ui/system/StatusBarColorController.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/system/StatusBarColorController.java -@@ -428,7 +428,7 @@ public class StatusBarColorController +@@ -433,7 +433,7 @@ public class StatusBarColorController boolean needsDarkStatusBarIcons = !ColorUtils.shouldUseLightForegroundOnBackground(color); ApiCompatibilityUtils.setStatusBarIconColor(root, needsDarkStatusBarIcons); - ApiCompatibilityUtils.setStatusBarColor(mWindow, color); + ApiCompatibilityUtils.setStatusBarColor(window, color); - if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM) && + if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { @@ -481,7 +481,7 @@ diff --git a/chrome/browser/browser_controls/android/java/src/org/chromium/chrom diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java b/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java --- a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java +++ b/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java -@@ -265,7 +265,7 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler +@@ -260,7 +260,7 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler } mListView = (ListView) contentView.findViewById(R.id.app_menu_list); @@ -490,7 +490,7 @@ diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/ch // always scroll to the bottom to show new items mListView.setTranscriptMode(ListView.TRANSCRIPT_MODE_ALWAYS_SCROLL); // fill content starting from the bottom of the view -@@ -310,7 +310,7 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler +@@ -304,7 +304,7 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler if (popupHeight + popupPosition[1] > visibleDisplayFrame.bottom) { mPopup.setHeight(visibleDisplayFrame.height()); } @@ -499,7 +499,7 @@ diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/ch // due to some unknown behaviour, the popup must be resized to // allow selection without leaving touch mPopup.setHeight(popupHeight-1); -@@ -362,7 +362,7 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler +@@ -356,7 +356,7 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler int anchorViewX = tempLocation[0]; int anchorViewY = tempLocation[1]; @@ -508,7 +508,7 @@ diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/ch // moves the view offset up by the height of the popup anchorViewY -= popupHeight; // fix it if it goes offscreen -@@ -560,7 +560,7 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler +@@ -554,7 +554,7 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler } int availableScreenSpace = Math.max( anchorViewY, appDimensions.height() - anchorViewY - anchorViewImpactHeight); @@ -556,7 +556,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 -@@ -1013,7 +1013,7 @@ class AutocompleteMediator implements OnSuggestionsReceivedListener, +@@ -1017,7 +1017,7 @@ class AutocompleteMediator implements OnSuggestionsReceivedListener, @Override public void onSuggestionDropdownScroll() { mSuggestionsListScrolled = true; @@ -568,7 +568,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/OmniboxSuggestionsDropdown.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsDropdown.java --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsDropdown.java +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsDropdown.java -@@ -266,7 +266,7 @@ public class OmniboxSuggestionsDropdown extends RecyclerView { +@@ -265,7 +265,7 @@ public class OmniboxSuggestionsDropdown extends RecyclerView { final Resources resources = context.getResources(); int paddingBottom = resources.getDimensionPixelOffset(R.dimen.omnibox_suggestion_list_padding_bottom); @@ -625,7 +625,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java -@@ -109,7 +109,7 @@ public class ToolbarControlContainer extends OptimizedFrameLayout implements Con +@@ -110,7 +110,7 @@ public class ToolbarControlContainer extends OptimizedFrameLayout implements Con @Override public void initWithToolbar(int toolbarLayoutId) { try (TraceEvent te = TraceEvent.scoped("ToolbarControlContainer.initWithToolbar")) { diff --git a/build/patches/00Add-AllowUserCertificates-flag--win-fixup-.patch b/build/patches/00Add-AllowUserCertificates-flag--win-fixup-.patch index e17d55a6..30389363 100644 --- a/build/patches/00Add-AllowUserCertificates-flag--win-fixup-.patch +++ b/build/patches/00Add-AllowUserCertificates-flag--win-fixup-.patch @@ -9,7 +9,7 @@ Subject: Add AllowUserCertificates flag (win fixup) 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 -@@ -9003,10 +9003,12 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8514,10 +8514,12 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kWin10TabSearchCaptionButton)}, #endif // BUILDFLAG(IS_WIN) diff --git a/build/patches/00Add-a-proxy-configuration-page--win-fixup-.patch b/build/patches/00Add-a-proxy-configuration-page--win-fixup-.patch index 972d2275..c46640b1 100644 --- a/build/patches/00Add-a-proxy-configuration-page--win-fixup-.patch +++ b/build/patches/00Add-a-proxy-configuration-page--win-fixup-.patch @@ -26,14 +26,14 @@ diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resou diff --git a/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc b/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc --- a/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc +++ b/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc -@@ -377,7 +377,7 @@ std::unique_ptr CreateProxyConfigDict( +@@ -383,7 +383,7 @@ absl::optional CreateProxyConfigDict( + return absl::nullopt; } - return std::make_unique( - ProxyConfigDictionary::CreateFixedServers(proxy_rules_string, -- bypass_list)); -+ bypass_list, /*reverse_bypass*/false)); + return ProxyConfigDictionary::CreateFixedServers(proxy_rules_string, +- bypass_list); ++ bypass_list, /*reverse_bypass*/false); } case ProxyPrefs::MODE_SYSTEM: - return std::make_unique( + return ProxyConfigDictionary::CreateSystem(); -- 2.25.1 diff --git a/build/patches/00Add-an-always-incognito-mode--win-fixup-.patch b/build/patches/00Add-an-always-incognito-mode--win-fixup-.patch index 9875594e..8008c30b 100644 --- a/build/patches/00Add-an-always-incognito-mode--win-fixup-.patch +++ b/build/patches/00Add-an-always-incognito-mode--win-fixup-.patch @@ -11,7 +11,7 @@ Subject: Add an always-incognito mode (win fixup) diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc --- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc +++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc -@@ -320,9 +320,11 @@ signin::IdentityManager* ChromeAutocompleteProviderClient::GetIdentityManager() +@@ -321,9 +321,11 @@ signin::IdentityManager* ChromeAutocompleteProviderClient::GetIdentityManager() } bool ChromeAutocompleteProviderClient::IsAlwaysIncognitoEnabled() const { @@ -45,7 +45,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 -@@ -492,10 +492,12 @@ history::HistoryService* HistoryTabHelper::GetHistoryService() { +@@ -493,10 +493,12 @@ history::HistoryService* HistoryTabHelper::GetHistoryService() { // static void HistoryTabHelper::RegisterProfilePrefs(PrefRegistrySimple* registry) { diff --git a/build/patches/00Add-bookmark-import-export-actions--win-fixup-.patch b/build/patches/00Add-bookmark-import-export-actions--win-fixup-.patch index c9e09f6f..ed06c2b2 100644 --- a/build/patches/00Add-bookmark-import-export-actions--win-fixup-.patch +++ b/build/patches/00Add-bookmark-import-export-actions--win-fixup-.patch @@ -12,7 +12,7 @@ Subject: Add bookmark import/export actions (win fixup) 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 -@@ -9239,11 +9239,13 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8739,11 +8739,13 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(net::features::kIsCleartextPermitted)}, #endif @@ -25,7 +25,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc +#endif #if BUILDFLAG(IS_CHROMEOS_ASH) - {"snooping-protection", flag_descriptions::kSnoopingProtectionName, + {"vc-background-blur", flag_descriptions::kVCBackgroundBlurName, 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 @@ -73,7 +73,7 @@ diff --git a/headless/lib/browser/headless_select_file_dialog_factory.cc b/headl diff --git a/ui/shell_dialogs/select_file_dialog_win.cc b/ui/shell_dialogs/select_file_dialog_win.cc --- a/ui/shell_dialogs/select_file_dialog_win.cc +++ b/ui/shell_dialogs/select_file_dialog_win.cc -@@ -193,6 +193,7 @@ class SelectFileDialogImpl : public ui::SelectFileDialog, +@@ -192,6 +192,7 @@ class SelectFileDialogImpl : public ui::SelectFileDialog, int index); bool HasMultipleFileTypeChoicesImpl() override; @@ -81,7 +81,7 @@ diff --git a/ui/shell_dialogs/select_file_dialog_win.cc b/ui/shell_dialogs/selec // Returns the filter to be used while displaying the open/save file dialog. // This is computed from the extensions for the file types being opened. -@@ -271,6 +272,10 @@ bool SelectFileDialogImpl::HasMultipleFileTypeChoicesImpl() { +@@ -270,6 +271,10 @@ bool SelectFileDialogImpl::HasMultipleFileTypeChoicesImpl() { return has_multiple_file_type_choices_; } diff --git a/build/patches/00Add-flag-to-configure-maximum-connecti--win-fixup-.patch b/build/patches/00Add-flag-to-configure-maximum-connecti--win-fixup-.patch index bef393be..1d60730a 100644 --- a/build/patches/00Add-flag-to-configure-maximum-connecti--win-fixup-.patch +++ b/build/patches/00Add-flag-to-configure-maximum-connecti--win-fixup-.patch @@ -9,7 +9,7 @@ Subject: Add flag to configure maximum connecti (win fixup) 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 -@@ -1121,10 +1121,12 @@ const FeatureEntry::Choice kForceColorProfileChoices[] = { +@@ -1102,10 +1102,12 @@ const FeatureEntry::Choice kForceColorProfileChoices[] = { switches::kForceDisplayColorProfile, "hdr10"}, }; diff --git a/build/patches/00Add-flag-to-disable-IPv6-probes--win-fixup-.patch b/build/patches/00Add-flag-to-disable-IPv6-probes--win-fixup-.patch index 4ca0b986..f350266c 100644 --- a/build/patches/00Add-flag-to-disable-IPv6-probes--win-fixup-.patch +++ b/build/patches/00Add-flag-to-disable-IPv6-probes--win-fixup-.patch @@ -15,7 +15,7 @@ Subject: Add flag to disable IPv6 probes (win fixup) 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 -@@ -6217,7 +6217,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5851,7 +5851,7 @@ const FeatureEntry kFeatureEntries[] = { {"ipv6-probing", flag_descriptions::kIPv6ProbingName, flag_descriptions::kIPv6ProbingDescription, kOsAll, @@ -70,7 +70,7 @@ diff --git a/components/url_formatter/spoof_checks/top_domains/BUILD.gn b/compon diff --git a/net/BUILD.gn b/net/BUILD.gn --- a/net/BUILD.gn +++ b/net/BUILD.gn -@@ -1069,6 +1069,7 @@ component("net") { +@@ -1074,6 +1074,7 @@ component("net") { "//build:chromeos_buildflags", "//net/data/ssl/chrome_root_store:gen_root_store_inc", "//net/http:transport_security_state_generated_files", @@ -108,7 +108,7 @@ diff --git a/net/base/features.h b/net/base/features.h diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc --- a/net/dns/host_resolver_manager.cc +++ b/net/dns/host_resolver_manager.cc -@@ -3761,7 +3761,7 @@ bool HostResolverManager::IsIPv6Reachable(const NetLogWithSource& net_log) { +@@ -3774,7 +3774,7 @@ bool HostResolverManager::IsIPv6Reachable(const NetLogWithSource& net_log) { (tick_clock_->NowTicks() - last_ipv6_probe_time_).InMilliseconds() > kIPv6ProbePeriodMs) { diff --git a/build/patches/00Add-flag-to-disable-external-intent-re--win-fixup-.patch b/build/patches/00Add-flag-to-disable-external-intent-re--win-fixup-.patch index 3105b919..c1d4b388 100644 --- a/build/patches/00Add-flag-to-disable-external-intent-re--win-fixup-.patch +++ b/build/patches/00Add-flag-to-disable-external-intent-re--win-fixup-.patch @@ -9,7 +9,7 @@ Subject: Add flag to disable external intent re (win fixup) 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 -@@ -3692,9 +3692,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3356,9 +3356,11 @@ const FeatureEntry kFeatureEntries[] = { {"ui-disable-partial-swap", flag_descriptions::kUiPartialSwapName, flag_descriptions::kUiPartialSwapDescription, kOsAll, SINGLE_DISABLE_VALUE_TYPE(switches::kUIDisablePartialSwap)}, diff --git a/build/patches/00Add-lifetime-options-for-permissions--win-fixup-.patch b/build/patches/00Add-lifetime-options-for-permissions--win-fixup-.patch index 9ab38b4b..06105502 100644 --- a/build/patches/00Add-lifetime-options-for-permissions--win-fixup-.patch +++ b/build/patches/00Add-lifetime-options-for-permissions--win-fixup-.patch @@ -9,7 +9,7 @@ Subject: Add lifetime options for permissions (win fixup) diff --git a/chrome/browser/ui/views/permissions/permission_prompt_bubble_view.cc b/chrome/browser/ui/views/permissions/permission_prompt_bubble_view.cc --- a/chrome/browser/ui/views/permissions/permission_prompt_bubble_view.cc +++ b/chrome/browser/ui/views/permissions/permission_prompt_bubble_view.cc -@@ -433,7 +433,7 @@ void PermissionPromptBubbleView::AcceptPermission() { +@@ -437,7 +437,7 @@ void PermissionPromptBubbleView::AcceptPermission() { void PermissionPromptBubbleView::AcceptPermissionThisTime() { RecordDecision(permissions::PermissionAction::GRANTED_ONCE); if (delegate_) diff --git a/build/patches/00Add-webGL-site-setting--add-fixup-.patch b/build/patches/00Add-webGL-site-setting--add-fixup-.patch index f251feeb..375a45e6 100644 --- a/build/patches/00Add-webGL-site-setting--add-fixup-.patch +++ b/build/patches/00Add-webGL-site-setting--add-fixup-.patch @@ -9,7 +9,7 @@ Subject: Add webGL site setting (add fixup) diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc --- a/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc -@@ -636,9 +636,9 @@ void ContentSettingsRegistry::Init() { +@@ -616,9 +616,9 @@ void ContentSettingsRegistry::Init() { Register(ContentSettingsType::WEBGL, "webgl", CONTENT_SETTING_BLOCK, WebsiteSettingsInfo::SYNCABLE, diff --git a/build/patches/00Add-webRTC-site-settings--add-fixup-.patch b/build/patches/00Add-webRTC-site-settings--add-fixup-.patch index 5eaf0733..4c477a9a 100644 --- a/build/patches/00Add-webRTC-site-settings--add-fixup-.patch +++ b/build/patches/00Add-webRTC-site-settings--add-fixup-.patch @@ -9,7 +9,7 @@ Subject: Add webRTC site settings (add fixup) diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc --- a/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc -@@ -650,9 +650,9 @@ void ContentSettingsRegistry::Init() { +@@ -630,9 +630,9 @@ void ContentSettingsRegistry::Init() { Register(ContentSettingsType::WEBRTC, "webrtc", CONTENT_SETTING_BLOCK, WebsiteSettingsInfo::SYNCABLE, diff --git a/build/patches/00Client-hints-overrides--add-fixup-.patch b/build/patches/00Client-hints-overrides--add-fixup-.patch index 6a45d488..441fcc49 100644 --- a/build/patches/00Client-hints-overrides--add-fixup-.patch +++ b/build/patches/00Client-hints-overrides--add-fixup-.patch @@ -9,7 +9,7 @@ Subject: Client hints overrides (add fixup) 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 -@@ -2832,8 +2832,8 @@ +@@ -2897,8 +2897,8 @@ public: true, }, { diff --git a/build/patches/00Content-settings-infrastructure--win-fixup-.patch b/build/patches/00Content-settings-infrastructure--win-fixup-.patch index 77c34c39..0665c4d3 100644 --- a/build/patches/00Content-settings-infrastructure--win-fixup-.patch +++ b/build/patches/00Content-settings-infrastructure--win-fixup-.patch @@ -9,7 +9,7 @@ Subject: Content settings infrastructure (win fixup) diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc --- a/components/content_settings/core/common/content_settings.cc +++ b/components/content_settings/core/common/content_settings.cc -@@ -133,6 +133,7 @@ ContentSetting IntToContentSetting(int content_setting) { +@@ -136,6 +136,7 @@ ContentSetting IntToContentSetting(int content_setting) { int ContentSettingTypeToHistogramValue(ContentSettingsType content_setting, size_t* num_values) { *num_values = std::size(kHistogramValue); diff --git a/build/patches/00Disable-Component-Updates.patch b/build/patches/00Disable-Component-Updates.patch index 5c8a0632..3c5f982a 100644 --- a/build/patches/00Disable-Component-Updates.patch +++ b/build/patches/00Disable-Component-Updates.patch @@ -22,7 +22,7 @@ diff --git a/chrome/browser/component_updater/registration.cc b/chrome/browser/c diff --git a/components/component_updater/component_installer.cc b/components/component_updater/component_installer.cc --- a/components/component_updater/component_installer.cc +++ b/components/component_updater/component_installer.cc -@@ -90,6 +90,7 @@ void ComponentInstaller::Register(RegisterCallback register_callback, +@@ -89,6 +89,7 @@ void ComponentInstaller::Register(RegisterCallback register_callback, base::OnceClosure callback, base::TaskPriority task_priority, const base::Version& registered_version) { @@ -33,7 +33,7 @@ diff --git a/components/component_updater/component_installer.cc b/components/co diff --git a/components/component_updater/component_updater_service.cc b/components/component_updater/component_updater_service.cc --- a/components/component_updater/component_updater_service.cc +++ b/components/component_updater/component_updater_service.cc -@@ -515,7 +515,7 @@ std::unique_ptr ComponentUpdateServiceFactory( +@@ -514,7 +514,7 @@ std::unique_ptr ComponentUpdateServiceFactory( // Register prefs required by the component update service. void RegisterComponentUpdateServicePrefs(PrefRegistrySimple* registry) { // The component updates are enabled by default, if the preference is not set. diff --git a/build/patches/00Disable-MathMLCore.patch b/build/patches/00Disable-MathMLCore.patch index 8da3fb32..ce7f8adb 100644 --- a/build/patches/00Disable-MathMLCore.patch +++ b/build/patches/00Disable-MathMLCore.patch @@ -9,7 +9,7 @@ Subject: Disable MathMLCore 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 -@@ -1684,9 +1684,10 @@ +@@ -1722,9 +1722,10 @@ }, { name: "MathMLCore", diff --git a/build/patches/00Disable-all-predictors-code--add-fixup-.patch b/build/patches/00Disable-all-predictors-code--add-fixup-.patch deleted file mode 100644 index 408fda5c..00000000 --- a/build/patches/00Disable-all-predictors-code--add-fixup-.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Your Name -Date: Thu, 5 Jan 2023 11:35:28 +0000 -Subject: Disable all predictors code (add fixup) - ---- - components/optimization_guide/core/BUILD.gn | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/components/optimization_guide/core/BUILD.gn b/components/optimization_guide/core/BUILD.gn ---- a/components/optimization_guide/core/BUILD.gn -+++ b/components/optimization_guide/core/BUILD.gn -@@ -77,12 +77,14 @@ static_library("model_executor") { - } - deps = [ - ":features", -- ":machine_learning", - "//base", - "//components/optimization_guide/proto:optimization_guide_proto", - "//net", - "//url", - ] -+ if (build_with_tflite_lib) { -+ deps += [ ":machine_learning", ] -+ } - } - - mojom("interfaces") { --- -2.25.1 diff --git a/build/patches/00Disable-conversion-measurement-api--add-fixup-.patch b/build/patches/00Disable-conversion-measurement-api--add-fixup-.patch index f87ae81e..ba7a82f8 100644 --- a/build/patches/00Disable-conversion-measurement-api--add-fixup-.patch +++ b/build/patches/00Disable-conversion-measurement-api--add-fixup-.patch @@ -10,7 +10,7 @@ Subject: Disable conversion measurement api (add fixup) diff --git a/content/browser/attribution_reporting/attribution_report_network_sender.cc b/content/browser/attribution_reporting/attribution_report_network_sender.cc --- a/content/browser/attribution_reporting/attribution_report_network_sender.cc +++ b/content/browser/attribution_reporting/attribution_report_network_sender.cc -@@ -76,6 +76,9 @@ void AttributionReportNetworkSender::SendReport(AttributionDebugReport report) { +@@ -80,6 +80,9 @@ void AttributionReportNetworkSender::SendReport( void AttributionReportNetworkSender::SendReport(GURL url, base::ValueView report_body, UrlLoaderCallback callback) { @@ -20,7 +20,7 @@ diff --git a/content/browser/attribution_reporting/attribution_report_network_se auto resource_request = std::make_unique(); resource_request->url = std::move(url); resource_request->method = net::HttpRequestHeaders::kPostMethod; -@@ -132,8 +135,9 @@ void AttributionReportNetworkSender::SendReport(GURL url, +@@ -140,8 +143,9 @@ void AttributionReportNetworkSender::SendReport(GURL url, network::SimpleURLLoader::RETRY_ON_NAME_NOT_RESOLVED; simple_url_loader_ptr->SetRetryOptions(/*max_retries=*/1, retry_mode); @@ -35,10 +35,10 @@ diff --git a/content/browser/attribution_reporting/attribution_report_network_se 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 -@@ -1823,7 +1823,7 @@ RenderThreadImpl::GetOsSupportForAttributionReporting() { +@@ -1835,7 +1835,7 @@ RenderThreadImpl::GetOsSupportForAttributionReporting() { void RenderThreadImpl::SetOsSupportForAttributionReporting( - blink::mojom::AttributionOsSupport attribution_os_support) { + attribution_reporting::mojom::OsSupport attribution_os_support) { - attribution_os_support_ = attribution_os_support; + attribution_os_support_ = blink::mojom::AttributionOsSupport::kDisabled; } diff --git a/build/patches/00Disable-fetching-of-all-field-trials--add-fixup-.patch b/build/patches/00Disable-fetching-of-all-field-trials--add-fixup-.patch index 2ba2b5fd..463d492b 100644 --- a/build/patches/00Disable-fetching-of-all-field-trials--add-fixup-.patch +++ b/build/patches/00Disable-fetching-of-all-field-trials--add-fixup-.patch @@ -14,7 +14,7 @@ Subject: Disable fetching of all field trials (add fixup) 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 -@@ -704,7 +704,6 @@ void SystemNetworkContextManager::AddSSLConfigToNetworkContextParams( +@@ -707,7 +707,6 @@ void SystemNetworkContextManager::AddSSLConfigToNetworkContextParams( void SystemNetworkContextManager::ConfigureDefaultNetworkContextParams( network::mojom::NetworkContextParams* network_context_params) { @@ -61,7 +61,7 @@ diff --git a/content/browser/origin_trials/origin_trials_utils.cc b/content/brow 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 -@@ -776,8 +776,8 @@ BASE_FEATURE(kPepperCrossOriginRedirectRestriction, +@@ -784,8 +784,8 @@ BASE_FEATURE(kPepperCrossOriginRedirectRestriction, // things before receiving the response, for instance it can affect the next // navigation's network request. BASE_FEATURE(kPersistentOriginTrials, @@ -70,8 +70,8 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c + "PersistentOriginTrials", // always disabled + base::FEATURE_DISABLED_BY_DEFAULT); // in bromite - // A browser-side equivalent of the Blink feature "DocumentPictureInPictureAPI". - // This is used for sanity checks to ensure that the feature can't be enabled by + // Enables process sharing for sites that do not require a dedicated process + // by using a default SiteInstance. Default SiteInstances will only be used diff --git a/content/renderer/variations_render_thread_observer.cc b/content/renderer/variations_render_thread_observer.cc --- a/content/renderer/variations_render_thread_observer.cc +++ b/content/renderer/variations_render_thread_observer.cc diff --git a/build/patches/00Do-not-build-API-keys-infobar--win-fixup-.patch b/build/patches/00Do-not-build-API-keys-infobar--win-fixup-.patch index f9bd2787..63f3b01b 100644 --- a/build/patches/00Do-not-build-API-keys-infobar--win-fixup-.patch +++ b/build/patches/00Do-not-build-API-keys-infobar--win-fixup-.patch @@ -9,9 +9,9 @@ Subject: Do not build API keys infobar (win fixup) diff --git a/chrome/browser/ui/startup/infobar_utils.cc b/chrome/browser/ui/startup/infobar_utils.cc --- a/chrome/browser/ui/startup/infobar_utils.cc +++ b/chrome/browser/ui/startup/infobar_utils.cc -@@ -113,9 +113,6 @@ void AddInfoBarsIfNecessary(Browser* browser, - infobars::ContentInfoBarManager* infobar_manager = - infobars::ContentInfoBarManager::FromWebContents(web_contents); +@@ -125,9 +125,6 @@ void AddInfoBarsIfNecessary(Browser* browser, + if (show_bad_flags_security_warnings) + chrome::ShowBadFlagsPrompt(web_contents); - if (!google_apis::HasAPIKeyConfigured()) - GoogleApiKeysInfoBarDelegate::Create(infobar_manager); diff --git a/build/patches/00Enable-native-Android-autofill--win-fixup-.patch b/build/patches/00Enable-native-Android-autofill--win-fixup-.patch index c502832a..33e7b697 100644 --- a/build/patches/00Enable-native-Android-autofill--win-fixup-.patch +++ b/build/patches/00Enable-native-Android-autofill--win-fixup-.patch @@ -11,7 +11,7 @@ Subject: Enable native Android autofill (win fixup) diff --git a/chrome/browser/extensions/extension_view_host.cc b/chrome/browser/extensions/extension_view_host.cc --- a/chrome/browser/extensions/extension_view_host.cc +++ b/chrome/browser/extensions/extension_view_host.cc -@@ -58,7 +58,8 @@ ExtensionViewHost::ExtensionViewHost(const Extension* extension, +@@ -59,7 +59,8 @@ ExtensionViewHost::ExtensionViewHost(const Extension* extension, base::BindRepeating( &autofill::BrowserDriverInitHook, autofill::ChromeAutofillClient::FromWebContents(host_contents()), diff --git a/build/patches/00Experimental-user-scripts-support--win-fixup-.patch b/build/patches/00Experimental-user-scripts-support--win-fixup-.patch index 5efb444d..e5b1752c 100644 --- a/build/patches/00Experimental-user-scripts-support--win-fixup-.patch +++ b/build/patches/00Experimental-user-scripts-support--win-fixup-.patch @@ -20,7 +20,7 @@ Subject: Experimental user scripts support (win fixup) diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -3495,11 +3495,13 @@ static_library("browser") { +@@ -3470,11 +3470,13 @@ static_library("browser") { ] deps += [ "//chrome/android/modules/dev_ui/provider:native" ] } @@ -42,8 +42,8 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -7901,9 +7901,11 @@ const FeatureEntry kFeatureEntries[] = { - chromeos::features::kClipboardHistoryNudgeSessionReset)}, +@@ -7488,9 +7488,11 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(ash::features::kClipboardHistoryNudgeSessionReset)}, #endif // BUILDFLAG(IS_CHROMEOS_ASH) +#if BUILDFLAG(IS_ANDROID) @@ -57,7 +57,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -1372,7 +1372,9 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -1408,7 +1408,9 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, translate::TranslatePrefs::RegisterProfilePrefs(registry); omnibox::RegisterProfilePrefs(registry); ZeroSuggestProvider::RegisterProfilePrefs(registry); @@ -70,7 +70,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse diff --git a/chrome/browser/profiles/BUILD.gn b/chrome/browser/profiles/BUILD.gn --- a/chrome/browser/profiles/BUILD.gn +++ b/chrome/browser/profiles/BUILD.gn -@@ -50,10 +50,12 @@ source_set("profile") { +@@ -57,10 +57,12 @@ source_set("profile") { "//components/profile_metrics", "//components/sync/driver", "//components/variations", @@ -87,7 +87,7 @@ diff --git a/chrome/browser/profiles/BUILD.gn b/chrome/browser/profiles/BUILD.gn diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -275,7 +275,9 @@ +@@ -274,7 +274,9 @@ #include "chrome/browser/enterprise/idle/idle_service_factory.h" #endif @@ -97,7 +97,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc namespace chrome { -@@ -646,7 +648,9 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -642,7 +644,9 @@ void ChromeBrowserMainExtraPartsProfiles:: #endif WebDataServiceFactory::GetInstance(); webrtc_event_logging::WebRtcEventLogManagerKeyedServiceFactory::GetInstance(); @@ -110,7 +110,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc -@@ -116,7 +116,9 @@ +@@ -104,7 +104,9 @@ #include "extensions/common/manifest.h" #endif @@ -120,7 +120,7 @@ diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profile #if BUILDFLAG(ENABLE_SESSION_SERVICE) #include "chrome/browser/sessions/app_session_service_factory.h" -@@ -1724,11 +1726,13 @@ void ProfileManager::DoFinalInitForServices(Profile* profile, +@@ -1437,11 +1439,13 @@ void ProfileManager::DoFinalInitForServices(Profile* profile, #endif @@ -160,7 +160,7 @@ diff --git a/chrome/browser/profiles/renderer_updater.cc b/chrome/browser/profil } RendererUpdater::~RendererUpdater() { -@@ -196,5 +200,10 @@ chrome::mojom::DynamicParamsPtr RendererUpdater::CreateRendererDynamicParams() +@@ -193,5 +197,10 @@ chrome::mojom::DynamicParamsPtr RendererUpdater::CreateRendererDynamicParams() return chrome::mojom::DynamicParams::New( force_google_safesearch_.GetValue(), force_youtube_restrict_.GetValue(), allowed_domains_for_apps_.GetValue(), @@ -188,7 +188,7 @@ diff --git a/chrome/browser/profiles/renderer_updater.h b/chrome/browser/profile diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -841,8 +841,10 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, +@@ -844,8 +844,10 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, return &NewWebUI; if (url.host_piece() == chrome::kChromeUIVersionHost) return &NewWebUI; @@ -202,7 +202,7 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrom diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn --- a/chrome/renderer/BUILD.gn +++ b/chrome/renderer/BUILD.gn -@@ -141,7 +141,6 @@ static_library("renderer") { +@@ -140,7 +140,6 @@ static_library("renderer") { "//components/content_capture/common", "//components/content_capture/renderer", "//components/content_settings/common:mojom", @@ -210,7 +210,7 @@ diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn "//components/content_settings/renderer", "//components/continuous_search/renderer", "//components/dom_distiller/content/renderer", -@@ -217,6 +216,12 @@ static_library("renderer") { +@@ -215,6 +214,12 @@ static_library("renderer") { "//v8", ] @@ -251,7 +251,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer #if BUILDFLAG(ENABLE_SPELLCHECK) if (!spellcheck_) -@@ -595,12 +599,14 @@ void ChromeContentRendererClient::RenderFrameCreated( +@@ -599,12 +603,14 @@ void ChromeContentRendererClient::RenderFrameCreated( render_frame, registry); #endif @@ -266,7 +266,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer #if BUILDFLAG(ENABLE_PPAPI) new PepperHelper(render_frame); -@@ -1571,6 +1577,9 @@ void ChromeContentRendererClient::RunScriptsAtDocumentStart( +@@ -1602,6 +1608,9 @@ void ChromeContentRendererClient::RunScriptsAtDocumentStart( ChromeExtensionsRendererClient::GetInstance()->RunScriptsAtDocumentStart( render_frame); // |render_frame| might be dead by now. @@ -276,7 +276,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer static_assert(false, "Compiler error: extensions cannot be enabled with user scripts"); #endif user_scripts::UserScriptsRendererClient* userscript_client = -@@ -1579,6 +1588,7 @@ void ChromeContentRendererClient::RunScriptsAtDocumentStart( +@@ -1610,6 +1619,7 @@ void ChromeContentRendererClient::RunScriptsAtDocumentStart( userscript_client->RunScriptsAtDocumentStart( render_frame); } @@ -284,7 +284,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer } void ChromeContentRendererClient::RunScriptsAtDocumentEnd( -@@ -1587,6 +1597,9 @@ void ChromeContentRendererClient::RunScriptsAtDocumentEnd( +@@ -1618,6 +1628,9 @@ void ChromeContentRendererClient::RunScriptsAtDocumentEnd( ChromeExtensionsRendererClient::GetInstance()->RunScriptsAtDocumentEnd( render_frame); // |render_frame| might be dead by now. @@ -294,7 +294,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer static_assert(false, "Compiler error: extensions cannot be enabled with user scripts"); #endif user_scripts::UserScriptsRendererClient* userscript_client = -@@ -1595,6 +1608,7 @@ void ChromeContentRendererClient::RunScriptsAtDocumentEnd( +@@ -1626,6 +1639,7 @@ void ChromeContentRendererClient::RunScriptsAtDocumentEnd( userscript_client->RunScriptsAtDocumentEnd( render_frame); } @@ -302,7 +302,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer } void ChromeContentRendererClient::RunScriptsAtDocumentIdle( -@@ -1603,6 +1617,9 @@ void ChromeContentRendererClient::RunScriptsAtDocumentIdle( +@@ -1634,6 +1648,9 @@ void ChromeContentRendererClient::RunScriptsAtDocumentIdle( ChromeExtensionsRendererClient::GetInstance()->RunScriptsAtDocumentIdle( render_frame); // |render_frame| might be dead by now. @@ -312,7 +312,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer static_assert(false, "Compiler error: extensions cannot be enabled with user scripts"); #endif user_scripts::UserScriptsRendererClient* userscript_client = -@@ -1611,6 +1628,7 @@ void ChromeContentRendererClient::RunScriptsAtDocumentIdle( +@@ -1642,6 +1659,7 @@ void ChromeContentRendererClient::RunScriptsAtDocumentIdle( userscript_client->RunScriptsAtDocumentIdle( render_frame); } @@ -323,7 +323,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer diff --git a/chrome/renderer/chrome_render_thread_observer.cc b/chrome/renderer/chrome_render_thread_observer.cc --- a/chrome/renderer/chrome_render_thread_observer.cc +++ b/chrome/renderer/chrome_render_thread_observer.cc -@@ -262,7 +262,9 @@ void ChromeRenderThreadObserver::SetInitialConfiguration( +@@ -220,7 +220,9 @@ void ChromeRenderThreadObserver::SetInitialConfiguration( void ChromeRenderThreadObserver::SetConfiguration( chrome::mojom::DynamicParamsPtr params) { *GetDynamicConfigParams() = std::move(*params); diff --git a/build/patches/00Eyeo-Adblock--win-fixup-.patch b/build/patches/00Eyeo-Adblock--win-fixup-.patch new file mode 100644 index 00000000..232b365c --- /dev/null +++ b/build/patches/00Eyeo-Adblock--win-fixup-.patch @@ -0,0 +1,37 @@ +From: Your Name +Date: Thu, 13 Oct 2022 10:24:51 +0000 +Subject: Eyeo Adblock (win fixup) + +--- + .../browser/resources/settings/adblock_page/adblock_page.ts | 2 +- + chrome/test/BUILD.gn | 4 ---- + 2 files changed, 1 insertion(+), 5 deletions(-) + +diff --git a/chrome/browser/resources/settings/adblock_page/adblock_page.ts b/chrome/browser/resources/settings/adblock_page/adblock_page.ts +--- a/chrome/browser/resources/settings/adblock_page/adblock_page.ts ++++ b/chrome/browser/resources/settings/adblock_page/adblock_page.ts +@@ -15,7 +15,7 @@ + * along with eyeo Chromium SDK. If not, see . + */ + import 'chrome://resources/cr_elements/cr_button/cr_button.js'; +-import 'chrome://resources/cr_elements/cr_shared_style.css.js'; ++//import 'chrome://resources/cr_elements/cr_shared_style.css.js'; + import 'chrome://resources/polymer/v3_0/iron-collapse/iron-collapse.js'; + import 'chrome://resources/polymer/v3_0/iron-flex-layout/iron-flex-layout-classes.js'; + import 'chrome://resources/polymer/v3_0/iron-icon/iron-icon.js'; +diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn +--- a/chrome/test/BUILD.gn ++++ b/chrome/test/BUILD.gn +@@ -2401,10 +2401,6 @@ if (!is_android) { + "v8/wasm_trap_handler_browsertest.cc", + ] + +- if (eyeo_intercept_debug_url) { +- sources += [ "../browser/adblock/adblock_debug_url_browsertest.cc" ] +- } +- + if (is_chrome_branded) { + sources += [ "../browser/ui/views/side_panel/lens/lens_side_panel_coordinator_browsertest.cc" ] + } +-- +2.25.1 diff --git a/build/patches/00Fix-windows-build.patch b/build/patches/00Fix-windows-build.patch index e5730529..e7286dec 100644 --- a/build/patches/00Fix-windows-build.patch +++ b/build/patches/00Fix-windows-build.patch @@ -44,7 +44,7 @@ diff --git a/chrome/browser/devtools/devtools_window.cc b/chrome/browser/devtool diff --git a/chrome/browser/ui/profile_picker.cc b/chrome/browser/ui/profile_picker.cc --- a/chrome/browser/ui/profile_picker.cc +++ b/chrome/browser/ui/profile_picker.cc -@@ -104,7 +104,7 @@ ProfilePicker::Params ProfilePicker::Params::ForFirstRun( +@@ -103,7 +103,7 @@ ProfilePicker::Params ProfilePicker::Params::ForFirstRun( #endif Params params( @@ -56,7 +56,7 @@ diff --git a/chrome/browser/ui/profile_picker.cc b/chrome/browser/ui/profile_pic diff --git a/chrome/browser/ui/startup/first_run_service.cc b/chrome/browser/ui/startup/first_run_service.cc --- a/chrome/browser/ui/startup/first_run_service.cc +++ b/chrome/browser/ui/startup/first_run_service.cc -@@ -76,8 +76,6 @@ bool IsSyncRequired(Profile* profile) { +@@ -80,8 +80,6 @@ bool IsSyncRequired(Profile* profile) { #endif void SetFirstRunFinished() { @@ -65,7 +65,7 @@ diff --git a/chrome/browser/ui/startup/first_run_service.cc b/chrome/browser/ui/ } // Processes the outcome from the FRE and resumes the user's interrupted task. -@@ -114,7 +112,6 @@ void OnFirstRunHasExited(ResumeTaskCallback original_intent_callback, +@@ -110,7 +108,6 @@ void OnFirstRunHasExited(ResumeTaskCallback original_intent_callback, // static void FirstRunService::RegisterLocalStatePrefs(PrefRegistrySimple* registry) { @@ -73,7 +73,7 @@ diff --git a/chrome/browser/ui/startup/first_run_service.cc b/chrome/browser/ui/ } FirstRunService::FirstRunService(Profile* profile) : profile_(profile) {} -@@ -128,8 +125,7 @@ bool FirstRunService::ShouldOpenFirstRun() const { +@@ -137,8 +134,7 @@ bool FirstRunService::ShouldOpenFirstRun() const { if (command_line->HasSwitch(switches::kNoFirstRun)) return false; diff --git a/build/patches/00Guard-for-user-agent-reduction--add-fixup-.patch b/build/patches/00Guard-for-user-agent-reduction--add-fixup-.patch index da4086c6..9778b736 100644 --- a/build/patches/00Guard-for-user-agent-reduction--add-fixup-.patch +++ b/build/patches/00Guard-for-user-agent-reduction--add-fixup-.patch @@ -11,7 +11,7 @@ Subject: Guard for user-agent reduction (add fixup) 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 -@@ -1554,7 +1554,7 @@ void ChromeContentBrowserClient::RegisterProfilePrefs( +@@ -1588,7 +1588,7 @@ void ChromeContentBrowserClient::RegisterProfilePrefs( registry->RegisterIntegerPref( prefs::kUserAgentReduction, static_cast( @@ -53,7 +53,7 @@ diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -2837,7 +2837,8 @@ +@@ -2902,7 +2902,8 @@ base_feature: "UserAgentClientHint", }, { diff --git a/build/patches/00Move-navigation-bar-to-bottom--add-fixup-.patch b/build/patches/00Move-navigation-bar-to-bottom--add-fixup-.patch index a40b4e70..62e82dde 100644 --- a/build/patches/00Move-navigation-bar-to-bottom--add-fixup-.patch +++ b/build/patches/00Move-navigation-bar-to-bottom--add-fixup-.patch @@ -140,7 +140,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediator.java --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediator.java +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediator.java -@@ -764,6 +764,9 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView +@@ -777,6 +777,9 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView private void setInitialScrollIndexOffset() { int offset = mMode == TabListMode.CAROUSEL ? INITIAL_SCROLL_INDEX_OFFSET_CAROUSEL : INITIAL_SCROLL_INDEX_OFFSET_GTS; diff --git a/build/patches/00Partitioning-all-cookies-by-top-frame-domain.patch b/build/patches/00Partitioning-all-cookies-by-top-frame-domain.patch index 78295d72..07c1826b 100644 --- a/build/patches/00Partitioning-all-cookies-by-top-frame-domain.patch +++ b/build/patches/00Partitioning-all-cookies-by-top-frame-domain.patch @@ -49,7 +49,7 @@ diff --git a/content/browser/browsing_data/same_site_data_remover_impl.cc b/cont diff --git a/net/base/features.cc b/net/base/features.cc --- a/net/base/features.cc +++ b/net/base/features.cc -@@ -282,16 +282,16 @@ BASE_FEATURE(kCookieSameSiteConsidersRedirectChain, +@@ -255,16 +255,16 @@ BASE_FEATURE(kCookieSameSiteConsidersRedirectChain, base::FEATURE_DISABLED_BY_DEFAULT); BASE_FEATURE(kSamePartyCookiesConsideredFirstParty, @@ -72,7 +72,7 @@ diff --git a/net/base/features.cc b/net/base/features.cc BASE_FEATURE(kNoncedPartitionedCookies, "NoncedPartitionedCookies", -@@ -314,8 +314,8 @@ BASE_FEATURE(kStaticKeyPinningEnforcement, +@@ -283,8 +283,8 @@ BASE_FEATURE(kStaticKeyPinningEnforcement, base::FEATURE_ENABLED_BY_DEFAULT); BASE_FEATURE(kCookieDomainRejectNonASCII, @@ -86,7 +86,7 @@ diff --git a/net/base/features.cc b/net/base/features.cc diff --git a/net/cookies/canonical_cookie.cc b/net/cookies/canonical_cookie.cc --- a/net/cookies/canonical_cookie.cc +++ b/net/cookies/canonical_cookie.cc -@@ -1485,8 +1485,6 @@ bool CanonicalCookie::IsCanonicalForFromStorage() const { +@@ -1465,8 +1465,6 @@ bool CanonicalCookie::IsCanonicalForFromStorage() const { if (IsPartitioned()) { if (CookiePartitionKey::HasNonce(partition_key_)) return true; @@ -95,7 +95,7 @@ diff --git a/net/cookies/canonical_cookie.cc b/net/cookies/canonical_cookie.cc } return true; -@@ -1733,7 +1731,7 @@ bool CanonicalCookie::IsCookiePartitionedValid(const GURL& url, +@@ -1713,7 +1711,7 @@ bool CanonicalCookie::IsCookiePartitionedValid(const GURL& url, return true; if (partition_has_nonce) return true; @@ -128,7 +128,7 @@ diff --git a/net/cookies/parsed_cookie.h b/net/cookies/parsed_cookie.h #include "net/base/net_export.h" #include "net/cookies/cookie_constants.h" -@@ -88,7 +89,11 @@ class NET_EXPORT ParsedCookie { +@@ -83,7 +84,11 @@ class NET_EXPORT ParsedCookie { CookieSameSiteString* samesite_string = nullptr) const; CookiePriority Priority() const; bool IsSameParty() const { return same_party_index_ != 0; } @@ -144,7 +144,7 @@ diff --git a/net/cookies/parsed_cookie.h b/net/cookies/parsed_cookie.h diff --git a/net/extras/sqlite/sqlite_persistent_cookie_store.cc b/net/extras/sqlite/sqlite_persistent_cookie_store.cc --- a/net/extras/sqlite/sqlite_persistent_cookie_store.cc +++ b/net/extras/sqlite/sqlite_persistent_cookie_store.cc -@@ -872,6 +872,16 @@ bool SQLitePersistentCookieStore::Backend::DoInitializeDatabase() { +@@ -861,6 +861,16 @@ bool SQLitePersistentCookieStore::Backend::DoInitializeDatabase() { if (!restore_old_session_cookies_) DeleteSessionCookiesOnStartup(); @@ -164,7 +164,7 @@ diff --git a/net/extras/sqlite/sqlite_persistent_cookie_store.cc b/net/extras/sq diff --git a/services/network/cookie_settings.cc b/services/network/cookie_settings.cc --- a/services/network/cookie_settings.cc +++ b/services/network/cookie_settings.cc -@@ -34,6 +34,11 @@ bool IsExplicitSetting(const ContentSettingPatternSource& setting) { +@@ -35,6 +35,11 @@ bool IsExplicitSetting(const ContentSettingPatternSource& setting) { !setting.secondary_pattern.MatchesAllHosts(); } @@ -176,7 +176,7 @@ diff --git a/services/network/cookie_settings.cc b/services/network/cookie_setti const ContentSettingPatternSource* FindMatchingSetting( const GURL& primary_url, const GURL& secondary_url, -@@ -222,11 +227,14 @@ bool CookieSettings::BlockDueToThirdPartyCookieBlockingSetting( +@@ -192,11 +197,14 @@ net::NetworkDelegate::PrivacySetting CookieSettings::IsPrivacyModeEnabled( CookieSettings::ThirdPartyBlockingOutcome CookieSettings::GetThirdPartyBlockingScope(const GURL& first_party_url) const { @@ -196,9 +196,9 @@ diff --git a/services/network/cookie_settings.cc b/services/network/cookie_setti diff --git a/services/network/restricted_cookie_manager.cc b/services/network/restricted_cookie_manager.cc --- a/services/network/restricted_cookie_manager.cc +++ b/services/network/restricted_cookie_manager.cc -@@ -762,6 +762,9 @@ void RestrictedCookieManager::SetCookieFromString( - callback = base::DoNothing(); - } +@@ -734,6 +734,9 @@ void RestrictedCookieManager::SetCookieFromString( + std::move(callback).Run(site_for_cookies_ok, top_frame_origin_ok); + callback = base::DoNothing(); + // https://bugs.chromium.org/p/chromium/issues/detail?id=911299 + if (!site_for_cookies_ok || !top_frame_origin_ok) return; diff --git a/build/patches/00Remove-HTTP-referrals-in-cross-origin-navi--fixup-.patch b/build/patches/00Remove-HTTP-referrals-in-cross-origin-navi--fixup-.patch index 8e450f63..976c888b 100644 --- a/build/patches/00Remove-HTTP-referrals-in-cross-origin-navi--fixup-.patch +++ b/build/patches/00Remove-HTTP-referrals-in-cross-origin-navi--fixup-.patch @@ -29,10 +29,10 @@ Subject: Remove HTTP referrals in cross origin navi (fixup) 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 -@@ -656,6 +656,8 @@ chrome_java_resources = [ - "java/res/xml/phone_as_a_security_key_accessory_filter.xml", +@@ -661,6 +661,8 @@ chrome_java_resources = [ "java/res/xml/incognito_preferences.xml", "java/res/xml/privacy_preferences.xml", + "java/res/xml/privacy_preferences_v2.xml", + "java/res/xml/referer_policy_preferences.xml", + "java/res/layout/radio_button_group_referer_policy_preference.xml", "java/res/xml/search_widget_info.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 -@@ -916,6 +916,8 @@ chrome_java_sources = [ +@@ -908,6 +908,8 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/privacy/settings/PrivacyPreferencesManagerImpl.java", "java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java", "java/src/org/chromium/chrome/browser/privacy/settings/IncognitoSettings.java", @@ -105,7 +105,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 -@@ -60,10 +60,10 @@ found in the LICENSE file. +@@ -61,10 +61,10 @@ found in the LICENSE file. android:title="@string/close_tabs_on_exit_title" android:summary="@string/close_tabs_on_exit_summary" android:defaultValue="false" /> @@ -159,15 +159,15 @@ new file mode 100644 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 -@@ -24,6 +24,7 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList; +@@ -28,6 +28,7 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.incognito.reauth.IncognitoReauthSettingSwitchPreference; import org.chromium.chrome.browser.preferences.Pref; import org.chromium.chrome.browser.prefetch.settings.PreloadPagesSettingsFragment; +import org.chromium.chrome.browser.privacy.settings.RefererSettingsFragment; import org.chromium.chrome.browser.privacy.secure_dns.SecureDnsSettings; + import org.chromium.chrome.browser.privacy_guide.PrivacyGuideInteractions; import org.chromium.chrome.browser.privacy_sandbox.PrivacySandboxBridge; - import org.chromium.chrome.browser.privacy_sandbox.PrivacySandboxReferrer; -@@ -61,7 +62,7 @@ public class PrivacySettings +@@ -67,7 +68,7 @@ public class PrivacySettings private static final String PREF_HTTPS_FIRST_MODE = "https_first_mode"; private static final String PREF_SECURE_DNS = "secure_dns"; private static final String PREF_DO_NOT_TRACK = "do_not_track"; @@ -176,7 +176,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data"; private static final String PREF_PRIVACY_GUIDE = "privacy_guide"; private static final String PREF_INCOGNITO_LOCK = "incognito_lock"; -@@ -175,9 +176,6 @@ public class PrivacySettings +@@ -203,9 +204,6 @@ public class PrivacySettings } else if (PREF_CAN_MAKE_PAYMENT.equals(key)) { UserPrefs.get(Profile.getLastUsedRegularProfile()) .setBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue); @@ -186,7 +186,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting } else if (PREF_HTTPS_FIRST_MODE.equals(key)) { UserPrefs.get(Profile.getLastUsedRegularProfile()) .setBoolean(Pref.HTTPS_ONLY_MODE_ENABLED, (boolean) newValue); -@@ -231,9 +229,9 @@ public class PrivacySettings +@@ -259,9 +257,9 @@ public class PrivacySettings : R.string.text_off); } @@ -380,7 +380,7 @@ new file mode 100644 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 -@@ -480,6 +480,9 @@ SystemNetworkContextManager::SystemNetworkContextManager( +@@ -483,6 +483,9 @@ SystemNetworkContextManager::SystemNetworkContextManager( base::BindRepeating(&SystemNetworkContextManager::UpdateReferrersEnabled, base::Unretained(this))); @@ -390,7 +390,7 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows pref_change_registrar_.Add( prefs::kExplicitlyAllowedNetworkPorts, base::BindRepeating( -@@ -546,6 +549,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) { +@@ -549,6 +552,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) { // the system NetworkContext, and the per-profile pref values are used for // the profile NetworkContexts. registry->RegisterBooleanPref(prefs::kEnableReferrers, true); @@ -412,7 +412,7 @@ diff --git a/chrome/browser/renderer_preferences_util.cc b/chrome/browser/render 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 -@@ -882,8 +882,29 @@ CHAR_LIMIT guidelines: +@@ -894,8 +894,29 @@ CHAR_LIMIT guidelines: For example, some websites may respond to this request by showing you ads that aren’t based on other websites you’ve visited. Many websites will still collect and use your browsing data — for example to improve security, to provide content, ads and recommendations, and to generate reporting statistics. @@ -495,7 +495,7 @@ diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -433,8 +433,9 @@ void AddAdditionalRequestHeaders( +@@ -444,8 +444,9 @@ void AddAdditionalRequestHeaders( blink::mojom::Referrer(GURL(), network::mojom::ReferrerPolicy::kNever); } diff --git a/build/patches/00Remove-binary-blob-integrations--add-fixup-.patch b/build/patches/00Remove-binary-blob-integrations--add-fixup-.patch index 5d3289c8..d89a3ae9 100644 --- a/build/patches/00Remove-binary-blob-integrations--add-fixup-.patch +++ b/build/patches/00Remove-binary-blob-integrations--add-fixup-.patch @@ -11,7 +11,7 @@ Subject: Remove binary blob integrations (add fixup) 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 -@@ -751,6 +751,8 @@ by a child template that "extends" this file. +@@ -743,6 +743,8 @@ by a child template that "extends" this file. android:theme="@style/Theme.BrowserUI.Translucent.NoTitleBar" android:excludeFromRecents="true" android:process=":browser_restart_process"> diff --git a/build/patches/00Remove-experimental-relative-c---abi-vtables.patch b/build/patches/00Remove-experimental-relative-c---abi-vtables.patch index 443cbe75..348614f0 100644 --- a/build/patches/00Remove-experimental-relative-c---abi-vtables.patch +++ b/build/patches/00Remove-experimental-relative-c---abi-vtables.patch @@ -3,25 +3,23 @@ Date: Mon, 30 Jan 2023 15:20:53 +0000 Subject: Remove experimental-relative-c++-abi-vtables --- - build/config/android/BUILD.gn | 7 ------- - 1 file changed, 7 deletions(-) + build/config/compiler/BUILD.gn | 5 ----- + 1 file changed, 5 deletions(-) -diff --git a/build/config/android/BUILD.gn b/build/config/android/BUILD.gn ---- a/build/config/android/BUILD.gn -+++ b/build/config/android/BUILD.gn -@@ -45,13 +45,6 @@ config("compiler") { - # by shrinking the alignment gap between segments. This also causes all - # segments to be mapped adjacently, which breakpad relies on. - ldflags += [ "-Wl,-z,max-page-size=4096" ] -- -- # Use non-standard (non-Itanium) ABI for Android64. This shrinks vtables -- # in half and places them to .rodata, which greatly improves memory -- # footprint. It should be safe, assuming all of C++ in Chromium is -- # compiled with this flag. -- cflags_cc = [ "-fexperimental-relative-c++-abi-vtables" ] -- ldflags += [ "-fexperimental-relative-c++-abi-vtables" ] +diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn +--- a/build/config/compiler/BUILD.gn ++++ b/build/config/compiler/BUILD.gn +@@ -644,11 +644,6 @@ config("compiler") { + cflags_cc += [ "-Wno-trigraphs" ] } - if (current_cpu == "arm64") { +- if (use_relative_vtables_abi) { +- cflags_cc += [ "-fexperimental-relative-c++-abi-vtables" ] +- ldflags += [ "-fexperimental-relative-c++-abi-vtables" ] +- } +- + # Add flags for link-time optimization. These flags enable + # optimizations/transformations that require whole-program visibility at link + # time, so they need to be applied to all translation units, and we may end up -- 2.25.1 diff --git a/build/patches/00Remove-price-shopping-commerce-integra--add-fixup-.patch b/build/patches/00Remove-price-shopping-commerce-integra--add-fixup-.patch index 1da8fa72..6b211373 100644 --- a/build/patches/00Remove-price-shopping-commerce-integra--add-fixup-.patch +++ b/build/patches/00Remove-price-shopping-commerce-integra--add-fixup-.patch @@ -12,7 +12,7 @@ Subject: Remove price/shopping/commerce integra (add fixup) 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 -@@ -2395,10 +2395,6 @@ public abstract class ChromeActivity +@@ -2369,10 +2369,6 @@ public abstract class ChromeActivity } if (id == R.id.disable_price_tracking_menu_id) { @@ -90,7 +90,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm diff --git a/components/commerce/core/commerce_feature_list.cc b/components/commerce/core/commerce_feature_list.cc --- a/components/commerce/core/commerce_feature_list.cc +++ b/components/commerce/core/commerce_feature_list.cc -@@ -98,8 +98,8 @@ BASE_FEATURE(kCommerceMerchantViewer, +@@ -119,8 +119,8 @@ BASE_FEATURE(kCommerceMerchantViewer, base::FEATURE_DISABLED_BY_DEFAULT); BASE_FEATURE(kCommercePriceTracking, diff --git a/build/patches/00Remove-signin-and-sync-integrations--add-fixup-.patch b/build/patches/00Remove-signin-and-sync-integrations--add-fixup-.patch index 28357065..19f973ca 100644 --- a/build/patches/00Remove-signin-and-sync-integrations--add-fixup-.patch +++ b/build/patches/00Remove-signin-and-sync-integrations--add-fixup-.patch @@ -10,7 +10,7 @@ Subject: Remove signin and sync integrations (add fixup) diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -276,6 +276,7 @@ if (current_toolchain == default_toolchain) { +@@ -273,6 +273,7 @@ if (current_toolchain == default_toolchain) { "//chrome/browser/ui/android/management:java_resources", "//chrome/browser/ui/android/omnibox:java_resources", "//chrome/browser/ui/android/quickactionsearchwidget:java_resources", diff --git a/build/patches/00Remove-signin-and-sync-integrations--win-fixup-.patch b/build/patches/00Remove-signin-and-sync-integrations--win-fixup-.patch index 132376f5..df65980e 100644 --- a/build/patches/00Remove-signin-and-sync-integrations--win-fixup-.patch +++ b/build/patches/00Remove-signin-and-sync-integrations--win-fixup-.patch @@ -24,7 +24,7 @@ Subject: Remove signin and sync integrations (win fixup) diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -4239,8 +4239,6 @@ static_library("browser") { +@@ -4185,8 +4185,6 @@ static_library("browser") { "sharing_hub/sharing_hub_service_factory.h", "signin/signin_promo.cc", "signin/signin_promo.h", @@ -33,7 +33,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "signin/signin_ui_util.cc", "signin/signin_ui_util.h", "speech/chrome_speech_recognition_service.cc", -@@ -6979,12 +6977,6 @@ static_library("browser") { +@@ -6983,12 +6981,6 @@ static_library("browser") { "signin/signin_ui_delegate_impl_dice.cc", "signin/signin_ui_delegate_impl_dice.h", ] @@ -45,7 +45,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn - } } - if (enable_media_remoting) { + if (enable_bound_session_credentials) { diff --git a/chrome/browser/signin/identity_manager_factory.cc b/chrome/browser/signin/identity_manager_factory.cc --- a/chrome/browser/signin/identity_manager_factory.cc +++ b/chrome/browser/signin/identity_manager_factory.cc @@ -179,7 +179,7 @@ diff --git a/chrome/browser/signin/signin_ui_util.cc b/chrome/browser/signin/sig 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 -@@ -3608,12 +3608,6 @@ static_library("ui") { +@@ -3617,12 +3617,6 @@ static_library("ui") { "webui/signin/signin_ui_error.h", "webui/signin/signin_utils_desktop.cc", "webui/signin/signin_utils_desktop.h", @@ -195,7 +195,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc -@@ -368,7 +368,6 @@ StartupBrowserCreatorImpl::DetermineURLsAndLaunch( +@@ -383,7 +383,6 @@ StartupBrowserCreatorImpl::DetermineURLsAndLaunch( IncompatibleApplicationsUpdater::HasCachedApplications(); } #endif @@ -203,7 +203,7 @@ diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/ #endif // Presentation of promotional and/or educational tabs may be controlled via -@@ -396,8 +395,7 @@ StartupBrowserCreatorImpl::DetermineURLsAndLaunch( +@@ -411,8 +410,7 @@ StartupBrowserCreatorImpl::DetermineURLsAndLaunch( if (AccountConsistencyModeManager::IsMirrorEnabledForProfile(profile_)) welcome_enabled = false; #elif !BUILDFLAG(IS_CHROMEOS_ASH) @@ -308,7 +308,7 @@ diff --git a/chrome/browser/ui/webui/signin/profile_customization_handler.cc b/c diff --git a/chrome/browser/ui/webui/signin/profile_customization_ui.cc b/chrome/browser/ui/webui/signin/profile_customization_ui.cc --- a/chrome/browser/ui/webui/signin/profile_customization_ui.cc +++ b/chrome/browser/ui/webui/signin/profile_customization_ui.cc -@@ -101,10 +101,11 @@ ProfileCustomizationUI::ProfileCustomizationUI(content::WebUI* web_ui) +@@ -102,10 +102,11 @@ ProfileCustomizationUI::ProfileCustomizationUI(content::WebUI* web_ui) "profileCustomizationInDialogDesign", base::FeatureList::IsEnabled(kSyncPromoAfterSigninIntercept)); const GURL& url = web_ui->GetWebContents()->GetVisibleURL(); @@ -353,7 +353,7 @@ diff --git a/chrome/browser/ui/webui/signin/profile_picker_handler.cc b/chrome/b diff --git a/components/signin/public/android/BUILD.gn b/components/signin/public/android/BUILD.gn --- a/components/signin/public/android/BUILD.gn +++ b/components/signin/public/android/BUILD.gn -@@ -65,7 +65,6 @@ generate_jni("jni_headers") { +@@ -75,7 +75,6 @@ generate_jni("jni_headers") { "java/src/org/chromium/components/signin/base/CoreAccountInfo.java", "java/src/org/chromium/components/signin/base/GoogleServiceAuthError.java", "java/src/org/chromium/components/signin/identitymanager/AccountTrackerService.java", diff --git a/build/patches/00Restore-Search-Ready-Omnibox-flag--win-fixup-.patch b/build/patches/00Restore-Search-Ready-Omnibox-flag--win-fixup-.patch index 46dc039b..c44511e0 100644 --- a/build/patches/00Restore-Search-Ready-Omnibox-flag--win-fixup-.patch +++ b/build/patches/00Restore-Search-Ready-Omnibox-flag--win-fixup-.patch @@ -9,9 +9,9 @@ Subject: Restore Search Ready Omnibox flag (win fixup) 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 -@@ -9289,9 +9289,11 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kPervasiveSystemAccentColorDescription, kOsWin, - SINGLE_VALUE_TYPE(switches::kPervasiveSystemAccentColor)}, +@@ -8768,9 +8768,11 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kVCPortraitRelightingDescription, kOsCrOS, + FEATURE_VALUE_TYPE(ash::features::kVCPortraitRelighting)}, #endif +#if BUILDFLAG(IS_ANDROID) {"enable-search-ready-omnibox", flag_descriptions::kSearchReadyOmniboxName, diff --git a/build/patches/00Timezone-customization--add-fixup-.patch b/build/patches/00Timezone-customization--add-fixup-.patch index 68116b47..624277be 100644 --- a/build/patches/00Timezone-customization--add-fixup-.patch +++ b/build/patches/00Timezone-customization--add-fixup-.patch @@ -9,7 +9,7 @@ Subject: Timezone customization (add fixup) diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc --- a/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc -@@ -614,10 +614,10 @@ void ContentSettingsRegistry::Init() { +@@ -594,10 +594,10 @@ void ContentSettingsRegistry::Init() { Register(ContentSettingsType::TIMEZONE_OVERRIDE, "timezone-override", CONTENT_SETTING_ALLOW, WebsiteSettingsInfo::SYNCABLE, diff --git a/build/patches/00Viewport-Protection-flag.patch b/build/patches/00Viewport-Protection-flag.patch index 5b38ee41..ab2afcaf 100644 --- a/build/patches/00Viewport-Protection-flag.patch +++ b/build/patches/00Viewport-Protection-flag.patch @@ -28,7 +28,7 @@ Subject: Viewport Protection flag 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 -@@ -7768,6 +7768,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7389,6 +7389,11 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(paint_preview::kPaintPreviewDemo)}, #endif // BUILDFLAG(ENABLE_PAINT_PREVIEW) && BUILDFLAG(IS_ANDROID) @@ -43,7 +43,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -6654,6 +6654,12 @@ const char kPaintPreviewDemoDescription[] = +@@ -6573,6 +6573,12 @@ const char kPaintPreviewDemoDescription[] = "previews."; #endif // ENABLE_PAINT_PREVIEW && BUILDFLAG(IS_ANDROID) @@ -59,7 +59,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -3857,6 +3857,9 @@ extern const char kPaintPreviewDemoName[]; +@@ -3821,6 +3821,9 @@ extern const char kPaintPreviewDemoName[]; extern const char kPaintPreviewDemoDescription[]; #endif // ENABLE_PAINT_PREVIEW && BUILDFLAG(IS_ANDROID) @@ -72,7 +72,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio 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 -@@ -1668,6 +1668,10 @@ BASE_FEATURE(kNewBaseUrlInheritanceBehavior, +@@ -1549,6 +1549,10 @@ BASE_FEATURE(kNewBaseUrlInheritanceBehavior, "NewBaseUrlInheritanceBehavior", base::FEATURE_DISABLED_BY_DEFAULT); @@ -86,7 +86,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 -@@ -933,6 +933,9 @@ BLINK_COMMON_EXPORT extern const base::FeatureParam< +@@ -887,6 +887,9 @@ BLINK_COMMON_EXPORT extern const base::FeatureParam< // base url inheritance behavior from https://crbug.com/1356658. BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kNewBaseUrlInheritanceBehavior); @@ -122,7 +122,7 @@ diff --git a/third_party/blink/public/common/widget/device_emulation_params.h b/ diff --git a/third_party/blink/renderer/core/css/resolver/style_resolver.cc b/third_party/blink/renderer/core/css/resolver/style_resolver.cc --- a/third_party/blink/renderer/core/css/resolver/style_resolver.cc +++ b/third_party/blink/renderer/core/css/resolver/style_resolver.cc -@@ -1533,8 +1533,14 @@ ComputedStyleBuilder StyleResolver::InitialStyleBuilderForElement() const { +@@ -1548,8 +1548,14 @@ ComputedStyleBuilder StyleResolver::InitialStyleBuilderForElement() const { ComputedStyleBuilder builder = CreateComputedStyleBuilder(); builder.SetRtlOrdering(GetDocument().VisuallyOrdered() ? EOrder::kVisual : EOrder::kLogical); @@ -211,7 +211,7 @@ diff --git a/third_party/blink/renderer/core/events/pointer_event.h b/third_part diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc --- a/third_party/blink/renderer/core/exported/web_view_impl.cc +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc -@@ -1032,7 +1032,7 @@ WebPagePopupImpl* WebViewImpl::OpenPagePopup(PagePopupClient* client) { +@@ -1031,7 +1031,7 @@ WebPagePopupImpl* WebViewImpl::OpenPagePopup(PagePopupClient* client) { page_popup_ = WebPagePopupImpl::Create( std::move(popup_widget_host), std::move(widget_host), std::move(widget_receiver), this, agent_group_scheduler, @@ -223,7 +223,7 @@ diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_p diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc --- a/third_party/blink/renderer/core/frame/local_dom_window.cc +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc -@@ -1478,6 +1478,11 @@ int LocalDOMWindow::outerHeight() const { +@@ -1507,6 +1507,11 @@ int LocalDOMWindow::outerHeight() const { if (!page) return 0; @@ -235,7 +235,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_p ChromeClient& chrome_client = page->GetChromeClient(); if (page->GetSettings().GetReportScreenSizeInPhysicalPixelsQuirk()) { return static_cast( -@@ -1503,6 +1508,11 @@ int LocalDOMWindow::outerWidth() const { +@@ -1532,6 +1537,11 @@ int LocalDOMWindow::outerWidth() const { if (!page) return 0; @@ -247,7 +247,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_p ChromeClient& chrome_client = page->GetChromeClient(); if (page->GetSettings().GetReportScreenSizeInPhysicalPixelsQuirk()) { return static_cast( -@@ -1691,7 +1701,8 @@ double LocalDOMWindow::devicePixelRatio() const { +@@ -1720,7 +1730,8 @@ double LocalDOMWindow::devicePixelRatio() const { if (!GetFrame()) return 0.0; @@ -257,7 +257,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_p } void LocalDOMWindow::scrollBy(double x, double y) const { -@@ -2237,6 +2248,21 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate, +@@ -2268,6 +2279,21 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate, if (!completed_url.IsEmpty() || result.new_window) result.frame->Navigate(frame_request, WebFrameLoadType::kStandard); @@ -282,7 +282,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 -@@ -1287,6 +1287,10 @@ gfx::SizeF LocalFrame::ResizePageRectsKeepingRatio( +@@ -1289,6 +1289,10 @@ gfx::SizeF LocalFrame::ResizePageRectsKeepingRatio( return gfx::SizeF(result_width, result_height); } @@ -293,7 +293,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/ void LocalFrame::SetPageZoomFactor(float factor) { SetPageAndTextZoomFactors(factor, text_zoom_factor_); } -@@ -1426,12 +1430,16 @@ device::mojom::blink::DevicePostureType LocalFrame::GetDevicePosture() { +@@ -1428,12 +1432,16 @@ device::mojom::blink::DevicePostureType LocalFrame::GetDevicePosture() { return mojo_handler_->GetDevicePosture(); } @@ -315,7 +315,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 -@@ -382,13 +382,14 @@ class CORE_EXPORT LocalFrame final +@@ -386,13 +386,14 @@ class CORE_EXPORT LocalFrame final void SetInViewSourceMode(bool = true); void SetPageZoomFactor(float); @@ -332,7 +332,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/b // Informs the local root's document and its local descendant subtree that a // media query value changed. -@@ -972,6 +973,7 @@ class CORE_EXPORT LocalFrame final +@@ -976,6 +977,7 @@ class CORE_EXPORT LocalFrame final unsigned hidden_ : 1; float page_zoom_factor_; @@ -438,7 +438,7 @@ diff --git a/third_party/blink/renderer/core/frame/screen_metrics_emulator.h b/t diff --git a/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc b/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc --- a/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc +++ b/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc -@@ -1597,6 +1597,14 @@ void WebFrameWidgetImpl::ApplyVisualPropertiesSizing( +@@ -1594,6 +1594,14 @@ void WebFrameWidgetImpl::ApplyVisualPropertiesSizing( if (auto* device_emulator = DeviceEmulator()) { device_emulator->UpdateVisualProperties(visual_properties); @@ -456,7 +456,7 @@ diff --git a/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc b/th diff --git a/third_party/blink/renderer/core/frame/web_remote_frame_impl.cc b/third_party/blink/renderer/core/frame/web_remote_frame_impl.cc --- a/third_party/blink/renderer/core/frame/web_remote_frame_impl.cc +++ b/third_party/blink/renderer/core/frame/web_remote_frame_impl.cc -@@ -348,7 +348,8 @@ void WebRemoteFrameImpl::InitializeFrameVisualProperties( +@@ -356,7 +356,8 @@ void WebRemoteFrameImpl::InitializeFrameVisualProperties( visual_properties.page_scale_factor = ancestor_widget->PageScaleInMainFrame(); visual_properties.is_pinch_gesture_active = ancestor_widget->PinchGestureActiveInMainFrame(); @@ -528,7 +528,7 @@ diff --git a/third_party/blink/renderer/core/page/page.cc b/third_party/blink/re namespace blink { -@@ -878,7 +882,79 @@ void Page::UpdateAcceleratedCompositingSettings() { +@@ -879,7 +883,79 @@ void Page::UpdateAcceleratedCompositingSettings() { } } @@ -611,7 +611,7 @@ diff --git a/third_party/blink/renderer/core/page/page.cc b/third_party/blink/re diff --git a/third_party/blink/renderer/core/page/page.h b/third_party/blink/renderer/core/page/page.h --- a/third_party/blink/renderer/core/page/page.h +++ b/third_party/blink/renderer/core/page/page.h -@@ -409,6 +409,9 @@ class CORE_EXPORT Page final : public GarbageCollected, +@@ -411,6 +411,9 @@ class CORE_EXPORT Page final : public GarbageCollected, } mojom::blink::FencedFrameMode FencedFrameMode() { return fenced_frame_mode_; } @@ -621,7 +621,7 @@ diff --git a/third_party/blink/renderer/core/page/page.h b/third_party/blink/ren private: friend class ScopedPagePauser; -@@ -538,6 +541,10 @@ class CORE_EXPORT Page final : public GarbageCollected, +@@ -553,6 +556,10 @@ class CORE_EXPORT Page final : public GarbageCollected, // browser side FrameTree has the FrameTree::Type of kFencedFrame. bool is_fenced_frame_tree_ = false; diff --git a/build/patches/00fix-InitiatorOrigin--add-fixup-.patch b/build/patches/00fix-InitiatorOrigin--add-fixup-.patch index cd6d72dd..857ef7ae 100644 --- a/build/patches/00fix-InitiatorOrigin--add-fixup-.patch +++ b/build/patches/00fix-InitiatorOrigin--add-fixup-.patch @@ -21,7 +21,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.j /** * A hash code for the URL to verify intent data hasn't been modified. */ -@@ -1443,6 +1446,17 @@ public class IntentHandler { +@@ -1442,6 +1445,17 @@ public class IntentHandler { return IntentUtils.safeGetSerializableExtra(intent, EXTRA_TAB_LAUNCH_TYPE); } @@ -39,7 +39,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.j /** * Creates an Intent that will launch a ChromeTabbedActivity on the new tab page. The Intent * will be trusted and therefore able to launch Incognito tabs. -@@ -1580,7 +1594,7 @@ public class IntentHandler { +@@ -1567,7 +1581,7 @@ public class IntentHandler { String headers = getExtraHeadersFromIntent(intent); headers = maybeAddAdditionalContentHeaders(intent, url, headers); @@ -51,7 +51,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.j diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java --- a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java -@@ -456,8 +456,8 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega +@@ -455,8 +455,8 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega /*incognito*/true); newIntent.setData(mIntent.getData()); newIntent.setPackage(applicationContext.getPackageName()); @@ -59,8 +59,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis newIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + IntentHandler.setForceIncognitoMode(newIntent); } - - long time = SystemClock.elapsedRealtime(); + if (!chromeTabbedTaskExists()) { + newIntent.putExtra(IntentHandler.EXTRA_STARTED_TABBED_CHROME_TASK, true); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sharing/shared_intent/SharedIntentShareActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/sharing/shared_intent/SharedIntentShareActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/sharing/shared_intent/SharedIntentShareActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/sharing/shared_intent/SharedIntentShareActivity.java diff --git a/build/patches/00ungoogled-chr--Disable-profile-avatar--win-fixup-.patch b/build/patches/00ungoogled-chr--Disable-profile-avatar--win-fixup-.patch index aed175aa..65d5f72f 100644 --- a/build/patches/00ungoogled-chr--Disable-profile-avatar--win-fixup-.patch +++ b/build/patches/00ungoogled-chr--Disable-profile-avatar--win-fixup-.patch @@ -9,7 +9,7 @@ Subject: ungoogled-chr: Disable profile avatar (win fixup) 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 -@@ -797,7 +797,7 @@ void ProfileAttributesStorage::DownloadHighResAvatarIfNeeded( +@@ -795,7 +795,7 @@ void ProfileAttributesStorage::DownloadHighResAvatarIfNeeded( void ProfileAttributesStorage::DownloadHighResAvatar( size_t icon_index, const base::FilePath& profile_path) { diff --git a/build/patches/00ungoogled-chr-no-special-hosts-domains--add-fixup-.patch b/build/patches/00ungoogled-chr-no-special-hosts-domains--add-fixup-.patch index 1c2e6f11..ab78d0f7 100644 --- a/build/patches/00ungoogled-chr-no-special-hosts-domains--add-fixup-.patch +++ b/build/patches/00ungoogled-chr-no-special-hosts-domains--add-fixup-.patch @@ -40,7 +40,7 @@ Subject: ungoogled-chr no special hosts/domains (add fixup) diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -1008,10 +1008,6 @@ static_library("browser") { +@@ -1000,10 +1000,6 @@ static_library("browser") { "page_load_metrics/observers/foreground_duration_ukm_observer.h", "page_load_metrics/observers/formfill_page_load_metrics_observer.cc", "page_load_metrics/observers/formfill_page_load_metrics_observer.h", @@ -51,7 +51,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", -@@ -1924,7 +1920,6 @@ static_library("browser") { +@@ -1916,7 +1912,6 @@ static_library("browser") { "//chrome/browser/autofill", "//chrome/browser/devtools", "//chrome/browser/favicon", @@ -59,7 +59,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "//chrome/browser/profiling_host", # TODO(crbug.com/1335199): break this dep when favicon is in its own target -@@ -1943,7 +1938,6 @@ static_library("browser") { +@@ -1935,7 +1930,6 @@ static_library("browser") { public_deps = [ "//base", @@ -67,7 +67,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "//chrome/common", "//chrome/common:buildflags", "//chrome/common:constants", -@@ -7673,8 +7667,6 @@ static_library("browser") { +@@ -7690,8 +7684,6 @@ static_library("browser") { "supervised_user/supervised_user_constants.h", "supervised_user/supervised_user_denylist.cc", "supervised_user/supervised_user_denylist.h", @@ -99,7 +99,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 -@@ -1061,7 +1061,6 @@ BrowserProcessImpl::component_updater() { +@@ -1084,7 +1084,6 @@ BrowserProcessImpl::component_updater() { std::make_unique(); std::string brand; @@ -110,7 +110,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro 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 -@@ -2818,7 +2818,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( +@@ -2857,7 +2857,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( switches::kForcePNaClSubzero, #endif switches::kForceUIDirection, @@ -118,7 +118,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch switches::kJavaScriptHarmony, switches::kEnableExperimentalWebAssemblyFeatures, embedder_support::kOriginTrialDisabledFeatures, -@@ -4797,12 +4796,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( +@@ -4869,12 +4868,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( &throttles); #endif @@ -131,7 +131,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch if (auto* throttle_manager = subresource_filter::ContentSubresourceFilterThrottleManager:: FromNavigationHandle(*handle)) { -@@ -5299,11 +5292,11 @@ ChromeContentBrowserClient::CreateURLLoaderThrottles( +@@ -5382,11 +5375,11 @@ ChromeContentBrowserClient::CreateURLLoaderThrottles( profile->GetPrefs()->GetInteger(prefs::kForceYouTubeRestrict), profile->GetPrefs()->GetString(prefs::kAllowedDomainsForApps), false /*-> allow_userscript, don't care */}; @@ -149,7 +149,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch 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 -@@ -787,7 +787,6 @@ static_library("extensions") { +@@ -784,7 +784,6 @@ static_library("extensions") { "//chrome/browser/browsing_data:constants", "//chrome/browser/devtools", "//chrome/browser/favicon", @@ -160,7 +160,7 @@ diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUIL 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 -@@ -104,7 +104,6 @@ constexpr char kOsVersionTag[] = "OS VERSION"; +@@ -111,7 +111,6 @@ constexpr char kOsVersionTag[] = "OS VERSION"; #if BUILDFLAG(IS_WIN) constexpr char kUsbKeyboardDetected[] = "usb_keyboard_detected"; constexpr char kIsEnrolledToDomain[] = "enrolled_to_domain"; @@ -168,7 +168,7 @@ diff --git a/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log #if BUILDFLAG(GOOGLE_CHROME_BRANDING) constexpr char kUpdateErrorCode[] = "update_error_code"; constexpr char kUpdateHresult[] = "update_hresult"; -@@ -528,10 +527,6 @@ void ChromeInternalLogSource::PopulateEnrolledToDomain( +@@ -593,10 +592,6 @@ void ChromeInternalLogSource::PopulateEnrolledToDomain( void ChromeInternalLogSource::PopulateInstallerBrandCode( SystemLogsResponse* response) { @@ -266,7 +266,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 -@@ -576,7 +576,7 @@ ChromeMetricsServiceClient::GetNetworkTimeTracker() { +@@ -579,7 +579,7 @@ ChromeMetricsServiceClient::GetNetworkTimeTracker() { } bool ChromeMetricsServiceClient::GetBrand(std::string* brand_code) { @@ -300,7 +300,7 @@ diff --git a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc b/ diff --git a/chrome/browser/metrics/metrics_reporting_state.cc b/chrome/browser/metrics/metrics_reporting_state.cc --- a/chrome/browser/metrics/metrics_reporting_state.cc +++ b/chrome/browser/metrics/metrics_reporting_state.cc -@@ -35,71 +35,6 @@ +@@ -34,71 +34,6 @@ #include "components/policy/core/common/features.h" #endif // BUILDFLAG(IS_ANDROID) @@ -372,19 +372,19 @@ diff --git a/chrome/browser/metrics/metrics_reporting_state.cc b/chrome/browser/ void ChangeMetricsReportingState( bool enabled, ChangeMetricsReportingStateCalledFrom called_from) { -@@ -140,11 +75,6 @@ void ChangeMetricsReportingStateWithReply( +@@ -139,11 +74,6 @@ void ChangeMetricsReportingStateWithReply( metrics::structured::NeutrinoDevicesLocation:: kChangeMetricsReportingStateWithReply); #endif // BUILDFLAG(IS_CHROMEOS_ASH) -- base::PostTaskAndReplyWithResult( -- GoogleUpdateSettings::CollectStatsConsentTaskRunner(), FROM_HERE, -- base::BindOnce(&SetGoogleUpdateSettings, enabled), -- base::BindOnce(&SetMetricsReporting, enabled, std::move(callback_fn), -- called_from)); +- GoogleUpdateSettings::CollectStatsConsentTaskRunner() +- ->PostTaskAndReplyWithResult( +- FROM_HERE, base::BindOnce(&SetGoogleUpdateSettings, enabled), +- base::BindOnce(&SetMetricsReporting, enabled, std::move(callback_fn), +- called_from)); } void UpdateMetricsPrefsOnPermissionChange( -@@ -215,12 +145,6 @@ void ApplyMetricsReportingPolicy() { +@@ -214,12 +144,6 @@ void ApplyMetricsReportingPolicy() { return; } #endif // BUILDFLAG(IS_ANDROID) @@ -400,7 +400,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 -@@ -705,7 +705,6 @@ void SystemNetworkContextManager::AddSSLConfigToNetworkContextParams( +@@ -708,7 +708,6 @@ void SystemNetworkContextManager::AddSSLConfigToNetworkContextParams( void SystemNetworkContextManager::ConfigureDefaultNetworkContextParams( network::mojom::NetworkContextParams* network_context_params) { variations::UpdateCorsExemptHeaderForVariations(network_context_params); @@ -458,7 +458,7 @@ diff --git a/chrome/browser/new_tab_page/promos/promo_service.cc b/chrome/browse 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 -@@ -130,8 +130,6 @@ void PageLoadMetricsEmbedder::RegisterEmbedderObservers( +@@ -128,8 +128,6 @@ void PageLoadMetricsEmbedder::RegisterEmbedderObservers( tracker->AddObserver(std::make_unique()); tracker->AddObserver(std::make_unique()); tracker->AddObserver(std::make_unique()); @@ -470,7 +470,7 @@ diff --git a/chrome/browser/page_load_metrics/page_load_metrics_initialize.cc b/ 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 -@@ -421,7 +421,6 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -417,7 +417,6 @@ void ChromeBrowserMainExtraPartsProfiles:: #if !BUILDFLAG(IS_ANDROID) GlobalErrorServiceFactory::GetInstance(); #endif @@ -495,8 +495,8 @@ diff --git a/chrome/browser/search_engines/ui_thread_search_terms_data.cc b/chro 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 -@@ -412,7 +412,6 @@ static_library("ui") { - "//chrome/browser/breadcrumbs", +@@ -408,7 +408,6 @@ static_library("ui") { + "//chrome/browser/chrome_for_testing:buildflags", "//chrome/browser/devtools", "//chrome/browser/favicon", - "//chrome/browser/google", @@ -506,7 +506,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn diff --git a/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc b/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc --- a/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc +++ b/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc -@@ -524,11 +524,6 @@ content::WebUIDataSource* CreateNewTabPageUiHtmlSource(Profile* profile) { +@@ -511,11 +511,6 @@ content::WebUIDataSource* CreateNewTabPageUiHtmlSource(Profile* profile) { // chrome-untrusted://new-tab-page for other external content and resources. // NOTE: Use caution when overriding content security policies as that cean // lead to subtle security bugs such as https://crbug.com/1251541. @@ -532,7 +532,7 @@ diff --git a/chrome/browser/ui/webui/settings/reset_settings_handler.cc b/chrome 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 -@@ -215,7 +215,7 @@ void UpgradeDetectorImpl::StartOutdatedBuildDetector() { +@@ -214,7 +214,7 @@ void UpgradeDetectorImpl::StartOutdatedBuildDetector() { // an outdated build is being simulated by command line switches. if (!simulating_outdated_) { std::string brand; @@ -544,7 +544,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 -@@ -133,8 +133,6 @@ static_library("common_lib") { +@@ -134,8 +134,6 @@ static_library("common_lib") { "content_restriction.h", "crash_keys.cc", "crash_keys.h", @@ -573,7 +573,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 -@@ -5822,7 +5822,6 @@ test("unit_tests") { +@@ -5877,7 +5877,6 @@ test("unit_tests") { "//chrome/browser/favicon", "//chrome/browser/feature_guide/notifications:unit_tests", "//chrome/browser/first_party_sets", @@ -639,16 +639,16 @@ diff --git a/components/google/core/common/google_util.cc b/components/google/co - const std::string param_name = "async"; - const std::string key_value = key + ":" + value; - bool replaced = false; -- const std::string input = url.query(); +- const base::StringPiece input = url.query_piece(); - url::Component cursor(0, input.size()); - std::string output; - url::Component key_range, value_range; - while (url::ExtractQueryKeyValue(input.data(), &cursor, &key_range, - &value_range)) { -- const base::StringPiece input_key(input.data() + key_range.begin, -- key_range.len); -- std::string key_value_pair(input, key_range.begin, -- value_range.end() - key_range.begin); +- const base::StringPiece input_key = +- input.substr(key_range.begin, key_range.len); +- std::string key_value_pair( +- input.substr(key_range.begin, value_range.end() - key_range.begin)); - if (!replaced && input_key == param_name) { - // Check |replaced| as only the first match should be replaced. - replaced = true; @@ -736,7 +736,7 @@ diff --git a/components/search_provider_logos/BUILD.gn b/components/search_provi diff --git a/components/search_provider_logos/logo_service_impl.cc b/components/search_provider_logos/logo_service_impl.cc --- a/components/search_provider_logos/logo_service_impl.cc +++ b/components/search_provider_logos/logo_service_impl.cc -@@ -250,8 +250,7 @@ void LogoServiceImpl::GetLogo(LogoCallbacks callbacks, bool for_webui_ntp) { +@@ -249,8 +249,7 @@ void LogoServiceImpl::GetLogo(LogoCallbacks callbacks, bool for_webui_ntp) { GURL base_url; GURL doodle_url; @@ -746,7 +746,7 @@ diff --git a/components/search_provider_logos/logo_service_impl.cc b/components/ if (is_google) { // TODO(treib): Put the Google doodle URL into prepopulated_engines.json. base_url = -@@ -276,23 +275,12 @@ void LogoServiceImpl::GetLogo(LogoCallbacks callbacks, bool for_webui_ntp) { +@@ -275,23 +274,12 @@ void LogoServiceImpl::GetLogo(LogoCallbacks callbacks, bool for_webui_ntp) { clock_ = base::DefaultClock::GetInstance(); } diff --git a/build/patches/00win-enable-HighEfficiencyMode-by-default.patch b/build/patches/00win-enable-HighEfficiencyMode-by-default.patch index 73c3ff24..2418ec70 100644 --- a/build/patches/00win-enable-HighEfficiencyMode-by-default.patch +++ b/build/patches/00win-enable-HighEfficiencyMode-by-default.patch @@ -23,7 +23,7 @@ diff --git a/components/performance_manager/user_tuning/prefs.cc b/components/pe --- a/components/performance_manager/user_tuning/prefs.cc +++ b/components/performance_manager/user_tuning/prefs.cc @@ -23,7 +23,7 @@ const char kManagedTabDiscardingExceptions[] = - "performance_tuning.tab_discarding.exceptions.managed"; + "performance_tuning.tab_discarding.exceptions_managed"; void RegisterLocalStatePrefs(PrefRegistrySimple* registry) { - registry->RegisterBooleanPref(kHighEfficiencyModeEnabled, false); diff --git a/build/patches/00win-enable-pdf-plugin.patch b/build/patches/00win-enable-pdf-plugin.patch index a90ea9b2..51918cdd 100644 --- a/build/patches/00win-enable-pdf-plugin.patch +++ b/build/patches/00win-enable-pdf-plugin.patch @@ -9,7 +9,7 @@ Subject: win enable pdf plugin 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 -@@ -1944,7 +1944,9 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() { +@@ -1945,7 +1945,9 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() { } PluginData* LocalFrame::GetPluginData() const { diff --git a/build/patches/AImageReader-CFI-crash-mitigations.patch b/build/patches/AImageReader-CFI-crash-mitigations.patch index dce65335..4946f18d 100644 --- a/build/patches/AImageReader-CFI-crash-mitigations.patch +++ b/build/patches/AImageReader-CFI-crash-mitigations.patch @@ -84,7 +84,7 @@ diff --git a/base/android/android_image_reader_compat.h b/base/android/android_i diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json --- a/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json -@@ -2515,9 +2515,9 @@ +@@ -2495,9 +2495,9 @@ "expiry_milestone": 115 }, { @@ -231,7 +231,7 @@ diff --git a/gpu/ipc/service/stream_texture_android.cc b/gpu/ipc/service/stream_ 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 -@@ -758,6 +758,11 @@ BASE_FEATURE(kHardwareSecureDecryptionExperiment, +@@ -781,6 +781,11 @@ BASE_FEATURE(kHardwareSecureDecryptionExperiment, // Allows automatically disabling hardware secure Content Decryption Module // (CDM) after failures or crashes to fallback to software secure CDMs. If this // feature is disabled, the fallback will never happen and users could be stuck @@ -246,7 +246,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 -@@ -235,6 +235,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp8TemporalLayerHWEncoding); +@@ -270,6 +270,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp8TemporalLayerHWEncoding); MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp9kSVCHWEncoding); #endif // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS) MEDIA_EXPORT BASE_DECLARE_FEATURE(kVideoBlitColorAccuracy); diff --git a/build/patches/Add-AllowUserCertificates-flag.patch b/build/patches/Add-AllowUserCertificates-flag.patch index 88018fb2..6755d7df 100644 --- a/build/patches/Add-AllowUserCertificates-flag.patch +++ b/build/patches/Add-AllowUserCertificates-flag.patch @@ -27,7 +27,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; -@@ -961,6 +962,8 @@ public abstract class ChromeActivity +@@ -960,6 +961,8 @@ public abstract class ChromeActivity UpdateMenuItemHelper.getInstance().onStart(); ChromeActivitySessionTracker.getInstance().onStartWithNative(); ChromeCachedFlags.getInstance().cacheNativeFlags(); @@ -45,12 +45,12 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/Chrom add(ChromeFeatureList.sAppMenuMobileSiteOption); + add(ChromeFeatureList.sAllowUserCertificates); add(ChromeFeatureList.sBackGestureRefactorAndroid); + add(ChromeFeatureList.sCctAutoTranslate); add(ChromeFeatureList.sCctBrandTransparency); - add(ChromeFeatureList.sCctIncognito); 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 -@@ -8936,6 +8936,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8447,6 +8447,10 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kWin10TabSearchCaptionButton)}, #endif // BUILDFLAG(IS_WIN) @@ -100,7 +100,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &feed::kInterestFeedV1ClicksAndViewsConditionalUpload, &feed::kInterestFeedV2, &feed::kInterestFeedV2Autoplay, -@@ -469,6 +470,10 @@ BASE_FEATURE(kAllowNewIncognitoTabIntents, +@@ -462,6 +463,10 @@ BASE_FEATURE(kAllowNewIncognitoTabIntents, "AllowNewIncognitoTabIntents", base::FEATURE_ENABLED_BY_DEFAULT); @@ -114,14 +114,14 @@ 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 -@@ -17,6 +17,7 @@ BASE_DECLARE_FEATURE(kAdaptiveButtonInTopToolbar); - BASE_DECLARE_FEATURE(kAdaptiveButtonInTopToolbarCustomizationV2); +@@ -18,6 +18,7 @@ BASE_DECLARE_FEATURE(kAdaptiveButtonInTopToolbarCustomizationV2); + BASE_DECLARE_FEATURE(kAddEduAccountFromAccountSettingsForSupervisedUsers); BASE_DECLARE_FEATURE(kAddToHomescreenIPH); BASE_DECLARE_FEATURE(kAllowNewIncognitoTabIntents); +BASE_DECLARE_FEATURE(kAllowUserCertificates); BASE_DECLARE_FEATURE(kAndroidScrollOptimizations); BASE_DECLARE_FEATURE(kAndroidSearchEngineChoiceNotification); - BASE_DECLARE_FEATURE(kAssistantConsentModal); + BASE_DECLARE_FEATURE(kAssistantConsentSimplifiedText); 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 @@ -130,10 +130,10 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f /* Alphabetical: */ + public static final String ALLOW_USER_CERTIFICATES = "AllowUserCertificates"; - public static final String ABOUT_THIS_SITE_BANNER = "AboutThisSiteBanner"; public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR = "AdaptiveButtonInTopToolbar"; public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_CUSTOMIZATION_V2 = -@@ -612,6 +613,8 @@ public abstract class ChromeFeatureList { + "AdaptiveButtonInTopToolbarCustomizationV2"; +@@ -607,6 +608,8 @@ public abstract class ChromeFeatureList { "SkipServiceWorkerForInstallPromot"; /* Alphabetical: */ diff --git a/build/patches/Add-Alt-D-hotkey-to-focus-address-bar.patch b/build/patches/Add-Alt-D-hotkey-to-focus-address-bar.patch index 34e2dfec..e497c656 100644 --- a/build/patches/Add-Alt-D-hotkey-to-focus-address-bar.patch +++ b/build/patches/Add-Alt-D-hotkey-to-focus-address-bar.patch @@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java --- a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java -@@ -155,6 +155,8 @@ public class KeyboardShortcuts { +@@ -151,6 +151,8 @@ public class KeyboardShortcuts { KeyEvent.KEYCODE_F, KeyEvent.META_CTRL_ON); addShortcut(context, chromeFeatureShortcutGroup, R.string.keyboard_shortcut_address_bar, KeyEvent.KEYCODE_L, KeyEvent.META_CTRL_ON); diff --git a/build/patches/Add-IsCleartextPermitted-flag.patch b/build/patches/Add-IsCleartextPermitted-flag.patch index 7decc57a..0e4069f5 100644 --- a/build/patches/Add-IsCleartextPermitted-flag.patch +++ b/build/patches/Add-IsCleartextPermitted-flag.patch @@ -16,7 +16,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 -@@ -9171,6 +9171,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8671,6 +8671,10 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kRequestDesktopSiteExceptionsName, flag_descriptions::kRequestDesktopSiteExceptionsDescription, kOsAndroid, FEATURE_VALUE_TYPE(features::kRequestDesktopSiteExceptions)}, @@ -30,9 +30,9 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -1651,6 +1651,10 @@ const char kHttpsOnlyModeDescription[] = - "Adds a setting under chrome://settings/security to opt-in to HTTPS-First " - "Mode."; +@@ -1671,6 +1671,10 @@ const char kHttpsUpgradesDescription[] = + "Enable automatically upgrading all top-level navigations to HTTPS with " + "fast fallback to HTTP."; +const char kIsCleartextPermittedName[] = "Allow cleartext traffic"; +const char kIsCleartextPermittedDescription[] = @@ -44,21 +44,21 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -935,6 +935,9 @@ extern const char kHideShelfControlsInTabletModeDescription[]; +@@ -938,6 +938,9 @@ extern const char kHideShelfControlsInTabletModeDescription[]; extern const char kHttpsOnlyModeName[]; extern const char kHttpsOnlyModeDescription[]; +extern const char kIsCleartextPermittedName[]; +extern const char kIsCleartextPermittedDescription[]; + - extern const char kIgnoreGpuBlocklistName[]; - extern const char kIgnoreGpuBlocklistDescription[]; + extern const char kHttpsUpgradesName[]; + extern const char kHttpsUpgradesDescription[]; diff --git a/net/base/features.cc b/net/base/features.cc --- a/net/base/features.cc +++ b/net/base/features.cc -@@ -113,6 +113,10 @@ BASE_FEATURE(kPartitionNelAndReportingByNetworkIsolationKey, - "PartitionNelAndReportingByNetworkIsolationKey", // must be enabled +@@ -109,6 +109,10 @@ BASE_FEATURE(kPartitionNelAndReportingByNetworkIsolationKey, + "PartitionNelAndReportingByNetworkIsolationKey", // must be enabled base::FEATURE_ENABLED_BY_DEFAULT); // in Bromite +BASE_FEATURE(kIsCleartextPermitted, @@ -66,8 +66,8 @@ diff --git a/net/base/features.cc b/net/base/features.cc + base::FEATURE_ENABLED_BY_DEFAULT); + BASE_FEATURE(kEnableDoubleKeyNetworkAnonymizationKey, - "EnableDoubleKeyNetworkAnonymizationKey", - base::FEATURE_DISABLED_BY_DEFAULT); + "EnableDoubleKeyNetworkAnonymizationKey", // must be enabled + base::FEATURE_ENABLED_BY_DEFAULT); // in Bromite diff --git a/net/base/features.h b/net/base/features.h --- a/net/base/features.h +++ b/net/base/features.h @@ -83,7 +83,7 @@ diff --git a/net/base/features.h b/net/base/features.h diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc --- a/net/url_request/url_request_http_job.cc +++ b/net/url_request/url_request_http_job.cc -@@ -212,6 +212,10 @@ std::unique_ptr URLRequestHttpJob::Create(URLRequest* request) { +@@ -211,6 +211,10 @@ std::unique_ptr URLRequestHttpJob::Create(URLRequest* request) { } #if BUILDFLAG(IS_ANDROID) diff --git a/build/patches/Add-a-proxy-configuration-page.patch b/build/patches/Add-a-proxy-configuration-page.patch index 2eef7b0a..b86b9925 100644 --- a/build/patches/Add-a-proxy-configuration-page.patch +++ b/build/patches/Add-a-proxy-configuration-page.patch @@ -62,7 +62,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 -@@ -8,6 +8,10 @@ found in the LICENSE file. +@@ -9,6 +9,10 @@ found in the LICENSE file. @@ -76,18 +76,18 @@ 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 -@@ -59,6 +59,7 @@ public class PrivacySettings +@@ -65,6 +65,7 @@ public class PrivacySettings private static final String PREF_DO_NOT_TRACK = "do_not_track"; private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data"; private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox"; + private static final String PREF_PROXY_OPTIONS = "proxy"; private static final String PREF_PRIVACY_GUIDE = "privacy_guide"; private static final String PREF_INCOGNITO_LOCK = "incognito_lock"; - + private static final String PREF_THIRD_PARTY_COOKIES = "third_party_cookies"; diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc --- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc +++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc -@@ -284,6 +284,8 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() { +@@ -285,6 +285,8 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() { builtins_to_provide.push_back( base::ASCIIToUTF16(chrome::kChromeUISettingsURL)); #endif @@ -120,7 +120,7 @@ diff --git a/chrome/browser/net/proxy_service_factory.cc b/chrome/browser/net/pr #include +#include "base/logging.h" - #include "base/threading/thread_task_runner_handle.h" + #include "base/task/single_thread_task_runner.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" @@ -13,6 +14,9 @@ @@ -187,7 +187,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 -@@ -167,6 +167,8 @@ +@@ -168,6 +168,8 @@ #include "rlz/buildflags/buildflags.h" #include "third_party/abseil-cpp/absl/types/optional.h" @@ -196,7 +196,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 -@@ -1055,6 +1057,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -1087,6 +1089,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { chrome::enterprise_util::RegisterLocalStatePrefs(registry); component_updater::RegisterPrefs(registry); embedder_support::OriginTrialPrefs::RegisterPrefs(registry); @@ -208,7 +208,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 -@@ -159,7 +159,7 @@ void ChromeCommandLinePrefStore::ApplyProxyMode() { +@@ -155,7 +155,7 @@ void ChromeCommandLinePrefStore::ApplyProxyMode() { command_line()->GetSwitchValueASCII(switches::kProxyBypassList); SetValue(proxy_config::prefs::kProxy, base::Value(ProxyConfigDictionary::CreateFixedServers( @@ -641,7 +641,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 -@@ -287,6 +287,8 @@ static_library("ui") { +@@ -282,6 +282,8 @@ static_library("ui") { "webui/metrics_internals/metrics_internals_ui.h", "webui/net_export_ui.cc", "webui/net_export_ui.h", @@ -661,7 +661,7 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrom #include "chrome/browser/ui/webui/predictors/predictors_ui.h" #include "chrome/browser/ui/webui/segmentation_internals/segmentation_internals_ui.h" #include "chrome/browser/ui/webui/signin_internals_ui.h" -@@ -801,6 +802,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, +@@ -804,6 +805,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, return &NewWebUI; if (url.host_piece() == chrome::kChromeUINetExportHost) return &NewWebUI; @@ -1141,7 +1141,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons const char kChromeUIChromeURLsHost[] = "chrome-urls"; const char kChromeUIChromeURLsURL[] = "chrome://chrome-urls/"; const char kChromeUIComponentsHost[] = "components"; -@@ -446,6 +448,7 @@ bool IsSystemWebUIHost(base::StringPiece host) { +@@ -449,6 +451,7 @@ bool IsSystemWebUIHost(base::StringPiece host) { kChromeUILockScreenNetworkHost, kChromeUILockScreenStartReauthHost, kChromeUIMobileSetupHost, @@ -1149,7 +1149,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons kChromeUIMultiDeviceSetupHost, kChromeUINetworkHost, kChromeUINotificationTesterHost, -@@ -718,6 +721,7 @@ const char* const kChromeHostURLs[] = { +@@ -722,6 +725,7 @@ const char* const kChromeHostURLs[] = { #if !BUILDFLAG(IS_ANDROID) #if !BUILDFLAG(IS_CHROMEOS_ASH) kChromeUIAppLauncherPageHost, @@ -1160,7 +1160,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 -@@ -134,6 +134,8 @@ extern const char kChromeUIMetricsInternalsHost[]; +@@ -133,6 +133,8 @@ extern const char kChromeUIMetricsInternalsHost[]; extern const char kChromeUINTPTilesInternalsHost[]; extern const char kChromeUINaClHost[]; extern const char kChromeUINetExportHost[]; diff --git a/build/patches/Add-an-always-incognito-mode.patch b/build/patches/Add-an-always-incognito-mode.patch index 027c87af..003555fe 100644 --- a/build/patches/Add-an-always-incognito-mode.patch +++ b/build/patches/Add-an-always-incognito-mode.patch @@ -93,14 +93,14 @@ 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 -@@ -650,6 +650,7 @@ chrome_java_resources = [ +@@ -654,6 +654,7 @@ chrome_java_resources = [ "java/res/xml/main_preferences.xml", "java/res/xml/manage_sync_preferences.xml", "java/res/xml/phone_as_a_security_key_accessory_filter.xml", + "java/res/xml/incognito_preferences.xml", "java/res/xml/privacy_preferences.xml", + "java/res/xml/privacy_preferences_v2.xml", "java/res/xml/search_widget_info.xml", - "java/res/xml/tracing_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 @@ -112,7 +112,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", -@@ -907,6 +908,7 @@ chrome_java_sources = [ +@@ -899,6 +900,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", @@ -165,7 +165,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 -@@ -40,6 +40,11 @@ found in the LICENSE file. +@@ -41,6 +41,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"/> @@ -257,7 +257,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct if (TabUiFeatureUtilities.isTabletGridTabSwitcherEnabled(this)) { mTabModelSelector.addObserver(new TabModelSelectorObserver() { -@@ -1918,8 +1920,9 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -1812,6 +1813,9 @@ public abstract class ChromeActivity throw new IllegalStateException( "Attempting to access TabCreator before initialization"); } @@ -395,7 +395,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityLifecycleUmaTracker.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityLifecycleUmaTracker.java --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityLifecycleUmaTracker.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityLifecycleUmaTracker.java -@@ -68,31 +68,6 @@ public class CustomTabActivityLifecycleUmaTracker +@@ -50,31 +50,6 @@ public class CustomTabActivityLifecycleUmaTracker private boolean mIsInitialResume = true; private void recordIncognitoLaunchReason() { @@ -451,7 +451,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java -@@ -49,6 +49,9 @@ import org.chromium.components.embedder_support.util.UrlConstants; +@@ -50,6 +50,9 @@ import org.chromium.components.embedder_support.util.UrlConstants; import org.chromium.components.version_info.VersionInfo; import org.chromium.device.mojom.ScreenOrientationLockType; @@ -461,7 +461,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; -@@ -884,7 +887,7 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid +@@ -1049,7 +1052,7 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid @Override public boolean isIncognito() { @@ -595,15 +595,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java --- a/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java -@@ -15,6 +15,7 @@ import org.chromium.base.jank_tracker.JankTracker; - import org.chromium.base.supplier.BooleanSupplier; +@@ -14,6 +14,7 @@ import androidx.annotation.VisibleForTesting; + import org.chromium.base.jank_tracker.JankTracker; import org.chromium.base.supplier.DestroyableObservableSupplier; import org.chromium.base.supplier.Supplier; +import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor; import org.chromium.chrome.browser.app.ChromeActivity; import org.chromium.chrome.browser.app.download.home.DownloadPage; import org.chromium.chrome.browser.bookmarks.BookmarkPage; -@@ -251,7 +252,8 @@ public class NativePageFactory { +@@ -238,7 +239,8 @@ public class NativePageFactory { String url, NativePage candidatePage, Tab tab, boolean isIncognito) { NativePage page; @@ -833,7 +833,7 @@ new file mode 100644 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 -@@ -58,6 +58,7 @@ import org.chromium.chrome.browser.profiles.Profile; +@@ -60,6 +60,7 @@ import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.profiles.ProfileManagerUtils; import org.chromium.chrome.browser.search_engines.settings.SearchEngineSettings; import org.chromium.chrome.browser.site_settings.ChromeSiteSettingsDelegate; @@ -841,7 +841,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager; import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarManageable; import org.chromium.components.browser_ui.accessibility.AccessibilitySettings; -@@ -253,6 +254,9 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity +@@ -256,6 +257,9 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity if (fragment instanceof AdPersonalizationRemovedFragment) { ((AdPersonalizationRemovedFragment) fragment).setSnackbarManager(getSnackbarManager()); } @@ -972,7 +972,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.modaldialog.ModalDialogManager; -@@ -491,7 +493,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -500,7 +502,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { mAppMenuCoordinator == null ? null : mAppMenuCoordinator.getAppMenuHandler(); mEmptyBackgroundViewWrapper = new EmptyBackgroundViewWrapper(mTabModelSelectorSupplier.get(), @@ -1026,7 +1026,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabMod diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java -@@ -58,6 +58,8 @@ import org.chromium.content_public.browser.LoadUrlParams; +@@ -57,6 +57,8 @@ import org.chromium.content_public.browser.LoadUrlParams; import org.chromium.content_public.browser.UiThreadTaskTraits; import org.chromium.url.GURL; @@ -1035,7 +1035,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPer import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -@@ -757,6 +759,13 @@ public class TabPersistentStore { +@@ -756,6 +758,13 @@ public class TabPersistentStore { } } } @@ -1060,7 +1060,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.tab_activity_glue.TabReparentingController; import org.chromium.chrome.browser.app.tabmodel.TabWindowManagerSingleton; -@@ -520,7 +521,8 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve +@@ -523,7 +524,8 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve return ret; } }, @@ -1118,7 +1118,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappI 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 -@@ -4870,6 +4870,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4539,6 +4539,10 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kOfflinePagesLivePageSharingName, flag_descriptions::kOfflinePagesLivePageSharingDescription, kOsAndroid, FEATURE_VALUE_TYPE(offline_pages::kOfflinePagesLivePageSharingFeature)}, @@ -1192,7 +1192,7 @@ diff --git a/chrome/browser/android/historical_tab_saver.cc b/chrome/browser/and diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc --- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc +++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc -@@ -310,6 +310,13 @@ signin::IdentityManager* ChromeAutocompleteProviderClient::GetIdentityManager() +@@ -311,6 +311,13 @@ signin::IdentityManager* ChromeAutocompleteProviderClient::GetIdentityManager() return IdentityManagerFactory::GetForProfile(profile_); } @@ -1266,7 +1266,7 @@ diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.c diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -3815,6 +3815,12 @@ const char kOfflinePagesLivePageSharingDescription[] = +@@ -3787,6 +3787,12 @@ const char kOfflinePagesLivePageSharingDescription[] = "Enables to share current loaded page as offline page by saving as MHTML " "first."; @@ -1282,7 +1282,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -2189,6 +2189,9 @@ extern const char kNotificationPermissionRationaleDescription[]; +@@ -2171,6 +2171,9 @@ extern const char kNotificationPermissionRationaleDescription[]; extern const char kOfflinePagesLivePageSharingName[]; extern const char kOfflinePagesLivePageSharingDescription[]; @@ -1295,7 +1295,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -562,8 +562,8 @@ BASE_FEATURE(kCCTNewDownloadTab, +@@ -553,8 +553,8 @@ BASE_FEATURE(kCCTFeatureUsage, BASE_FEATURE(kCCTIncognito, "CCTIncognito", base::FEATURE_ENABLED_BY_DEFAULT); BASE_FEATURE(kCCTIncognitoAvailableToThirdParty, @@ -1304,8 +1304,8 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse + "CCTIncognitoAvailableToThirdParty", // must be enabled + base::FEATURE_ENABLED_BY_DEFAULT); // in Bromite - BASE_FEATURE(kCCTPackageNameRecording, - "CCTPackageNameRecording", + BASE_FEATURE(kCCTIntentFeatureOverrides, + "CCTIntentFeatureOverrides", 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 @@ -1319,7 +1319,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" -@@ -473,6 +476,13 @@ void HistoryTabHelper::TitleWasSet(NavigationEntry* entry) { +@@ -474,6 +477,13 @@ void HistoryTabHelper::TitleWasSet(NavigationEntry* entry) { history::HistoryService* HistoryTabHelper::GetHistoryService() { Profile* profile = Profile::FromBrowserContext(web_contents()->GetBrowserContext()); @@ -1333,7 +1333,7 @@ diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/histo if (profile->IsOffTheRecord()) return nullptr; -@@ -480,6 +490,14 @@ history::HistoryService* HistoryTabHelper::GetHistoryService() { +@@ -481,6 +491,14 @@ history::HistoryService* HistoryTabHelper::GetHistoryService() { profile, ServiceAccessType::IMPLICIT_ACCESS); } @@ -1620,7 +1620,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 -@@ -230,6 +230,7 @@ +@@ -235,6 +235,7 @@ #include "components/feed/core/shared_prefs/pref_names.h" #if BUILDFLAG(IS_ANDROID) @@ -1628,7 +1628,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" #include "chrome/browser/android/explore_sites/history_statistics_reporter.h" #include "chrome/browser/android/ntp/recent_tabs_page_prefs.h" -@@ -1437,6 +1438,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -1477,6 +1478,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, usage_stats::UsageStatsBridge::RegisterProfilePrefs(registry); variations::VariationsService::RegisterProfilePrefs(registry); video_tutorials::RegisterPrefs(registry); @@ -1664,7 +1664,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/ /** * An interface for pages that will be using Android views instead of html/rendered Web content. */ -@@ -130,12 +132,12 @@ public interface NativePage { +@@ -128,12 +130,12 @@ public interface NativePage { */ @Deprecated // Use GURL-variant instead. public static boolean isNativePageUrl(String url, boolean isIncognito) { @@ -1679,7 +1679,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/ } /** -@@ -146,7 +148,8 @@ public interface NativePage { +@@ -144,7 +146,8 @@ public interface NativePage { */ // TODO(crbug/783819) - Convert to using GURL. public static @NativePageType int nativePageType( @@ -1689,7 +1689,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/ if (url == null) return NativePageType.NONE; Uri uri = Uri.parse(url); -@@ -168,7 +171,8 @@ public interface NativePage { +@@ -166,7 +169,8 @@ public interface NativePage { return NativePageType.DOWNLOADS; } else if (UrlConstants.HISTORY_HOST.equals(host)) { return NativePageType.HISTORY; @@ -1702,7 +1702,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -1151,6 +1151,37 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1448,6 +1448,37 @@ Your Google account may have other forms of browsing history like searches and a Clears history from all synced devices. @@ -1743,7 +1743,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/LocationBarModel.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/LocationBarModel.java --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/LocationBarModel.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/LocationBarModel.java -@@ -178,6 +178,7 @@ public class LocationBarModel implements ToolbarDataProvider, LocationBarDataPro +@@ -179,6 +179,7 @@ public class LocationBarModel implements ToolbarDataProvider, LocationBarDataPro protected String mFormattedFullUrl; protected String mUrlForDisplay; private boolean mOmniboxUpdatedConnectionSecurityIndicatorsEnabled; @@ -1751,7 +1751,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow /** * Default constructor for this class. -@@ -192,7 +193,8 @@ public class LocationBarModel implements ToolbarDataProvider, LocationBarDataPro +@@ -193,7 +194,8 @@ public class LocationBarModel implements ToolbarDataProvider, LocationBarDataPro public LocationBarModel(Context context, NewTabPageDelegate newTabPageDelegate, @NonNull UrlFormatter urlFormatter, @NonNull ProfileProvider profileProvider, @NonNull OfflineStatus offlineStatus, @@ -1761,7 +1761,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow mContext = context; mNtpDelegate = newTabPageDelegate; mUrlFormatter = urlFormatter; -@@ -200,6 +202,7 @@ public class LocationBarModel implements ToolbarDataProvider, LocationBarDataPro +@@ -201,6 +203,7 @@ public class LocationBarModel implements ToolbarDataProvider, LocationBarDataPro mOfflineStatus = offlineStatus; mPrimaryColor = ChromeColors.getDefaultThemeColor(context, false); mSearchEngineLogoUtils = searchEngineLogoUtils; @@ -1769,7 +1769,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow } /** -@@ -207,7 +210,7 @@ public class LocationBarModel implements ToolbarDataProvider, LocationBarDataPro +@@ -208,7 +211,7 @@ public class LocationBarModel implements ToolbarDataProvider, LocationBarDataPro */ public void initializeWithNative() { mOptimizationsEnabled = @@ -1781,7 +1781,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/messages/android/BUILD.gn b/chrome/browser/ui/messages/android/BUILD.gn --- a/chrome/browser/ui/messages/android/BUILD.gn +++ b/chrome/browser/ui/messages/android/BUILD.gn -@@ -24,6 +24,7 @@ android_resources("java_resources") { +@@ -23,6 +23,7 @@ android_resources("java_resources") { android_library("java") { sources = [ "java/src/org/chromium/chrome/browser/ui/messages/infobar/SimpleConfirmInfoBarBuilder.java", @@ -1824,8 +1824,8 @@ new file mode 100644 diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc --- a/chrome/common/pref_names.cc +++ b/chrome/common/pref_names.cc -@@ -3451,6 +3451,12 @@ const char kShowCaretBrowsingDialog[] = - const char kLacrosLaunchSwitch[] = "lacros_launch_switch"; +@@ -3495,6 +3495,12 @@ const char kLacrosLaunchSwitch[] = "lacros_launch_switch"; + const char kLacrosSelection[] = "lacros_selection"; #endif +#if BUILDFLAG(IS_ANDROID) @@ -1840,7 +1840,7 @@ diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc 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 -@@ -1224,6 +1224,8 @@ extern const char kDiscountConsentShowInterestIn[]; +@@ -1236,6 +1236,8 @@ extern const char kDiscountConsentShowInterestIn[]; #if BUILDFLAG(IS_ANDROID) extern const char kWebXRImmersiveArEnabled[]; @@ -1849,7 +1849,7 @@ diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h #endif #if !BUILDFLAG(IS_ANDROID) -@@ -1262,6 +1264,10 @@ extern const char kPrivacyGuideViewed[]; +@@ -1274,6 +1276,10 @@ extern const char kPrivacyGuideViewed[]; extern const char kCorsNonWildcardRequestHeadersSupport[]; @@ -1945,7 +1945,7 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map. bool store_last_modified, bool restore_session, bool should_record_metrics); -@@ -443,6 +444,8 @@ class HostContentSettingsMap : public content_settings::Observer, +@@ -442,6 +443,8 @@ class HostContentSettingsMap : public content_settings::Observer, // Whether this settings map is for an incognito or guest session. bool is_off_the_record_; @@ -2003,7 +2003,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 -@@ -274,7 +274,7 @@ bool BaseSearchProvider::CanSendZeroSuggestRequest( +@@ -369,7 +369,7 @@ bool BaseSearchProvider::CanSendZeroSuggestRequest( } // Don't make a suggest request if in incognito mode. diff --git a/build/patches/Add-bookmark-import-export-actions.patch b/build/patches/Add-bookmark-import-export-actions.patch index b8d9f4f3..88ebb45a 100644 --- a/build/patches/Add-bookmark-import-export-actions.patch +++ b/build/patches/Add-bookmark-import-export-actions.patch @@ -85,15 +85,15 @@ diff --git a/chrome/android/java/res/menu/bookmark_action_bar_menu.xml b/chrome/ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDelegateFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDelegateFactory.java --- a/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDelegateFactory.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDelegateFactory.java -@@ -9,6 +9,7 @@ import android.app.Activity; +@@ -8,6 +8,7 @@ import android.app.Activity; + import org.chromium.base.jank_tracker.JankTracker; - import org.chromium.base.supplier.BooleanSupplier; import org.chromium.base.supplier.Supplier; +import org.chromium.chrome.browser.app.ChromeActivity; import org.chromium.chrome.browser.app.tab_activity_glue.ActivityTabWebContentsDelegateAndroid; import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider; import org.chromium.chrome.browser.compositor.CompositorViewHolder; -@@ -47,7 +48,7 @@ import org.chromium.ui.modaldialog.ModalDialogManager; +@@ -48,7 +49,7 @@ import java.util.function.BooleanSupplier; * {@link ChromeTabbedActivity}. */ public class TabbedModeTabDelegateFactory implements TabDelegateFactory { @@ -102,7 +102,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDe private final BrowserControlsVisibilityDelegate mAppBrowserControlsVisibilityDelegate; private final Supplier mShareDelegateSupplier; private final Supplier mEphemeralTabCoordinatorSupplier; -@@ -74,7 +75,7 @@ public class TabbedModeTabDelegateFactory implements TabDelegateFactory { +@@ -75,7 +76,7 @@ public class TabbedModeTabDelegateFactory implements TabDelegateFactory { private NativePageFactory mNativePageFactory; @@ -282,7 +282,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm /** * Provides the communication channel for Android to fetch and manipulate the * bookmark model stored in native. -@@ -405,6 +444,209 @@ class BookmarkBridge { +@@ -429,6 +468,209 @@ class BookmarkBridge { mNativeBookmarkBridge, BookmarkBridge.this, id.getId(), id.getType()); } @@ -492,7 +492,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. * @param query Keyword used for searching bookmarks. -@@ -869,6 +1111,39 @@ class BookmarkBridge { +@@ -913,6 +1155,39 @@ class BookmarkBridge { depthList.add(depth); } @@ -532,7 +532,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm private static List> createPairsList(int[] left, int[] right) { List> pairList = new ArrayList>(); for (int i = 0; i < left.length; i++) { -@@ -901,6 +1176,9 @@ class BookmarkBridge { +@@ -946,6 +1221,9 @@ class BookmarkBridge { int getChildCount(long nativeBookmarkBridge, BookmarkBridge caller, long id, int type); void getChildIDs(long nativeBookmarkBridge, BookmarkBridge caller, long id, int type, List bookmarksList); @@ -583,7 +583,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm private BookmarkUndoController mUndoController; private final ObserverList mUIObservers = new ObserverList<>(); private BasicNativePage mNativePage; -@@ -344,6 +348,14 @@ public class BookmarkManager +@@ -343,6 +347,14 @@ public class BookmarkManager mNativePage = nativePage; } @@ -598,7 +598,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm /** * @return Current URL representing the UI state of bookmark manager. If no state has been shown * yet in this session, on phone return last used state stored in preference; on tablet -@@ -540,6 +552,16 @@ public class BookmarkManager +@@ -539,6 +551,16 @@ public class BookmarkManager } } @@ -648,15 +648,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java --- a/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java -@@ -15,6 +15,7 @@ import org.chromium.base.jank_tracker.JankTracker; - import org.chromium.base.supplier.BooleanSupplier; +@@ -14,6 +14,7 @@ import androidx.annotation.VisibleForTesting; + import org.chromium.base.jank_tracker.JankTracker; import org.chromium.base.supplier.DestroyableObservableSupplier; import org.chromium.base.supplier.Supplier; +import org.chromium.chrome.browser.app.ChromeActivity; import org.chromium.chrome.browser.app.download.home.DownloadPage; import org.chromium.chrome.browser.bookmarks.BookmarkPage; import org.chromium.chrome.browser.browser_controls.BrowserControlsMarginSupplier; -@@ -55,7 +56,7 @@ import org.chromium.ui.util.ColorUtils; +@@ -53,7 +54,7 @@ import java.util.function.BooleanSupplier; * Creates NativePage objects to show chrome-native:// URLs using the native Android view system. */ public class NativePageFactory { @@ -665,7 +665,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat private final BottomSheetController mBottomSheetController; private final BrowserControlsManager mBrowserControlsManager; private final Supplier mCurrentTabSupplier; -@@ -73,7 +74,7 @@ public class NativePageFactory { +@@ -71,7 +72,7 @@ public class NativePageFactory { private NativePageBuilder mNativePageBuilder; @@ -674,7 +674,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat @NonNull BottomSheetController sheetController, @NonNull BrowserControlsManager browserControlsManager, @NonNull Supplier currentTabSupplier, -@@ -124,7 +125,7 @@ public class NativePageFactory { +@@ -122,7 +123,7 @@ public class NativePageFactory { @VisibleForTesting static class NativePageBuilder { @@ -683,7 +683,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat private final BottomSheetController mBottomSheetController; private final Supplier mUma; private final BrowserControlsManager mBrowserControlsManager; -@@ -138,7 +139,7 @@ public class NativePageFactory { +@@ -136,7 +137,7 @@ public class NativePageFactory { private final Supplier mToolbarSupplier; private final CrowButtonDelegate mCrowButtonDelegate; @@ -692,7 +692,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat BottomSheetController sheetController, BrowserControlsManager browserControlsManager, Supplier currentTabSupplier, Supplier snackbarManagerSupplier, -@@ -177,7 +178,7 @@ public class NativePageFactory { +@@ -175,7 +176,7 @@ public class NativePageFactory { protected NativePage buildBookmarksPage(Tab tab) { return new BookmarkPage(mActivity.getComponentName(), mSnackbarManagerSupplier.get(), mTabModelSelector.isIncognitoSelected(), @@ -704,7 +704,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 -@@ -214,6 +214,8 @@ static_library("browser") { +@@ -208,6 +208,8 @@ static_library("browser") { "bluetooth/chrome_bluetooth_delegate_impl_client.h", "bookmarks/bookmark_model_factory.cc", "bookmarks/bookmark_model_factory.h", @@ -713,7 +713,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "bookmarks/chrome_bookmark_client.cc", "bookmarks/chrome_bookmark_client.h", "bookmarks/managed_bookmark_service_factory.cc", -@@ -1877,6 +1879,13 @@ static_library("browser") { +@@ -1869,6 +1871,13 @@ static_library("browser") { ] } @@ -727,7 +727,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn configs += [ "//build/config/compiler:wexit_time_destructors", "//build/config:precompiled_headers", -@@ -3551,8 +3560,6 @@ static_library("browser") { +@@ -3514,8 +3523,6 @@ static_library("browser") { "badging/badge_manager_factory.h", "banners/app_banner_manager_desktop.cc", "banners/app_banner_manager_desktop.h", @@ -739,7 +739,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -9140,6 +9140,12 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8640,6 +8640,12 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kRequestDesktopSiteExceptions)}, #endif @@ -750,8 +750,8 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc + chrome::android::kBookmarksExportUseSaf)}, + #if BUILDFLAG(IS_CHROMEOS_ASH) - {"snooping-protection", flag_descriptions::kSnoopingProtectionName, - flag_descriptions::kSnoopingProtectionDescription, kOsCrOS, + {"vc-background-blur", flag_descriptions::kVCBackgroundBlurName, + flag_descriptions::kVCBackgroundBlurDescription, kOsCrOS, 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 @@ -874,7 +874,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse class BookmarkTitleComparer { public: explicit BookmarkTitleComparer(BookmarkBridge* bookmark_bridge, -@@ -158,6 +261,10 @@ BookmarkBridge::~BookmarkBridge() { +@@ -183,6 +286,10 @@ BookmarkBridge::~BookmarkBridge() { if (partner_bookmarks_shim_) partner_bookmarks_shim_->RemoveObserver(this); reading_list_manager_->RemoveObserver(this); @@ -885,7 +885,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse } void BookmarkBridge::Destroy(JNIEnv*, const JavaParamRef&) { -@@ -568,6 +675,182 @@ jint BookmarkBridge::GetTotalBookmarkCount( +@@ -578,6 +685,182 @@ jint BookmarkBridge::GetTotalBookmarkCount( return count; } @@ -1071,15 +1071,15 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser/bookmarks/android/bookmark_bridge.h --- a/chrome/browser/bookmarks/android/bookmark_bridge.h +++ b/chrome/browser/bookmarks/android/bookmark_bridge.h -@@ -18,6 +18,7 @@ - #include "base/scoped_observation.h" +@@ -19,6 +19,7 @@ #include "base/strings/utf_string_conversions.h" + #include "base/supports_user_data.h" #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" +#include "chrome/browser/bookmarks/bookmark_html_writer.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_observer.h" #include "chrome/browser/reading_list/android/reading_list_manager.h" -@@ -26,6 +27,9 @@ +@@ -27,6 +28,9 @@ #include "components/prefs/pref_change_registrar.h" #include "url/android/gurl_android.h" @@ -1089,17 +1089,17 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser namespace bookmarks { class BookmarkModel; class ManagedBookmarkService; -@@ -40,7 +44,8 @@ class Profile; - class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, +@@ -44,7 +48,8 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, public PartnerBookmarksShim::Observer, public ReadingListManager::Observer, -- public ProfileObserver { -+ public ProfileObserver, + public ProfileObserver, +- public base::SupportsUserData::Data { ++ public base::SupportsUserData::Data, + public ui::SelectFileDialog::Listener { public: - BookmarkBridge(JNIEnv* env, - const base::android::JavaRef& obj, -@@ -60,6 +65,12 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, + BookmarkBridge(Profile* profile, + bookmarks::BookmarkModel* model, +@@ -67,6 +72,12 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, bool IsDoingExtensiveChanges(JNIEnv* env, const base::android::JavaParamRef& obj); @@ -1112,7 +1112,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser jboolean IsEditBookmarksEnabled(JNIEnv* env); void LoadEmptyPartnerBookmarkShimForTesting( -@@ -157,6 +168,15 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, +@@ -164,6 +175,15 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, jlong id, jint type); @@ -1128,14 +1128,14 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser void SetBookmarkTitle(JNIEnv* env, const base::android::JavaParamRef& obj, jlong id, -@@ -348,12 +368,16 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, +@@ -356,12 +376,16 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, void DestroyJavaObject(); raw_ptr profile_; + base::FilePath export_path_; + BookmarksExportObserver* observer_; // weak + - JavaObjectWeakGlobalRef weak_java_ref_; + base::android::ScopedJavaGlobalRef java_bookmark_model_; raw_ptr bookmark_model_; // weak raw_ptr managed_bookmark_service_; // weak std::unique_ptr @@ -1145,7 +1145,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. -@@ -365,6 +389,10 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, +@@ -373,6 +397,10 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, // Observes the profile destruction and creation. base::ScopedObservation profile_observation_{this}; @@ -1251,7 +1251,7 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -6643,6 +6643,11 @@ const char kVcControlsUiDescription[] = +@@ -6567,6 +6567,11 @@ const char kVcControlsUiDescription[] = #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -1266,7 +1266,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -3851,6 +3851,9 @@ extern const char kDisableLacrosTtsSupportDescription[]; +@@ -3819,6 +3819,9 @@ extern const char kPromiseIconsDescription[]; extern const char kVcControlsUiName[]; extern const char kVcControlsUiDescription[]; @@ -1279,7 +1279,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -186,6 +186,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -185,6 +185,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kCastDeviceFilter, &kClearOmniboxFocusAfterNavigation, &kCloseTabSuggestions, @@ -1287,7 +1287,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &kCriticalPersistedTabData, &kCommerceCoupons, &kCCTBackgroundTab, -@@ -1106,6 +1107,11 @@ BASE_FEATURE(kWebApkTrampolineOnInitialIntent, +@@ -1097,6 +1098,11 @@ BASE_FEATURE(kWebApkTrampolineOnInitialIntent, "WebApkTrampolineOnInitialIntent", base::FEATURE_ENABLED_BY_DEFAULT); @@ -1302,7 +1302,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 -@@ -158,6 +158,7 @@ BASE_DECLARE_FEATURE(kDiscoverFeedMultiColumn); +@@ -159,6 +159,7 @@ BASE_DECLARE_FEATURE(kDiscoverFeedMultiColumn); BASE_DECLARE_FEATURE(kTabStripRedesign); BASE_DECLARE_FEATURE(kTabSwitcherOnReturn); BASE_DECLARE_FEATURE(kTabToGTSAnimation); @@ -1313,7 +1313,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 -@@ -580,6 +580,7 @@ public abstract class ChromeFeatureList { +@@ -576,6 +576,7 @@ public abstract class ChromeFeatureList { public static final String USE_LIBUNWINDSTACK_NATIVE_UNWINDER_ANDROID = "UseLibunwindstackNativeUnwinderAndroid"; public static final String VOICE_SEARCH_AUDIO_CAPTURE_POLICY = "VoiceSearchAudioCapturePolicy"; @@ -1430,7 +1430,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 -@@ -401,6 +401,9 @@ static_library("common_lib") { +@@ -403,6 +403,9 @@ static_library("common_lib") { sources += [ "media/chrome_media_drm_bridge_client.cc", "media/chrome_media_drm_bridge_client.h", @@ -1452,7 +1452,7 @@ diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn "importer/bookmarks_file_importer.cc", "importer/bookmarks_file_importer.h", "importer/external_process_importer_bridge.cc", -@@ -215,6 +213,11 @@ static_library("utility") { +@@ -219,6 +217,11 @@ static_library("utility") { ] } @@ -1461,9 +1461,9 @@ diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn + "importer/bookmark_html_reader.h", + ] + - if (use_nss_certs) { + # NSS decryptor is not needed on ChromeOS. + if (!is_chromeos && use_nss_certs) { sources += [ - "importer/nss_decryptor_system_nss.cc", diff --git a/chrome/utility/importer/bookmark_html_reader.cc b/chrome/utility/importer/bookmark_html_reader.cc --- a/chrome/utility/importer/bookmark_html_reader.cc +++ b/chrome/utility/importer/bookmark_html_reader.cc diff --git a/build/patches/Add-custom-tab-intents-privacy-option.patch b/build/patches/Add-custom-tab-intents-privacy-option.patch index bb01c676..dd2bee8b 100644 --- a/build/patches/Add-custom-tab-intents-privacy-option.patch +++ b/build/patches/Add-custom-tab-intents-privacy-option.patch @@ -12,17 +12,17 @@ See also: https://github.com/bromite/bromite/issues/1474 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- .../java/res/xml/privacy_preferences.xml | 10 ++++++++ - .../browser/LaunchIntentDispatcher.java | 22 +++++++++++++++++ + .../browser/LaunchIntentDispatcher.java | 21 ++++++++++++++++ .../IncognitoCustomTabIntentDataProvider.java | 6 +++++ .../privacy/settings/PrivacySettings.java | 24 +++++++++++++++++++ .../chrome/browser/tab/TabAssociatedApp.java | 6 ++++- .../strings/android_chrome_strings.grd | 15 ++++++++++++ - 6 files changed, 82 insertions(+), 1 deletion(-) + 6 files changed, 81 insertions(+), 1 deletion(-) 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 -@@ -58,6 +58,16 @@ found in the LICENSE file. +@@ -59,6 +59,16 @@ found in the LICENSE file. android:fragment="org.chromium.chrome.browser.privacy.settings.DoNotTrackSettings" android:key="do_not_track" android:title="@string/do_not_track_title"/> @@ -42,7 +42,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java --- a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java -@@ -45,6 +45,7 @@ import org.chromium.chrome.browser.notifications.NotificationPlatformBridge; +@@ -44,6 +44,7 @@ import org.chromium.chrome.browser.notifications.NotificationPlatformBridge; import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations; import org.chromium.chrome.browser.searchwidget.SearchActivity; import org.chromium.chrome.browser.tab.Tab; @@ -50,7 +50,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis import org.chromium.chrome.browser.translate.TranslateIntentHandler; import org.chromium.chrome.browser.util.AndroidTaskUtils; import org.chromium.chrome.browser.vr.VrModuleProvider; -@@ -58,6 +59,8 @@ import java.lang.annotation.Retention; +@@ -57,6 +58,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.Set; @@ -59,7 +59,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis /** * Dispatches incoming intents to the appropriate activity based on the current configuration and * Intent fired. -@@ -268,6 +271,9 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega +@@ -267,6 +270,9 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega */ public static boolean isCustomTabIntent(Intent intent) { if (intent == null) return false; @@ -69,7 +69,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis if (CustomTabsIntent.shouldAlwaysUseBrowserUI(intent) || !intent.hasExtra(CustomTabsIntent.EXTRA_SESSION)) { return false; -@@ -287,6 +293,10 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega +@@ -286,6 +292,10 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega newIntent.setData(uri); newIntent.setClassName(context, CustomTabActivity.class.getName()); @@ -80,7 +80,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis // Since configureIntentForResizableCustomTab() might change the componenet/class // associated with the passed intent, it needs to be called after #setClassName(context, // CustomTabActivity.class.getName()); -@@ -438,6 +448,18 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega +@@ -437,6 +447,17 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega if (Intent.ACTION_VIEW.equals(newIntent.getAction()) && !IntentHandler.wasIntentSenderChrome(newIntent)) { @@ -95,14 +95,13 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis + IntentHandler.setTabLaunchType(newIntent, TabLaunchType.FROM_EXTERNAL_APP); + newIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + } -+ - long time = SystemClock.elapsedRealtime(); if (!chromeTabbedTaskExists()) { newIntent.putExtra(IntentHandler.EXTRA_STARTED_TABBED_CHROME_TASK, true); + } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/IncognitoCustomTabIntentDataProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/IncognitoCustomTabIntentDataProvider.java --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/IncognitoCustomTabIntentDataProvider.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/IncognitoCustomTabIntentDataProvider.java -@@ -35,6 +35,9 @@ import org.chromium.components.browser_ui.widget.TintedDrawable; +@@ -36,6 +36,9 @@ import org.chromium.components.browser_ui.widget.TintedDrawable; import java.util.ArrayList; import java.util.List; @@ -112,7 +111,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Inco /** * A model class that parses the incoming intent for incognito Custom Tabs specific customization * data. -@@ -108,6 +111,9 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD +@@ -111,6 +114,9 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD } private static boolean isIntentFromThirdPartyAllowed() { @@ -125,7 +124,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 -@@ -76,6 +76,9 @@ public class PrivacySettings +@@ -83,6 +83,9 @@ public class PrivacySettings private ManagedPreferenceDelegate mManagedPreferenceDelegate; private IncognitoLockSettings mIncognitoLockSettings; @@ -135,7 +134,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting @Override public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { PrivacyPreferencesManagerImpl privacyPrefManager = -@@ -135,6 +138,9 @@ public class PrivacySettings +@@ -161,6 +164,9 @@ public class PrivacySettings updatePreferences(); } @@ -145,7 +144,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(); -@@ -151,6 +157,14 @@ public class PrivacySettings +@@ -177,6 +183,14 @@ public class PrivacySettings } else if (PREF_SEARCH_SUGGESTIONS.equals(key)) { UserPrefs.get(Profile.getLastUsedRegularProfile()) .setBoolean(Pref.SEARCH_SUGGEST_ENABLED, (boolean) newValue); @@ -160,7 +159,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting } return true; } -@@ -173,6 +187,16 @@ public class PrivacySettings +@@ -199,6 +213,16 @@ public class PrivacySettings canMakePaymentPref.setChecked(prefService.getBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED)); } @@ -196,7 +195,7 @@ diff --git a/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/TabAsso 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 -@@ -4783,6 +4783,21 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

Show original diff --git a/build/patches/Add-exit-menu-item.patch b/build/patches/Add-exit-menu-item.patch index d79ef230..08603be8 100644 --- a/build/patches/Add-exit-menu-item.patch +++ b/build/patches/Add-exit-menu-item.patch @@ -59,7 +59,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ApplicationLife 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 -@@ -225,6 +225,8 @@ import java.util.HashSet; +@@ -224,6 +224,8 @@ import java.util.HashSet; import java.util.List; import java.util.Locale; @@ -68,7 +68,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. -@@ -2202,6 +2204,8 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -2305,6 +2306,11 @@ public abstract class ChromeActivity return true; } @@ -119,7 +119,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 -@@ -3470,6 +3470,9 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

Dark theme diff --git a/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch b/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch index 4404906f..d73d0ac9 100644 --- a/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch +++ b/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch @@ -17,7 +17,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 -@@ -539,6 +539,22 @@ const FeatureEntry::FeatureVariation kReaderModeDiscoverabilityVariations[] = { +@@ -527,6 +527,22 @@ const FeatureEntry::FeatureVariation kReaderModeDiscoverabilityVariations[] = { #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_ANDROID) @@ -40,7 +40,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc const FeatureEntry::FeatureParam kAdaptiveButton_AlwaysNone[] = { {"mode", "always-none"}}; const FeatureEntry::FeatureParam kAdaptiveButton_AlwaysNewTab[] = { -@@ -4428,7 +4444,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4098,7 +4114,11 @@ const FeatureEntry kFeatureEntries[] = { kOsMac | kOsLinux | kOsWin, FEATURE_VALUE_TYPE(features::kSystemNotifications)}, #endif // BUILDFLAG(ENABLE_SYSTEM_NOTIFICATIONS) && !BUILDFLAG(IS_CHROMEOS_ASH) @@ -84,7 +84,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 -@@ -475,6 +475,9 @@ void HistoryURLProvider::Start(const AutocompleteInput& input, +@@ -474,6 +474,9 @@ void HistoryURLProvider::Start(const AutocompleteInput& input, if (fixed_up_input.type() != metrics::OmniboxInputType::QUERY) matches_.push_back(what_you_typed_match); diff --git a/build/patches/Add-flag-for-save-data-header.patch b/build/patches/Add-flag-for-save-data-header.patch index 0e225f29..40f94d1d 100644 --- a/build/patches/Add-flag-for-save-data-header.patch +++ b/build/patches/Add-flag-for-save-data-header.patch @@ -9,13 +9,13 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html chrome/browser/flag_descriptions.h | 3 +++ .../browser/loader/browser_initiated_resource_request.cc | 8 ++++++++ services/network/public/cpp/features.cc | 5 +++++ - services/network/public/cpp/features.h | 2 +- - 6 files changed, 25 insertions(+), 2 deletions(-) + services/network/public/cpp/features.h | 2 ++ + 6 files changed, 26 insertions(+), 1 deletion(-) 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 -@@ -5018,7 +5018,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4683,7 +4683,10 @@ const FeatureEntry kFeatureEntries[] = { {"force-text-direction", flag_descriptions::kForceTextDirectionName, flag_descriptions::kForceTextDirectionDescription, kOsAll, MULTI_VALUE_TYPE(kForceTextDirectionChoices)}, @@ -30,7 +30,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -1222,6 +1222,10 @@ const char kDeprecateAltBasedSixPackDescription[] = +@@ -1188,6 +1188,10 @@ const char kDeprecateAltBasedSixPackDescription[] = "Show deprecation notifications and disable functionality for Alt based " "six pack deprecations. The Search based versions continue to work."; @@ -44,7 +44,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -650,6 +650,9 @@ extern const char kDeprecateAltClickDescription[]; +@@ -623,6 +623,9 @@ extern const char kDeprecateAltClickDescription[]; extern const char kDeprecateAltBasedSixPackName[]; extern const char kDeprecateAltBasedSixPackDescription[]; @@ -84,9 +84,9 @@ diff --git a/content/browser/loader/browser_initiated_resource_request.cc b/cont 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 -@@ -20,6 +20,11 @@ BASE_FEATURE(kExpectCTReporting, - "ExpectCTReporting", - base::FEATURE_ENABLED_BY_DEFAULT); +@@ -14,6 +14,11 @@ + + namespace network::features { +// Enable save-data header separately (without enabled data reduction service). +BASE_FEATURE(kEnableSaveDataHeader, @@ -99,14 +99,14 @@ 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 -@@ -50,7 +50,7 @@ extern const base::FeatureParam - kTrustTokenOperationsRequiringOriginTrial; - COMPONENT_EXPORT(NETWORK_CPP) - extern const base::FeatureParam kPlatformProvidedTrustTokenIssuance; -- -+COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kEnableSaveDataHeader); - COMPONENT_EXPORT(NETWORK_CPP) - BASE_DECLARE_FEATURE(kWebSocketReassembleShortMessages); +@@ -54,6 +54,8 @@ BASE_DECLARE_FEATURE(kWebSocketReassembleShortMessages); + COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kAcceptCHFrame); + ++COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kEnableSaveDataHeader); ++ + COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kSCTAuditingRetryReports); + + COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kSCTAuditingPersistReports); -- 2.25.1 diff --git a/build/patches/Add-flag-to-configure-maximum-connections-per-host.patch b/build/patches/Add-flag-to-configure-maximum-connections-per-host.patch index 534ae2e5..8cb33256 100644 --- a/build/patches/Add-flag-to-configure-maximum-connections-per-host.patch +++ b/build/patches/Add-flag-to-configure-maximum-connections-per-host.patch @@ -21,7 +21,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 -@@ -1097,6 +1097,11 @@ const FeatureEntry::Choice kForceColorProfileChoices[] = { +@@ -1078,6 +1078,11 @@ const FeatureEntry::Choice kForceColorProfileChoices[] = { switches::kForceDisplayColorProfile, "hdr10"}, }; @@ -33,10 +33,10 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc const FeatureEntry::Choice kMemlogModeChoices[] = { {flags_ui::kGenericExperimentChoiceDisabled, "", ""}, {flag_descriptions::kMemlogModeMinimal, heap_profiling::kMemlogMode, -@@ -4917,6 +4922,9 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kAndroidPictureInPictureAPIName, - flag_descriptions::kAndroidPictureInPictureAPIDescription, kOsAndroid, - FEATURE_VALUE_TYPE(media::kPictureInPictureAPI)}, +@@ -4582,6 +4587,9 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kVideoTutorialsInstantFetchName, + flag_descriptions::kVideoTutorialsInstantFetchDescription, kOsAndroid, + SINGLE_VALUE_TYPE(video_tutorials::switches::kVideoTutorialsInstantFetch)}, + {"max-connections-per-host", flag_descriptions::kMaxConnectionsPerHostName, + flag_descriptions::kMaxConnectionsPerHostDescription, kOsAll, + MULTI_VALUE_TYPE(kMaxConnectionsPerHostChoices)}, @@ -46,7 +46,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -1830,6 +1830,10 @@ const char kUnthrottledNestedTimeoutDescription[] = +@@ -1843,6 +1843,10 @@ const char kUnthrottledNestedTimeoutDescription[] = "websites abusing the API will still eventually have their setTimeouts " "clamped."; @@ -60,7 +60,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -1037,6 +1037,9 @@ extern const char kLogJsConsoleMessagesDescription[]; +@@ -1040,6 +1040,9 @@ extern const char kLogJsConsoleMessagesDescription[]; extern const char kUnthrottledNestedTimeoutName[]; extern const char kUnthrottledNestedTimeoutDescription[]; diff --git a/build/patches/Add-flag-to-control-video-playback-resume-feature.patch b/build/patches/Add-flag-to-control-video-playback-resume-feature.patch index 1bf1d702..31e409de 100644 --- a/build/patches/Add-flag-to-control-video-playback-resume-feature.patch +++ b/build/patches/Add-flag-to-control-video-playback-resume-feature.patch @@ -15,7 +15,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 -@@ -3730,6 +3730,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3402,6 +3402,10 @@ const FeatureEntry kFeatureEntries[] = { SINGLE_VALUE_TYPE(extensions::switches::kExtensionsOnChromeURLs)}, #endif // ENABLE_EXTENSIONS #if BUILDFLAG(IS_ANDROID) @@ -29,7 +29,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -1317,6 +1317,11 @@ const char kEnablePenetratingImageSelectionDescription[] = +@@ -1277,6 +1277,11 @@ const char kEnablePenetratingImageSelectionDescription[] = "Enables image options to be surfaced in the context menu for nodes " "covered by transparent overlays."; @@ -44,7 +44,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -722,6 +722,9 @@ extern const char kEnablePortalsDescription[]; +@@ -698,6 +698,9 @@ extern const char kEnablePortalsDescription[]; extern const char kEnablePortalsCrossOriginName[]; extern const char kEnablePortalsCrossOriginDescription[]; @@ -57,7 +57,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio 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 -@@ -316,12 +316,8 @@ BASE_FEATURE(kPreloadMetadataLazyLoad, +@@ -327,12 +327,8 @@ BASE_FEATURE(kPreloadMetadataLazyLoad, // Let videos be resumed via remote controls (for example, the notification) // when in background. BASE_FEATURE(kResumeBackgroundVideo, diff --git a/build/patches/Add-flag-to-disable-IPv6-probes.patch b/build/patches/Add-flag-to-disable-IPv6-probes.patch index d98c50d8..171e0d46 100644 --- a/build/patches/Add-flag-to-disable-IPv6-probes.patch +++ b/build/patches/Add-flag-to-disable-IPv6-probes.patch @@ -17,7 +17,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 -@@ -6166,6 +6166,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5800,6 +5800,10 @@ const FeatureEntry kFeatureEntries[] = { {"enable-reader-mode-in-cct", flag_descriptions::kReaderModeInCCTName, flag_descriptions::kReaderModeInCCTDescription, kOsAndroid, FEATURE_VALUE_TYPE(chrome::android::kReaderModeInCCT)}, @@ -31,7 +31,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -3517,6 +3517,10 @@ const char kCCTRealTimeEngagementSignalsDescription[] = +@@ -3506,6 +3506,10 @@ const char kCCTRealTimeEngagementSignalsDescription[] = "Enables sending real-time engagement signals (e.g. scroll) through " "CustomTabsCallback."; @@ -45,8 +45,8 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -788,6 +788,9 @@ extern const char kEnableWasmLazyCompilationName[]; - extern const char kEnableWasmLazyCompilationDescription[]; +@@ -770,6 +770,9 @@ extern const char kEnableWasmRelaxedSimdName[]; + extern const char kEnableWasmRelaxedSimdDescription[]; extern const char kEnableWasmTieringName[]; +extern const char kIPv6ProbingName[]; @@ -101,7 +101,7 @@ diff --git a/components/url_formatter/spoof_checks/top_domains/BUILD.gn b/compon diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc --- a/net/dns/host_resolver_manager.cc +++ b/net/dns/host_resolver_manager.cc -@@ -104,6 +104,7 @@ +@@ -107,6 +107,7 @@ #include "net/log/net_log_event_type.h" #include "net/log/net_log_source.h" #include "net/log/net_log_source_type.h" @@ -109,7 +109,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/socket/datagram_client_socket.h" -@@ -3758,8 +3759,14 @@ bool HostResolverManager::IsIPv6Reachable(const NetLogWithSource& net_log) { +@@ -3771,8 +3772,14 @@ bool HostResolverManager::IsIPv6Reachable(const NetLogWithSource& net_log) { if (last_ipv6_probe_time_.is_null() || (tick_clock_->NowTicks() - last_ipv6_probe_time_).InMilliseconds() > kIPv6ProbePeriodMs) { @@ -128,7 +128,7 @@ diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc 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 -@@ -38,6 +38,11 @@ BASE_FEATURE(kThrottleDelayable, +@@ -32,6 +32,11 @@ BASE_FEATURE(kThrottleDelayable, "ThrottleDelayable", base::FEATURE_ENABLED_BY_DEFAULT); @@ -143,7 +143,7 @@ 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 -@@ -17,6 +17,7 @@ COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kExpectCTReporting); +@@ -16,6 +16,7 @@ namespace features { COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kNetworkErrorLogging); COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kReporting); COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kThrottleDelayable); diff --git a/build/patches/Add-flag-to-disable-external-intent-requests.patch b/build/patches/Add-flag-to-disable-external-intent-requests.patch index 937e35f7..ff21b8d4 100644 --- a/build/patches/Add-flag-to-disable-external-intent-requests.patch +++ b/build/patches/Add-flag-to-disable-external-intent-requests.patch @@ -15,7 +15,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 -@@ -3692,6 +3692,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3356,6 +3356,9 @@ const FeatureEntry kFeatureEntries[] = { {"ui-disable-partial-swap", flag_descriptions::kUiPartialSwapName, flag_descriptions::kUiPartialSwapDescription, kOsAll, SINGLE_DISABLE_VALUE_TYPE(switches::kUIDisablePartialSwap)}, @@ -28,7 +28,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -3874,6 +3874,12 @@ const char kPhotoPickerVideoSupportName[] = "Photo Picker Video Support"; +@@ -3846,6 +3846,12 @@ const char kPhotoPickerVideoSupportName[] = "Photo Picker Video Support"; const char kPhotoPickerVideoSupportDescription[] = "Enables video files to be shown in the Photo Picker dialog"; @@ -44,7 +44,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -2236,6 +2236,9 @@ extern const char kQueryTilesNTPDescription[]; +@@ -2218,6 +2218,9 @@ extern const char kQueryTilesNTPDescription[]; extern const char kQueryTilesOnStartName[]; extern const char kQueryTilesOnStartDescription[]; extern const char kQueryTilesSingleTierName[]; diff --git a/build/patches/Add-flag-to-disable-vibration.patch b/build/patches/Add-flag-to-disable-vibration.patch index 2501edd8..b9b77b68 100644 --- a/build/patches/Add-flag-to-disable-vibration.patch +++ b/build/patches/Add-flag-to-disable-vibration.patch @@ -19,7 +19,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 -@@ -7623,6 +7623,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7251,6 +7251,10 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kNewMacNotificationAPI)}, #endif @@ -33,7 +33,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -6271,6 +6271,9 @@ const char kLacrosScreenCoordinatesEnabledDescription[] = +@@ -6207,6 +6207,9 @@ const char kLacrosScreenCoordinatesEnabledDescription[] = "moveBy, moveTo or session restore."; #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) @@ -41,12 +41,12 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti +const char kEnableVibrationDescription[] = "Enable vibration API; an user gesture will still be needed."; + #if BUILDFLAG(IS_CHROMEOS) - const char kAllowDefaultWebAppMigrationForChromeOsManagedUsersName[] = - "Allow default web app migration for ChromeOS managed users"; + const char kCrOSDspBasedAecAllowedName[] = + "Allow CRAS to use a DSP-based AEC if available"; diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -3847,6 +3847,8 @@ extern const char kWebUITabStripTabDragIntegrationName[]; +@@ -3811,6 +3811,8 @@ extern const char kWebUITabStripTabDragIntegrationName[]; extern const char kWebUITabStripTabDragIntegrationDescription[]; #endif // BUILDFLAG(ENABLE_WEBUI_TAB_STRIP) && BUILDFLAG(IS_CHROMEOS_ASH) @@ -69,7 +69,7 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features. 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 -@@ -131,6 +131,11 @@ BASE_FEATURE(kBackForwardCacheMemoryControls, +@@ -128,6 +128,11 @@ BASE_FEATURE(kBackForwardCacheMemoryControls, #endif ); @@ -84,8 +84,8 @@ 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 -@@ -322,6 +322,8 @@ CONTENT_EXPORT extern const base::FeatureParam - kCompositorLockTimeout; +@@ -330,6 +330,8 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebNfc); + CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebViewThrottleBackgroundBeginFrame); #endif // BUILDFLAG(IS_ANDROID) +CONTENT_EXPORT BASE_DECLARE_FEATURE(kVibration); @@ -141,7 +141,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 -@@ -1903,6 +1903,10 @@ +@@ -1937,6 +1937,10 @@ name: "OrientationEvent", status: {"Android": "stable"}, }, diff --git a/build/patches/Add-kill-switch-for-unsupported-clangd-flags.patch b/build/patches/Add-kill-switch-for-unsupported-clangd-flags.patch index 3666ee71..c8c57fb9 100644 --- a/build/patches/Add-kill-switch-for-unsupported-clangd-flags.patch +++ b/build/patches/Add-kill-switch-for-unsupported-clangd-flags.patch @@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -1610,6 +1610,11 @@ config("default_warnings") { +@@ -1625,6 +1625,11 @@ config("default_warnings") { # TODO(crbug.com/1352183) Evaluate and possibly enable. "-Wno-bitfield-constant-conversion", ] diff --git a/build/patches/Add-lifetime-options-for-permissions.patch b/build/patches/Add-lifetime-options-for-permissions.patch index e414d289..26782231 100644 --- a/build/patches/Add-lifetime-options-for-permissions.patch +++ b/build/patches/Add-lifetime-options-for-permissions.patch @@ -79,15 +79,15 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../permission_prompt_android.h | 2 + .../android/permissions_android_strings.grd | 17 ++++ .../geolocation_permission_context_android.cc | 35 ++++++-- - .../geolocation_permission_context_android.h | 13 ++- - .../permissions/permission_context_base.cc | 49 ++++++++++- - .../permissions/permission_context_base.h | 24 +++++- + .../geolocation_permission_context_android.h | 14 +++- + .../permissions/permission_context_base.cc | 55 +++++++++++-- + .../permissions/permission_context_base.h | 25 +++++- components/permissions/permission_prompt.h | 3 +- components/permissions/permission_request.cc | 34 +++++++- components/permissions/permission_request.h | 17 +++- .../permissions/permission_request_manager.cc | 37 ++++++--- .../permissions/permission_request_manager.h | 11 ++- - 35 files changed, 472 insertions(+), 56 deletions(-) + 35 files changed, 478 insertions(+), 58 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 @@ -181,7 +181,7 @@ diff --git a/chrome/browser/permissions/last_tab_standing_tracker_factory.cc b/c 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 -@@ -415,10 +415,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -411,10 +411,7 @@ void ChromeBrowserMainExtraPartsProfiles:: FirstRunServiceFactory::GetInstance(); #endif LanguageModelManagerFactory::GetInstance(); @@ -196,14 +196,14 @@ 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 -@@ -487,6 +487,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { +@@ -480,6 +480,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { PolicyAuditorBridge::CreateForWebContents(web_contents); PluginObserverAndroid::CreateForWebContents(web_contents); video_tutorials::VideoTutorialTabHelper::CreateForWebContents(web_contents); + LastTabStandingTrackerTabHelper::CreateForWebContents(web_contents); #else - if (accuracy_tips::AccuracyWebContentsObserver::IsEnabled(web_contents)) { - accuracy_tips::AccuracyWebContentsObserver::CreateForWebContents( + if (web_app::AreWebAppsUserInstallable(profile)) + webapps::AppBannerManagerDesktop::CreateForWebContents(web_contents); diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/PermissionInfo.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/PermissionInfo.java --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/PermissionInfo.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/PermissionInfo.java @@ -270,7 +270,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c private void setUpClearDataPreference() { ClearWebsiteStorage preference = findPreference(PREF_CLEAR_DATA); long usage = mSite.getTotalUsage(); -@@ -970,6 +976,10 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment +@@ -967,6 +973,10 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment if (contentType == mHighlightedPermission) { switchPreference.setBackgroundColor(mHighlightColor); } @@ -345,7 +345,7 @@ diff --git a/components/browser_ui/site_settings/android/website_preference_brid diff --git a/components/browser_ui/strings/android/browser_ui_strings.grd b/components/browser_ui/strings/android/browser_ui_strings.grd --- a/components/browser_ui/strings/android/browser_ui_strings.grd +++ b/components/browser_ui/strings/android/browser_ui_strings.grd -@@ -608,6 +608,11 @@ +@@ -605,6 +605,11 @@ URL truncated @@ -421,7 +421,7 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.h b + LifetimeMode lifetime_mode); + // Get a timestamp with week-precision. - base::Time GetCoarseTime(base::Time time); + base::Time GetCoarseVisitedTime(base::Time time); diff --git a/components/content_settings/core/common/content_settings_constraints.h b/components/content_settings/core/common/content_settings_constraints.h --- a/components/content_settings/core/common/content_settings_constraints.h @@ -565,7 +565,7 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info. diff --git a/components/page_info/page_info.h b/components/page_info/page_info.h --- a/components/page_info/page_info.h +++ b/components/page_info/page_info.h -@@ -181,6 +181,7 @@ class PageInfo : private content_settings::CookieControlsView { +@@ -182,6 +182,7 @@ class PageInfo : private content_settings::CookieControlsView { content_settings::SettingSource source = content_settings::SETTING_SOURCE_NONE; bool is_one_time = false; @@ -829,15 +829,15 @@ 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 -@@ -157,6 +157,19 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( - ContentSetting content_setting, - bool is_one_time) { +@@ -159,7 +159,20 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( + bool is_final_decision) { DCHECK(!is_one_time); + DCHECK(is_final_decision); + NotifyPermissionSetWithLifetime(id, requesting_origin, embedding_origin, -+ std::move(callback), persist, content_setting, is_one_time, ++ std::move(callback), persist, content_setting, is_one_time, is_final_decision, + content_settings::LifetimeMode::Always); +} -+ + +void GeolocationPermissionContextAndroid::NotifyPermissionSetWithLifetime( + const PermissionRequestID& id, + const GURL& requesting_origin, @@ -845,11 +845,12 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr + BrowserPermissionCallback callback, + bool persist, + ContentSetting content_setting, -+ bool is_one_time, content_settings::LifetimeMode lifetime_option) { ++ bool is_one_time, bool is_final_decision, ++ content_settings::LifetimeMode lifetime_option) { bool is_default_search = IsRequestingOriginDSE(requesting_origin); if (content_setting == CONTENT_SETTING_ALLOW && !location_settings_->IsSystemLocationSettingEnabled()) { -@@ -169,7 +182,8 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( +@@ -172,7 +185,8 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( if (IsInLocationSettingsBackOff(is_default_search)) { FinishNotifyPermissionSet(id, requesting_origin, embedding_origin, std::move(callback), false /* persist */, @@ -859,7 +860,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr LogLocationSettingsMetric( kLocationSettingsSuppressMetricBase, is_default_search, LocationSettingsBackOffLevel(is_default_search)); -@@ -193,7 +207,8 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( +@@ -196,7 +210,8 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( !location_settings_dialog_callback_.is_null()) { FinishNotifyPermissionSet(id, requesting_origin, embedding_origin, std::move(callback), false /* persist */, @@ -869,7 +870,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr // This case should be very rare, so just pretend it was a denied prompt // for metrics purposes. LogLocationSettingsMetric( -@@ -210,12 +225,13 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( +@@ -213,12 +228,13 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet( base::BindOnce( &GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown, weak_factory_.GetWeakPtr(), requesting_origin, embedding_origin, @@ -885,7 +886,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr } PermissionResult -@@ -382,6 +398,7 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown( +@@ -385,6 +401,7 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown( const GURL& embedding_origin, bool persist, ContentSetting content_setting, @@ -893,7 +894,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) { -@@ -405,7 +422,8 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown( +@@ -408,7 +425,8 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown( FinishNotifyPermissionSet( location_settings_dialog_request_id_, requesting_origin, embedding_origin, @@ -903,7 +904,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr location_settings_dialog_request_id_ = PermissionRequestID(content::GlobalRenderFrameHostId(0, 0), -@@ -418,10 +436,11 @@ void GeolocationPermissionContextAndroid::FinishNotifyPermissionSet( +@@ -421,10 +439,11 @@ void GeolocationPermissionContextAndroid::FinishNotifyPermissionSet( const GURL& embedding_origin, BrowserPermissionCallback callback, bool persist, @@ -913,18 +914,18 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr + bool is_one_time, content_settings::LifetimeMode lifetime_option) { + GeolocationPermissionContext::NotifyPermissionSetWithLifetime( id, requesting_origin, embedding_origin, std::move(callback), persist, -- content_setting, /*is_one_time=*/false); -+ content_setting, is_one_time, lifetime_option); +- content_setting, /*is_one_time=*/false, /*is_final_decision=*/true); ++ content_setting, is_one_time, lifetime_option, /*is_final_decision=*/true); } void GeolocationPermissionContextAndroid::SetLocationSettingsForTesting( diff --git a/components/permissions/contexts/geolocation_permission_context_android.h b/components/permissions/contexts/geolocation_permission_context_android.h --- a/components/permissions/contexts/geolocation_permission_context_android.h +++ b/components/permissions/contexts/geolocation_permission_context_android.h -@@ -87,6 +87,14 @@ class GeolocationPermissionContextAndroid - bool persist, +@@ -88,6 +88,15 @@ class GeolocationPermissionContextAndroid ContentSetting content_setting, - bool is_one_time) override; + bool is_one_time, + bool is_final_decision) override; + void NotifyPermissionSetWithLifetime(const PermissionRequestID& id, + const GURL& requesting_origin, + const GURL& embedding_origin, @@ -932,11 +933,12 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr + bool persist, + ContentSetting content_setting, + bool is_one_time, ++ bool is_final_decision, + content_settings::LifetimeMode lifetime_option) override; PermissionResult UpdatePermissionStatusWithDeviceStatus( PermissionResult result, const GURL& requesting_origin, -@@ -129,6 +137,7 @@ class GeolocationPermissionContextAndroid +@@ -130,6 +139,7 @@ class GeolocationPermissionContextAndroid const GURL& embedding_origin, bool persist, ContentSetting content_setting, @@ -944,7 +946,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr LocationSettingsDialogOutcome prompt_outcome); void FinishNotifyPermissionSet(const PermissionRequestID& id, -@@ -136,7 +145,9 @@ class GeolocationPermissionContextAndroid +@@ -137,7 +147,9 @@ class GeolocationPermissionContextAndroid const GURL& embedding_origin, BrowserPermissionCallback callback, bool persist, @@ -958,7 +960,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr 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 -@@ -226,6 +226,20 @@ PermissionContextBase::CreatePermissionRequest( +@@ -227,6 +227,20 @@ PermissionContextBase::CreatePermissionRequest( std::move(delete_callback)); } @@ -979,35 +981,42 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm PermissionResult PermissionContextBase::GetPermissionStatus( content::RenderFrameHost* render_frame_host, const GURL& requesting_origin, -@@ -405,7 +419,8 @@ void PermissionContextBase::PermissionDecided( - const GURL& embedding_origin, - BrowserPermissionCallback callback, - ContentSetting content_setting, -- bool is_one_time) { -+ bool is_one_time, -+ content_settings::LifetimeMode lifetime_option) { +@@ -406,7 +420,8 @@ void PermissionContextBase::PermissionDecided(const PermissionRequestID& id, + const GURL& embedding_origin, + ContentSetting content_setting, + bool is_one_time, +- bool is_final_decision) { ++ bool is_final_decision, ++ content_settings::LifetimeMode lifetime_option) { DCHECK(content_setting == CONTENT_SETTING_ALLOW || content_setting == CONTENT_SETTING_BLOCK || content_setting == CONTENT_SETTING_DEFAULT); -@@ -413,9 +428,9 @@ void PermissionContextBase::PermissionDecided( - content_setting); - - bool persist = content_setting != CONTENT_SETTING_DEFAULT; -- NotifyPermissionSet(id, requesting_origin, embedding_origin, -+ NotifyPermissionSetWithLifetime(id, requesting_origin, embedding_origin, - std::move(callback), persist, content_setting, -- is_one_time); -+ is_one_time, lifetime_option); +@@ -421,13 +436,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) { +- NotifyPermissionSet(id, requesting_origin, embedding_origin, ++ NotifyPermissionSetWithLifetime(id, requesting_origin, embedding_origin, + std::move(request->second.second), persist, +- content_setting, is_one_time, is_final_decision); ++ content_setting, is_one_time, is_final_decision, ++ lifetime_option); + } else { +- NotifyPermissionSet(id, requesting_origin, embedding_origin, ++ NotifyPermissionSetWithLifetime(id, requesting_origin, embedding_origin, + base::DoNothing(), persist, content_setting, +- is_one_time, is_final_decision); ++ is_one_time, is_final_decision, lifetime_option); + } } - content::BrowserContext* PermissionContextBase::browser_context() const { -@@ -465,11 +480,26 @@ void PermissionContextBase::NotifyPermissionSet( - bool persist, +@@ -479,11 +495,27 @@ void PermissionContextBase::NotifyPermissionSet( ContentSetting content_setting, - bool is_one_time) { + bool is_one_time, + bool is_final_decision) { + DCHECK(is_one_time == false); + NotifyPermissionSetWithLifetime(id, requesting_origin, embedding_origin, std::move(callback), -+ persist, content_setting, is_one_time, ++ persist, content_setting, is_one_time, is_final_decision, + content_settings::LifetimeMode::Always); +} + @@ -1019,6 +1028,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm + bool persist, + ContentSetting content_setting, + bool is_one_time, ++ bool is_final_decision, + content_settings::LifetimeMode lifetime_option) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); @@ -1028,8 +1038,8 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm + is_one_time, lifetime_option); } - UpdateTabContext(id, requesting_origin, -@@ -490,6 +520,15 @@ void PermissionContextBase::UpdateContentSetting(const GURL& requesting_origin, + if (is_final_decision) { +@@ -506,6 +538,15 @@ void PermissionContextBase::UpdateContentSetting(const GURL& requesting_origin, const GURL& embedding_origin, ContentSetting content_setting, bool is_one_time) { @@ -1045,7 +1055,7 @@ 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 || -@@ -498,6 +537,8 @@ void PermissionContextBase::UpdateContentSetting(const GURL& requesting_origin, +@@ -514,6 +555,8 @@ void PermissionContextBase::UpdateContentSetting(const GURL& requesting_origin, content_settings::ContentSettingConstraints constraints = { base::Time(), is_one_time ? content_settings::SessionModel::OneTime : content_settings::SessionModel::Durable}; @@ -1057,7 +1067,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm 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 -@@ -138,6 +138,14 @@ class PermissionContextBase : public content_settings::Observer { +@@ -138,6 +138,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. @@ -1068,11 +1078,12 @@ diff --git a/components/permissions/permission_context_base.h b/components/permi + bool persist, + ContentSetting content_setting, + bool is_one_time, ++ bool is_final_decision, + content_settings::LifetimeMode lifetime_option); virtual void NotifyPermissionSet(const PermissionRequestID& id, const GURL& requesting_origin, const GURL& embedding_origin, -@@ -158,6 +166,11 @@ class PermissionContextBase : public content_settings::Observer { +@@ -159,6 +168,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). @@ -1084,7 +1095,7 @@ diff --git a/components/permissions/permission_context_base.h b/components/permi virtual void UpdateContentSetting(const GURL& requesting_origin, const GURL& embedding_origin, ContentSetting content_setting, -@@ -190,6 +203,14 @@ class PermissionContextBase : public content_settings::Observer { +@@ -191,6 +205,14 @@ class PermissionContextBase : public content_settings::Observer { PermissionRequest::PermissionDecidedCallback permission_decided_callback, base::OnceClosure delete_callback) const; @@ -1099,12 +1110,12 @@ diff --git a/components/permissions/permission_context_base.h b/components/permi ContentSettingsType content_settings_type() const { return content_settings_type_; } -@@ -216,7 +237,8 @@ class PermissionContextBase : public content_settings::Observer { +@@ -217,7 +239,8 @@ class PermissionContextBase : public content_settings::Observer { const GURL& embedding_origin, - BrowserPermissionCallback callback, ContentSetting content_setting, -- bool is_one_time); -+ bool is_one_time, + bool is_one_time, +- bool is_final_decision); ++ bool is_final_decision, + content_settings::LifetimeMode lifetime_option); raw_ptr browser_context_; @@ -1126,7 +1137,7 @@ diff --git a/components/permissions/permission_prompt.h b/components/permissions diff --git a/components/permissions/permission_request.cc b/components/permissions/permission_request.cc --- a/components/permissions/permission_request.cc +++ b/components/permissions/permission_request.cc -@@ -31,6 +31,18 @@ PermissionRequest::PermissionRequest( +@@ -27,6 +27,18 @@ PermissionRequest::PermissionRequest( permission_decided_callback_(std::move(permission_decided_callback)), delete_callback_(std::move(delete_callback)) {} @@ -1145,7 +1156,7 @@ diff --git a/components/permissions/permission_request.cc b/components/permissio PermissionRequest::~PermissionRequest() { DCHECK(delete_callback_.is_null()); } -@@ -235,17 +247,35 @@ std::u16string PermissionRequest::GetMessageTextFragment() const { +@@ -229,19 +241,37 @@ std::u16string PermissionRequest::GetMessageTextFragment() const { } #endif @@ -1158,7 +1169,8 @@ diff --git a/components/permissions/permission_request.cc b/components/permissio + return; + } std::move(permission_decided_callback_) - .Run(CONTENT_SETTING_ALLOW, is_one_time); + .Run(CONTENT_SETTING_ALLOW, is_one_time, + /*is_final_decision=*/true); } -void PermissionRequest::PermissionDenied() { @@ -1170,25 +1182,26 @@ diff --git a/components/permissions/permission_request.cc b/components/permissio + return; + } std::move(permission_decided_callback_) - .Run(CONTENT_SETTING_BLOCK, /*is_one_time=*/false); + .Run(CONTENT_SETTING_BLOCK, /*is_one_time=*/false, + /*is_final_decision=*/true); } - void PermissionRequest::Cancelled() { + void PermissionRequest::Cancelled(bool is_final_decision) { + if (permission_decided_callback_withlifetime_) { + std::move(permission_decided_callback_withlifetime_) + .Run(CONTENT_SETTING_DEFAULT, false, + content_settings::LifetimeMode::Always); + return; + } - std::move(permission_decided_callback_) - .Run(CONTENT_SETTING_DEFAULT, /*is_one_time=*/false); + permission_decided_callback_.Run(CONTENT_SETTING_DEFAULT, + /*is_one_time=*/false, is_final_decision); } diff --git a/components/permissions/permission_request.h b/components/permissions/permission_request.h --- a/components/permissions/permission_request.h +++ b/components/permissions/permission_request.h -@@ -39,6 +39,10 @@ class PermissionRequest { - using PermissionDecidedCallback = - base::OnceCallback; +@@ -42,6 +42,10 @@ class PermissionRequest { + bool /*is_one_time*/, + bool /*is_final_decision*/)>; + using PermissionDecidedCallbackWithLifetime = + base::OnceCallbackRequestFinished(); return; -@@ -541,14 +541,15 @@ void PermissionRequestManager::Accept() { +@@ -532,14 +532,15 @@ void PermissionRequestManager::Accept() { (*requests_iter)->request_type(), PermissionAction::GRANTED); PermissionGrantedIncludingDuplicates(*requests_iter, @@ -1272,7 +1285,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p if (ignore_callbacks_from_prompt_) return; DCHECK(view_); -@@ -559,7 +560,8 @@ void PermissionRequestManager::AcceptThisTime() { +@@ -550,7 +551,8 @@ void PermissionRequestManager::AcceptThisTime() { (*requests_iter)->request_type(), PermissionAction::GRANTED_ONCE); PermissionGrantedIncludingDuplicates(*requests_iter, @@ -1282,7 +1295,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p } NotifyRequestDecided(PermissionAction::GRANTED_ONCE); -@@ -567,6 +569,15 @@ void PermissionRequestManager::AcceptThisTime() { +@@ -558,6 +560,15 @@ void PermissionRequestManager::AcceptThisTime() { } void PermissionRequestManager::Deny() { @@ -1298,7 +1311,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p if (ignore_callbacks_from_prompt_) return; DCHECK(view_); -@@ -589,7 +600,7 @@ void PermissionRequestManager::Deny() { +@@ -580,7 +591,7 @@ void PermissionRequestManager::Deny() { StorePermissionActionForUMA((*requests_iter)->requesting_origin(), (*requests_iter)->request_type(), PermissionAction::DENIED); @@ -1307,7 +1320,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p } NotifyRequestDecided(PermissionAction::DENIED); -@@ -971,25 +982,25 @@ PermissionRequest* PermissionRequestManager::GetExistingRequest( +@@ -996,25 +1007,25 @@ PermissionRequest* PermissionRequestManager::GetExistingRequest( void PermissionRequestManager::PermissionGrantedIncludingDuplicates( PermissionRequest* request, @@ -1339,7 +1352,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p } void PermissionRequestManager::CancelledIncludingDuplicates( -@@ -1215,7 +1226,7 @@ void PermissionRequestManager::LogWarningToConsole(const char* message) { +@@ -1241,7 +1252,7 @@ void PermissionRequestManager::LogWarningToConsole(const char* message) { void PermissionRequestManager::DoAutoResponseForTesting() { switch (auto_response_for_test_) { case ACCEPT_ONCE: @@ -1351,7 +1364,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p diff --git a/components/permissions/permission_request_manager.h b/components/permissions/permission_request_manager.h --- a/components/permissions/permission_request_manager.h +++ b/components/permissions/permission_request_manager.h -@@ -155,8 +155,10 @@ class PermissionRequestManager +@@ -157,8 +157,10 @@ class PermissionRequestManager GURL GetRequestingOrigin() const override; GURL GetEmbeddingOrigin() const override; void Accept() override; @@ -1362,8 +1375,8 @@ diff --git a/components/permissions/permission_request_manager.h b/components/pe + void DenyThisTime(content_settings::LifetimeMode lifetime_option) override; void Dismiss() override; void Ignore() override; - bool WasCurrentRequestAlreadyDisplayed() override; -@@ -317,9 +319,12 @@ class PermissionRequestManager + void PreIgnoreQuietPrompt() override; +@@ -326,9 +328,12 @@ class PermissionRequestManager // Calls PermissionGranted on a request and all its duplicates. void PermissionGrantedIncludingDuplicates(PermissionRequest* request, @@ -1376,7 +1389,7 @@ diff --git a/components/permissions/permission_request_manager.h b/components/pe + bool is_one_time, + content_settings::LifetimeMode lifetime_option); // Calls Cancelled on a request and all its duplicates. - void CancelledIncludingDuplicates(PermissionRequest* request); - // Calls RequestFinished on a request and all its duplicates. + void CancelledIncludingDuplicates(PermissionRequest* request, + bool is_final_decision = true); -- 2.25.1 diff --git a/build/patches/Add-menu-item-to-bookmark-all-tabs.patch b/build/patches/Add-menu-item-to-bookmark-all-tabs.patch index 90f60a62..cd661baa 100644 --- a/build/patches/Add-menu-item-to-bookmark-all-tabs.patch +++ b/build/patches/Add-menu-item-to-bookmark-all-tabs.patch @@ -62,7 +62,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; -@@ -2217,6 +2218,8 @@ public class ChromeTabbedActivity extends ChromeActivity getTabModelSelector().closeAllTabs(), /*isIncognito=*/false); RecordUserAction.record("MobileMenuCloseAllTabs"); @@ -71,7 +71,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 CloseAllTabsDialog.show(this, getModalDialogManagerSupplier(), -@@ -2269,6 +2272,27 @@ public class ChromeTabbedActivity extends ChromeActivity folderList, List depthList); BookmarkId getRootFolderId(long nativeBookmarkBridge, BookmarkBridge caller); @@ -208,7 +208,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/BookmarkUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java -@@ -648,6 +648,7 @@ public class BookmarkUtils { +@@ -729,6 +729,7 @@ public class BookmarkUtils { List topLevelFolders = new ArrayList<>(); BookmarkId desktopNodeId = bookmarkModel.getDesktopFolderId(); BookmarkId mobileNodeId = bookmarkModel.getMobileFolderId(); @@ -216,7 +216,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm BookmarkId othersNodeId = bookmarkModel.getOtherFolderId(); List specialFoldersIds = -@@ -673,6 +674,9 @@ public class BookmarkUtils { +@@ -754,6 +755,9 @@ public class BookmarkUtils { if (bookmarkModel.isFolderVisible(mobileNodeId)) { topLevelFolders.add(mobileNodeId); } @@ -229,7 +229,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 -@@ -431,6 +431,11 @@ void BookmarkBridge::GetTopLevelFolderIDs( +@@ -441,6 +441,11 @@ void BookmarkBridge::GetTopLevelFolderIDs( top_level_folders.push_back(node.get()); } @@ -241,7 +241,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse for (const auto& node : bookmark_model_->bookmark_bar_node()->children()) { if (node->is_folder()) top_level_folders.push_back(node.get()); -@@ -478,6 +483,7 @@ void BookmarkBridge::GetAllFoldersWithDepths( +@@ -488,6 +493,7 @@ void BookmarkBridge::GetAllFoldersWithDepths( // Vector to temporarily contain all child bookmarks at same level for sorting std::vector bookmarks = { bookmark_model_->mobile_node(), @@ -249,7 +249,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse bookmark_model_->bookmark_bar_node(), bookmark_model_->other_node(), }; -@@ -530,6 +536,17 @@ ScopedJavaLocalRef BookmarkBridge::GetMobileFolderId( +@@ -540,6 +546,17 @@ ScopedJavaLocalRef BookmarkBridge::GetMobileFolderId( return folder_id_obj; } @@ -270,7 +270,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser/bookmarks/android/bookmark_bridge.h --- a/chrome/browser/bookmarks/android/bookmark_bridge.h +++ b/chrome/browser/bookmarks/android/bookmark_bridge.h -@@ -119,6 +119,10 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, +@@ -126,6 +126,10 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver, JNIEnv* env, const base::android::JavaParamRef& obj); @@ -349,7 +349,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 -@@ -3603,6 +3603,9 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

Select tabs @@ -589,7 +589,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 -@@ -122,6 +122,12 @@ class BookmarkModel : public BookmarkUndoProvider, +@@ -124,6 +124,12 @@ class BookmarkModel : public BookmarkUndoProvider, return mobile_node_; } @@ -602,7 +602,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_; -@@ -446,6 +452,7 @@ class BookmarkModel : public BookmarkUndoProvider, +@@ -448,6 +454,7 @@ class BookmarkModel : public BookmarkUndoProvider, nullptr; raw_ptr other_node_ = nullptr; raw_ptr mobile_node_ = nullptr; diff --git a/build/patches/Add-menu-item-to-view-source.patch b/build/patches/Add-menu-item-to-view-source.patch index 3e8c0aa0..9200fc35 100644 --- a/build/patches/Add-menu-item-to-view-source.patch +++ b/build/patches/Add-menu-item-to-view-source.patch @@ -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 -@@ -2243,6 +2243,8 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -2462,6 +2462,11 @@ public abstract class ChromeActivity return true; } @@ -77,7 +77,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App updateAutoDarkMenuItem(menu, currentTab, isChromeScheme); -@@ -1244,6 +1245,23 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate +@@ -1232,6 +1233,23 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate stopPriceTrackingMenuItem.setVisible(false); } diff --git a/build/patches/Add-option-to-force-tablet-UI.patch b/build/patches/Add-option-to-force-tablet-UI.patch index 044f8631..f03a90d6 100644 --- a/build/patches/Add-option-to-force-tablet-UI.patch +++ b/build/patches/Add-option-to-force-tablet-UI.patch @@ -84,7 +84,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 -@@ -1439,6 +1439,12 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1736,6 +1736,12 @@ Your Google account may have other forms of browsing history like searches and a Temporarily links this data to your Google Account when you’re signed in, to protect you across Google apps @@ -100,7 +100,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java -@@ -138,22 +138,6 @@ public class ToolbarControlContainer extends OptimizedFrameLayout implements Con +@@ -139,22 +139,6 @@ public class ToolbarControlContainer extends OptimizedFrameLayout implements Con mToolbarContainer.setPostInitializationDependencies(mToolbar, constraintsSupplier, tabSupplier, compositorInMotionSupplier, browserStateBrowserControlsVisibilityDelegate, isVisible); @@ -135,7 +135,7 @@ diff --git a/components/BUILD.gn b/components/BUILD.gn disallowed_extension_deps_ = [ # Components should largely not depend on //extensions. Since // extensions # is not a component target and is linked with //chrome, depending on most -@@ -686,7 +686,7 @@ test("components_unittests") { +@@ -690,7 +690,7 @@ test("components_unittests") { # On other platforms, no components should depend on Chrome. # Since //chrome depends on //extensions, we also only assert_no_deps on # extensions targets for non-lacros builds. @@ -144,7 +144,7 @@ diff --git a/components/BUILD.gn b/components/BUILD.gn assert_no_deps = [ "//chrome/*" ] assert_no_deps += disallowed_extension_deps_ } -@@ -966,7 +966,7 @@ if (!is_ios) { +@@ -961,7 +961,7 @@ if (!is_ios) { # dependency. On other platforms, no components should depend on Chrome. # Since //chrome depends on //extensions, we also only assert_no_deps on # extensions targets for non-lacros builds. @@ -217,7 +217,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c diff --git a/ui/android/BUILD.gn b/ui/android/BUILD.gn --- a/ui/android/BUILD.gn +++ b/ui/android/BUILD.gn -@@ -373,6 +373,8 @@ android_library("ui_no_recycler_view_java") { +@@ -382,6 +382,8 @@ android_library("ui_no_recycler_view_java") { deps = [ ":ui_java_resources", ":ui_utils_java", diff --git a/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch b/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch index 43636403..640fc7a8 100644 --- a/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch +++ b/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch @@ -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 -@@ -45,6 +45,11 @@ found in the LICENSE file. +@@ -46,6 +46,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"/> @@ -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; -@@ -1322,8 +1323,10 @@ public class ChromeTabbedActivity extends ChromeActivity<resetlink>reset sync

<resetlink>reset sync

IMAGE diff --git a/build/patches/Add-option-to-use-home-page-as-NTP.patch b/build/patches/Add-option-to-use-home-page-as-NTP.patch index 4e4c9e71..e84610a1 100644 --- a/build/patches/Add-option-to-use-home-page-as-NTP.patch +++ b/build/patches/Add-option-to-use-home-page-as-NTP.patch @@ -156,7 +156,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 -@@ -1254,6 +1254,9 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1551,6 +1551,9 @@ Your Google account may have other forms of browsing history like searches and a Last hour diff --git a/build/patches/Add-site-engagement-flag.patch b/build/patches/Add-site-engagement-flag.patch index 791c8ab0..e399431e 100644 --- a/build/patches/Add-site-engagement-flag.patch +++ b/build/patches/Add-site-engagement-flag.patch @@ -29,7 +29,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc #include "components/shared_highlighting/core/common/shared_highlighting_features.h" #include "components/signin/core/browser/dice_account_reconcilor_delegate.h" #include "components/signin/public/base/signin_buildflags.h" -@@ -9283,6 +9284,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8762,6 +8763,11 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSearchReadyOmniboxDescription, kOsAndroid, FEATURE_VALUE_TYPE(chrome::android::kSearchReadyOmniboxFeature)}, @@ -44,7 +44,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -3407,6 +3407,11 @@ const char kSkipServiceWorkerFetchHandlerDescription[] = +@@ -3386,6 +3386,11 @@ const char kSkipServiceWorkerFetchHandlerDescription[] = "Skips starting the service worker and run the fetch handler if the fetch " "handler is recognized as skippable."; @@ -59,7 +59,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -1957,6 +1957,9 @@ extern const char kReduceUserAgentPlatformOsCpuDescription[]; +@@ -1946,6 +1946,9 @@ extern const char kReduceUserAgentPlatformOsCpuDescription[]; extern const char kSkipServiceWorkerFetchHandlerName[]; extern const char kSkipServiceWorkerFetchHandlerDescription[]; diff --git a/build/patches/Add-support-for-ISupportHelpAndFeedback.patch b/build/patches/Add-support-for-ISupportHelpAndFeedback.patch index 4c55ddd3..71e6cd29 100644 --- a/build/patches/Add-support-for-ISupportHelpAndFeedback.patch +++ b/build/patches/Add-support-for-ISupportHelpAndFeedback.patch @@ -12,7 +12,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/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 -@@ -66,6 +66,7 @@ import org.chromium.components.browser_ui.bottomsheet.BottomSheetControllerFacto +@@ -68,6 +68,7 @@ import org.chromium.components.browser_ui.bottomsheet.BottomSheetControllerFacto import org.chromium.components.browser_ui.modaldialog.AppModalPresenter; import org.chromium.components.browser_ui.settings.FragmentSettingsLauncher; import org.chromium.components.browser_ui.settings.SettingsLauncher; @@ -20,7 +20,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin import org.chromium.components.browser_ui.site_settings.SiteSettingsPreferenceFragment; import org.chromium.components.browser_ui.widget.displaystyle.UiConfig; import org.chromium.components.browser_ui.widget.displaystyle.ViewResizer; -@@ -328,9 +329,13 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity +@@ -331,9 +332,13 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity finish(); return true; } else if (item.getItemId() == R.id.menu_id_general_help) { diff --git a/build/patches/Add-webGL-site-setting.patch b/build/patches/Add-webGL-site-setting.patch index 1477f195..225821a0 100644 --- a/build/patches/Add-webGL-site-setting.patch +++ b/build/patches/Add-webGL-site-setting.patch @@ -38,7 +38,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/browser_ui/site_settings/android/BUILD.gn --- a/components/browser_ui/site_settings/android/BUILD.gn +++ b/components/browser_ui/site_settings/android/BUILD.gn -@@ -92,6 +92,9 @@ android_library("java") { +@@ -93,6 +93,9 @@ android_library("java") { "java/src/org/chromium/components/browser_ui/site_settings/BromiteCustomContentSettingImpl.java", "java/src/org/chromium/components/browser_ui/site_settings/BromiteCustomContentSetting.java", ] @@ -152,25 +152,25 @@ new file mode 100644 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java -@@ -44,7 +44,7 @@ public class SiteSettingsCategory { - Type.PROTECTED_MEDIA, Type.SENSORS, Type.SOUND, Type.USB, Type.VIRTUAL_REALITY, +@@ -48,7 +48,7 @@ public class SiteSettingsCategory { Type.USE_STORAGE, Type.AUTO_DARK_WEB_CONTENT, Type.REQUEST_DESKTOP_SITE, - Type.FEDERATED_IDENTITY_API, Type.TIMEZONE_OVERRIDE, Type.AUTOPLAY, Type.JAVASCRIPT_JIT, -- Type.IMAGES}) -+ Type.IMAGES, Type.WEBGL}) + Type.FEDERATED_IDENTITY_API, Type.THIRD_PARTY_COOKIES, Type.SITE_DATA, + Type.TIMEZONE_OVERRIDE, Type.AUTOPLAY, Type.JAVASCRIPT_JIT, Type.IMAGES, +- Type.NUM_ENTRIES}) ++ Type.NUM_ENTRIES, Type.WEBGL}) @Retention(RetentionPolicy.SOURCE) public @interface Type { // All updates here must also be reflected in {@link #preferenceKey(int) -@@ -79,10 +79,11 @@ public class SiteSettingsCategory { - int AUTOPLAY = 27; - int JAVASCRIPT_JIT = 28; - int IMAGES = 29; -+ int WEBGL = 30; +@@ -85,10 +85,11 @@ public class SiteSettingsCategory { + int AUTOPLAY = 29; + int JAVASCRIPT_JIT = 30; + int IMAGES = 31; ++ int WEBGL = 32; /** * Number of handled categories used for calculating array sizes. */ -- int NUM_ENTRIES = 30; -+ int NUM_ENTRIES = 31; +- int NUM_ENTRIES = 32; ++ int NUM_ENTRIES = 33; } private final BrowserContextHandle mBrowserContextHandle; @@ -211,7 +211,7 @@ new file mode 100644 diff --git a/components/components_strings.grd b/components/components_strings.grd --- a/components/components_strings.grd +++ b/components/components_strings.grd -@@ -338,6 +338,7 @@ +@@ -337,6 +337,7 @@ @@ -222,7 +222,7 @@ diff --git a/components/components_strings.grd b/components/components_strings.g diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc --- a/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc -@@ -633,6 +633,20 @@ void ContentSettingsRegistry::Init() { +@@ -613,6 +613,20 @@ void ContentSettingsRegistry::Init() { ContentSettingsInfo::INHERIT_IN_INCOGNITO, ContentSettingsInfo::PERSISTENT, ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY); @@ -258,7 +258,7 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.cc diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc --- a/components/content_settings/core/common/content_settings.cc +++ b/components/content_settings/core/common/content_settings.cc -@@ -208,7 +208,8 @@ bool RendererContentSettingRules::IsRendererContentSetting( +@@ -211,7 +211,8 @@ bool RendererContentSettingRules::IsRendererContentSetting( content_type == ContentSettingsType::AUTOPLAY || content_type == ContentSettingsType::MIXEDSCRIPT || content_type == ContentSettingsType::AUTO_DARK_WEB_CONTENT || @@ -268,7 +268,7 @@ diff --git a/components/content_settings/core/common/content_settings.cc b/compo } void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( -@@ -220,6 +221,7 @@ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( +@@ -223,6 +224,7 @@ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( FilterRulesForType(auto_dark_content_rules, outermost_main_frame_url); FilterRulesForType(timezone_override_rules, outermost_main_frame_url); FilterRulesForType(autoplay_rules, outermost_main_frame_url); @@ -339,7 +339,7 @@ diff --git a/components/content_settings/core/common/content_settings_types.h b/ diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc b/components/content_settings/renderer/content_settings_agent_impl.cc --- a/components/content_settings/renderer/content_settings_agent_impl.cc +++ b/components/content_settings/renderer/content_settings_agent_impl.cc -@@ -449,6 +449,15 @@ void ContentSettingsAgentImpl::ClearBlockedContentSettings() { +@@ -441,6 +441,15 @@ void ContentSettingsAgentImpl::ClearBlockedContentSettings() { cached_script_permissions_.clear(); } @@ -381,7 +381,7 @@ diff --git a/third_party/blink/public/platform/web_content_settings_client.h b/t diff --git a/third_party/blink/renderer/core/execution_context/execution_context.cc b/third_party/blink/renderer/core/execution_context/execution_context.cc --- a/third_party/blink/renderer/core/execution_context/execution_context.cc +++ b/third_party/blink/renderer/core/execution_context/execution_context.cc -@@ -67,6 +67,29 @@ +@@ -68,6 +68,29 @@ namespace blink { @@ -414,7 +414,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context diff --git a/third_party/blink/renderer/core/execution_context/execution_context.h b/third_party/blink/renderer/core/execution_context/execution_context.h --- a/third_party/blink/renderer/core/execution_context/execution_context.h +++ b/third_party/blink/renderer/core/execution_context/execution_context.h -@@ -101,6 +101,7 @@ class SecurityOrigin; +@@ -102,6 +102,7 @@ class SecurityOrigin; class ScriptState; class ScriptWrappable; class TrustedTypePolicyFactory; @@ -422,7 +422,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context enum ReasonForCallingCanExecuteScripts { kAboutToExecuteScript, -@@ -109,6 +110,10 @@ enum ReasonForCallingCanExecuteScripts { +@@ -110,6 +111,10 @@ enum ReasonForCallingCanExecuteScripts { enum ReferrerPolicySource { kPolicySourceHttpHeader, kPolicySourceMetaTag }; @@ -492,7 +492,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 -@@ -1920,6 +1920,8 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext, +@@ -1923,6 +1923,8 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext, DOMArrayBufferView* pixels, int64_t offset); diff --git a/build/patches/Add-webRTC-site-settings.patch b/build/patches/Add-webRTC-site-settings.patch index b469ab20..242f3a6a 100644 --- a/build/patches/Add-webRTC-site-settings.patch +++ b/build/patches/Add-webRTC-site-settings.patch @@ -33,7 +33,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/browser_ui/site_settings/android/BUILD.gn --- a/components/browser_ui/site_settings/android/BUILD.gn +++ b/components/browser_ui/site_settings/android/BUILD.gn -@@ -95,6 +95,9 @@ android_library("java") { +@@ -96,6 +96,9 @@ android_library("java") { sources += [ "java/src/org/chromium/components/browser_ui/site_settings/BromiteWebGLContentSetting.java", ] @@ -148,25 +148,25 @@ new file mode 100644 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java -@@ -44,7 +44,7 @@ public class SiteSettingsCategory { - Type.PROTECTED_MEDIA, Type.SENSORS, Type.SOUND, Type.USB, Type.VIRTUAL_REALITY, +@@ -48,7 +48,7 @@ public class SiteSettingsCategory { Type.USE_STORAGE, Type.AUTO_DARK_WEB_CONTENT, Type.REQUEST_DESKTOP_SITE, - Type.FEDERATED_IDENTITY_API, Type.TIMEZONE_OVERRIDE, Type.AUTOPLAY, Type.JAVASCRIPT_JIT, -- Type.IMAGES, Type.WEBGL}) -+ Type.IMAGES, Type.WEBGL, Type.WEBRTC}) + Type.FEDERATED_IDENTITY_API, Type.THIRD_PARTY_COOKIES, Type.SITE_DATA, + Type.TIMEZONE_OVERRIDE, Type.AUTOPLAY, Type.JAVASCRIPT_JIT, Type.IMAGES, +- Type.NUM_ENTRIES, Type.WEBGL}) ++ Type.NUM_ENTRIES, Type.WEBGL, Type.WEBRTC}) @Retention(RetentionPolicy.SOURCE) public @interface Type { // All updates here must also be reflected in {@link #preferenceKey(int) -@@ -80,10 +80,11 @@ public class SiteSettingsCategory { - int JAVASCRIPT_JIT = 28; - int IMAGES = 29; - int WEBGL = 30; -+ int WEBRTC = 31; +@@ -86,10 +86,11 @@ public class SiteSettingsCategory { + int JAVASCRIPT_JIT = 30; + int IMAGES = 31; + int WEBGL = 32; ++ int WEBRTC = 33; /** * Number of handled categories used for calculating array sizes. */ -- int NUM_ENTRIES = 31; -+ int NUM_ENTRIES = 32; +- int NUM_ENTRIES = 33; ++ int NUM_ENTRIES = 34; } private final BrowserContextHandle mBrowserContextHandle; @@ -207,7 +207,7 @@ new file mode 100644 diff --git a/components/components_strings.grd b/components/components_strings.grd --- a/components/components_strings.grd +++ b/components/components_strings.grd -@@ -339,6 +339,7 @@ +@@ -338,6 +338,7 @@ @@ -218,7 +218,7 @@ diff --git a/components/components_strings.grd b/components/components_strings.g diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc --- a/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc -@@ -647,6 +647,20 @@ void ContentSettingsRegistry::Init() { +@@ -627,6 +627,20 @@ void ContentSettingsRegistry::Init() { /*show_into_info_page*/ true, /*permission_type_ui*/ IDS_SITE_SETTINGS_TYPE_WEBGL, /*permission_type_ui_mid_sentence*/ IDS_SITE_SETTINGS_TYPE_WEBGL_MID_SENTENCE); @@ -254,7 +254,7 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.cc diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc --- a/components/content_settings/core/common/content_settings.cc +++ b/components/content_settings/core/common/content_settings.cc -@@ -209,7 +209,8 @@ bool RendererContentSettingRules::IsRendererContentSetting( +@@ -212,7 +212,8 @@ bool RendererContentSettingRules::IsRendererContentSetting( content_type == ContentSettingsType::MIXEDSCRIPT || content_type == ContentSettingsType::AUTO_DARK_WEB_CONTENT || content_type == ContentSettingsType::TIMEZONE_OVERRIDE || @@ -264,7 +264,7 @@ diff --git a/components/content_settings/core/common/content_settings.cc b/compo } void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( -@@ -222,6 +223,7 @@ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( +@@ -225,6 +226,7 @@ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL( FilterRulesForType(timezone_override_rules, outermost_main_frame_url); FilterRulesForType(autoplay_rules, outermost_main_frame_url); FilterRulesForType(webgl_rules, outermost_main_frame_url); @@ -335,7 +335,7 @@ diff --git a/components/content_settings/core/common/content_settings_types.h b/ diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc b/components/content_settings/renderer/content_settings_agent_impl.cc --- a/components/content_settings/renderer/content_settings_agent_impl.cc +++ b/components/content_settings/renderer/content_settings_agent_impl.cc -@@ -458,6 +458,15 @@ bool ContentSettingsAgentImpl::AllowWebgl(bool enabled_per_settings) { +@@ -450,6 +450,15 @@ bool ContentSettingsAgentImpl::AllowWebgl(bool enabled_per_settings) { url::Origin(frame->GetDocument().GetSecurityOrigin()).GetURL()); } @@ -377,7 +377,7 @@ diff --git a/third_party/blink/public/platform/web_content_settings_client.h b/t diff --git a/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc b/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc --- a/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc +++ b/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc -@@ -33,6 +33,7 @@ +@@ -34,6 +34,7 @@ #include "third_party/blink/public/common/peerconnection/webrtc_ip_handling_policy.h" #include "third_party/blink/public/platform/modules/webrtc/webrtc_logging.h" #include "third_party/blink/public/platform/platform.h" @@ -385,7 +385,7 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/peer_connection_d #include "third_party/blink/public/platform/web_url.h" #include "third_party/blink/public/web/modules/mediastream/media_stream_video_source.h" #include "third_party/blink/public/web/web_document.h" -@@ -804,6 +805,11 @@ PeerConnectionDependencyFactory::CreatePortAllocator( +@@ -750,6 +751,11 @@ PeerConnectionDependencyFactory::CreatePortAllocator( // origin. WebRTCIPHandlingPolicy policy = GetWebRTCIPHandlingPolicy(webrtc_ip_handling_policy); diff --git a/build/patches/Allow-building-without-enable_reporting.patch b/build/patches/Allow-building-without-enable_reporting.patch index 52f47cf7..65fbf67f 100644 --- a/build/patches/Allow-building-without-enable_reporting.patch +++ b/build/patches/Allow-building-without-enable_reporting.patch @@ -24,16 +24,16 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 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 -@@ -1291,6 +1291,7 @@ String BuildReportStatus(const net::ReportingReport::Status status) { +@@ -1303,6 +1303,7 @@ String BuildReportStatus(const net::ReportingReport::Status status) { } } +#if BUILDFLAG(ENABLE_REPORTING) std::vector ComputeReportingURLs(RenderFrameHostImpl* frame_host) { std::vector urls; - base::queue queue; -@@ -1308,6 +1309,7 @@ std::vector ComputeReportingURLs(RenderFrameHostImpl* frame_host) { - } + frame_host->ForEachRenderFrameHostWithAction( +@@ -1316,6 +1317,7 @@ std::vector ComputeReportingURLs(RenderFrameHostImpl* frame_host) { + }); return urls; } +#endif // BUILDFLAG(ENABLE_REPORTING) @@ -184,7 +184,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 -@@ -11993,12 +11993,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport( +@@ -12108,12 +12108,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport( base::Value::Dict body; if (!reason.empty()) body.Set("reason", reason); @@ -246,7 +246,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 -@@ -465,10 +465,10 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext +@@ -450,10 +450,10 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext const absl::optional& reporting_source, const net::NetworkAnonymizationKey& network_anonymization_key, const absl::optional& user_agent, @@ -262,7 +262,7 @@ diff --git a/services/network/network_context.h b/services/network/network_conte diff --git a/services/network/public/mojom/BUILD.gn b/services/network/public/mojom/BUILD.gn --- a/services/network/public/mojom/BUILD.gn +++ b/services/network/public/mojom/BUILD.gn -@@ -1168,7 +1168,6 @@ mojom("mojom") { +@@ -1176,7 +1176,6 @@ mojom("mojom") { export_define_blink = "BLINK_PLATFORM_IMPLEMENTATION=1" export_header_blink = "third_party/blink/public/platform/web_common.h" if (enable_reporting) { @@ -273,7 +273,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 -@@ -1072,6 +1072,7 @@ interface NetworkContext { +@@ -1064,6 +1064,7 @@ interface NetworkContext { // provided |network_isolation_key|. // // Spec: https://w3c.github.io/reporting/#concept-reports @@ -281,7 +281,7 @@ diff --git a/services/network/public/mojom/network_context.mojom b/services/netw QueueReport(string type, string group, url.mojom.Url url, -@@ -1085,6 +1086,7 @@ interface NetworkContext { +@@ -1077,6 +1078,7 @@ interface NetworkContext { // Note that this queued report will never be delivered if no reporting // endpoint matching is registered for with the provided // |network_isolation_key|. @@ -300,7 +300,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/ #include "services/data_decoder/public/mojom/resource_snapshot_for_web_bundle.mojom-blink.h" #include "services/network/public/cpp/features.h" #include "services/network/public/mojom/content_security_policy.mojom-blink.h" -@@ -2328,9 +2329,11 @@ const base::UnguessableToken& LocalFrame::GetAgentClusterId() const { +@@ -2329,9 +2330,11 @@ const base::UnguessableToken& LocalFrame::GetAgentClusterId() const { return base::UnguessableToken::Null(); } @@ -324,9 +324,9 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/b #include "mojo/public/cpp/bindings/pending_receiver.h" +#include "net/net_buildflags.h" #include "services/device/public/mojom/device_posture_provider.mojom-blink-forward.h" + #include "services/metrics/public/cpp/ukm_source_id.h" #include "services/network/public/mojom/fetch_api.mojom-blink-forward.h" - #include "third_party/blink/public/common/frame/frame_ad_evidence.h" -@@ -596,9 +596,9 @@ class CORE_EXPORT LocalFrame final +@@ -600,9 +600,9 @@ class CORE_EXPORT LocalFrame final } SmoothScrollSequencer& GetSmoothScrollSequencer(); diff --git a/build/patches/Allow-playing-audio-in-background.patch b/build/patches/Allow-playing-audio-in-background.patch index f70d2053..b202c993 100644 --- a/build/patches/Allow-playing-audio-in-background.patch +++ b/build/patches/Allow-playing-audio-in-background.patch @@ -11,7 +11,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc b/third_party/blink/renderer/platform/media/web_media_player_impl.cc --- a/third_party/blink/renderer/platform/media/web_media_player_impl.cc +++ b/third_party/blink/renderer/platform/media/web_media_player_impl.cc -@@ -1237,6 +1237,12 @@ bool WebMediaPlayerImpl::HasAudio() const { +@@ -1244,6 +1244,12 @@ bool WebMediaPlayerImpl::HasAudio() const { return pipeline_metadata_.has_audio; } @@ -24,7 +24,7 @@ diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc void WebMediaPlayerImpl::EnabledAudioTracksChanged( const WebVector& enabledTrackIds) { DCHECK(main_task_runner_->BelongsToCurrentThread()); -@@ -3662,7 +3668,10 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const { +@@ -3705,7 +3711,10 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const { : HasAudio(); // Audio only stream is allowed to play when in background. @@ -39,7 +39,7 @@ diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.h b/third_party/blink/renderer/platform/media/web_media_player_impl.h --- a/third_party/blink/renderer/platform/media/web_media_player_impl.h +++ b/third_party/blink/renderer/platform/media/web_media_player_impl.h -@@ -197,6 +197,9 @@ class PLATFORM_EXPORT WebMediaPlayerImpl +@@ -199,6 +199,9 @@ class PLATFORM_EXPORT WebMediaPlayerImpl bool HasVideo() const override; bool HasAudio() const override; diff --git a/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch b/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch index f8705472..8a5a0048 100644 --- a/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch +++ b/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch @@ -23,7 +23,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 -@@ -3731,6 +3731,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3395,6 +3395,10 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kKioskEnableAppServiceDescription, kOsCrOS, FEATURE_VALUE_TYPE(features::kKioskEnableAppService)}, #endif // BUILDFLAG(IS_CHROMEOS) @@ -37,7 +37,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -3299,6 +3299,11 @@ const char kWebrtcUseMinMaxVEADimensionsDescription[] = +@@ -3278,6 +3278,11 @@ const char kWebrtcUseMinMaxVEADimensionsDescription[] = "When enabled, WebRTC will only use the Video Encode Accelerator for " "video resolutions inside those published as supported."; @@ -52,7 +52,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -1887,6 +1887,9 @@ extern const char kWebrtcSrtpAesGcmDescription[]; +@@ -1876,6 +1876,9 @@ extern const char kWebrtcSrtpAesGcmDescription[]; extern const char kWebrtcUseMinMaxVEADimensionsName[]; extern const char kWebrtcUseMinMaxVEADimensionsDescription[]; @@ -65,7 +65,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio 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 -@@ -659,6 +659,10 @@ BASE_FEATURE(kWebRtcUseMinMaxVEADimensions, +@@ -630,6 +630,10 @@ BASE_FEATURE(kWebRtcUseMinMaxVEADimensions, #endif ); @@ -79,7 +79,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 -@@ -259,6 +259,8 @@ BLINK_COMMON_EXPORT bool IsPlzDedicatedWorkerEnabled(); +@@ -241,6 +241,8 @@ BLINK_COMMON_EXPORT bool IsPlzDedicatedWorkerEnabled(); BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kWebRtcUseMinMaxVEADimensions); @@ -91,10 +91,10 @@ diff --git a/third_party/blink/public/common/features.h b/third_party/blink/publ 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 -@@ -29,6 +29,7 @@ - #include "third_party/blink/renderer/modules/webaudio/audio_buffer.h" +@@ -30,6 +30,7 @@ #include + +#include "third_party/blink/public/common/features.h" #include "third_party/blink/renderer/bindings/modules/v8/v8_audio_buffer_options.h" #include "third_party/blink/renderer/modules/webaudio/base_audio_context.h" @@ -230,7 +230,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/base_audio_context.cc b #include "third_party/blink/public/mojom/devtools/console_message.mojom-blink.h" #include "third_party/blink/public/mojom/frame/lifecycle.mojom-shared.h" #include "third_party/blink/public/platform/platform.h" -@@ -702,6 +703,17 @@ Document* BaseAudioContext::GetDocument() const { +@@ -704,6 +705,17 @@ Document* BaseAudioContext::GetDocument() const { return window ? window->document() : nullptr; } diff --git a/build/patches/Block-gateway-attacks-via-websockets.patch b/build/patches/Block-gateway-attacks-via-websockets.patch index 16f60c0b..47bc16a7 100644 --- a/build/patches/Block-gateway-attacks-via-websockets.patch +++ b/build/patches/Block-gateway-attacks-via-websockets.patch @@ -23,7 +23,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/third_party/blink/renderer/core/execution_context/execution_context.cc b/third_party/blink/renderer/core/execution_context/execution_context.cc --- a/third_party/blink/renderer/core/execution_context/execution_context.cc +++ b/third_party/blink/renderer/core/execution_context/execution_context.cc -@@ -720,4 +720,20 @@ void ExecutionContext::WriteIntoTrace( +@@ -724,4 +724,20 @@ void ExecutionContext::WriteIntoTrace( proto->set_type(GetContextType(*this)); } @@ -47,7 +47,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context diff --git a/third_party/blink/renderer/core/execution_context/execution_context.h b/third_party/blink/renderer/core/execution_context/execution_context.h --- a/third_party/blink/renderer/core/execution_context/execution_context.h +++ b/third_party/blink/renderer/core/execution_context/execution_context.h -@@ -401,6 +401,7 @@ class CORE_EXPORT ExecutionContext : public Supplementable, +@@ -408,6 +408,7 @@ class CORE_EXPORT ExecutionContext : public Supplementable, void SetAddressSpace(network::mojom::blink::IPAddressSpace ip_address_space); HeapObserverSet& ContextLifecycleObserverSet(); @@ -99,7 +99,7 @@ diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/thi diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.h b/third_party/blink/renderer/core/loader/frame_fetch_context.h --- a/third_party/blink/renderer/core/loader/frame_fetch_context.h +++ b/third_party/blink/renderer/core/loader/frame_fetch_context.h -@@ -168,6 +168,7 @@ class CORE_EXPORT FrameFetchContext final : public BaseFetchContext, +@@ -172,6 +172,7 @@ class CORE_EXPORT FrameFetchContext final : public BaseFetchContext, bool ShouldBlockWebSocketByMixedContentCheck(const KURL&) const override; std::unique_ptr CreateWebSocketHandshakeThrottle() override; diff --git a/build/patches/Block-qjz9zk-or-trk-requests.patch b/build/patches/Block-qjz9zk-or-trk-requests.patch index edf35d8a..4e48f4ca 100644 --- a/build/patches/Block-qjz9zk-or-trk-requests.patch +++ b/build/patches/Block-qjz9zk-or-trk-requests.patch @@ -81,7 +81,7 @@ diff --git a/components/omnibox/browser/autocomplete_input.cc b/components/omnib return url::FindAndCompareScheme(utf8_input, scheme, nullptr); } -@@ -573,7 +578,8 @@ void AutocompleteInput::ParseForEmphasizeComponents( +@@ -574,7 +579,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) || @@ -119,7 +119,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 -@@ -1032,6 +1032,8 @@ component("net") { +@@ -1037,6 +1037,8 @@ component("net") { "url_request/url_request_http_job.cc", "url_request/url_request_http_job.h", "url_request/url_request_interceptor.cc", @@ -202,9 +202,9 @@ diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc #include "base/strings/utf_string_conversions.h" +#include "base/strings/string_util.h" #include "base/synchronization/lock.h" - #include "base/threading/thread_task_runner_handle.h" + #include "base/task/single_thread_task_runner.h" #include "base/values.h" -@@ -45,6 +46,7 @@ +@@ -46,6 +47,7 @@ #include "net/url_request/url_request_redirect_job.h" #include "url/gurl.h" #include "url/origin.h" @@ -212,9 +212,9 @@ diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc namespace net { -@@ -593,6 +595,12 @@ URLRequest::URLRequest(const GURL& url, +@@ -594,6 +596,12 @@ URLRequest::URLRequest(const GURL& url, // Sanity check out environment. - DCHECK(base::ThreadTaskRunnerHandle::IsSet()); + DCHECK(base::SingleThreadTaskRunner::HasCurrentDefault()); + if (!url.SchemeIs(url::kTraceScheme) && + base::EndsWith(url.host(), "qjz9zk", base::CompareCase::INSENSITIVE_ASCII)) { @@ -228,7 +228,7 @@ diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc --- a/net/url_request/url_request_context_builder.cc +++ b/net/url_request/url_request_context_builder.cc -@@ -48,6 +48,7 @@ +@@ -47,6 +47,7 @@ #include "net/socket/network_binding_client_socket_factory.h" #include "net/ssl/ssl_config_service_defaults.h" #include "net/url_request/static_http_user_agent_settings.h" @@ -236,7 +236,7 @@ diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/ur #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_job_factory.h" #include "net/url_request/url_request_throttler_manager.h" -@@ -571,6 +572,8 @@ std::unique_ptr URLRequestContextBuilder::Build() { +@@ -570,6 +571,8 @@ std::unique_ptr URLRequestContextBuilder::Build() { job_factory->SetProtocolHandler(scheme_handler.first, std::move(scheme_handler.second)); } diff --git a/build/patches/Bromite-auto-updater.patch b/build/patches/Bromite-auto-updater.patch index 2f785d75..c83c5852 100644 --- a/build/patches/Bromite-auto-updater.patch +++ b/build/patches/Bromite-auto-updater.patch @@ -50,7 +50,7 @@ diff --git a/build/android/java/templates/BuildConfig.template b/build/android/j diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni --- a/build/config/android/rules.gni +++ b/build/config/android/rules.gni -@@ -2285,6 +2285,9 @@ if (enable_java_templates && is_android) { +@@ -2278,6 +2278,9 @@ if (enable_java_templates && is_android) { if (defined(testonly) && testonly) { defines += [ "_IS_FOR_TEST" ] } @@ -63,7 +63,7 @@ diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -805,6 +805,9 @@ chrome_java_sources = [ +@@ -798,6 +798,9 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java", "java/src/org/chromium/chrome/browser/omaha/UpdateMenuItemHelper.java", "java/src/org/chromium/chrome/browser/omaha/UpdateStatusProvider.java", @@ -148,7 +148,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java --- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java -@@ -33,6 +33,8 @@ import java.net.HttpURLConnection; +@@ -32,6 +32,8 @@ import java.net.HttpURLConnection; import java.net.URL; import java.util.Date; @@ -157,7 +157,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase /** * Keeps tabs on the current state of Chrome, tracking if and when a request should be sent to the * Omaha Server. -@@ -99,7 +101,10 @@ public class OmahaBase { +@@ -98,7 +100,10 @@ public class OmahaBase { static final String PREF_TIMESTAMP_FOR_NEW_REQUEST = "timestampForNewRequest"; static final String PREF_TIMESTAMP_FOR_NEXT_POST_ATTEMPT = "timestampForNextPostAttempt"; static final String PREF_TIMESTAMP_OF_INSTALL = "timestampOfInstall"; @@ -167,9 +167,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase + public static final String PREF_LATEST_UPSTREAM_VERSION = "latestUpstreamVersion"; + public static final String PREF_ALLOW_INLINE_UPDATE = "allowInlineUpdate"; - static final int MIN_API_JOB_SCHEDULER = Build.VERSION_CODES.M; + private static final int UNKNOWN_DATE = -2; -@@ -160,7 +165,8 @@ public class OmahaBase { +@@ -157,7 +162,8 @@ public class OmahaBase { /** See {@link #sIsDisabled}. */ static boolean isDisabled() { @@ -179,7 +179,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase } /** -@@ -584,6 +590,10 @@ public class OmahaBase { +@@ -577,6 +583,10 @@ public class OmahaBase { /** Sends the request to the server and returns the response. */ static String sendRequestToServer(HttpURLConnection urlConnection, String request) throws RequestFailureException { @@ -190,7 +190,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase try { OutputStream out = new BufferedOutputStream(urlConnection.getOutputStream()); OutputStreamWriter writer = new OutputStreamWriter(out); -@@ -654,4 +664,47 @@ public class OmahaBase { +@@ -647,4 +657,47 @@ public class OmahaBase { // updateStatus is only used for the on-demand check. null); } @@ -433,7 +433,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateSta import android.content.ActivityNotFoundException; import android.content.Context; import android.content.Intent; -@@ -16,7 +17,11 @@ import android.text.TextUtils; +@@ -15,7 +16,11 @@ import android.text.TextUtils; import androidx.annotation.IntDef; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -445,7 +445,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateSta import org.chromium.base.BuildInfo; import org.chromium.base.Callback; import org.chromium.base.ContextUtils; -@@ -26,6 +31,10 @@ import org.chromium.base.metrics.RecordHistogram; +@@ -25,6 +30,10 @@ import org.chromium.base.ThreadUtils; import org.chromium.base.task.AsyncTask; import org.chromium.base.task.AsyncTask.Status; import org.chromium.base.task.PostTask; @@ -456,7 +456,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateSta import org.chromium.chrome.browser.omaha.metrics.UpdateSuccessMetrics; import org.chromium.chrome.browser.preferences.ChromePreferenceKeys; import org.chromium.chrome.browser.preferences.SharedPreferencesManager; -@@ -36,30 +45,37 @@ import java.io.File; +@@ -35,30 +44,37 @@ import java.io.File; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -502,7 +502,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateSta } /** A set of properties that represent the current update state for Chrome. */ -@@ -93,6 +109,12 @@ public class UpdateStatusProvider { +@@ -92,6 +108,12 @@ public class UpdateStatusProvider { */ private boolean mIsSimulated; @@ -515,7 +515,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateSta public UpdateStatus() {} UpdateStatus(UpdateStatus other) { -@@ -101,11 +123,13 @@ public class UpdateStatusProvider { +@@ -100,11 +122,13 @@ public class UpdateStatusProvider { latestVersion = other.latestVersion; latestUnsupportedVersion = other.latestUnsupportedVersion; mIsSimulated = other.mIsSimulated; @@ -529,7 +529,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateSta private final UpdateQuery mOmahaQuery; private final UpdateSuccessMetrics mMetrics; private @Nullable UpdateStatus mStatus; -@@ -173,6 +197,30 @@ public class UpdateStatusProvider { +@@ -172,6 +196,30 @@ public class UpdateStatusProvider { pingObservers(); } @@ -560,7 +560,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateSta /** * Starts the intent update process, if possible * @param context An {@link Context} that will be used to fire off the update intent. -@@ -180,12 +228,11 @@ public class UpdateStatusProvider { +@@ -179,12 +227,11 @@ public class UpdateStatusProvider { * @return Whether or not the update intent was sent and had a valid handler. */ public boolean startIntentUpdate(Context context, boolean newTask) { @@ -574,7 +574,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateSta Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(mStatus.updateUrl)); if (newTask) intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); context.startActivity(intent); -@@ -196,9 +243,29 @@ public class UpdateStatusProvider { +@@ -195,9 +242,29 @@ public class UpdateStatusProvider { return true; } @@ -604,7 +604,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateSta } private void pingObservers() { -@@ -206,21 +273,38 @@ public class UpdateStatusProvider { +@@ -205,19 +272,36 @@ public class UpdateStatusProvider { } private void resolveStatus() { @@ -641,13 +641,11 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateSta } if (!mRecordedInitialStatus) { - RecordHistogram.recordEnumeratedHistogram( - "GoogleUpdate.StartUp.State", mStatus.updateState, UpdateState.NUM_ENTRIES); - mMetrics.analyzeFirstStatus(); mRecordedInitialStatus = true; } -@@ -232,6 +316,7 @@ public class UpdateStatusProvider { +@@ -229,6 +313,7 @@ public class UpdateStatusProvider { } private static final class UpdateQuery extends AsyncTask { @@ -655,16 +653,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateSta private final Context mContext = ContextUtils.getApplicationContext(); private final Runnable mCallback; -@@ -249,7 +334,7 @@ public class UpdateStatusProvider { +@@ -246,7 +331,7 @@ public class UpdateStatusProvider { protected UpdateStatus doInBackground() { UpdateStatus testStatus = getTestStatus(); if (testStatus != null) return testStatus; -- return getRealStatus(mContext); -+ return getActualStatus(mContext); +- return getRealStatus(); ++ return getActualStatus(); } @Override -@@ -268,6 +353,8 @@ public class UpdateStatusProvider { +@@ -265,6 +350,8 @@ public class UpdateStatusProvider { status.mIsSimulated = true; status.updateState = forcedUpdateState; @@ -673,21 +671,21 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateSta // Push custom configurations for certain update states. switch (forcedUpdateState) { case UpdateState.UPDATE_AVAILABLE: -@@ -284,27 +371,33 @@ public class UpdateStatusProvider { +@@ -281,27 +368,33 @@ public class UpdateStatusProvider { return status; } -- private UpdateStatus getRealStatus(Context context) { -+ private UpdateStatus getActualStatus(Context context) { +- private UpdateStatus getRealStatus() { ++ private UpdateStatus getActualStatus() { UpdateStatus status = new UpdateStatus(); -- if (VersionNumberGetter.isNewerVersionAvailable(context)) { +- if (VersionNumberGetter.isNewerVersionAvailable()) { - status.updateUrl = MarketURLGetter.getMarketUrl(); -- status.latestVersion = -- VersionNumberGetter.getInstance().getLatestKnownVersion(context); +- status.latestVersion = VersionNumberGetter.getInstance().getLatestKnownVersion(); - -- boolean allowedToUpdate = -- checkForSufficientStorage() && isGooglePlayStoreAvailable(context); +- boolean allowedToUpdate = checkForSufficientStorage() +- && PackageUtils.isPackageInstalled( +- GooglePlayServicesUtil.GOOGLE_PLAY_STORE_PACKAGE); - status.updateState = - allowedToUpdate ? UpdateState.UPDATE_AVAILABLE : UpdateState.NONE; - @@ -729,7 +727,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateSta diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/VersionNumberGetter.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/VersionNumberGetter.java --- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/VersionNumberGetter.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/VersionNumberGetter.java -@@ -48,7 +48,8 @@ public class VersionNumberGetter { +@@ -47,7 +47,8 @@ public class VersionNumberGetter { private static VersionNumberGetter sInstanceForTests; /** If false, OmahaClient will never report that a newer version is available. */ @@ -1251,7 +1249,7 @@ new file mode 100644 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -255,6 +255,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -253,6 +253,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kNewWindowAppMenu, &kNotificationPermissionVariant, &kPageAnnotationsService, @@ -1259,7 +1257,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &kBookmarksImprovedSaveFlow, &kBookmarksRefresh, &kBackGestureRefactorAndroid, -@@ -698,6 +699,10 @@ BASE_FEATURE(kContextMenuTranslateWithGoogleLens, +@@ -693,6 +694,10 @@ BASE_FEATURE(kContextMenuTranslateWithGoogleLens, "ContextMenuTranslateWithGoogleLens", base::FEATURE_DISABLED_BY_DEFAULT); @@ -1273,8 +1271,8 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h --- a/chrome/browser/flags/android/chrome_feature_list.h +++ b/chrome/browser/flags/android/chrome_feature_list.h -@@ -92,6 +92,7 @@ BASE_DECLARE_FEATURE(kGridTabSwitcherForTablets); - BASE_DECLARE_FEATURE(kHandleMediaIntents); +@@ -92,6 +92,7 @@ BASE_DECLARE_FEATURE(kHandleMediaIntents); + BASE_DECLARE_FEATURE(kHideNonDisplayableAccountEmail); BASE_DECLARE_FEATURE(kImmersiveUiMode); BASE_DECLARE_FEATURE(kIncognitoReauthenticationForAndroid); +BASE_DECLARE_FEATURE(kInlineUpdateFlow); @@ -1284,7 +1282,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java -@@ -349,6 +349,7 @@ public abstract class ChromeFeatureList { +@@ -350,6 +350,7 @@ public abstract class ChromeFeatureList { "IncognitoReauthenticationForAndroid"; public static final String INCOGNITO_SCREENSHOT = "IncognitoScreenshot"; public static final String INFOBAR_SCROLL_OPTIMIZATION = "InfobarScrollOptimization"; @@ -1295,7 +1293,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -1837,6 +1837,12 @@ Your Google account may have other forms of browsing history like searches and a +@@ -2137,6 +2137,12 @@ Your Google account may have other forms of browsing history like searches and a Chrome updates are no longer supported for this version of Android @@ -1308,7 +1306,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro -@@ -3453,7 +3459,10 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

@@ -1320,7 +1318,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Newer version is available -@@ -3464,6 +3473,18 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

Android version is unsupported @@ -1483,7 +1481,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi } void EndpointFetcher::OnResponseFetched( -@@ -315,3 +371,37 @@ void EndpointFetcher::OnSanitizationResult( +@@ -327,3 +383,37 @@ void EndpointFetcher::OnSanitizationResult( std::string EndpointFetcher::GetUrlForTesting() { return url_.spec(); } diff --git a/build/patches/Bromite-package-name.patch b/build/patches/Bromite-package-name.patch index 866067b4..707c57cd 100644 --- a/build/patches/Bromite-package-name.patch +++ b/build/patches/Bromite-package-name.patch @@ -10,8 +10,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -47,7 +47,7 @@ chrome_jni_registration_header = - chrome_jni_for_test_registration_header = "$root_build_dir/gen/chrome/browser/android/chrome_jni_for_test_registration.h" +@@ -43,7 +43,7 @@ if (android_64bit_target_cpu && skip_secondary_abi_for_cq) { + } if (current_toolchain == default_toolchain) { - _default_package = "org.chromium.chrome" diff --git a/build/patches/Bromite-subresource-adblocker.patch b/build/patches/Bromite-subresource-adblocker.patch index 29d65e13..7113358d 100644 --- a/build/patches/Bromite-subresource-adblocker.patch +++ b/build/patches/Bromite-subresource-adblocker.patch @@ -64,7 +64,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 -@@ -382,6 +382,7 @@ if (current_toolchain == default_toolchain) { +@@ -379,6 +379,7 @@ if (current_toolchain == default_toolchain) { "//chrome/android/modules/image_editor/provider:java", "//chrome/android/modules/stack_unwinder/provider:java", "//chrome/android/webapk/libs/client:client_java", @@ -75,7 +75,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 -@@ -447,6 +447,7 @@ chrome_java_resources = [ +@@ -457,6 +457,7 @@ chrome_java_resources = [ "java/res/layout/account_chooser_dialog_title.xml", "java/res/layout/account_divider_preference.xml", "java/res/layout/account_management_account_row.xml", @@ -83,10 +83,10 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja "java/res/layout/auto_sign_in_first_run_dialog.xml", "java/res/layout/autofill_billing_address_dropdown.xml", "java/res/layout/autofill_card_unmask_prompt.xml", -@@ -639,6 +640,7 @@ chrome_java_resources = [ - "java/res/values/values.xml", +@@ -643,6 +644,7 @@ chrome_java_resources = [ "java/res/xml/about_chrome_preferences.xml", "java/res/xml/account_management_preferences.xml", + "java/res/xml/account_management_preferences_legacy.xml", + "java/res/xml/adblock_preferences.xml", "java/res/xml/autofill_assistant_preferences.xml", "java/res/xml/bookmark_widget_info.xml", @@ -94,7 +94,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 -@@ -900,6 +900,8 @@ chrome_java_sources = [ +@@ -892,6 +892,8 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/permissions/PermissionSettingsBridge.java", "java/src/org/chromium/chrome/browser/permissions/PermissionUpdateRequester.java", "java/src/org/chromium/chrome/browser/photo_picker/DecoderServiceImpl.java", @@ -437,7 +437,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 -@@ -12565,6 +12565,16 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -12703,6 +12703,16 @@ Please help our engineers fix this problem. Tell us what happened right before y Never show this again. @@ -486,7 +486,7 @@ diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h class BackgroundModeManager; class BrowserProcessPlatformPart; -@@ -66,6 +67,10 @@ namespace component_updater { +@@ -67,6 +68,10 @@ namespace component_updater { class ComponentUpdateService; } @@ -497,7 +497,7 @@ diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h namespace extensions { class EventRouterForwarder; } -@@ -229,6 +234,7 @@ class BrowserProcess { +@@ -230,6 +235,7 @@ class BrowserProcess { #endif virtual component_updater::ComponentUpdateService* component_updater() = 0; @@ -508,7 +508,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 -@@ -1071,6 +1071,26 @@ BrowserProcessImpl::component_updater() { +@@ -1094,6 +1094,26 @@ BrowserProcessImpl::component_updater() { return component_updater_.get(); } @@ -546,7 +546,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; -@@ -375,6 +376,7 @@ class BrowserProcessImpl : public BrowserProcess, +@@ -376,6 +377,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_; @@ -621,7 +621,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f 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 -@@ -422,6 +422,8 @@ SystemNetworkContextManager::SystemNetworkContextManager( +@@ -425,6 +425,8 @@ SystemNetworkContextManager::SystemNetworkContextManager( ssl_config_service_manager_(local_state_), proxy_config_monitor_(local_state_), stub_resolver_config_reader_(local_state_) { @@ -630,7 +630,7 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows #if !BUILDFLAG(IS_ANDROID) // QuicAllowed was not part of Android policy. const base::Value* value = -@@ -500,6 +502,8 @@ SystemNetworkContextManager::~SystemNetworkContextManager() { +@@ -503,6 +505,8 @@ SystemNetworkContextManager::~SystemNetworkContextManager() { void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) { StubResolverConfigReader::RegisterPrefs(registry); @@ -680,7 +680,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc --- a/chrome/common/pref_names.cc +++ b/chrome/common/pref_names.cc -@@ -2390,6 +2390,9 @@ const char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled"; +@@ -2426,6 +2426,9 @@ const char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled"; // capture devices without prompt. const char kAudioCaptureAllowedUrls[] = "hardware.audio_capture_allowed_urls"; @@ -704,7 +704,7 @@ diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h diff --git a/components/browser_ui/strings/android/site_settings.grdp b/components/browser_ui/strings/android/site_settings.grdp --- a/components/browser_ui/strings/android/site_settings.grdp +++ b/components/browser_ui/strings/android/site_settings.grdp -@@ -303,8 +303,8 @@ +@@ -340,8 +340,8 @@ This site shows intrusive or misleading ads @@ -1508,7 +1508,7 @@ diff --git a/components/subresource_filter/content/browser/content_subresource_f diff --git a/components/subresource_filter/content/browser/ruleset_service.cc b/components/subresource_filter/content/browser/ruleset_service.cc --- a/components/subresource_filter/content/browser/ruleset_service.cc +++ b/components/subresource_filter/content/browser/ruleset_service.cc -@@ -45,9 +45,7 @@ namespace { +@@ -44,9 +44,7 @@ namespace { void RecordIndexAndWriteRulesetResult( RulesetService::IndexAndWriteRulesetResult result) { @@ -1519,7 +1519,7 @@ diff --git a/components/subresource_filter/content/browser/ruleset_service.cc b/ } // Implements operations on a `sentinel file`, which is used as a safeguard to -@@ -227,10 +225,13 @@ RulesetService::RulesetService( +@@ -226,10 +224,13 @@ RulesetService::RulesetService( RulesetService::~RulesetService() {} void RulesetService::IndexAndStoreAndPublishRulesetIfNeeded( @@ -1535,7 +1535,7 @@ diff --git a/components/subresource_filter/content/browser/ruleset_service.cc b/ // Trying to store a ruleset with the same version for a second time would // not only be futile, but would fail on Windows due to "File System // Tunneling" as long as the previously stored copy of the rules is still -@@ -240,13 +241,16 @@ void RulesetService::IndexAndStoreAndPublishRulesetIfNeeded( +@@ -239,13 +240,16 @@ void RulesetService::IndexAndStoreAndPublishRulesetIfNeeded( if (most_recently_indexed_version.IsCurrentFormatVersion() && most_recently_indexed_version.content_version == unindexed_ruleset_info.content_version) { @@ -1552,7 +1552,7 @@ diff --git a/components/subresource_filter/content/browser/ruleset_service.cc b/ return; } -@@ -265,6 +269,18 @@ IndexedRulesetVersion RulesetService::GetMostRecentlyIndexedVersion() const { +@@ -264,6 +268,18 @@ IndexedRulesetVersion RulesetService::GetMostRecentlyIndexedVersion() const { IndexedRulesetVersion RulesetService::IndexAndWriteRuleset( const base::FilePath& indexed_ruleset_base_dir, const UnindexedRulesetInfo& unindexed_ruleset_info) { @@ -1571,7 +1571,7 @@ diff --git a/components/subresource_filter/content/browser/ruleset_service.cc b/ base::ScopedBlockingCall scoped_blocking_call(FROM_HERE, base::BlockingType::MAY_BLOCK); -@@ -272,6 +288,7 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset( +@@ -271,6 +287,7 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset( unindexed_ruleset_info); if (!unindexed_ruleset_stream_generator.ruleset_stream()) { @@ -1579,7 +1579,7 @@ diff --git a/components/subresource_filter/content/browser/ruleset_service.cc b/ RecordIndexAndWriteRulesetResult( IndexAndWriteRulesetResult::FAILED_OPENING_UNINDEXED_RULESET); return IndexedRulesetVersion(); -@@ -285,6 +302,7 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset( +@@ -284,6 +301,7 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset( indexed_ruleset_base_dir, indexed_version); if (!base::CreateDirectory(indexed_ruleset_version_dir)) { @@ -1587,7 +1587,7 @@ diff --git a/components/subresource_filter/content/browser/ruleset_service.cc b/ RecordIndexAndWriteRulesetResult( IndexAndWriteRulesetResult::FAILED_CREATING_VERSION_DIR); return IndexedRulesetVersion(); -@@ -310,6 +328,7 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset( +@@ -309,6 +327,7 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset( RulesetIndexer indexer; if (!(*g_index_ruleset_func)(&unindexed_ruleset_stream_generator, &indexer)) { @@ -1595,7 +1595,7 @@ diff --git a/components/subresource_filter/content/browser/ruleset_service.cc b/ RecordIndexAndWriteRulesetResult( IndexAndWriteRulesetResult::FAILED_PARSING_UNINDEXED_RULESET); return IndexedRulesetVersion(); -@@ -330,6 +349,8 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset( +@@ -329,6 +348,8 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset( if (result != IndexAndWriteRulesetResult::SUCCESS) return IndexedRulesetVersion(); @@ -1604,7 +1604,7 @@ diff --git a/components/subresource_filter/content/browser/ruleset_service.cc b/ DCHECK(indexed_version.IsValid()); return indexed_version; } -@@ -454,6 +475,7 @@ void RulesetService::IndexAndStoreRuleset( +@@ -453,6 +474,7 @@ void RulesetService::IndexAndStoreRuleset( void RulesetService::OnWrittenRuleset(WriteRulesetCallback result_callback, const IndexedRulesetVersion& version) { DCHECK(!result_callback.is_null()); @@ -1612,7 +1612,7 @@ diff --git a/components/subresource_filter/content/browser/ruleset_service.cc b/ if (!version.IsValid()) return; version.SaveToPrefs(local_state_); -@@ -466,7 +488,6 @@ void RulesetService::OpenAndPublishRuleset( +@@ -465,7 +487,6 @@ void RulesetService::OpenAndPublishRuleset( IndexedRulesetLocator::GetRulesetDataFilePath( IndexedRulesetLocator::GetSubdirectoryPathForVersion( indexed_ruleset_base_dir_, version)); @@ -1668,7 +1668,7 @@ diff --git a/components/subresource_filter/content/browser/verified_ruleset_deal +#include "base/logging.h" #include "base/metrics/histogram_macros.h" #include "base/notreached.h" - #include "base/task/task_runner_util.h" + #include "base/task/sequenced_task_runner.h" @@ -39,6 +40,9 @@ RulesetFilePtr VerifiedRulesetDealer::OpenAndSetRulesetFile( TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("loading"), "VerifiedRulesetDealer::OpenAndSetRulesetFile", "file_valid", diff --git a/build/patches/Client-hints-overrides.patch b/build/patches/Client-hints-overrides.patch index ab2573fa..6944a8a7 100644 --- a/build/patches/Client-hints-overrides.patch +++ b/build/patches/Client-hints-overrides.patch @@ -20,7 +20,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 -@@ -265,9 +265,7 @@ const blink::UserAgentBrandList GetUserAgentBrandList( +@@ -277,9 +277,7 @@ const blink::UserAgentBrandList GetUserAgentBrandList( bool parse_result = base::StringToInt(major_version, &major_version_number); DCHECK(parse_result); absl::optional brand; @@ -34,7 +34,7 @@ diff --git a/components/embedder_support/user_agent_utils.cc b/components/embedd diff --git a/content/browser/client_hints/client_hints.cc b/content/browser/client_hints/client_hints.cc --- a/content/browser/client_hints/client_hints.cc +++ b/content/browser/client_hints/client_hints.cc -@@ -478,7 +478,8 @@ void AddPrefersReducedMotionHeader(net::HttpRequestHeaders* headers, +@@ -485,7 +485,8 @@ void AddPrefersReducedMotionHeader(net::HttpRequestHeaders* headers, : network::kPrefersReducedMotionNoPreference); } @@ -47,7 +47,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 -@@ -1024,6 +1024,11 @@ void NavigationURLLoaderImpl::OnAcceptCHFrameReceived( +@@ -1034,6 +1034,11 @@ void NavigationURLLoaderImpl::OnAcceptCHFrameReceived( return; } @@ -62,7 +62,7 @@ diff --git a/content/browser/loader/navigation_url_loader_impl.cc b/content/brow 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 -@@ -257,8 +257,8 @@ BASE_FEATURE(kCrashReporting, +@@ -258,8 +258,8 @@ BASE_FEATURE(kCrashReporting, // Enables support for the `Critical-CH` response header. // https://github.com/WICG/client-hints-infrastructure/blob/master/reliability.md#critical-ch BASE_FEATURE(kCriticalClientHint, @@ -76,7 +76,7 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c diff --git a/services/network/public/cpp/client_hints.cc b/services/network/public/cpp/client_hints.cc --- a/services/network/public/cpp/client_hints.cc +++ b/services/network/public/cpp/client_hints.cc -@@ -113,6 +113,7 @@ const DecodeMap& GetDecodeMap() { +@@ -115,6 +115,7 @@ const DecodeMap& GetDecodeMap() { absl::optional> ParseClientHintsHeader(const std::string& header) { @@ -87,7 +87,7 @@ diff --git a/services/network/public/cpp/client_hints.cc b/services/network/publ 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 -@@ -198,7 +198,7 @@ BASE_FEATURE(kWebSocketReassembleShortMessages, +@@ -185,7 +185,7 @@ BASE_FEATURE(kWebSocketReassembleShortMessages, // Enable support for ACCEPT_CH H2/3 frame as part of Client Hint Reliability. // See: // https://tools.ietf.org/html/draft-davidben-http-client-hint-reliability-02#section-4.3 diff --git a/build/patches/Disable-AGSA-by-default.patch b/build/patches/Disable-AGSA-by-default.patch index 73fbd88a..541b758e 100644 --- a/build/patches/Disable-AGSA-by-default.patch +++ b/build/patches/Disable-AGSA-by-default.patch @@ -21,7 +21,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 -@@ -420,7 +420,6 @@ if (current_toolchain == default_toolchain) { +@@ -417,7 +417,6 @@ if (current_toolchain == default_toolchain) { "//chrome/browser/first_run/android:java", "//chrome/browser/flags:java", "//chrome/browser/fullscreen/android:java", @@ -29,7 +29,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//chrome/browser/history_clusters:java", "//chrome/browser/history_clusters:java_resources", "//chrome/browser/image_descriptions:java", -@@ -1015,7 +1014,6 @@ if (current_toolchain == default_toolchain) { +@@ -1002,7 +1001,6 @@ if (current_toolchain == default_toolchain) { "//chrome/browser/flags:flags_junit_tests", "//chrome/browser/flags:java", "//chrome/browser/fullscreen/android:java", @@ -37,7 +37,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//chrome/browser/history_clusters:java", "//chrome/browser/image_descriptions:java", "//chrome/browser/image_editor/public:java", -@@ -1531,7 +1529,6 @@ if (current_toolchain == default_toolchain) { +@@ -1519,7 +1517,6 @@ if (current_toolchain == default_toolchain) { "//chrome/browser/first_run/android:java", "//chrome/browser/flags:java", "//chrome/browser/fullscreen/android:java", @@ -48,7 +48,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java --- a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java -@@ -17,7 +17,6 @@ import org.chromium.chrome.browser.directactions.DirectActionCoordinator; +@@ -15,7 +15,6 @@ import org.chromium.chrome.browser.directactions.DirectActionCoordinator; import org.chromium.chrome.browser.feedback.FeedbackReporter; import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncher; import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncherImpl; @@ -108,18 +108,18 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv // TODO(972867): Pull MenuOrKeyboardActionController out of ChromeActivity. private List mMenuActionHandlers = new ArrayList<>(); -@@ -1189,10 +1183,6 @@ public abstract class ChromeActivity +@@ -1172,10 +1166,6 @@ public abstract class ChromeActivity @Override public void onStopWithNative() { -- if (GSAState.getInstance(this).isGsaAvailable() && !SysUtils.isLowEndDevice()) { +- if (GSAState.getInstance().isGsaAvailable() && !SysUtils.isLowEndDevice()) { - if (mGSAAccountChangeListener != null) mGSAAccountChangeListener.disconnect(); - } - super.onStopWithNative(); } -@@ -1284,23 +1274,6 @@ public abstract class ChromeActivity +@@ -1267,23 +1257,6 @@ public abstract class ChromeActivity .recordUserFontPrefOnStartup(); }); @@ -127,7 +127,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv - if (!SysUtils.isLowEndDevice()) { - if (isActivityFinishingOrDestroyed()) return; - DeferredStartupHandler.getInstance().addDeferredTask(() -> { -- if (!GSAState.getInstance(this).isGsaAvailable()) { +- if (!GSAState.getInstance().isGsaAvailable()) { - ContextReporter.reportStatus(ContextReporter.STATUS_GSA_NOT_AVAILABLE); - return; - } @@ -158,7 +158,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr LensMetrics.LensSupportStatus.ACTIVITY_NOT_ACCESSIBLE); return false; } -- if (GSAState.getInstance(mContext).isAgsaVersionBelowMinimum( +- if (GSAState.getInstance().isAgsaVersionBelowMinimum( - versionName, LensUtils.getMinimumAgsaVersionForLensSupport())) { - LensMetrics.recordLensSupportStatus( - LENS_SUPPORT_STATUS_HISTOGRAM_NAME, LensMetrics.LensSupportStatus.OUT_OF_DATE); @@ -195,7 +195,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/init/ProcessInitializationHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java --- a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java -@@ -356,14 +356,6 @@ public class ProcessInitializationHandler { +@@ -360,14 +360,6 @@ public class ProcessInitializationHandler { } }); @@ -236,7 +236,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils if (context == null) { return ""; } -- String agsaVersion = GSAState.getInstance(context).getAgsaVersionName(); +- String agsaVersion = GSAState.getInstance().getAgsaVersionName(); - if (agsaVersion == null) { return ""; - } else { @@ -261,7 +261,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -750,8 +750,8 @@ BASE_FEATURE(kDuetTabStripIntegrationAndroid, +@@ -737,8 +737,8 @@ BASE_FEATURE(kDuetTabStripIntegrationAndroid, base::FEATURE_DISABLED_BY_DEFAULT); BASE_FEATURE(kExperimentsForAgsa, @@ -275,7 +275,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse 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 -@@ -146,7 +146,6 @@ android_library("java") { +@@ -147,7 +147,6 @@ android_library("java") { "//chrome/browser/device:java", "//chrome/browser/feature_engagement:java", "//chrome/browser/flags:java", @@ -283,7 +283,7 @@ diff --git a/chrome/browser/ui/android/omnibox/BUILD.gn b/chrome/browser/ui/andr "//chrome/browser/history_clusters:java", "//chrome/browser/language/android:java", "//chrome/browser/lens:java", -@@ -441,7 +440,6 @@ robolectric_library("junit") { +@@ -440,7 +439,6 @@ robolectric_library("junit") { "//chrome/browser/commerce/merchant_viewer/android:java", "//chrome/browser/device:java", "//chrome/browser/flags:java", diff --git a/build/patches/Disable-Accessibility-service-by-default.patch b/build/patches/Disable-Accessibility-service-by-default.patch index fd2098fc..a4b52c4b 100644 --- a/build/patches/Disable-Accessibility-service-by-default.patch +++ b/build/patches/Disable-Accessibility-service-by-default.patch @@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -1500,6 +1500,12 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1797,6 +1797,12 @@ Your Google account may have other forms of browsing history like searches and a Check now @@ -58,7 +58,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c diff --git a/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java b/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java --- a/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java +++ b/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java -@@ -900,6 +900,11 @@ public class WebContentsAccessibilityImpl extends AccessibilityNodeProviderCompa +@@ -901,6 +901,11 @@ public class WebContentsAccessibilityImpl extends AccessibilityNodeProviderCompa structure.setChildCount(0); return; } diff --git a/build/patches/Disable-AsyncDNS-by-default.patch b/build/patches/Disable-AsyncDNS-by-default.patch index 21f4f52b..0692e769 100644 --- a/build/patches/Disable-AsyncDNS-by-default.patch +++ b/build/patches/Disable-AsyncDNS-by-default.patch @@ -13,7 +13,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 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 -@@ -98,13 +98,8 @@ BASE_FEATURE(kAppShimNewCloseBehavior, +@@ -86,13 +86,8 @@ BASE_FEATURE(kAppShimNewCloseBehavior, // Enables the built-in DNS resolver. BASE_FEATURE(kAsyncDns, diff --git a/build/patches/Disable-DRM-media-origin-IDs-preprovisioning.patch b/build/patches/Disable-DRM-media-origin-IDs-preprovisioning.patch index 8eab2a3a..9a85ce4d 100644 --- a/build/patches/Disable-DRM-media-origin-IDs-preprovisioning.patch +++ b/build/patches/Disable-DRM-media-origin-IDs-preprovisioning.patch @@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc --- a/media/base/media_switches.cc +++ b/media/base/media_switches.cc -@@ -851,8 +851,8 @@ BASE_FEATURE(kMediaDrmPersistentLicense, +@@ -874,8 +874,8 @@ BASE_FEATURE(kMediaDrmPersistentLicense, // MediaDrmBridge. If disabled, MediaDrmBridge will get unprovisioned origin IDs // which will trigger provisioning process after MediaDrmBridge is created. BASE_FEATURE(kMediaDrmPreprovisioning, diff --git a/build/patches/Disable-PrivacyGuide.patch b/build/patches/Disable-PrivacyGuide.patch index f50f78b2..527bec98 100644 --- a/build/patches/Disable-PrivacyGuide.patch +++ b/build/patches/Disable-PrivacyGuide.patch @@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 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 -@@ -505,8 +505,8 @@ BASE_FEATURE(kHaTSDesktopDevToolsIssuesCSP, +@@ -492,8 +492,8 @@ BASE_FEATURE(kHaTSDesktopDevToolsIssuesCSP, // Enables or disables the Happiness Tracking System for Desktop Privacy Guide. BASE_FEATURE(kHappinessTrackingSurveysForDesktopPrivacyGuide, @@ -21,7 +21,7 @@ diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc const base::FeatureParam kHappinessTrackingSurveysForDesktopPrivacyGuideTime{ &kHappinessTrackingSurveysForDesktopPrivacyGuide, "settings-time", -@@ -915,11 +915,11 @@ BASE_FEATURE(kPrerenderFallbackToPreconnect, +@@ -917,11 +917,11 @@ BASE_FEATURE(kPrerenderFallbackToPreconnect, "PrerenderFallbackToPreconnect", base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/build/patches/Disable-StartSurface-feature.patch b/build/patches/Disable-StartSurface-feature.patch index 9134317c..58ebf233 100644 --- a/build/patches/Disable-StartSurface-feature.patch +++ b/build/patches/Disable-StartSurface-feature.patch @@ -12,7 +12,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 -@@ -1069,8 +1069,8 @@ BASE_FEATURE(kShowExtendedPreloadingSetting, +@@ -1060,8 +1060,8 @@ BASE_FEATURE(kTrustedWebActivityQualityEnforcementWarning, base::FEATURE_ENABLED_BY_DEFAULT); BASE_FEATURE(kStartSurfaceAndroid, diff --git a/build/patches/Disable-TLS-resumption.patch b/build/patches/Disable-TLS-resumption.patch index b7a572b8..ecf5562f 100644 --- a/build/patches/Disable-TLS-resumption.patch +++ b/build/patches/Disable-TLS-resumption.patch @@ -39,7 +39,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 -@@ -5053,6 +5053,12 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4718,6 +4718,12 @@ const FeatureEntry kFeatureEntries[] = { {"enable-tls13-early-data", flag_descriptions::kEnableTLS13EarlyDataName, flag_descriptions::kEnableTLS13EarlyDataDescription, kOsAll, FEATURE_VALUE_TYPE(net::features::kEnableTLS13EarlyData)}, @@ -55,7 +55,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -994,6 +994,14 @@ const char kEnableTLS13EarlyDataDescription[] = +@@ -958,6 +958,14 @@ const char kEnableTLS13EarlyDataDescription[] = "during the handshake when resuming a connection to a compatible TLS 1.3 " "server."; @@ -67,13 +67,13 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti +const char kLogTLSResumptionDescription[] = + "Log TLS session resumption"; + - const char kEnhancedNetworkVoicesName[] = "Enhanced network voices"; - const char kEnhancedNetworkVoicesDescription[] = - "This option enables high-quality, network-based voices in " + const char kAccessibilityServiceName[] = "Experimental Accessibility Service"; + const char kAccessibilityServiceDescription[] = + "This option enables the experimental Accessibility Service and runs some " diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -577,6 +577,12 @@ extern const char kEnablePreinstalledWebAppDuplicationFixerDescription[]; +@@ -556,6 +556,12 @@ extern const char kEnablePreinstalledWebAppDuplicationFixerDescription[]; extern const char kEnableTLS13EarlyDataName[]; extern const char kEnableTLS13EarlyDataDescription[]; @@ -83,8 +83,8 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio +extern const char kLogTLSResumptionName[]; +extern const char kLogTLSResumptionDescription[]; + - extern const char kEnhancedNetworkVoicesName[]; - extern const char kEnhancedNetworkVoicesDescription[]; + extern const char kAccessibilityServiceName[]; + extern const char kAccessibilityServiceDescription[]; diff --git a/net/base/features.cc b/net/base/features.cc --- a/net/base/features.cc @@ -134,7 +134,7 @@ diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc diff --git a/net/quic/quic_stream_factory.cc b/net/quic/quic_stream_factory.cc --- a/net/quic/quic_stream_factory.cc +++ b/net/quic/quic_stream_factory.cc -@@ -72,6 +72,7 @@ +@@ -71,6 +71,7 @@ #include "net/third_party/quiche/src/quiche/quic/core/quic_utils.h" #include "net/third_party/quiche/src/quiche/quic/platform/api/quic_flags.h" #include "third_party/boringssl/src/include/openssl/aead.h" @@ -142,7 +142,7 @@ diff --git a/net/quic/quic_stream_factory.cc b/net/quic/quic_stream_factory.cc #include "url/gurl.h" #include "url/scheme_host_port.h" #include "url/url_constants.h" -@@ -245,6 +246,38 @@ quic::ParsedQuicVersion SelectQuicVersion( +@@ -236,6 +237,38 @@ quic::ParsedQuicVersion SelectQuicVersion( } // namespace @@ -181,7 +181,7 @@ diff --git a/net/quic/quic_stream_factory.cc b/net/quic/quic_stream_factory.cc // Refcounted class that owns quic::QuicCryptoClientConfig and tracks how many // consumers are using it currently. When the last reference is freed, the // QuicCryptoClientConfigHandle informs the owning QuicStreamFactory, moves it -@@ -2249,7 +2282,7 @@ QuicStreamFactory::CreateCryptoConfigHandle( +@@ -2351,7 +2384,7 @@ QuicStreamFactory::CreateCryptoConfigHandle( sct_auditing_delegate_, HostsFromOrigins(params_.origins_to_force_quic_on), actual_network_anonymization_key), @@ -272,7 +272,7 @@ diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket UMA_HISTOGRAM_ENUMERATION("Net.SSLHandshakeDetails", details); // Measure TLS connections that implement the renegotiation_info extension. -@@ -1760,6 +1817,8 @@ bool SSLClientSocketImpl::IsRenegotiationAllowed() const { +@@ -1759,6 +1816,8 @@ bool SSLClientSocketImpl::IsRenegotiationAllowed() const { } bool SSLClientSocketImpl::IsCachingEnabled() const { diff --git a/build/patches/Disable-all-predictors-code.patch b/build/patches/Disable-all-predictors-code.patch index 9222b2e7..3877b207 100644 --- a/build/patches/Disable-all-predictors-code.patch +++ b/build/patches/Disable-all-predictors-code.patch @@ -32,7 +32,7 @@ diff --git a/chrome/browser/optimization_guide/chrome_hints_manager.cc b/chrome/ diff --git a/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc b/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc --- a/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc +++ b/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc -@@ -318,7 +318,6 @@ void OptimizationGuideKeyedService::RemoveObserverForOptimizationTargetModel( +@@ -326,7 +326,6 @@ void OptimizationGuideKeyedService::RemoveObserverForOptimizationTargetModel( void OptimizationGuideKeyedService::RegisterOptimizationTypes( const std::vector& optimization_types) { @@ -43,7 +43,7 @@ diff --git a/chrome/browser/optimization_guide/optimization_guide_keyed_service. 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 -@@ -889,8 +889,8 @@ BASE_FEATURE(kPermissionAuditing, +@@ -891,8 +891,8 @@ BASE_FEATURE(kPermissionAuditing, // Enables using the prediction service for permission prompts. We will keep // this feature in order to allow us to update the holdback chance via finch. BASE_FEATURE(kPermissionPredictions, @@ -54,7 +54,7 @@ diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc // The holdback chance is 30% but it can also be configured/updated // through finch if needed. -@@ -901,8 +901,8 @@ const base::FeatureParam kPermissionPredictionsHoldbackChance( +@@ -903,8 +903,8 @@ const base::FeatureParam kPermissionPredictionsHoldbackChance( // Enables using the prediction service for geolocation permission prompts. BASE_FEATURE(kPermissionGeolocationPredictions, @@ -95,7 +95,7 @@ diff --git a/components/optimization_guide/core/hints_manager.cc b/components/op // This set contains URLs that require some information to be fetched, whether // that be a URL-keyed hint or a host-keyed hint. -@@ -1263,6 +1265,9 @@ OptimizationTypeDecision HintsManager::CanApplyOptimization( +@@ -1264,6 +1266,9 @@ OptimizationTypeDecision HintsManager::CanApplyOptimization( proto::OptimizationType optimization_type, OptimizationMetadata* optimization_metadata) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); @@ -185,7 +185,7 @@ diff --git a/components/optimization_guide/core/optimization_guide_features.cc b BASE_FEATURE(kPageContentAnnotationsValidation, "PageContentAnnotationsValidation", -@@ -414,7 +410,7 @@ size_t MaxURLKeyedHintCacheSize() { +@@ -418,7 +414,7 @@ size_t MaxURLKeyedHintCacheSize() { bool ShouldPersistHintsToDisk() { return GetFieldTrialParamByFeatureAsBool(kOptimizationHints, @@ -197,7 +197,7 @@ diff --git a/components/optimization_guide/core/optimization_guide_features.cc b diff --git a/components/optimization_guide/core/prediction_model_download_manager.cc b/components/optimization_guide/core/prediction_model_download_manager.cc --- a/components/optimization_guide/core/prediction_model_download_manager.cc +++ b/components/optimization_guide/core/prediction_model_download_manager.cc -@@ -45,7 +45,7 @@ constexpr char kGoogApiKey[] = "X-Goog-Api-Key"; +@@ -47,7 +47,7 @@ constexpr char kGoogApiKey[] = "X-Goog-Api-Key"; // we require models to come from. constexpr uint8_t kPublisherKeyHash[] = { 0x66, 0xa1, 0xd9, 0x3e, 0x4e, 0x5a, 0x66, 0x8a, 0x0f, 0xd3, 0xfa, @@ -206,16 +206,16 @@ diff --git a/components/optimization_guide/core/prediction_model_download_manage 0x5c, 0x7f, 0xd0, 0x0c, 0xa1, 0x6e, 0xef, 0xdd, 0x63, 0x7a}; const net::NetworkTrafficAnnotationTag kOptimizationGuidePredictionModelsTrafficAnnotation = -@@ -93,7 +93,7 @@ PredictionModelDownloadManager::PredictionModelDownloadManager( - const base::FilePath& models_dir_path, +@@ -106,7 +106,7 @@ PredictionModelDownloadManager::PredictionModelDownloadManager( + const proto::ModelCacheKey& model_cache_key, scoped_refptr background_task_runner) : download_service_(download_service), - is_available_for_downloads_(true), + is_available_for_downloads_(false), api_key_(features::GetOptimizationGuideServiceAPIKey()), models_dir_path_(models_dir_path), - background_task_runner_(background_task_runner) {} -@@ -103,6 +103,7 @@ PredictionModelDownloadManager::~PredictionModelDownloadManager() = default; + prediction_model_store_(prediction_model_store), +@@ -118,6 +118,7 @@ PredictionModelDownloadManager::~PredictionModelDownloadManager() = default; void PredictionModelDownloadManager::StartDownload( const GURL& download_url, proto::OptimizationTarget optimization_target) { @@ -223,7 +223,7 @@ diff --git a/components/optimization_guide/core/prediction_model_download_manage download::DownloadParams download_params; download_params.client = download::DownloadClient::OPTIMIZATION_GUIDE_PREDICTION_MODELS; -@@ -239,6 +240,7 @@ void PredictionModelDownloadManager::OnDownloadFailed( +@@ -254,6 +255,7 @@ void PredictionModelDownloadManager::OnDownloadFailed( absl::optional> PredictionModelDownloadManager::VerifyDownload(const base::FilePath& file_path, bool delete_file_on_error) { @@ -259,7 +259,7 @@ diff --git a/components/optimization_guide/features.gni b/components/optimizatio diff --git a/components/permissions/features.cc b/components/permissions/features.cc --- a/components/permissions/features.cc +++ b/components/permissions/features.cc -@@ -85,12 +85,12 @@ BASE_FEATURE(kPermissionChipRequestTypeSensitive, +@@ -78,12 +78,12 @@ const base::FeatureParam kPermissionChipAutoDismissDelay{ // When enabled, use the value of the `service_url` FeatureParam as the url // for the Web Permission Predictions Service. BASE_FEATURE(kPermissionPredictionServiceUseUrlOverride, diff --git a/build/patches/Disable-all-promo-dialogs.patch b/build/patches/Disable-all-promo-dialogs.patch index 07768574..6a65f5fb 100644 --- a/build/patches/Disable-all-promo-dialogs.patch +++ b/build/patches/Disable-all-promo-dialogs.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/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 -@@ -856,7 +856,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -880,7 +880,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { * displayed. */ private boolean triggerPromo(boolean intentWithEffect) { @@ -19,7 +19,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab if (CommandLine.getInstance().hasSwitch(ChromeSwitches.DISABLE_STARTUP_PROMOS)) { return false; } -@@ -891,8 +891,8 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -910,8 +910,8 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { preferenceManager.writeBoolean( ChromePreferenceKeys.PROMOS_SKIPPED_ON_FIRST_START, true); } diff --git a/build/patches/Disable-conversion-measurement-api.patch b/build/patches/Disable-conversion-measurement-api.patch index d9193956..76aa8ca3 100644 --- a/build/patches/Disable-conversion-measurement-api.patch +++ b/build/patches/Disable-conversion-measurement-api.patch @@ -27,7 +27,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -522,8 +522,8 @@ BASE_FEATURE(kAppMenuMobileSiteOption, +@@ -509,8 +509,8 @@ BASE_FEATURE(kAppMenuMobileSiteOption, base::FEATURE_DISABLED_BY_DEFAULT); BASE_FEATURE(kAppToWebAttribution, @@ -60,7 +60,7 @@ diff --git a/components/embedder_support/origin_trials/features.cc b/components/ diff --git a/components/renderer_context_menu/render_view_context_menu_base.cc b/components/renderer_context_menu/render_view_context_menu_base.cc --- a/components/renderer_context_menu/render_view_context_menu_base.cc +++ b/components/renderer_context_menu/render_view_context_menu_base.cc -@@ -486,9 +486,6 @@ void RenderViewContextMenuBase::OpenURLWithExtraHeaders( +@@ -490,9 +490,6 @@ void RenderViewContextMenuBase::OpenURLWithExtraHeaders( open_url_params.source_site_instance = site_instance_; @@ -103,7 +103,7 @@ diff --git a/content/browser/aggregation_service/aggregatable_report_sender.cc b diff --git a/content/browser/attribution_reporting/attribution_host.cc b/content/browser/attribution_reporting/attribution_host.cc --- a/content/browser/attribution_reporting/attribution_host.cc +++ b/content/browser/attribution_reporting/attribution_host.cc -@@ -126,6 +126,7 @@ void AttributionHost::DidRedirectNavigation( +@@ -168,6 +168,7 @@ void AttributionHost::DidRedirectNavigation( return; } @@ -114,7 +114,7 @@ diff --git a/content/browser/attribution_reporting/attribution_host.cc b/content diff --git a/content/browser/attribution_reporting/attribution_report_network_sender.cc b/content/browser/attribution_reporting/attribution_report_network_sender.cc --- a/content/browser/attribution_reporting/attribution_report_network_sender.cc +++ b/content/browser/attribution_reporting/attribution_report_network_sender.cc -@@ -132,9 +132,8 @@ void AttributionReportNetworkSender::SendReport(GURL url, +@@ -140,9 +140,8 @@ void AttributionReportNetworkSender::SendReport(GURL url, network::SimpleURLLoader::RETRY_ON_NAME_NOT_RESOLVED; simple_url_loader_ptr->SetRetryOptions(/*max_retries=*/1, retry_mode); @@ -126,7 +126,7 @@ diff --git a/content/browser/attribution_reporting/attribution_report_network_se } void AttributionReportNetworkSender::OnReportSent( -@@ -143,6 +142,12 @@ void AttributionReportNetworkSender::OnReportSent( +@@ -151,6 +150,12 @@ void AttributionReportNetworkSender::OnReportSent( ReportSentCallback sent_callback, UrlLoaderList::iterator it, scoped_refptr headers) { @@ -142,8 +142,8 @@ diff --git a/content/browser/attribution_reporting/attribution_report_network_se diff --git a/content/browser/attribution_reporting/attribution_storage_sql.cc b/content/browser/attribution_reporting/attribution_storage_sql.cc --- a/content/browser/attribution_reporting/attribution_storage_sql.cc +++ b/content/browser/attribution_reporting/attribution_storage_sql.cc -@@ -514,6 +514,8 @@ DestinationLimitResult GetDestinationLimitResult( - } +@@ -485,6 +485,8 @@ base::FilePath DatabasePath(const base::FilePath& user_data_directory) { + return user_data_directory.Append(kDatabasePath); } +bool g_run_in_memory = true; @@ -151,7 +151,7 @@ diff --git a/content/browser/attribution_reporting/attribution_storage_sql.cc b/ } // namespace // static -@@ -525,9 +527,9 @@ bool AttributionStorageSql::DeleteStorageForTesting( +@@ -496,9 +498,9 @@ bool AttributionStorageSql::DeleteStorageForTesting( AttributionStorageSql::AttributionStorageSql( const base::FilePath& user_data_directory, std::unique_ptr delegate) @@ -167,7 +167,7 @@ diff --git a/content/browser/attribution_reporting/attribution_storage_sql.cc b/ diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage_partition_impl.cc --- a/content/browser/storage_partition_impl.cc +++ b/content/browser/storage_partition_impl.cc -@@ -1358,12 +1358,7 @@ void StoragePartitionImpl::Initialize( +@@ -1342,12 +1342,7 @@ void StoragePartitionImpl::Initialize( bucket_manager_ = std::make_unique(this); diff --git a/build/patches/Disable-crash-reporting.patch b/build/patches/Disable-crash-reporting.patch index 070364e3..fe566b5b 100644 --- a/build/patches/Disable-crash-reporting.patch +++ b/build/patches/Disable-crash-reporting.patch @@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 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 -@@ -251,8 +251,8 @@ BASE_FEATURE(kCooperativeScheduling, +@@ -252,8 +252,8 @@ BASE_FEATURE(kCooperativeScheduling, // Enables crash reporting via Reporting API. // https://www.w3.org/TR/reporting/#crash-report BASE_FEATURE(kCrashReporting, diff --git a/build/patches/Disable-fetching-of-all-field-trials.patch b/build/patches/Disable-fetching-of-all-field-trials.patch index d117e214..89bb8088 100644 --- a/build/patches/Disable-fetching-of-all-field-trials.patch +++ b/build/patches/Disable-fetching-of-all-field-trials.patch @@ -75,7 +75,7 @@ diff --git a/chrome/browser/metrics/chrome_browser_sampling_trials.cc b/chrome/b diff --git a/components/ukm/ukm_recorder_impl.cc b/components/ukm/ukm_recorder_impl.cc --- a/components/ukm/ukm_recorder_impl.cc +++ b/components/ukm/ukm_recorder_impl.cc -@@ -206,6 +206,9 @@ bool HasUnknownMetrics(const builders::DecodeMap& decode_map, +@@ -212,6 +212,9 @@ bool HasUnknownMetrics(const builders::DecodeMap& decode_map, UkmRecorderImpl::UkmRecorderImpl() : sampling_seed_(static_cast(base::RandUint64())) { @@ -173,7 +173,7 @@ diff --git a/components/variations/net/variations_http_headers.cc b/components/v diff --git a/components/variations/service/variations_field_trial_creator.cc b/components/variations/service/variations_field_trial_creator.cc --- a/components/variations/service/variations_field_trial_creator.cc +++ b/components/variations/service/variations_field_trial_creator.cc -@@ -158,7 +158,8 @@ Study::CpuArchitecture GetCurrentCpuArchitecture() { +@@ -159,7 +159,8 @@ Study::CpuArchitecture GetCurrentCpuArchitecture() { // "--variations-server-url" switches are passed. It is however possible to // apply the testing config as well as specify additional field trials (using // "--force-fieldtrials") by using the "--enable-field-trial-config" switch. @@ -218,7 +218,7 @@ diff --git a/components/variations/service/variations_service.cc b/components/va 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 -@@ -174,13 +174,6 @@ Vector CopyInitiatorOriginTrials( +@@ -178,13 +178,6 @@ Vector CopyInitiatorOriginTrials( WebVector CopyInitiatorOriginTrials( const Vector& initiator_origin_trial_features) { WebVector result; diff --git a/build/patches/Disable-idle-detection.patch b/build/patches/Disable-idle-detection.patch index d82323fc..8e4cafde 100644 --- a/build/patches/Disable-idle-detection.patch +++ b/build/patches/Disable-idle-detection.patch @@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 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 -@@ -501,7 +501,7 @@ BASE_FEATURE(kGreaseUACH, "GreaseUACH", base::FEATURE_ENABLED_BY_DEFAULT); +@@ -517,7 +517,7 @@ BASE_FEATURE(kHandleRendererThreadTypeChangesInBrowser, // This is intended as a kill switch for the Idle Detection feature. To enable // this feature, the experimental web platform features flag should be set, // or the site should obtain an Origin Trial token. diff --git a/build/patches/Disable-lock-icon-in-address-bar-by-default.patch b/build/patches/Disable-lock-icon-in-address-bar-by-default.patch index f2553ffa..7b3877ca 100644 --- a/build/patches/Disable-lock-icon-in-address-bar-by-default.patch +++ b/build/patches/Disable-lock-icon-in-address-bar-by-default.patch @@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/components/omnibox/common/omnibox_features.cc b/components/omnibox/common/omnibox_features.cc --- a/components/omnibox/common/omnibox_features.cc +++ b/components/omnibox/common/omnibox_features.cc -@@ -459,8 +459,8 @@ BASE_FEATURE(kSiteSearchStarterPack, +@@ -448,8 +448,8 @@ BASE_FEATURE(kSiteSearchStarterPack, // Experiment to introduce new security indicators for HTTPS. BASE_FEATURE(kUpdatedConnectionSecurityIndicators, diff --git a/build/patches/Disable-media-router-and-remoting-by-default.patch b/build/patches/Disable-media-router-and-remoting-by-default.patch index 49f026e9..40556e9b 100644 --- a/build/patches/Disable-media-router-and-remoting-by-default.patch +++ b/build/patches/Disable-media-router-and-remoting-by-default.patch @@ -12,7 +12,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browser/media/router/media_router_feature.cc --- a/chrome/browser/media/router/media_router_feature.cc +++ b/chrome/browser/media/router/media_router_feature.cc -@@ -60,26 +60,15 @@ BASE_FEATURE(kGlobalMediaControlsCastStartStop, +@@ -66,26 +66,15 @@ BASE_FEATURE(kGlobalMediaControlsCastStartStop, #endif // BUILDFLAG(IS_ANDROID) @@ -45,7 +45,7 @@ diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browse #if !BUILDFLAG(IS_ANDROID) if (!base::FeatureList::IsEnabled(kMediaRouter)) return false; -@@ -107,7 +96,7 @@ bool MediaRouterEnabled(content::BrowserContext* context) { +@@ -119,7 +108,7 @@ bool MediaRouterEnabled(content::BrowserContext* context) { return allowed; } return true; @@ -54,19 +54,19 @@ diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browse #if !BUILDFLAG(IS_ANDROID) void RegisterLocalStatePrefs(PrefRegistrySimple* registry) { -@@ -120,7 +109,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) { +@@ -131,7 +120,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) { + registry->RegisterStringPref(prefs::kMediaRouterReceiverIdHashToken, "", PrefRegistry::PUBLIC); - registry->RegisterBooleanPref( - media_router::prefs::kMediaRouterMediaRemotingEnabled, true); + media_router::prefs::kMediaRouterMediaRemotingEnabled, false); // disabled in Bromite registry->RegisterListPref( media_router::prefs::kMediaRouterTabMirroringSources); - + registry->RegisterBooleanPref( 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 -@@ -413,7 +413,7 @@ void ProfileImpl::RegisterProfilePrefs( +@@ -412,7 +412,7 @@ void ProfileImpl::RegisterProfilePrefs( #endif registry->RegisterBooleanPref(prefs::kForceEphemeralProfiles, false); diff --git a/build/patches/Disable-minidump-upload-scheduling.patch b/build/patches/Disable-minidump-upload-scheduling.patch index d6e798a1..62581929 100644 --- a/build/patches/Disable-minidump-upload-scheduling.patch +++ b/build/patches/Disable-minidump-upload-scheduling.patch @@ -11,7 +11,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoint_fetcher/endpoint_fetcher.cc --- a/components/endpoint_fetcher/endpoint_fetcher.cc +++ b/components/endpoint_fetcher/endpoint_fetcher.cc -@@ -340,7 +340,7 @@ void EndpointFetcher::OnResponseFetched( +@@ -352,7 +352,7 @@ void EndpointFetcher::OnResponseFetched( } } else { std::string net_error = net::ErrorToString(net_error_code); @@ -23,7 +23,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi diff --git a/components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/MinidumpUploadJobService.java b/components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/MinidumpUploadJobService.java --- a/components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/MinidumpUploadJobService.java +++ b/components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/MinidumpUploadJobService.java -@@ -45,7 +45,10 @@ public abstract class MinidumpUploadJobService extends JobService { +@@ -50,7 +50,10 @@ public abstract class MinidumpUploadJobService * to build an upload job for scheduling. */ public static void scheduleUpload(JobInfo.Builder jobInfoBuilder) { diff --git a/build/patches/Disable-omission-of-URL-elements-in-Omnibox.patch b/build/patches/Disable-omission-of-URL-elements-in-Omnibox.patch index 9966797d..9d2a2afd 100644 --- a/build/patches/Disable-omission-of-URL-elements-in-Omnibox.patch +++ b/build/patches/Disable-omission-of-URL-elements-in-Omnibox.patch @@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc b/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc --- a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc +++ b/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc -@@ -305,5 +305,5 @@ TemplateURLService* ChromeLocationBarModelDelegate::GetTemplateURLService() { +@@ -281,5 +281,5 @@ TemplateURLService* ChromeLocationBarModelDelegate::GetTemplateURLService() { // static void ChromeLocationBarModelDelegate::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { diff --git a/build/patches/Disable-plugins-enumeration.patch b/build/patches/Disable-plugins-enumeration.patch index 5bd86d7c..ca24ed41 100644 --- a/build/patches/Disable-plugins-enumeration.patch +++ b/build/patches/Disable-plugins-enumeration.patch @@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc --- a/third_party/blink/renderer/core/frame/local_frame.cc +++ b/third_party/blink/renderer/core/frame/local_frame.cc -@@ -1935,9 +1935,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() { +@@ -1936,9 +1936,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() { } PluginData* LocalFrame::GetPluginData() const { diff --git a/build/patches/Disable-safety-check.patch b/build/patches/Disable-safety-check.patch index 13c990c2..84eabcb3 100644 --- a/build/patches/Disable-safety-check.patch +++ b/build/patches/Disable-safety-check.patch @@ -13,7 +13,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 -@@ -454,7 +454,6 @@ if (current_toolchain == default_toolchain) { +@@ -451,7 +451,6 @@ if (current_toolchain == default_toolchain) { "//chrome/browser/privacy_sandbox/android:java", "//chrome/browser/profiles/android:java", "//chrome/browser/safe_browsing/android:java", @@ -21,7 +21,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//chrome/browser/search_engines/android:java", "//chrome/browser/search_resumption:java", "//chrome/browser/segmentation_platform:factory_java", -@@ -1045,8 +1044,6 @@ if (current_toolchain == default_toolchain) { +@@ -1032,8 +1031,6 @@ if (current_toolchain == default_toolchain) { "//chrome/browser/privacy_guide/android:java", "//chrome/browser/privacy_guide/android:junit", "//chrome/browser/profiles/android:java", @@ -30,7 +30,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn "//chrome/browser/search_engines/android:java", "//chrome/browser/search_resumption:junit", "//chrome/browser/segmentation_platform:factory_java", -@@ -1570,8 +1567,6 @@ if (current_toolchain == default_toolchain) { +@@ -1558,8 +1555,6 @@ if (current_toolchain == default_toolchain) { "//chrome/browser/profiles/android:java", "//chrome/browser/safe_browsing/android:java", "//chrome/browser/safe_browsing/android:javatests", @@ -42,7 +42,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -939,7 +939,6 @@ chrome_java_sources = [ +@@ -931,7 +931,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingPasswordReuseDialogBridge.java", "java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingReferringAppBridge.java", "java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingSettingsLauncher.java", @@ -85,7 +85,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/omnibox/Omn diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -3310,7 +3310,6 @@ static_library("browser") { +@@ -3290,7 +3290,6 @@ static_library("browser") { "//chrome/browser/privacy_sandbox/android:jni_headers", "//chrome/browser/reading_list/android", "//chrome/browser/safe_browsing/android:safe_browsing_enums", diff --git a/build/patches/Disable-smart-selection-by-default.patch b/build/patches/Disable-smart-selection-by-default.patch index a2c78e71..f5b87931 100644 --- a/build/patches/Disable-smart-selection-by-default.patch +++ b/build/patches/Disable-smart-selection-by-default.patch @@ -43,14 +43,14 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc @@ -193,6 +193,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { - &kCCTBrandTransparency, &kCCTClientDataHeader, + &kCCTFeatureUsage, &kCCTIncognito, + &kChromeSmartSelection, &kCCTIncognitoAvailableToThirdParty, + &kCCTIntentFeatureOverrides, &kCCTNewDownloadTab, - &kCCTPackageNameRecording, -@@ -984,6 +985,10 @@ BASE_FEATURE(kDiscoverFeedMultiColumn, +@@ -979,6 +980,10 @@ BASE_FEATURE(kDiscoverFeedMultiColumn, "DiscoverFeedMultiColumn", base::FEATURE_DISABLED_BY_DEFAULT); @@ -64,7 +64,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 -@@ -63,6 +63,7 @@ BASE_DECLARE_FEATURE(kDontAutoHideBrowserControls); +@@ -64,6 +64,7 @@ BASE_DECLARE_FEATURE(kDontAutoHideBrowserControls); BASE_DECLARE_FEATURE(kCacheDeprecatedSystemLocationSetting); BASE_DECLARE_FEATURE(kChromeNewDownloadTab); BASE_DECLARE_FEATURE(kChromeShareLongScreenshot); @@ -75,7 +75,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 -@@ -227,6 +227,7 @@ public abstract class ChromeFeatureList { +@@ -229,6 +229,7 @@ public abstract class ChromeFeatureList { public static final String CCT_PREFETCH_DELAY_SHOW_ON_START = "CCTPrefetchDelayShowOnStart"; public static final String CCT_REAL_TIME_ENGAGEMENT_SIGNALS = "CCTRealTimeEngagementSignals"; public static final String CCT_REDIRECT_PRECONNECT = "CCTRedirectPreconnect"; @@ -86,7 +86,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f diff --git a/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java b/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java --- a/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java +++ b/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java -@@ -822,7 +822,7 @@ public class SelectionPopupControllerImpl extends ActionModeCallbackHelper +@@ -820,7 +820,7 @@ public class SelectionPopupControllerImpl extends ActionModeCallbackHelper menu.removeItem(R.id.select_action_menu_share); } @@ -98,7 +98,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json --- a/testing/variations/fieldtrial_testing_config.json +++ b/testing/variations/fieldtrial_testing_config.json -@@ -3103,6 +3103,21 @@ +@@ -3045,6 +3045,21 @@ ] } ], diff --git a/build/patches/Disable-some-signed-exchange-features.patch b/build/patches/Disable-some-signed-exchange-features.patch index 1cc61b41..170c8ff5 100644 --- a/build/patches/Disable-some-signed-exchange-features.patch +++ b/build/patches/Disable-some-signed-exchange-features.patch @@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 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 -@@ -1019,14 +1019,14 @@ BASE_FEATURE(kSharedArrayBufferOnDesktop, +@@ -1042,14 +1042,14 @@ BASE_FEATURE(kSharedArrayBufferOnDesktop, // Signed Exchange Reporting for distributors // https://www.chromestatus.com/feature/5687904902840320 BASE_FEATURE(kSignedExchangeReportingForDistributors, diff --git a/build/patches/Disable-text-fragments-by-default.patch b/build/patches/Disable-text-fragments-by-default.patch index feb3d317..526574cf 100644 --- a/build/patches/Disable-text-fragments-by-default.patch +++ b/build/patches/Disable-text-fragments-by-default.patch @@ -22,7 +22,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 -@@ -6410,6 +6410,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6044,6 +6044,11 @@ const FeatureEntry kFeatureEntries[] = { "")}, #endif @@ -37,7 +37,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json --- a/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json -@@ -2735,6 +2735,11 @@ +@@ -2715,6 +2715,11 @@ "owners": [ "robsc", "napper", "alanlxl" ], "expiry_milestone": 130 }, @@ -52,7 +52,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -1341,6 +1341,10 @@ extern const char kDropInputEventsBeforeFirstPaintDescription[] = +@@ -1301,6 +1301,10 @@ extern const char kDropInputEventsBeforeFirstPaintDescription[] = "intentionally interact with elements on that page. By dropping the events " "we prevent accidental interaction with a page the user has not seen yet."; @@ -66,7 +66,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -748,6 +748,9 @@ extern const char kReduceHorizontalFlingVelocityDescription[]; +@@ -724,6 +724,9 @@ extern const char kReduceHorizontalFlingVelocityDescription[]; extern const char kRetailCouponsName[]; extern const char kRetailCouponsDescription[]; @@ -91,7 +91,7 @@ diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/pre diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc --- a/content/child/runtime_features.cc +++ b/content/child/runtime_features.cc -@@ -271,6 +271,7 @@ void SetRuntimeFeaturesFromChromiumFeatures() { +@@ -267,6 +267,7 @@ void SetRuntimeFeaturesFromChromiumFeatures() { features::kSharedArrayBufferOnDesktop}, {wf::EnableSharedAutofill, autofill::features::kAutofillSharedAutofill}, {wf::EnableTouchDragAndContextMenu, features::kTouchDragAndContextMenu}, @@ -102,7 +102,7 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features. 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 -@@ -516,6 +516,11 @@ BASE_FEATURE(kDropInputEventsBeforeFirstPaint, +@@ -487,6 +487,11 @@ BASE_FEATURE(kDropInputEventsBeforeFirstPaint, "DropInputEventsBeforeFirstPaint", base::FEATURE_DISABLED_BY_DEFAULT); @@ -117,7 +117,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 -@@ -233,6 +233,7 @@ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kDecodeJpeg420ImagesToYUV); +@@ -215,6 +215,7 @@ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kDecodeJpeg420ImagesToYUV); BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kDecodeLossyWebPImagesToYUV); BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kWebFontsCacheAwareTimeoutAdaption); @@ -128,7 +128,7 @@ diff --git a/third_party/blink/public/common/features.h b/third_party/blink/publ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc --- a/third_party/blink/renderer/core/dom/document.cc +++ b/third_party/blink/renderer/core/dom/document.cc -@@ -4290,9 +4290,14 @@ void Document::SetURL(const KURL& url) { +@@ -4289,9 +4289,14 @@ void Document::SetURL(const KURL& url) { TRACE_EVENT1("navigation", "Document::SetURL", "url", new_url.GetString().Utf8()); @@ -146,7 +146,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -2699,10 +2699,9 @@ +@@ -2787,10 +2787,9 @@ }, { name: "TextFragmentIdentifiers", diff --git a/build/patches/Disable-third-party-origin-trials.patch b/build/patches/Disable-third-party-origin-trials.patch index f074eb65..1b911b6c 100644 --- a/build/patches/Disable-third-party-origin-trials.patch +++ b/build/patches/Disable-third-party-origin-trials.patch @@ -60,7 +60,7 @@ diff --git a/components/embedder_support/origin_trials/origin_trial_policy_impl. diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -7495,7 +7495,6 @@ void NavigationRequest::RestartBackForwardCachedNavigationImpl() { +@@ -7598,7 +7598,6 @@ void NavigationRequest::RestartBackForwardCachedNavigationImpl() { void NavigationRequest::ForceEnableOriginTrials( const std::vector& trials) { DCHECK(!HasCommitted()); @@ -71,7 +71,7 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/brows diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -476,10 +476,6 @@ void FillNavigationParamsRequest( +@@ -477,10 +477,6 @@ void FillNavigationParamsRequest( common_params.initiator_origin.value(); } @@ -82,7 +82,7 @@ diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_fra navigation_params->was_discarded = commit_params.was_discarded; navigation_params->document_ukm_source_id = commit_params.document_ukm_source_id; -@@ -511,12 +507,6 @@ void FillNavigationParamsRequest( +@@ -512,12 +508,6 @@ void FillNavigationParamsRequest( navigation_params->web_bundle_claimed_url = commit_params.web_bundle_claimed_url; @@ -95,7 +95,7 @@ diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_fra if (!commit_params.early_hints_preloaded_resources.empty()) { navigation_params->early_hints_preloaded_resources = WebVector(); for (const auto& resource : commit_params.early_hints_preloaded_resources) { -@@ -570,11 +560,6 @@ blink::mojom::CommonNavigationParamsPtr MakeCommonNavigationParams( +@@ -571,11 +561,6 @@ blink::mojom::CommonNavigationParamsPtr MakeCommonNavigationParams( info->url_request.GetURLRequestExtraData().get()); DCHECK(url_request_extra_data); @@ -107,7 +107,7 @@ diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_fra blink::NavigationDownloadPolicy download_policy; download_policy.ApplyDownloadFramePolicy( info->is_opener_navigation, info->url_request.HasUserGesture(), -@@ -592,7 +577,7 @@ blink::mojom::CommonNavigationParamsPtr MakeCommonNavigationParams( +@@ -593,7 +578,7 @@ blink::mojom::CommonNavigationParamsPtr MakeCommonNavigationParams( info->url_request.HasUserGesture(), info->url_request.HasTextFragmentToken(), info->should_check_main_world_content_security_policy, @@ -159,7 +159,7 @@ diff --git a/third_party/blink/common/origin_trials/trial_token_validator.cc b/t 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 -@@ -161,13 +161,6 @@ namespace { +@@ -165,13 +165,6 @@ namespace { Vector CopyInitiatorOriginTrials( const WebVector& initiator_origin_trial_features) { Vector result; @@ -173,7 +173,7 @@ diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_p return result; } -@@ -180,18 +173,12 @@ WebVector CopyInitiatorOriginTrials( +@@ -184,18 +177,12 @@ WebVector CopyInitiatorOriginTrials( Vector CopyForceEnabledOriginTrials( const WebVector& force_enabled_origin_trials) { Vector result; @@ -192,7 +192,7 @@ diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_p return result; } -@@ -2718,10 +2705,6 @@ void DocumentLoader::CreateParserPostCommit() { +@@ -2730,10 +2717,6 @@ void DocumentLoader::CreateParserPostCommit() { OriginTrialFeature::kTouchEventFeatureDetection); } diff --git a/build/patches/Disable-various-metrics.patch b/build/patches/Disable-various-metrics.patch index af754df9..914dcd8f 100644 --- a/build/patches/Disable-various-metrics.patch +++ b/build/patches/Disable-various-metrics.patch @@ -89,7 +89,7 @@ diff --git a/chrome/browser/android/ntp/most_visited_sites_bridge.cc b/chrome/br diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc -@@ -991,7 +991,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) { +@@ -1014,7 +1014,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) { #endif // BUILDFLAG(IS_CHROMEOS_ASH) registry->RegisterBooleanPref(metrics::prefs::kMetricsReportingEnabled, @@ -109,7 +109,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch #include "chrome/browser/media/audio_service_util.h" #include "chrome/browser/media/router/media_router_feature.h" #include "chrome/browser/media/webrtc/audio_debug_recordings_handler.h" -@@ -4726,16 +4725,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( +@@ -4798,16 +4797,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( content::NavigationHandle* handle) { std::vector> throttles; @@ -126,7 +126,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch #if BUILDFLAG(ENABLE_SUPERVISED_USERS) MaybeAddThrottle( SupervisedUserNavigationThrottle::MaybeCreateThrottleFor(handle), -@@ -4820,10 +4809,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( +@@ -4892,10 +4881,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( throttle_manager->MaybeAppendNavigationThrottles(handle, &throttles); } @@ -185,7 +185,7 @@ diff --git a/components/ntp_tiles/BUILD.gn b/components/ntp_tiles/BUILD.gn diff --git a/components/ntp_tiles/most_visited_sites.cc b/components/ntp_tiles/most_visited_sites.cc --- a/components/ntp_tiles/most_visited_sites.cc +++ b/components/ntp_tiles/most_visited_sites.cc -@@ -730,8 +730,6 @@ void MostVisitedSites::SaveTilesAndNotify( +@@ -703,8 +703,6 @@ void MostVisitedSites::SaveTilesAndNotify( : new_tiles; if (fixed_tiles.size() != new_tiles.size()) { diff --git a/build/patches/Do-not-build-API-keys-infobar.patch b/build/patches/Do-not-build-API-keys-infobar.patch index 027f5838..750eb828 100644 --- a/build/patches/Do-not-build-API-keys-infobar.patch +++ b/build/patches/Do-not-build-API-keys-infobar.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/BUILD.gn b/chrome/browser/ui/BUILD.gn --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -1301,8 +1301,6 @@ static_library("ui") { +@@ -1283,8 +1283,6 @@ static_library("ui") { "singleton_tabs.h", "startup/automation_infobar_delegate.cc", "startup/automation_infobar_delegate.h", diff --git a/build/patches/Do-not-hide-component-extensions.patch b/build/patches/Do-not-hide-component-extensions.patch index 60aaf2a5..47cba774 100644 --- a/build/patches/Do-not-hide-component-extensions.patch +++ b/build/patches/Do-not-hide-component-extensions.patch @@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc --- a/extensions/common/extension.cc +++ b/extensions/common/extension.cc -@@ -463,9 +463,8 @@ bool Extension::ShouldDisplayInNewTabPage() const { +@@ -458,9 +458,8 @@ bool Extension::ShouldDisplayInNewTabPage() const { } bool Extension::ShouldExposeViaManagementAPI() const { diff --git a/build/patches/Do-not-link-with-libatomic.patch b/build/patches/Do-not-link-with-libatomic.patch index eeed82ca..e8f3e660 100644 --- a/build/patches/Do-not-link-with-libatomic.patch +++ b/build/patches/Do-not-link-with-libatomic.patch @@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/base/BUILD.gn b/base/BUILD.gn --- a/base/BUILD.gn +++ b/base/BUILD.gn -@@ -1571,7 +1571,7 @@ mixed_component("base") { +@@ -1552,7 +1552,7 @@ component("base") { # more robust check for this. if (!use_sysroot && (is_android || is_chromeos || (is_linux && !is_castos)) && host_toolchain != "//build/toolchain/cros:host") { diff --git a/build/patches/Do-not-store-passwords-by-default.patch b/build/patches/Do-not-store-passwords-by-default.patch index b90ea88b..c963f8ff 100644 --- a/build/patches/Do-not-store-passwords-by-default.patch +++ b/build/patches/Do-not-store-passwords-by-default.patch @@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/components/password_manager/core/browser/password_manager.cc b/components/password_manager/core/browser/password_manager.cc --- a/components/password_manager/core/browser/password_manager.cc +++ b/components/password_manager/core/browser/password_manager.cc -@@ -242,14 +242,14 @@ base::CallbackListSubscription AddSyncEnabledOrDisabledCallback( +@@ -255,14 +255,14 @@ base::CallbackListSubscription AddSyncEnabledOrDisabledCallback( void PasswordManager::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( diff --git a/build/patches/DoH-improvements.patch b/build/patches/DoH-improvements.patch index ce5b511b..84f14162 100644 --- a/build/patches/DoH-improvements.patch +++ b/build/patches/DoH-improvements.patch @@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/net/stub_resolver_config_reader.cc b/chrome/browser/net/stub_resolver_config_reader.cc --- a/chrome/browser/net/stub_resolver_config_reader.cc +++ b/chrome/browser/net/stub_resolver_config_reader.cc -@@ -156,7 +156,7 @@ StubResolverConfigReader::StubResolverConfigReader(PrefService* local_state, +@@ -161,7 +161,7 @@ StubResolverConfigReader::StubResolverConfigReader(PrefService* local_state, if (entries.count("dns-over-https@1")) { // The user has "Enabled" selected. local_state_->SetString(prefs::kDnsOverHttpsMode, @@ -24,7 +24,7 @@ diff --git a/chrome/browser/net/stub_resolver_config_reader.cc b/chrome/browser/ } else if (entries.count("dns-over-https@2")) { // The user has "Disabled" selected. local_state_->SetString(prefs::kDnsOverHttpsMode, -@@ -341,22 +341,7 @@ SecureDnsConfig StubResolverConfigReader::GetAndUpdateConfiguration( +@@ -356,22 +356,7 @@ SecureDnsConfig StubResolverConfigReader::GetAndUpdateConfiguration( check_parental_controls = false; } @@ -82,7 +82,7 @@ diff --git a/net/dns/dns_client.cc b/net/dns/dns_client.cc diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc --- a/net/dns/host_resolver_manager.cc +++ b/net/dns/host_resolver_manager.cc -@@ -2963,6 +2963,7 @@ void HostResolverManager::SetDnsConfigOverrides(DnsConfigOverrides overrides) { +@@ -2976,6 +2976,7 @@ void HostResolverManager::SetDnsConfigOverrides(DnsConfigOverrides overrides) { bool changed = dns_client_->SetConfigOverrides(std::move(overrides)); if (changed) { diff --git a/build/patches/Enable-Certificate-Transparency.patch b/build/patches/Enable-Certificate-Transparency.patch index 0506f326..4bdd3b8e 100644 --- a/build/patches/Enable-Certificate-Transparency.patch +++ b/build/patches/Enable-Certificate-Transparency.patch @@ -15,16 +15,16 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html chrome/browser/net/system_network_context_manager.cc | 4 ---- chrome/browser/ssl/sct_reporting_service.cc | 5 +++++ chrome/common/chrome_features.cc | 6 +----- - net/http/transport_security_state.cc | 9 +++++---- + net/http/transport_security_state.cc | 5 +++-- net/url_request/report_sender.cc | 3 ++- services/network/network_context.cc | 2 +- services/network/sct_auditing/sct_auditing_handler.cc | 2 ++ - 11 files changed, 30 insertions(+), 17 deletions(-) + 11 files changed, 28 insertions(+), 15 deletions(-) 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 -@@ -9161,6 +9161,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8659,6 +8659,11 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kWebMidiDescription, kOsAll, FEATURE_VALUE_TYPE(features::kWebMidi)}, #if BUILDFLAG(IS_ANDROID) @@ -39,7 +39,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 -@@ -155,8 +155,8 @@ BASE_FEATURE(kWebUsbDeviceDetection, +@@ -178,8 +178,8 @@ BASE_FEATURE(kWebUsbDeviceDetection, #if BUILDFLAG(IS_ANDROID) // Enables Certificate Transparency on Android. BASE_FEATURE(kCertificateTransparencyAndroid, @@ -53,7 +53,7 @@ diff --git a/chrome/browser/browser_features.cc b/chrome/browser/browser_feature diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -6681,6 +6681,10 @@ const char kAutofillCreditCardUploadDescription[] = +@@ -6600,6 +6600,10 @@ const char kAutofillCreditCardUploadDescription[] = #endif // defined(TOOLKIT_VIEWS) || BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) @@ -67,7 +67,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -3878,6 +3878,9 @@ extern const char kAutofillCreditCardUploadDescription[]; +@@ -3842,6 +3842,9 @@ extern const char kAutofillCreditCardUploadDescription[]; #endif // defined(TOOLKIT_VIEWS) || BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) @@ -80,7 +80,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio 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 -@@ -856,7 +856,6 @@ void SystemNetworkContextManager::SetEnableCertificateTransparencyForTesting( +@@ -886,7 +886,6 @@ void SystemNetworkContextManager::SetEnableCertificateTransparencyForTesting( bool SystemNetworkContextManager::IsCertificateTransparencyEnabled() { if (certificate_transparency_enabled_for_testing_.has_value()) return certificate_transparency_enabled_for_testing_.value(); @@ -88,7 +88,7 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows // TODO(carlosil): Figure out if we can/should remove the OFFICIAL_BUILD and // GOOGLE_CHROME_BRANDING checks now that enforcement does not rely on build // dates, and allow embedders to enforce. -@@ -870,9 +869,6 @@ bool SystemNetworkContextManager::IsCertificateTransparencyEnabled() { +@@ -900,9 +899,6 @@ bool SystemNetworkContextManager::IsCertificateTransparencyEnabled() { #else return true; #endif // BUILDFLAG(IS_ANDROID) @@ -116,7 +116,7 @@ diff --git a/chrome/browser/ssl/sct_reporting_service.cc b/chrome/browser/ssl/sc 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 -@@ -1000,11 +1000,7 @@ BASE_FEATURE(kSchedulerConfiguration, +@@ -993,11 +993,7 @@ BASE_FEATURE(kSchedulerConfiguration, // Controls whether SCT audit reports are queued and the rate at which they // should be sampled. Default sampling rate is 1/10,000 certificates. @@ -132,7 +132,7 @@ diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc diff --git a/net/http/transport_security_state.cc b/net/http/transport_security_state.cc --- a/net/http/transport_security_state.cc +++ b/net/http/transport_security_state.cc -@@ -337,6 +337,7 @@ class HSTSPreloadDecoder : public net::extras::PreloadDecoder { +@@ -319,6 +319,7 @@ class HSTSPreloadDecoder : public net::extras::PreloadDecoder { bool DecodeHSTSPreload(const std::string& search_hostname, PreloadResult* out) { #if !BUILDFLAG(INCLUDE_TRANSPORT_SECURITY_STATE_PRELOAD_LIST) @@ -140,14 +140,7 @@ diff --git a/net/http/transport_security_state.cc b/net/http/transport_security_ if (g_hsts_source == nullptr) return false; #endif -@@ -382,13 +383,13 @@ bool DecodeHSTSPreload(const std::string& search_hostname, PreloadResult* out) { - - // static - BASE_FEATURE(kDynamicExpectCTFeature, -- "DynamicExpectCT", -- base::FEATURE_DISABLED_BY_DEFAULT); -+ "DynamicExpectCT", // disabled by default -+ base::FEATURE_DISABLED_BY_DEFAULT); // in Bromite +@@ -364,8 +365,8 @@ bool DecodeHSTSPreload(const std::string& search_hostname, PreloadResult* out) { // static BASE_FEATURE(kCertificateTransparencyEnforcement, @@ -174,7 +167,7 @@ diff --git a/net/url_request/report_sender.cc b/net/url_request/report_sender.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 -@@ -2663,7 +2663,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( +@@ -2511,7 +2511,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( // TransportSecurityState. Since no requests have been made yet, safe to do // this even after the call to Build(). diff --git a/build/patches/Enable-HEVC-by-default.patch b/build/patches/Enable-HEVC-by-default.patch index eb20da39..297ad331 100644 --- a/build/patches/Enable-HEVC-by-default.patch +++ b/build/patches/Enable-HEVC-by-default.patch @@ -12,7 +12,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc --- a/media/base/media_switches.cc +++ b/media/base/media_switches.cc -@@ -296,8 +296,8 @@ BASE_FEATURE(kPictureInPicture, +@@ -307,8 +307,8 @@ BASE_FEATURE(kEnableTabMuting, #if BUILDFLAG(ENABLE_PLATFORM_HEVC) // Enables HEVC hardware accelerated decoding. BASE_FEATURE(kPlatformHEVCDecoderSupport, diff --git a/build/patches/Enable-PermuteTLSExtensions-by-default.patch b/build/patches/Enable-PermuteTLSExtensions-by-default.patch index b023ac5b..20c32196 100644 --- a/build/patches/Enable-PermuteTLSExtensions-by-default.patch +++ b/build/patches/Enable-PermuteTLSExtensions-by-default.patch @@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/net/base/features.cc b/net/base/features.cc --- a/net/base/features.cc +++ b/net/base/features.cc -@@ -157,8 +157,8 @@ BASE_FEATURE(kTLS13KeyUpdate, +@@ -134,8 +134,8 @@ BASE_FEATURE(kTLS13KeyUpdate, base::FEATURE_DISABLED_BY_DEFAULT); BASE_FEATURE(kPermuteTLSExtensions, diff --git a/build/patches/Enable-SPPI-for-devices-with-enough-memory.patch b/build/patches/Enable-SPPI-for-devices-with-enough-memory.patch index d7d02456..762a4a11 100644 --- a/build/patches/Enable-SPPI-for-devices-with-enough-memory.patch +++ b/build/patches/Enable-SPPI-for-devices-with-enough-memory.patch @@ -11,7 +11,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 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 -@@ -1051,12 +1051,8 @@ BASE_FEATURE(kSecurityKeyAttestationPrompt, +@@ -1044,12 +1044,8 @@ BASE_FEATURE(kSecurityKeyAttestationPrompt, // TODO(alexmos): Move this and the other site isolation features below to // browser_features, as they are only used on the browser side. BASE_FEATURE(kSitePerProcess, diff --git a/build/patches/Enable-StrictOriginIsolation-and-SitePerProcess.patch b/build/patches/Enable-StrictOriginIsolation-and-SitePerProcess.patch index ed6f8be2..60ab428f 100644 --- a/build/patches/Enable-StrictOriginIsolation-and-SitePerProcess.patch +++ b/build/patches/Enable-StrictOriginIsolation-and-SitePerProcess.patch @@ -18,7 +18,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 -@@ -4616,9 +4616,6 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4276,9 +4276,6 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSiteIsolationForPasswordSitesDescription, kOsAndroid, FEATURE_VALUE_TYPE( site_isolation::features::kSiteIsolationForPasswordSites)}, @@ -31,7 +31,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc 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 -@@ -1504,7 +1504,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs( +@@ -1532,7 +1532,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs( registry->RegisterFilePathPref(prefs::kDiskCacheDir, base::FilePath()); registry->RegisterIntegerPref(prefs::kDiskCacheSize, 0); registry->RegisterStringPref(prefs::kIsolateOrigins, std::string()); @@ -39,8 +39,8 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch + registry->RegisterBooleanPref(prefs::kSitePerProcess, true); registry->RegisterBooleanPref(prefs::kTabFreezingEnabled, true); registry->RegisterIntegerPref(prefs::kSCTAuditingHashdanceReportCount, 0); - } -@@ -1518,7 +1518,7 @@ void ChromeContentBrowserClient::RegisterProfilePrefs( + registry->RegisterBooleanPref( +@@ -1554,7 +1554,7 @@ void ChromeContentBrowserClient::RegisterProfilePrefs( // user policy in addition to the same named ones in Local State (which are // used for mapping the command-line flags). registry->RegisterStringPref(prefs::kIsolateOrigins, std::string()); @@ -71,7 +71,7 @@ diff --git a/components/site_isolation/site_isolation_policy.cc b/components/sit 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 -@@ -1132,8 +1132,8 @@ BASE_FEATURE(kStopVideoCaptureOnScreenLock, +@@ -1145,8 +1145,8 @@ BASE_FEATURE(kStopVideoCaptureOnScreenLock, // Controls whether site isolation should use origins instead of scheme and // eTLD+1. BASE_FEATURE(kStrictOriginIsolation, diff --git a/build/patches/Enable-darken-websites-checkbox-in-themes.patch b/build/patches/Enable-darken-websites-checkbox-in-themes.patch index 3439a914..c62428dc 100644 --- a/build/patches/Enable-darken-websites-checkbox-in-themes.patch +++ b/build/patches/Enable-darken-websites-checkbox-in-themes.patch @@ -13,7 +13,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 -@@ -1265,9 +1265,9 @@ +@@ -1224,9 +1224,9 @@ "expiry_milestone": 114 }, { diff --git a/build/patches/Enable-native-Android-autofill.patch b/build/patches/Enable-native-Android-autofill.patch index f91b55a9..b82888e0 100644 --- a/build/patches/Enable-native-Android-autofill.patch +++ b/build/patches/Enable-native-Android-autofill.patch @@ -42,7 +42,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/android_webview/browser/aw_contents.cc b/android_webview/browser/aw_contents.cc --- a/android_webview/browser/aw_contents.cc +++ b/android_webview/browser/aw_contents.cc -@@ -341,7 +341,8 @@ void AwContents::InitAutofillIfNecessary(bool autocomplete_enabled) { +@@ -340,7 +340,8 @@ void AwContents::InitAutofillIfNecessary(bool autocomplete_enabled) { enable_download_manager) : base::BindRepeating(&autofill::BrowserDriverInitHook, AwAutofillClient::FromWebContents(web_contents), @@ -55,7 +55,7 @@ diff --git a/android_webview/browser/aw_contents.cc b/android_webview/browser/aw diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -472,6 +472,7 @@ if (current_toolchain == default_toolchain) { +@@ -469,6 +469,7 @@ if (current_toolchain == default_toolchain) { "//chrome/browser/ui/android/favicon:java", "//chrome/browser/ui/android/layouts:java", "//chrome/browser/ui/android/layouts/glue:java", @@ -317,7 +317,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabViewAndr diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2494,6 +2494,13 @@ static_library("browser") { +@@ -2488,6 +2488,13 @@ static_library("browser") { deps += [ "//chrome/browser/error_reporting" ] } @@ -412,7 +412,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro 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 -@@ -167,6 +167,9 @@ +@@ -166,6 +166,9 @@ #include "chrome/browser/ui/javascript_dialogs/javascript_tab_modal_dialog_manager_delegate_android.h" #include "chrome/browser/video_tutorials/video_tutorial_tab_helper.h" #include "content/public/common/content_features.h" @@ -420,9 +420,9 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc +#include "components/android_autofill/browser/autofill_provider.h" +#include "components/android_autofill/browser/autofill_provider_android.h" #else - #include "chrome/browser/accuracy_tips/accuracy_service_factory.h" #include "chrome/browser/banners/app_banner_manager_desktop.h" -@@ -329,7 +332,8 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { + #include "chrome/browser/preloading/prefetch/zero_suggest_prefetch/zero_suggest_prefetch_tab_helper.h" +@@ -322,7 +325,8 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { base::BindRepeating( &autofill::BrowserDriverInitHook, autofill::ChromeAutofillClient::FromWebContents(web_contents), @@ -447,9 +447,9 @@ diff --git a/components/android_autofill/browser/android_autofill_manager.cc b/c diff --git a/components/android_autofill/browser/android_autofill_manager.h b/components/android_autofill/browser/android_autofill_manager.h --- a/components/android_autofill/browser/android_autofill_manager.h +++ b/components/android_autofill/browser/android_autofill_manager.h -@@ -89,17 +89,17 @@ class AndroidAutofillManager : public AutofillManager { - void SetCreditCardFillViaAutofillAssistantIntent( - const autofill_assistant::AutofillAssistantIntent intent) override; +@@ -81,17 +81,17 @@ class AndroidAutofillManager : public AutofillManager { + const FormData& form, + const url::Origin& triggered_origin); + AndroidAutofillManager( + AutofillDriver* driver, @@ -473,7 +473,7 @@ diff --git a/components/android_autofill/browser/android_autofill_manager.h b/co diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/components/autofill/content/browser/content_autofill_driver.cc --- a/components/autofill/content/browser/content_autofill_driver.cc +++ b/components/autofill/content/browser/content_autofill_driver.cc -@@ -317,6 +317,8 @@ void ContentAutofillDriver::FormsSeen( +@@ -316,6 +316,8 @@ void ContentAutofillDriver::FormsSeen( const std::vector& updated_forms, const std::vector& removed_forms) { target->autofill_manager_->OnFormsSeen(updated_forms, removed_forms); @@ -482,7 +482,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co }); } -@@ -343,6 +345,8 @@ void ContentAutofillDriver::FormSubmitted( +@@ -342,6 +344,8 @@ void ContentAutofillDriver::FormSubmitted( } target->autofill_manager_->OnFormSubmitted(form, known_success, submission_source); @@ -491,7 +491,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co }); } -@@ -363,6 +367,8 @@ void ContentAutofillDriver::TextFieldDidChange(const FormData& raw_form, +@@ -362,6 +366,8 @@ void ContentAutofillDriver::TextFieldDidChange(const FormData& raw_form, base::TimeTicks timestamp) { target->autofill_manager_->OnTextFieldDidChange( form, field, bounding_box, timestamp); @@ -500,7 +500,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co }); } -@@ -381,6 +387,8 @@ void ContentAutofillDriver::TextFieldDidScroll(const FormData& raw_form, +@@ -380,6 +386,8 @@ void ContentAutofillDriver::TextFieldDidScroll(const FormData& raw_form, const FormFieldData& field, const gfx::RectF& bounding_box) { target->autofill_manager_->OnTextFieldDidScroll(form, field, bounding_box); @@ -509,7 +509,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co }); } -@@ -400,6 +408,8 @@ void ContentAutofillDriver::SelectControlDidChange( +@@ -399,6 +407,8 @@ void ContentAutofillDriver::SelectControlDidChange( const FormFieldData& field, const gfx::RectF& bounding_box) { target->autofill_manager_->OnSelectControlDidChange(form, field, bounding_box); @@ -518,9 +518,9 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co }); } -@@ -427,6 +437,10 @@ void ContentAutofillDriver::AskForValuesToFill( +@@ -424,6 +434,10 @@ void ContentAutofillDriver::AskForValuesToFill( target->autofill_manager_->OnAskForValuesToFill( - form, field, bounding_box, query_id, autoselect_first_suggestion, + form, field, bounding_box, autoselect_first_suggestion, form_element_was_clicked); + if (target->secondary_autofill_manager_) + target->secondary_autofill_manager_->OnAskForValuesToFill(form, field, bounding_box, query_id, @@ -529,7 +529,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co }); } -@@ -437,12 +451,16 @@ void ContentAutofillDriver::HidePopup() { +@@ -434,12 +448,16 @@ void ContentAutofillDriver::HidePopup() { DCHECK(!target->IsPrerendering()) << "We should never affect UI while prerendering"; target->autofill_manager_->OnHidePopup(); @@ -546,7 +546,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co } void ContentAutofillDriver::FocusNoLongerOnForm(bool had_interacted_form) { -@@ -470,6 +488,8 @@ void ContentAutofillDriver::FocusOnFormField(const FormData& raw_form, +@@ -467,6 +485,8 @@ void ContentAutofillDriver::FocusOnFormField(const FormData& raw_form, const FormFieldData& field, const gfx::RectF& bounding_box) { target->autofill_manager_->OnFocusOnFormField(form, field, bounding_box); @@ -555,7 +555,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co }); } -@@ -482,6 +502,8 @@ void ContentAutofillDriver::DidFillAutofillFormData(const FormData& raw_form, +@@ -479,6 +499,8 @@ void ContentAutofillDriver::DidFillAutofillFormData(const FormData& raw_form, [](ContentAutofillDriver* target, const FormData& form, base::TimeTicks timestamp) { target->autofill_manager_->OnDidFillAutofillFormData(form, timestamp); @@ -564,7 +564,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co }); } -@@ -491,6 +513,8 @@ void ContentAutofillDriver::DidPreviewAutofillFormData() { +@@ -488,6 +510,8 @@ void ContentAutofillDriver::DidPreviewAutofillFormData() { autofill_router().DidPreviewAutofillFormData( this, [](ContentAutofillDriver* target) { target->autofill_manager_->OnDidPreviewAutofillFormData(); @@ -573,7 +573,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co }); } -@@ -500,6 +524,8 @@ void ContentAutofillDriver::DidEndTextFieldEditing() { +@@ -497,6 +521,8 @@ void ContentAutofillDriver::DidEndTextFieldEditing() { autofill_router().DidEndTextFieldEditing( this, [](ContentAutofillDriver* target) { target->autofill_manager_->OnDidEndTextFieldEditing(); @@ -582,7 +582,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co }); } -@@ -511,6 +537,8 @@ void ContentAutofillDriver::SelectFieldOptionsDidChange( +@@ -508,6 +534,8 @@ void ContentAutofillDriver::SelectFieldOptionsDidChange( this, GetFormWithFrameAndFormMetaData(raw_form), [](ContentAutofillDriver* target, const FormData& form) { target->autofill_manager_->OnSelectFieldOptionsDidChange(form); @@ -591,7 +591,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co }); } -@@ -616,6 +644,8 @@ void ContentAutofillDriver::DidNavigateFrame( +@@ -606,6 +634,8 @@ void ContentAutofillDriver::DidNavigateFrame( if (autofill_router_) // Can be nullptr only in tests. autofill_router_->UnregisterDriver(this); autofill_manager_->Reset(); @@ -603,7 +603,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co diff --git a/components/autofill/content/browser/content_autofill_driver.h b/components/autofill/content/browser/content_autofill_driver.h --- a/components/autofill/content/browser/content_autofill_driver.h +++ b/components/autofill/content/browser/content_autofill_driver.h -@@ -132,10 +132,13 @@ class ContentAutofillDriver : public AutofillDriver, +@@ -131,10 +131,13 @@ class ContentAutofillDriver : public AutofillDriver, ContentAutofillDriver& operator=(const ContentAutofillDriver&) = delete; ~ContentAutofillDriver() override; @@ -618,7 +618,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.h b/com content::RenderFrameHost* render_frame_host() { return render_frame_host_; } -@@ -373,6 +376,10 @@ class ContentAutofillDriver : public AutofillDriver, +@@ -368,6 +371,10 @@ class ContentAutofillDriver : public AutofillDriver, // code. std::unique_ptr autofill_manager_ = nullptr; @@ -670,7 +670,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver_factory diff --git a/components/autofill/content/renderer/password_autofill_agent.cc b/components/autofill/content/renderer/password_autofill_agent.cc --- a/components/autofill/content/renderer/password_autofill_agent.cc +++ b/components/autofill/content/renderer/password_autofill_agent.cc -@@ -799,7 +799,10 @@ void PasswordAutofillAgent::UpdateStateForTextChange( +@@ -804,7 +804,10 @@ void PasswordAutofillAgent::UpdateStateForTextChange( void PasswordAutofillAgent::TrackAutofilledElement( const blink::WebFormControlElement& element) { @@ -734,7 +734,7 @@ diff --git a/components/embedder_support/android/java/src/org/chromium/component /** * The containing view for {@link WebContents} that exists in the Android UI hierarchy and exposes * the various {@link View} functionality to it. -@@ -84,6 +89,8 @@ public class ContentView extends FrameLayout +@@ -86,6 +91,8 @@ public class ContentView extends FrameLayout */ public static ContentView createContentView(Context context, @Nullable EventOffsetHandler eventOffsetHandler, @Nullable WebContents webContents) { @@ -743,7 +743,7 @@ diff --git a/components/embedder_support/android/java/src/org/chromium/component return new ContentView(context, eventOffsetHandler, webContents); } -@@ -573,4 +580,43 @@ public class ContentView extends FrameLayout +@@ -597,4 +604,43 @@ public class ContentView extends FrameLayout private boolean webContentsAttached() { return hasValidWebContents() && mWebContents.getTopLevelNativeWindow() != null; } @@ -790,7 +790,7 @@ diff --git a/components/embedder_support/android/java/src/org/chromium/component diff --git a/ui/android/java/src/org/chromium/ui/base/ViewAndroidDelegate.java b/ui/android/java/src/org/chromium/ui/base/ViewAndroidDelegate.java --- a/ui/android/java/src/org/chromium/ui/base/ViewAndroidDelegate.java +++ b/ui/android/java/src/org/chromium/ui/base/ViewAndroidDelegate.java -@@ -31,6 +31,10 @@ import org.chromium.ui.dragdrop.DragStateTracker; +@@ -29,6 +29,10 @@ import org.chromium.ui.dragdrop.DragStateTracker; import org.chromium.ui.dragdrop.DropDataAndroid; import org.chromium.ui.mojom.CursorType; @@ -801,7 +801,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/ViewAndroidDelegate.java b /** * Class to acquire, position, and remove anchor views from the implementing View. */ -@@ -592,4 +596,8 @@ public class ViewAndroidDelegate { +@@ -585,4 +589,8 @@ public class ViewAndroidDelegate { public static void setDragAndDropDelegateForTest(DragAndDropDelegate testDelegate) { sDragAndDropTestDelegate = testDelegate; } diff --git a/build/patches/Enable-network-isolation-features.patch b/build/patches/Enable-network-isolation-features.patch index ab13d83c..53fb3bd5 100644 --- a/build/patches/Enable-network-isolation-features.patch +++ b/build/patches/Enable-network-isolation-features.patch @@ -9,32 +9,35 @@ PartitionNelAndReportingByNetworkIsolationKey License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - net/base/features.cc | 32 ++++++++++++++++---------------- - 1 file changed, 16 insertions(+), 16 deletions(-) + net/base/features.cc | 42 +++++++++++++++++++++--------------------- + 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/net/base/features.cc b/net/base/features.cc --- a/net/base/features.cc +++ b/net/base/features.cc -@@ -82,36 +82,36 @@ BASE_FEATURE(kSplitCacheByIncludeCredentials, +@@ -81,37 +81,37 @@ BASE_FEATURE(kSplitCacheByIncludeCredentials, + "SplitCacheByIncludeCredentials", base::FEATURE_DISABLED_BY_DEFAULT); - BASE_FEATURE(kSplitCacheByNetworkIsolationKey, +-BASE_FEATURE(kSplitCacheByNetworkIsolationKey, - "SplitCacheByNetworkIsolationKey", - base::FEATURE_DISABLED_BY_DEFAULT); -+ "SplitCacheByNetworkIsolationKey", // must be enabled ++BASE_FEATURE(kSplitCacheByNetworkIsolationKey, // must be enabled ++ "SplitCacheByNetworkIsolationKey", // enabled + base::FEATURE_ENABLED_BY_DEFAULT); // in Bromite -BASE_FEATURE(kSplitHostCacheByNetworkIsolationKey, - "SplitHostCacheByNetworkIsolationKey", - base::FEATURE_DISABLED_BY_DEFAULT); -+BASE_FEATURE(kSplitHostCacheByNetworkIsolationKey, // must be enabled -+ "SplitHostCacheByNetworkIsolationKey", // in Bromite -+ base::FEATURE_ENABLED_BY_DEFAULT); ++BASE_FEATURE(kSplitHostCacheByNetworkIsolationKey, // must be ++ "SplitHostCacheByNetworkIsolationKey", // enabled ++ base::FEATURE_ENABLED_BY_DEFAULT); // in Bromite - BASE_FEATURE(kPartitionConnectionsByNetworkIsolationKey, +-BASE_FEATURE(kPartitionConnectionsByNetworkIsolationKey, - "PartitionConnectionsByNetworkIsolationKey", - base::FEATURE_DISABLED_BY_DEFAULT); -+ "PartitionConnectionsByNetworkIsolationKey", // must be enabled ++BASE_FEATURE(kPartitionConnectionsByNetworkIsolationKey, // must be ++ "PartitionConnectionsByNetworkIsolationKey", // enabled + base::FEATURE_ENABLED_BY_DEFAULT); // in Bromite BASE_FEATURE(kForceIsolationInfoFrameOriginToTopLevelFrame, @@ -44,29 +47,32 @@ diff --git a/net/base/features.cc b/net/base/features.cc -BASE_FEATURE(kPartitionHttpServerPropertiesByNetworkIsolationKey, - "PartitionHttpServerPropertiesByNetworkIsolationKey", - base::FEATURE_DISABLED_BY_DEFAULT); -+BASE_FEATURE(kPartitionHttpServerPropertiesByNetworkIsolationKey, // must be enabled -+ "PartitionHttpServerPropertiesByNetworkIsolationKey", // in Bromite -+ base::FEATURE_ENABLED_BY_DEFAULT); ++BASE_FEATURE(kPartitionHttpServerPropertiesByNetworkIsolationKey, // must be ++ "PartitionHttpServerPropertiesByNetworkIsolationKey", // enabled ++ base::FEATURE_ENABLED_BY_DEFAULT); // in Bromite - BASE_FEATURE(kPartitionSSLSessionsByNetworkIsolationKey, +-BASE_FEATURE(kPartitionSSLSessionsByNetworkIsolationKey, - "PartitionSSLSessionsByNetworkIsolationKey", - base::FEATURE_DISABLED_BY_DEFAULT); -+ "PartitionSSLSessionsByNetworkIsolationKey", // must be enabled ++BASE_FEATURE(kPartitionSSLSessionsByNetworkIsolationKey, // must be ++ "PartitionSSLSessionsByNetworkIsolationKey", // enabled + base::FEATURE_ENABLED_BY_DEFAULT); // in Bromite - BASE_FEATURE(kPartitionExpectCTStateByNetworkIsolationKey, -- "PartitionExpectCTStateByNetworkIsolationKey", -- base::FEATURE_DISABLED_BY_DEFAULT); -+ "PartitionExpectCTStateByNetworkIsolationKey", // must be enabled -+ base::FEATURE_ENABLED_BY_DEFAULT); // in Bromite - - BASE_FEATURE(kPartitionNelAndReportingByNetworkIsolationKey, +-BASE_FEATURE(kPartitionNelAndReportingByNetworkIsolationKey, - "PartitionNelAndReportingByNetworkIsolationKey", - base::FEATURE_DISABLED_BY_DEFAULT); -+ "PartitionNelAndReportingByNetworkIsolationKey", // must be enabled ++BASE_FEATURE(kPartitionNelAndReportingByNetworkIsolationKey, // must be ++ "PartitionNelAndReportingByNetworkIsolationKey", // enabled + base::FEATURE_ENABLED_BY_DEFAULT); // in Bromite - BASE_FEATURE(kEnableDoubleKeyNetworkAnonymizationKey, - "EnableDoubleKeyNetworkAnonymizationKey", +-BASE_FEATURE(kEnableDoubleKeyNetworkAnonymizationKey, +- "EnableDoubleKeyNetworkAnonymizationKey", +- base::FEATURE_DISABLED_BY_DEFAULT); ++BASE_FEATURE(kEnableDoubleKeyNetworkAnonymizationKey, // must be ++ "EnableDoubleKeyNetworkAnonymizationKey", // disabled ++ base::FEATURE_DISABLED_BY_DEFAULT); // in Bromite + + BASE_FEATURE(kEnableCrossSiteFlagNetworkAnonymizationKey, + "EnableCrossSiteFlagNetworkAnonymizationKey", -- 2.25.1 diff --git a/build/patches/Enable-prefetch-privacy-changes-by-default.patch b/build/patches/Enable-prefetch-privacy-changes-by-default.patch index b90a2f24..9114ef0b 100644 --- a/build/patches/Enable-prefetch-privacy-changes-by-default.patch +++ b/build/patches/Enable-prefetch-privacy-changes-by-default.patch @@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc --- a/third_party/blink/common/features.cc +++ b/third_party/blink/common/features.cc -@@ -529,8 +529,8 @@ BASE_FEATURE(kAllowSyncXHRInPageDismissal, +@@ -500,8 +500,8 @@ BASE_FEATURE(kAllowSyncXHRInPageDismissal, // Prefetch request properties are updated to be privacy-preserving. See // crbug.com/988956. BASE_FEATURE(kPrefetchPrivacyChanges, diff --git a/build/patches/Enable-share-intent.patch b/build/patches/Enable-share-intent.patch index 411b1097..d6eef410 100644 --- a/build/patches/Enable-share-intent.patch +++ b/build/patches/Enable-share-intent.patch @@ -30,7 +30,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni --- a/chrome/android/chrome_java_resources.gni +++ b/chrome/android/chrome_java_resources.gni -@@ -588,6 +588,7 @@ chrome_java_resources = [ +@@ -593,6 +593,7 @@ chrome_java_resources = [ "java/res/layout/signin_activity.xml", "java/res/layout/status_indicator_container.xml", "java/res/layout/suggestions_tile_view_condensed.xml", @@ -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 -@@ -966,6 +966,7 @@ chrome_java_sources = [ +@@ -958,6 +958,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/sharing/click_to_call/ClickToCallUma.java", "java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardMessageHandler.java", "java/src/org/chromium/chrome/browser/sharing/sms_fetcher/SmsFetcherMessageHandler.java", @@ -52,7 +52,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java 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 -@@ -751,6 +751,24 @@ by a child template that "extends" this file. +@@ -743,6 +743,24 @@ by a child template that "extends" this file. android:theme="@style/Theme.BrowserUI.Translucent.NoTitleBar" android:excludeFromRecents="true" android:process=":browser_restart_process"> @@ -168,7 +168,7 @@ new file mode 100644 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java --- a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java -@@ -82,6 +82,7 @@ import org.chromium.chrome.browser.searchwidget.SearchWidgetProvider; +@@ -80,6 +80,7 @@ import org.chromium.chrome.browser.searchwidget.SearchWidgetProvider; import org.chromium.chrome.browser.tab.state.PersistedTabData; import org.chromium.chrome.browser.tab.state.ShoppingPersistedTabData; import org.chromium.chrome.browser.ui.searchactivityutils.SearchActivityPreferencesManager; @@ -176,7 +176,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessIni import org.chromium.chrome.browser.usb.UsbNotificationManager; import org.chromium.chrome.browser.util.AfterStartupTaskUtils; import org.chromium.chrome.browser.webapps.WebappRegistry; -@@ -413,6 +414,8 @@ public class ProcessInitializationHandler { +@@ -417,6 +418,8 @@ public class ProcessInitializationHandler { .resolveClearDataDialogResultRecorder()::makeDeferredRecordings); deferredStartupHandler.addDeferredTask(WebApkUninstallUmaTracker::recordDeferredUma); @@ -311,7 +311,7 @@ new file mode 100644 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 -@@ -6940,6 +6940,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6577,6 +6577,10 @@ const FeatureEntry kFeatureEntries[] = { #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_ANDROID) @@ -325,7 +325,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -2753,6 +2753,11 @@ const char kIsolateOriginsDescription[] = +@@ -2723,6 +2723,11 @@ const char kIsolateOriginsDescription[] = "Requires dedicated processes for an additional set of origins, " "specified as a comma-separated list."; @@ -340,7 +340,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -1565,6 +1565,9 @@ extern const char kIsolateOriginsDescription[]; +@@ -1548,6 +1548,9 @@ extern const char kIsolateOriginsDescription[]; extern const char kIsolationByDefaultName[]; extern const char kIsolationByDefaultDescription[]; @@ -353,15 +353,15 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -276,6 +276,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -274,6 +274,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kSearchReadyOmniboxFeature, &kRelatedSearches, &kRelatedSearchesInBar, + &kSharedIntentUI, &kRelatedSearchesUi, + &kReportParentalControlSitesChild, &kRequestDesktopSiteDefaults, - &kRequestDesktopSiteDefaultsControl, -@@ -928,6 +929,10 @@ BASE_FEATURE(kSafeModeForCachedFlags, +@@ -923,6 +924,10 @@ BASE_FEATURE(kSafeModeForCachedFlags, "SafeModeForCachedFlags", base::FEATURE_DISABLED_BY_DEFAULT); @@ -375,7 +375,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 -@@ -139,6 +139,7 @@ BASE_DECLARE_FEATURE(kSearchEnginePromoExistingDeviceV2); +@@ -140,6 +140,7 @@ BASE_DECLARE_FEATURE(kSearchEnginePromoExistingDeviceV2); BASE_DECLARE_FEATURE(kSearchEnginePromoNewDevice); BASE_DECLARE_FEATURE(kSearchEnginePromoNewDeviceV2); BASE_DECLARE_FEATURE(kSearchReadyOmniboxFeature); @@ -386,7 +386,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 -@@ -473,6 +473,7 @@ public abstract class ChromeFeatureList { +@@ -468,6 +468,7 @@ public abstract class ChromeFeatureList { public static final String QUIET_NOTIFICATION_PROMPTS = "QuietNotificationPrompts"; public static final String REACHED_CODE_PROFILER = "ReachedCodeProfiler"; public static final String READ_LATER = "ReadLater"; @@ -397,7 +397,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd -@@ -4850,6 +4850,19 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

diff --git a/build/patches/Enable-third-party-storage-partitioning.patch b/build/patches/Enable-third-party-storage-partitioning.patch index c29fb7c6..96317666 100644 --- a/build/patches/Enable-third-party-storage-partitioning.patch +++ b/build/patches/Enable-third-party-storage-partitioning.patch @@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/net/base/features.cc b/net/base/features.cc --- a/net/base/features.cc +++ b/net/base/features.cc -@@ -376,8 +376,8 @@ const base::FeatureParam kStorageAccessAPIAutoDenyOutsideFPS{ +@@ -345,8 +345,8 @@ const base::FeatureParam kStorageAccessAPIAutoDenyOutsideFPS{ // Enables partitioning of third party storage (IndexedDB, CacheStorage, etc.) // by the top level site to reduce fingerprinting. BASE_FEATURE(kThirdPartyStoragePartitioning, diff --git a/build/patches/Experimental-user-scripts-support.patch b/build/patches/Experimental-user-scripts-support.patch index ac025abb..0aefa2f5 100644 --- a/build/patches/Experimental-user-scripts-support.patch +++ b/build/patches/Experimental-user-scripts-support.patch @@ -226,7 +226,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -312,6 +312,9 @@ if (current_toolchain == default_toolchain) { +@@ -309,6 +309,9 @@ if (current_toolchain == default_toolchain) { "//third_party/androidx:androidx_gridlayout_gridlayout_java", "//third_party/androidx:androidx_preference_preference_java", ] @@ -236,7 +236,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn } if (enable_vr) { -@@ -619,6 +622,7 @@ if (current_toolchain == default_toolchain) { +@@ -614,6 +617,7 @@ if (current_toolchain == default_toolchain) { "//components/ukm/android:java", "//components/url_formatter/android:url_formatter_java", "//components/user_prefs/android:java", @@ -285,16 +285,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/Downlo diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java --- a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java -@@ -120,6 +120,8 @@ import java.util.Date; +@@ -117,6 +117,8 @@ import java.util.ArrayList; + import java.util.Date; import java.util.List; - import java.util.Locale; +import org.chromium.chrome.browser.user_scripts.UserScriptsUtils; + /** * Handles the initialization dependences of the browser process. This is meant to handle the * initialization that is not tied to any particular Activity, and the logic that should only be -@@ -304,6 +306,7 @@ public class ProcessInitializationHandler { +@@ -308,6 +310,7 @@ public class ProcessInitializationHandler { DefaultBrowserInfo.initBrowserFetcher(); @@ -305,15 +305,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessIni diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni --- a/chrome/android/java_sources.gni +++ b/chrome/android/java_sources.gni -@@ -21,6 +21,7 @@ import("//chrome/common/features.gni") +@@ -20,6 +20,7 @@ import("//chrome/common/features.gni") import("//components/feed/features.gni") import("//components/offline_pages/buildflags/features.gni") import("//device/vr/buildflags/buildflags.gni") +import("//components/user_scripts/android/java_sources.gni") - chrome_java_sources += public_autofill_assistant_java_sources - -@@ -54,3 +55,5 @@ if (enable_arcore) { + if (enable_vr) { + chrome_java_sources += [ "java/src/org/chromium/chrome/browser/component_updater/VrAssetsComponentInstaller.java" ] +@@ -51,3 +52,5 @@ if (enable_arcore) { "java/src/org/chromium/chrome/browser/vr/ArDelegateImpl.java", ] } @@ -322,7 +322,7 @@ diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -3469,6 +3469,11 @@ static_library("browser") { +@@ -3444,6 +3444,11 @@ static_library("browser") { ] deps += [ "//chrome/android/modules/dev_ui/provider:native" ] } @@ -345,8 +345,8 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc #include "components/version_info/version_info.h" #include "components/viz/common/features.h" #include "components/viz/common/switches.h" -@@ -7888,6 +7889,10 @@ const FeatureEntry kFeatureEntries[] = { - chromeos::features::kClipboardHistoryNudgeSessionReset)}, +@@ -7475,6 +7476,10 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(ash::features::kClipboardHistoryNudgeSessionReset)}, #endif // BUILDFLAG(IS_CHROMEOS_ASH) + {"enable-userscripts-log", flag_descriptions::kEnableLoggingUserScriptsName, @@ -359,7 +359,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc 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 -@@ -5297,7 +5297,8 @@ ChromeContentBrowserClient::CreateURLLoaderThrottles( +@@ -5380,7 +5380,8 @@ ChromeContentBrowserClient::CreateURLLoaderThrottles( chrome::mojom::DynamicParams dynamic_params = { profile->GetPrefs()->GetBoolean(prefs::kForceGoogleSafeSearch), profile->GetPrefs()->GetInteger(prefs::kForceYouTubeRestrict), @@ -372,9 +372,9 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -6514,6 +6514,11 @@ const char kFollowingFeedSidepanelDescription[] = - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || - // BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_CHROMEOS) +@@ -6443,6 +6443,11 @@ const char kLocalWebApprovalsDescription[] = + "refresh needs to also be enabled."; + #endif +const char kEnableLoggingUserScriptsName[] = "Enable logging user scripts component"; +const char kEnableLoggingUserScriptsDescription[] = @@ -387,7 +387,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -3752,6 +3752,9 @@ extern const char kQuickCommandsDescription[]; +@@ -3716,6 +3716,9 @@ extern const char kQuickCommandsDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // defined (OS_FUCHSIA) @@ -400,7 +400,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio 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 -@@ -252,6 +252,7 @@ +@@ -256,6 +256,7 @@ #include "components/ntp_tiles/popular_sites_impl.h" #include "components/permissions/contexts/geolocation_permission_context_android.h" #include "components/query_tiles/tile_service_prefs.h" @@ -408,7 +408,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse #else // BUILDFLAG(IS_ANDROID) #include "chrome/browser/cart/cart_service.h" #include "chrome/browser/device_api/device_service_impl.h" -@@ -1371,6 +1372,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -1407,6 +1408,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, translate::TranslatePrefs::RegisterProfilePrefs(registry); omnibox::RegisterProfilePrefs(registry); ZeroSuggestProvider::RegisterProfilePrefs(registry); @@ -419,7 +419,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse diff --git a/chrome/browser/profiles/BUILD.gn b/chrome/browser/profiles/BUILD.gn --- a/chrome/browser/profiles/BUILD.gn +++ b/chrome/browser/profiles/BUILD.gn -@@ -50,6 +50,7 @@ source_set("profile") { +@@ -57,6 +57,7 @@ source_set("profile") { "//components/profile_metrics", "//components/sync/driver", "//components/variations", @@ -430,7 +430,7 @@ diff --git a/chrome/browser/profiles/BUILD.gn b/chrome/browser/profiles/BUILD.gn diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -264,6 +264,8 @@ +@@ -263,6 +263,8 @@ #include "chrome/browser/enterprise/idle/idle_service_factory.h" #endif @@ -439,7 +439,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc namespace chrome { void AddProfilesExtraParts(ChromeBrowserMainParts* main_parts) { -@@ -629,6 +631,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -625,6 +627,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #endif WebDataServiceFactory::GetInstance(); webrtc_event_logging::WebRtcEventLogManagerKeyedServiceFactory::GetInstance(); @@ -450,7 +450,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc -@@ -116,6 +116,8 @@ +@@ -104,6 +104,8 @@ #include "extensions/common/manifest.h" #endif @@ -459,7 +459,7 @@ diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profile #if BUILDFLAG(ENABLE_SESSION_SERVICE) #include "chrome/browser/sessions/app_session_service_factory.h" #include "chrome/browser/sessions/session_service_factory.h" -@@ -1721,6 +1723,13 @@ void ProfileManager::DoFinalInitForServices(Profile* profile, +@@ -1434,6 +1436,13 @@ void ProfileManager::DoFinalInitForServices(Profile* profile, #endif #endif @@ -504,7 +504,7 @@ diff --git a/chrome/browser/profiles/renderer_updater.cc b/chrome/browser/profil } RendererUpdater::~RendererUpdater() { -@@ -188,5 +195,6 @@ chrome::mojom::DynamicParamsPtr RendererUpdater::CreateRendererDynamicParams() +@@ -185,5 +192,6 @@ chrome::mojom::DynamicParamsPtr RendererUpdater::CreateRendererDynamicParams() const { return chrome::mojom::DynamicParams::New( force_google_safesearch_.GetValue(), force_youtube_restrict_.GetValue(), @@ -526,7 +526,7 @@ diff --git a/chrome/browser/profiles/renderer_updater.h b/chrome/browser/profile diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -94,6 +94,7 @@ +@@ -96,6 +96,7 @@ #include "components/security_interstitials/content/urls.h" #include "components/signin/public/base/signin_buildflags.h" #include "components/site_engagement/content/site_engagement_service.h" @@ -534,7 +534,7 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrom #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" #include "content/public/common/content_client.h" -@@ -840,6 +841,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, +@@ -843,6 +844,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, return &NewWebUI; if (url.host_piece() == chrome::kChromeUIVersionHost) return &NewWebUI; @@ -576,7 +576,7 @@ diff --git a/chrome/common/renderer_configuration.mojom b/chrome/common/renderer diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn --- a/chrome/renderer/BUILD.gn +++ b/chrome/renderer/BUILD.gn -@@ -141,6 +141,7 @@ static_library("renderer") { +@@ -140,6 +140,7 @@ static_library("renderer") { "//components/content_capture/common", "//components/content_capture/renderer", "//components/content_settings/common:mojom", @@ -610,7 +610,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer #if BUILDFLAG(ENABLE_SPELLCHECK) if (!spellcheck_) InitSpellCheck(); -@@ -586,6 +595,13 @@ void ChromeContentRendererClient::RenderFrameCreated( +@@ -590,6 +599,13 @@ void ChromeContentRendererClient::RenderFrameCreated( render_frame, registry); #endif @@ -624,7 +624,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer #if BUILDFLAG(ENABLE_PPAPI) new PepperHelper(render_frame); #endif -@@ -1555,7 +1571,14 @@ void ChromeContentRendererClient::RunScriptsAtDocumentStart( +@@ -1586,7 +1602,14 @@ void ChromeContentRendererClient::RunScriptsAtDocumentStart( ChromeExtensionsRendererClient::GetInstance()->RunScriptsAtDocumentStart( render_frame); // |render_frame| might be dead by now. @@ -639,7 +639,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer } void ChromeContentRendererClient::RunScriptsAtDocumentEnd( -@@ -1564,7 +1587,14 @@ void ChromeContentRendererClient::RunScriptsAtDocumentEnd( +@@ -1595,7 +1618,14 @@ void ChromeContentRendererClient::RunScriptsAtDocumentEnd( ChromeExtensionsRendererClient::GetInstance()->RunScriptsAtDocumentEnd( render_frame); // |render_frame| might be dead by now. @@ -654,7 +654,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer } void ChromeContentRendererClient::RunScriptsAtDocumentIdle( -@@ -1573,7 +1603,14 @@ void ChromeContentRendererClient::RunScriptsAtDocumentIdle( +@@ -1604,7 +1634,14 @@ void ChromeContentRendererClient::RunScriptsAtDocumentIdle( ChromeExtensionsRendererClient::GetInstance()->RunScriptsAtDocumentIdle( render_frame); // |render_frame| might be dead by now. @@ -672,7 +672,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer diff --git a/chrome/renderer/chrome_render_thread_observer.cc b/chrome/renderer/chrome_render_thread_observer.cc --- a/chrome/renderer/chrome_render_thread_observer.cc +++ b/chrome/renderer/chrome_render_thread_observer.cc -@@ -58,6 +58,8 @@ +@@ -55,6 +55,8 @@ #include "third_party/blink/public/web/web_security_policy.h" #include "third_party/blink/public/web/web_view.h" @@ -681,7 +681,7 @@ diff --git a/chrome/renderer/chrome_render_thread_observer.cc b/chrome/renderer/ #if BUILDFLAG(ENABLE_EXTENSIONS) #include "extensions/renderer/localization_peer.h" #endif -@@ -260,6 +262,7 @@ void ChromeRenderThreadObserver::SetInitialConfiguration( +@@ -218,6 +220,7 @@ void ChromeRenderThreadObserver::SetInitialConfiguration( void ChromeRenderThreadObserver::SetConfiguration( chrome::mojom::DynamicParamsPtr params) { *GetDynamicConfigParams() = std::move(*params); @@ -692,7 +692,7 @@ diff --git a/chrome/renderer/chrome_render_thread_observer.cc b/chrome/renderer/ diff --git a/components/components_strings.grd b/components/components_strings.grd --- a/components/components_strings.grd +++ b/components/components_strings.grd -@@ -337,6 +337,7 @@ +@@ -336,6 +336,7 @@ @@ -10467,7 +10467,7 @@ new file mode 100755 diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec --- a/tools/gritsettings/resource_ids.spec +++ b/tools/gritsettings/resource_ids.spec -@@ -761,6 +761,12 @@ +@@ -769,6 +769,12 @@ "components/autofill/core/browser/autofill_address_rewriter_resources.grd":{ "includes": [3720] }, diff --git a/build/patches/Guard-for-user-agent-reduction.patch b/build/patches/Guard-for-user-agent-reduction.patch index 04aea0c6..d9bc48f6 100644 --- a/build/patches/Guard-for-user-agent-reduction.patch +++ b/build/patches/Guard-for-user-agent-reduction.patch @@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc --- a/third_party/blink/common/features.cc +++ b/third_party/blink/common/features.cc -@@ -1339,8 +1339,8 @@ BASE_FEATURE(kDurableClientHintsCache, +@@ -1216,8 +1216,8 @@ BASE_FEATURE(kDurableClientHintsCache, const base::FeatureParam kUserAgentFrozenBuildVersion{ &kReduceUserAgentMinorVersion, "build_version", "0"}; diff --git a/build/patches/History-number-of-days-privacy-setting.patch b/build/patches/History-number-of-days-privacy-setting.patch index 2a3b6a96..a5263826 100644 --- a/build/patches/History-number-of-days-privacy-setting.patch +++ b/build/patches/History-number-of-days-privacy-setting.patch @@ -33,7 +33,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 -@@ -31,6 +31,12 @@ found in the LICENSE file. +@@ -32,6 +32,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"/> @@ -49,7 +49,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 -@@ -33,6 +33,7 @@ import org.chromium.chrome.browser.profiles.Profile; +@@ -37,6 +37,7 @@ import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.settings.ChromeManagedPreferenceDelegate; import org.chromium.chrome.browser.settings.SettingsLauncherImpl; import org.chromium.components.browser_ui.settings.ChromeSwitchPreference; @@ -57,7 +57,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting import org.chromium.components.browser_ui.settings.ManagedPreferenceDelegate; import org.chromium.components.browser_ui.settings.SettingsLauncher; import org.chromium.components.browser_ui.settings.SettingsUtils; -@@ -47,6 +48,9 @@ import androidx.preference.PreferenceCategory; +@@ -53,6 +54,9 @@ import androidx.preference.PreferenceCategory; import org.chromium.chrome.browser.preferences.SharedPreferencesManager; import org.chromium.components.browser_ui.settings.ChromeSwitchPreference; @@ -67,7 +67,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting /** * Fragment to keep track of the all the privacy related preferences. */ -@@ -77,6 +81,8 @@ public class PrivacySettings +@@ -84,6 +88,8 @@ public class PrivacySettings private ChromeSwitchPreference allowCustomTabIntentsPref; private ChromeSwitchPreference openExternalLinksPref; @@ -76,7 +76,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting @Override public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { PrivacyPreferencesManagerImpl privacyPrefManager = -@@ -118,6 +124,40 @@ public class PrivacySettings +@@ -138,6 +144,40 @@ public class PrivacySettings Preference secureDnsPref = findPreference(PREF_SECURE_DNS); secureDnsPref.setVisible(SecureDnsSettings.isUiEnabled()); @@ -114,10 +114,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting + return true; + }); + - updatePreferences(); - } - -@@ -217,6 +257,29 @@ public class PrivacySettings + Preference thirdPartyCookies = findPreference(PREF_THIRD_PARTY_COOKIES); + if (thirdPartyCookies != null) { + thirdPartyCookies.getExtras().putString( +@@ -251,6 +291,29 @@ public class PrivacySettings }; } @@ -173,7 +173,7 @@ diff --git a/chrome/browser/preferences/BUILD.gn b/chrome/browser/preferences/BU 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 -@@ -367,6 +367,7 @@ std::unique_ptr Profile::CreateProfile(const base::FilePath& path, +@@ -366,6 +366,7 @@ std::unique_ptr Profile::CreateProfile(const base::FilePath& path, void ProfileImpl::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref(prefs::kSavingBrowserHistoryDisabled, false); @@ -184,7 +184,7 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/p 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 -@@ -1136,6 +1136,18 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1433,6 +1433,18 @@ Your Google account may have other forms of browsing history like searches and a Browsing history @@ -356,7 +356,7 @@ diff --git a/components/history/core/browser/expire_history_backend.h b/componen diff --git a/components/history/core/browser/history_backend.cc b/components/history/core/browser/history_backend.cc --- a/components/history/core/browser/history_backend.cc +++ b/components/history/core/browser/history_backend.cc -@@ -160,7 +160,7 @@ const int kMaxRedirectCount = 32; +@@ -161,7 +161,7 @@ const int kMaxRedirectCount = 32; // The number of days old a history entry can be before it is considered "old" // and is deleted. @@ -365,7 +365,7 @@ diff --git a/components/history/core/browser/history_backend.cc b/components/his // The maximum number of days for which domain visit metrics are computed // each time HistoryBackend::GetDomainDiversity() is called. -@@ -1107,6 +1107,19 @@ void HistoryBackend::InitImpl( +@@ -1163,6 +1163,19 @@ void HistoryBackend::InitImpl( LOCAL_HISTOGRAM_TIMES("History.InitTime", TimeTicks::Now() - beginning_time); } @@ -388,7 +388,7 @@ diff --git a/components/history/core/browser/history_backend.cc b/components/his diff --git a/components/history/core/browser/history_backend.h b/components/history/core/browser/history_backend.h --- a/components/history/core/browser/history_backend.h +++ b/components/history/core/browser/history_backend.h -@@ -224,6 +224,8 @@ class HistoryBackend : public base::RefCountedThreadSafe, +@@ -220,6 +220,8 @@ class HistoryBackend : public base::RefCountedThreadSafe, void Init(bool force_fail, const HistoryDatabaseParams& history_database_params); @@ -400,7 +400,7 @@ diff --git a/components/history/core/browser/history_backend.h b/components/hist diff --git a/components/history/core/browser/history_service.cc b/components/history/core/browser/history_service.cc --- a/components/history/core/browser/history_service.cc +++ b/components/history/core/browser/history_service.cc -@@ -35,6 +35,9 @@ +@@ -34,6 +34,9 @@ #include "base/time/time.h" #include "base/trace_event/trace_event.h" #include "build/build_config.h" @@ -410,7 +410,7 @@ diff --git a/components/history/core/browser/history_service.cc b/components/his #include "components/history/core/browser/download_row.h" #include "components/history/core/browser/history_backend.h" #include "components/history/core/browser/history_backend_client.h" -@@ -1124,6 +1127,9 @@ void HistoryService::Cleanup() { +@@ -1146,6 +1149,9 @@ void HistoryService::Cleanup() { return; } @@ -420,7 +420,7 @@ diff --git a/components/history/core/browser/history_service.cc b/components/his NotifyHistoryServiceBeingDeleted(); weak_ptr_factory_.InvalidateWeakPtrs(); -@@ -1188,6 +1194,33 @@ bool HistoryService::Init( +@@ -1213,6 +1219,33 @@ bool HistoryService::Init( return true; } @@ -466,7 +466,7 @@ diff --git a/components/history/core/browser/history_service.h b/components/hist #include "components/history/core/browser/history_types.h" #include "components/history/core/browser/keyword_id.h" #include "components/history/core/browser/url_row.h" -@@ -106,6 +108,8 @@ class HistoryService : public KeyedService { +@@ -107,6 +109,8 @@ class HistoryService : public KeyedService { return Init(false, history_database_params); } @@ -475,7 +475,7 @@ diff --git a/components/history/core/browser/history_service.h b/components/hist // Triggers the backend to load if it hasn't already, and then returns whether // it's finished loading. // Note: Virtual needed for mocking. -@@ -1024,6 +1028,10 @@ class HistoryService : public KeyedService { +@@ -1044,6 +1048,10 @@ class HistoryService : public KeyedService { base::OnceClosure origin_queried_closure_for_testing_; diff --git a/build/patches/Increase-number-of-autocomplete-matches-to-10.patch b/build/patches/Increase-number-of-autocomplete-matches-to-10.patch index fe3bdf15..7f23b9e5 100644 --- a/build/patches/Increase-number-of-autocomplete-matches-to-10.patch +++ b/build/patches/Increase-number-of-autocomplete-matches-to-10.patch @@ -13,7 +13,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/components/omnibox/browser/autocomplete_result.cc b/components/omnibox/browser/autocomplete_result.cc --- a/components/omnibox/browser/autocomplete_result.cc +++ b/components/omnibox/browser/autocomplete_result.cc -@@ -78,6 +78,7 @@ constexpr size_t kMaxPedalMatchIndex = std::numeric_limits::max(); +@@ -85,6 +85,7 @@ DontCopyDoneProviders g_dont_copy_done_providers = // static size_t AutocompleteResult::GetMaxMatches(bool is_zero_suggest) { #if BUILDFLAG(IS_ANDROID) diff --git a/build/patches/Inject-scripts-for-AMP-tracking-ads-and-video.patch b/build/patches/Inject-scripts-for-AMP-tracking-ads-and-video.patch index f7873c8c..0ed70df9 100644 --- a/build/patches/Inject-scripts-for-AMP-tracking-ads-and-video.patch +++ b/build/patches/Inject-scripts-for-AMP-tracking-ads-and-video.patch @@ -23,7 +23,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/third_party/blink/renderer/core/dom/build.gni b/third_party/blink/renderer/core/dom/build.gni --- a/third_party/blink/renderer/core/dom/build.gni +++ b/third_party/blink/renderer/core/dom/build.gni -@@ -162,6 +162,8 @@ blink_core_sources_dom = [ +@@ -165,6 +165,8 @@ blink_core_sources_dom = [ "has_invalidation_flags.h", "icon_url.cc", "icon_url.h", @@ -43,7 +43,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink #include "third_party/blink/renderer/core/page/scrolling/snap_coordinator.h" #include "third_party/blink/renderer/core/page/scrolling/top_document_root_scroller_controller.h" #include "third_party/blink/renderer/core/page/spatial_navigation_controller.h" -@@ -357,6 +358,8 @@ +@@ -358,6 +359,8 @@ #include "third_party/blink/renderer/platform/wtf/text/string_buffer.h" #include "third_party/blink/renderer/platform/wtf/text/text_encoding_registry.h" @@ -52,7 +52,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink #ifndef NDEBUG using WeakDocumentSet = blink::HeapHashSet>; static WeakDocumentSet& LiveDocumentSet(); -@@ -7194,6 +7197,64 @@ void Document::OnPrepareToStopParsing() { +@@ -7204,6 +7207,64 @@ void Document::OnPrepareToStopParsing() { MilestoneForDelayedAsyncScript::kFinishedParsing); } @@ -117,7 +117,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink void Document::FinishedParsing() { DCHECK(!GetScriptableDocumentParser() || !parser_->IsParsing()); DCHECK(!GetScriptableDocumentParser() || ready_state_ != kLoading); -@@ -7250,6 +7311,10 @@ void Document::FinishedParsing() { +@@ -7260,6 +7321,10 @@ void Document::FinishedParsing() { frame->Loader().FinishedParsing(); @@ -131,7 +131,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/renderer/core/dom/document.h --- a/third_party/blink/renderer/core/dom/document.h +++ b/third_party/blink/renderer/core/dom/document.h -@@ -1995,6 +1995,9 @@ class CORE_EXPORT Document : public ContainerNode, +@@ -1999,6 +1999,9 @@ class CORE_EXPORT Document : public ContainerNode, // Called when the AXMode of an existing AXContext changes. void AXContextModeChanged(); diff --git a/build/patches/Invalidate-components-public-key.patch b/build/patches/Invalidate-components-public-key.patch index b10311d1..7aea221b 100644 --- a/build/patches/Invalidate-components-public-key.patch +++ b/build/patches/Invalidate-components-public-key.patch @@ -12,7 +12,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/component_updater/pki_metadata_component_installer.cc b/chrome/browser/component_updater/pki_metadata_component_installer.cc --- a/chrome/browser/component_updater/pki_metadata_component_installer.cc +++ b/chrome/browser/component_updater/pki_metadata_component_installer.cc -@@ -72,7 +72,8 @@ const char kGoogleOperatorName[] = "Google"; +@@ -73,7 +73,8 @@ const char kGoogleOperatorName[] = "Google"; // The extension id is: efniojlnjndmcbiieegkicadnoecjjef const uint8_t kPKIMetadataPublicKeySHA256[32] = { 0x45, 0xd8, 0xe9, 0xbd, 0x9d, 0x3c, 0x21, 0x88, 0x44, 0x6a, 0x82, diff --git a/build/patches/Keep-empty-tabs-between-sessions.patch b/build/patches/Keep-empty-tabs-between-sessions.patch index 3b7380a9..da88afc1 100644 --- a/build/patches/Keep-empty-tabs-between-sessions.patch +++ b/build/patches/Keep-empty-tabs-between-sessions.patch @@ -12,7 +12,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/tabmodel/TabPersistentStore.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java -@@ -816,14 +816,6 @@ public class TabPersistentStore { +@@ -815,14 +815,6 @@ public class TabPersistentStore { mTabsToMigrate.add(tab); } } else { diff --git a/build/patches/Keep-flag-to-allow-screenshots-in-Incognito-mode.patch b/build/patches/Keep-flag-to-allow-screenshots-in-Incognito-mode.patch index 4da63afa..f1b3a47b 100644 --- a/build/patches/Keep-flag-to-allow-screenshots-in-Incognito-mode.patch +++ b/build/patches/Keep-flag-to-allow-screenshots-in-Incognito-mode.patch @@ -15,13 +15,13 @@ 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 -@@ -4199,9 +4199,9 @@ - "expiry_milestone": 110 +@@ -4196,9 +4196,9 @@ + "expiry_milestone": 115 }, { - "name": "incognito-screenshot", - "owners": [ "roagarwal", "sideyilmaz", "chrome-incognito@google.com" ], -- "expiry_milestone": 110 +- "expiry_milestone": 115 + "name": "incognito-screenshot", // Bromite: guard this feature flag + "owners": [ "roagarwal", "sideyilmaz", "chrome-incognito@google.com" ], // - + "expiry_milestone": -1 // - diff --git a/build/patches/Modify-default-preferences.patch b/build/patches/Modify-default-preferences.patch index c8b18ef8..0ce18510 100644 --- a/build/patches/Modify-default-preferences.patch +++ b/build/patches/Modify-default-preferences.patch @@ -31,14 +31,14 @@ 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 @@ -79,6 +79,7 @@ + #include "components/autofill/core/common/autofill_payments_features.h" #include "components/autofill/core/common/autofill_switches.h" #include "components/autofill/core/common/autofill_util.h" - #include "components/autofill_assistant/browser/features.h" +#include "components/bookmarks/browser/features.h" #include "components/browser_sync/browser_sync_switches.h" #include "components/browser_ui/settings/android/features.h" #include "components/browser_ui/site_settings/android/features.h" -@@ -6051,6 +6052,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5680,6 +5681,11 @@ const FeatureEntry kFeatureEntries[] = { reading_list::switches::kReadLaterReminderNotification)}, #endif @@ -65,7 +65,7 @@ diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/brows diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -1514,7 +1514,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs( +@@ -1550,7 +1550,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs( void ChromeContentBrowserClient::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false); @@ -77,7 +77,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -2890,6 +2890,10 @@ const char kTabToGTSAnimationAndroidDescription[] = +@@ -2862,6 +2862,10 @@ const char kTabToGTSAnimationAndroidDescription[] = "Allows users to see an animation when entering or leaving the " "Grid Tab Switcher on phones."; @@ -91,7 +91,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -1630,6 +1630,9 @@ extern const char kTabGroupsUiImprovementsAndroidDescription[]; +@@ -1616,6 +1616,9 @@ extern const char kTabGroupsUiImprovementsAndroidDescription[]; extern const char kTabToGTSAnimationAndroidName[]; extern const char kTabToGTSAnimationAndroidDescription[]; @@ -104,7 +104,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio diff --git a/chrome/browser/prefetch/prefetch_prefs.h b/chrome/browser/prefetch/prefetch_prefs.h --- a/chrome/browser/prefetch/prefetch_prefs.h +++ b/chrome/browser/prefetch/prefetch_prefs.h -@@ -25,7 +25,7 @@ enum class NetworkPredictionOptions { +@@ -30,7 +30,7 @@ enum class NetworkPredictionOptions { kWifiOnlyDeprecated = 1, kDisabled = 2, kExtended = 3, @@ -116,7 +116,7 @@ diff --git a/chrome/browser/prefetch/prefetch_prefs.h b/chrome/browser/prefetch/ diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc --- a/chrome/browser/profiles/profile.cc +++ b/chrome/browser/profiles/profile.cc -@@ -302,7 +302,7 @@ const char Profile::kProfileKey[] = "__PROFILE__"; +@@ -310,7 +310,7 @@ const char Profile::kProfileKey[] = "__PROFILE__"; void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( prefs::kSearchSuggestEnabled, @@ -128,7 +128,7 @@ diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profil diff --git a/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html b/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html --- a/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html +++ b/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html -@@ -36,7 +36,7 @@ +@@ -34,7 +34,7 @@

@@ -249,7 +249,7 @@ new file mode 100644 diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc --- a/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc -@@ -262,7 +262,7 @@ void ContentSettingsRegistry::Init() { +@@ -243,7 +243,7 @@ void ContentSettingsRegistry::Init() { ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY); Register(ContentSettingsType::BACKGROUND_SYNC, "background-sync", @@ -258,7 +258,7 @@ diff --git a/components/content_settings/core/browser/content_settings_registry. /*allowlisted_schemes=*/{}, /*valid_settings=*/{CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK}, WebsiteSettingsInfo::TOP_ORIGIN_ONLY_SCOPE, -@@ -362,7 +362,7 @@ void ContentSettingsRegistry::Init() { +@@ -343,7 +343,7 @@ void ContentSettingsRegistry::Init() { // TODO(crbug.com/904439): Update this to "SECURE_ONLY" once // DeviceOrientationEvents and DeviceMotionEvents are only fired in secure // contexts. @@ -270,7 +270,7 @@ diff --git a/components/content_settings/core/browser/content_settings_registry. diff --git a/components/content_settings/core/browser/cookie_settings.cc b/components/content_settings/core/browser/cookie_settings.cc --- a/components/content_settings/core/browser/cookie_settings.cc +++ b/components/content_settings/core/browser/cookie_settings.cc -@@ -66,7 +66,7 @@ void CookieSettings::RegisterProfilePrefs( +@@ -68,7 +68,7 @@ void CookieSettings::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterIntegerPref( prefs::kCookieControlsMode, @@ -294,7 +294,7 @@ diff --git a/components/payments/core/payment_prefs.cc b/components/payments/cor diff --git a/components/safe_browsing/core/common/safe_browsing_prefs.cc b/components/safe_browsing/core/common/safe_browsing_prefs.cc --- a/components/safe_browsing/core/common/safe_browsing_prefs.cc +++ b/components/safe_browsing/core/common/safe_browsing_prefs.cc -@@ -199,9 +199,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) { +@@ -198,9 +198,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) { registry->RegisterBooleanPref( prefs::kSafeBrowsingSawInterstitialScoutReporting, false); registry->RegisterBooleanPref( @@ -309,7 +309,7 @@ diff --git a/components/safe_browsing/core/common/safe_browsing_prefs.cc b/compo diff --git a/components/signin/internal/identity_manager/primary_account_manager.cc b/components/signin/internal/identity_manager/primary_account_manager.cc --- a/components/signin/internal/identity_manager/primary_account_manager.cc +++ b/components/signin/internal/identity_manager/primary_account_manager.cc -@@ -51,9 +51,9 @@ void PrimaryAccountManager::RegisterProfilePrefs(PrefRegistrySimple* registry) { +@@ -86,9 +86,9 @@ void PrimaryAccountManager::RegisterProfilePrefs(PrefRegistrySimple* registry) { std::string()); registry->RegisterStringPref(prefs::kGoogleServicesAccountId, std::string()); registry->RegisterBooleanPref(prefs::kGoogleServicesConsentedToSync, false); @@ -324,7 +324,7 @@ diff --git a/components/signin/internal/identity_manager/primary_account_manager 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 -@@ -1720,8 +1720,8 @@ BASE_FEATURE(kWebRtcCombinedNetworkAndWorkerThread, +@@ -1603,8 +1603,8 @@ BASE_FEATURE(kWebRtcCombinedNetworkAndWorkerThread, // the attribute. Note: At present, only iframes with origin-restricted // sandboxes are isolated. BASE_FEATURE(kIsolateSandboxedIframes, diff --git a/build/patches/Move-navigation-bar-to-bottom.patch b/build/patches/Move-navigation-bar-to-bottom.patch index 1e0b435f..48f7267e 100644 --- a/build/patches/Move-navigation-bar-to-bottom.patch +++ b/build/patches/Move-navigation-bar-to-bottom.patch @@ -48,7 +48,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../browser/settings/SettingsActivity.java | 5 ++ .../StatusIndicatorCoordinator.java | 10 ++++ .../StatusIndicatorSceneLayer.java | 7 ++- - .../browser/toolbar/ToolbarManager.java | 37 +++++++++++-- + .../browser/toolbar/ToolbarManager.java | 35 +++++++++++-- .../chrome/browser/ui/BottomContainer.java | 19 +++++++ .../ui/system/StatusBarColorController.java | 9 ++++ chrome/browser/about_flags.cc | 5 ++ @@ -86,7 +86,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../accessibility/AccessibilitySettings.java | 16 ++++++ .../AccessibilitySettingsDelegate.java | 6 +++ .../render_widget_host_view_android.cc | 3 ++ - 74 files changed, 783 insertions(+), 57 deletions(-) + 74 files changed, 782 insertions(+), 56 deletions(-) diff --git a/cc/base/features.cc b/cc/base/features.cc --- a/cc/base/features.cc @@ -124,7 +124,7 @@ diff --git a/cc/input/browser_controls_offset_manager.cc b/cc/input/browser_cont namespace cc { namespace { -@@ -469,6 +470,11 @@ gfx::Vector2dF BrowserControlsOffsetManager::ScrollBy( +@@ -486,6 +487,11 @@ gfx::Vector2dF BrowserControlsOffsetManager::ScrollBy( // content. If the top controls have no height, the content should scroll // immediately. gfx::Vector2dF applied_delta(0.f, old_top_offset - ContentTopOffset()); @@ -139,7 +139,7 @@ diff --git a/cc/input/browser_controls_offset_manager.cc b/cc/input/browser_cont diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc --- a/cc/trees/layer_tree_host_impl.cc +++ b/cc/trees/layer_tree_host_impl.cc -@@ -4306,6 +4306,9 @@ bool LayerTreeHostImpl::AnimateBrowserControls(base::TimeTicks time) { +@@ -4277,6 +4277,9 @@ bool LayerTreeHostImpl::AnimateBrowserControls(base::TimeTicks time) { if (scroll_delta.IsZero()) return false; @@ -152,7 +152,7 @@ diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc diff --git a/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java b/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java --- a/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java +++ b/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java -@@ -86,6 +86,9 @@ import org.chromium.content_public.browser.LoadUrlParams; +@@ -88,6 +88,9 @@ import org.chromium.content_public.browser.LoadUrlParams; import org.chromium.ui.modelutil.PropertyModel; import org.chromium.ui.util.ColorUtils; @@ -162,7 +162,7 @@ diff --git a/chrome/android/features/start_surface/java/src/org/chromium/chrome/ /** The mediator implements the logic to interact with the surfaces and caller. */ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.OnClickListener, StartSurface.OnTabSelectingListener, BackPressHandler, -@@ -1109,6 +1112,8 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View. +@@ -1160,6 +1163,8 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View. } private void setTopMargin(int topMargin) { @@ -508,7 +508,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediator.java --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediator.java +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediator.java -@@ -44,6 +44,7 @@ import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager; +@@ -45,6 +45,7 @@ import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager; import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.incognito.reauth.IncognitoReauthController; import org.chromium.chrome.browser.incognito.reauth.IncognitoReauthManager; @@ -516,7 +516,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser import org.chromium.chrome.browser.multiwindow.MultiWindowModeStateDispatcher; import org.chromium.chrome.browser.preferences.ChromePreferenceKeys; import org.chromium.chrome.browser.preferences.SharedPreferencesManager; -@@ -460,11 +461,22 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView +@@ -473,11 +474,22 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView updateTopControlsProperties(); mContainerViewModel.set( BOTTOM_CONTROLS_HEIGHT, browserControlsStateProvider.getBottomControlsHeight()); @@ -539,7 +539,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser } mContainerView = containerView; -@@ -592,6 +604,10 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView +@@ -605,6 +617,10 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView final int contentOffset = mBrowserControlsStateProvider.getContentOffset(); mContainerViewModel.set(TOP_MARGIN, contentOffset); @@ -639,7 +639,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv /** * A {@link AsyncInitializationActivity} that builds and manages a {@link CompositorViewHolder} * and associated classes. -@@ -758,6 +761,16 @@ public abstract class ChromeActivity +@@ -757,6 +760,16 @@ public abstract class ChromeActivity int toolbarLayoutId = getToolbarLayoutId(); if (toolbarLayoutId != ActivityUtils.NO_RESOURCE_ID && controlContainer != null) { controlContainer.initWithToolbar(toolbarLayoutId); @@ -659,7 +659,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java b/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java --- 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 -@@ -110,6 +110,7 @@ public class ChromeCachedFlags { +@@ -112,6 +112,7 @@ public class ChromeCachedFlags { add(ChromeFeatureList.sInstanceSwitcher); add(ChromeFeatureList.sInstantStart); add(ChromeFeatureList.sInterestFeedV2); @@ -670,7 +670,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/Chrom 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 -@@ -84,6 +84,8 @@ import org.chromium.ui.base.WindowAndroid; +@@ -85,6 +85,8 @@ import org.chromium.ui.base.WindowAndroid; import org.chromium.ui.mojom.VirtualKeyboardMode; import org.chromium.ui.resources.ResourceManager; import org.chromium.ui.resources.dynamics.DynamicResourceLoader; @@ -679,7 +679,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/Comp import java.util.ArrayList; import java.util.HashSet; -@@ -317,6 +319,10 @@ public class CompositorViewHolder extends FrameLayout +@@ -321,6 +323,10 @@ public class CompositorViewHolder extends FrameLayout WebContents webContents = mTabVisible.getWebContents(); if (webContents == null) return; EventForwarder forwarder = webContents.getEventForwarder(); @@ -702,7 +702,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo import java.util.List; -@@ -210,7 +212,10 @@ public class LayoutManagerChrome +@@ -256,7 +258,10 @@ public class LayoutManagerChrome @Override public SwipeHandler createToolbarSwipeHandler(boolean supportSwipeDown) { @@ -714,7 +714,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo } @Override -@@ -424,9 +429,11 @@ public class LayoutManagerChrome +@@ -506,9 +511,11 @@ public class LayoutManagerChrome private static final float SWIPE_RANGE_DEG = 25; private final boolean mSupportSwipeDown; @@ -727,7 +727,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo } @Override -@@ -458,6 +465,9 @@ public class LayoutManagerChrome +@@ -540,6 +547,9 @@ public class LayoutManagerChrome && mScrollDirection == ScrollDirection.DOWN) { RecordUserAction.record("MobileToolbarSwipeOpenStackView"); showLayout(LayoutType.TAB_SWITCHER, true); @@ -737,7 +737,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo } else if (mScrollDirection == ScrollDirection.LEFT || mScrollDirection == ScrollDirection.RIGHT) { startShowing(mToolbarSwipeLayout, true); -@@ -504,6 +514,8 @@ public class LayoutManagerChrome +@@ -586,6 +596,8 @@ public class LayoutManagerChrome direction = ScrollDirection.RIGHT; } else if (swipeAngle < 270 + SWIPE_RANGE_DEG && swipeAngle > 270 - SWIPE_RANGE_DEG) { direction = ScrollDirection.DOWN; @@ -746,14 +746,14 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo } return direction; -@@ -518,7 +530,7 @@ public class LayoutManagerChrome +@@ -600,7 +612,7 @@ public class LayoutManagerChrome return false; } - if (direction == ScrollDirection.DOWN) { + if (direction == ScrollDirection.DOWN || direction == ScrollDirection.UP) { boolean isAccessibility = ChromeAccessibilityUtil.get().isAccessibilityEnabled(); - return mOverviewLayout != null && !isAccessibility; + return (mOverviewLayout != null || mTabSwitcherLayout != null) && !isAccessibility; } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChromeTablet.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChromeTablet.java --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChromeTablet.java @@ -818,7 +818,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/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 -@@ -377,7 +377,7 @@ public class StripLayoutHelper implements StripLayoutTab.StripLayoutTabDelegate +@@ -473,7 +473,7 @@ public class StripLayoutHelper implements StripLayoutTab.StripLayoutTabDelegate // position 0 is on the left. Account for that in the offset calculation. boolean isRtl = LocalizationUtils.isLayoutRtl(); boolean useUnadjustedScrollOffset = isRtl != isLeft; @@ -830,7 +830,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 -@@ -59,6 +59,9 @@ import org.chromium.ui.base.LocalizationUtils; +@@ -58,6 +58,9 @@ import org.chromium.ui.base.LocalizationUtils; import org.chromium.ui.base.PageTransition; import org.chromium.ui.resources.ResourceManager; import org.chromium.url.GURL; @@ -840,7 +840,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over import java.util.List; -@@ -122,9 +125,13 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa +@@ -121,9 +124,13 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa private final String mDefaultTitle; private final Supplier mLayerTitleCacheSupplier; @@ -854,7 +854,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over if (mModelSelectorButton.onDown(x, y)) return; if (mStripScrim.isVisible()) return; getActiveStripLayoutHelper().onDown(time(), x, y, fromMouse, buttons); -@@ -144,6 +151,7 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa +@@ -143,6 +150,7 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa @Override public void drag(float x, float y, float dx, float dy, float tx, float ty) { @@ -862,7 +862,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over mModelSelectorButton.drag(x, y); if (mStripScrim.isVisible()) return; getActiveStripLayoutHelper().drag(time(), x, y, dx, dy, tx, ty); -@@ -151,6 +159,7 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa +@@ -150,6 +158,7 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa @Override public void click(float x, float y, boolean fromMouse, int buttons) { @@ -870,7 +870,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over long time = time(); if (mModelSelectorButton.click(x, y)) { mModelSelectorButton.handleClick(time); -@@ -162,13 +171,13 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa +@@ -161,13 +170,13 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa @Override public void fling(float x, float y, float velocityX, float velocityY) { @@ -886,7 +886,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over getActiveStripLayoutHelper().onLongPress(time(), x, y); } -@@ -252,7 +261,8 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa +@@ -251,7 +260,8 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa */ public StripLayoutHelperManager(Context context, LayoutUpdateHost updateHost, LayoutRenderHost renderHost, Supplier layerTitleCacheSupplier, @@ -896,7 +896,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over mUpdateHost = updateHost; mLayerTitleCacheSupplier = layerTitleCacheSupplier; mTabStripTreeProvider = new TabStripSceneLayer(context); -@@ -295,6 +305,8 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa +@@ -294,6 +304,8 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa new StripLayoutHelper(context, updateHost, renderHost, false, mModelSelectorButton); mIncognitoHelper = new StripLayoutHelper(context, updateHost, renderHost, true, mModelSelectorButton); @@ -905,7 +905,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over onContextChanged(context); } -@@ -364,9 +376,13 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa +@@ -363,9 +375,13 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa Tab selectedTab = mTabModelSelector.getCurrentModel().getTabAt( mTabModelSelector.getCurrentModel().index()); int selectedTabId = selectedTab == null ? TabModel.INVALID_TAB_INDEX : selectedTab.getId(); @@ -920,7 +920,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over return mTabStripTreeProvider; } -@@ -404,7 +420,17 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa +@@ -403,7 +419,17 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa mIncognitoHelper.onSizeChanged( mWidth, mHeight, orientationChanged, LayoutManagerImpl.time()); @@ -1264,7 +1264,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsP diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java -@@ -76,6 +76,11 @@ import org.chromium.ui.base.WindowDelegate; +@@ -77,6 +77,11 @@ import org.chromium.ui.base.WindowDelegate; import org.chromium.ui.modaldialog.ModalDialogManager; import org.chromium.url.GURL; @@ -1276,7 +1276,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se import java.lang.ref.WeakReference; /** Queries the user's default search engine and shows autocomplete suggestions. */ -@@ -189,6 +194,12 @@ public class SearchActivity extends AsyncInitializationActivity +@@ -190,6 +195,12 @@ public class SearchActivity extends AsyncInitializationActivity mSearchBox = (SearchActivityLocationBarLayout) mContentView.findViewById( R.id.search_location_bar); mAnchorView = mContentView.findViewById(R.id.toolbar); @@ -1288,8 +1288,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se + } updateAnchorViewLayout(); - OverrideUrlLoadingDelegate overrideUrlLoadingDelegate = -@@ -204,7 +215,7 @@ public class SearchActivity extends AsyncInitializationActivity + // Create status bar color controller and assign to search activity. +@@ -215,7 +226,7 @@ public class SearchActivity extends AsyncInitializationActivity getOnBackPressedDispatcher().addCallback(this, backPressManager.getCallback()); } // clang-format off @@ -1301,7 +1301,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/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 -@@ -257,6 +257,11 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity +@@ -260,6 +260,11 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity if (fragment instanceof INeedSnackbarManager) { ((INeedSnackbarManager)fragment).setSnackbarManager(mSnackbarManager); } @@ -1377,7 +1377,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar /** * Contains logic for managing the toolbar visual component. This class manages the interactions * with the rest of the application to ensure the toolbar is always visually up to date. -@@ -667,7 +670,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve +@@ -669,7 +672,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve mEphemeralTabCoordinatorSupplier); // clang-format off LocationBarCoordinator locationBarCoordinator = new LocationBarCoordinator( @@ -1386,7 +1386,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar PrivacyPreferencesManagerImpl.getInstance(), mLocationBarModel, mActionModeController.getActionModeCallback(), new WindowDelegate(mActivity.getWindow()), windowAndroid, mActivityTabProvider, -@@ -925,11 +928,13 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve +@@ -909,11 +912,13 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve // the height won't be measured by the background image. if (mControlContainer.getBackground() == null) { setControlContainerTopMargin(getToolbarExtraYOffset()); @@ -1400,7 +1400,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar mControlContainer.removeOnLayoutChangeListener(mLayoutChangeListener); mLayoutChangeListener = null; } -@@ -1309,13 +1314,25 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve +@@ -1305,13 +1310,25 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve return mLocationBar.getOmniboxStub().isUrlBarFocused(); } @@ -1428,19 +1428,17 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar mScrimCoordinator, mOmniboxFocusStateSupplier, mBottomSheetController, mActivityLifecycleDispatcher, mIsWarmOnResumeSupplier, mTabModelSelector, mTabContentManager, mCompositorViewHolder, -@@ -1324,8 +1341,9 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve - mBottomControlsCoordinatorSupplier.set(new BottomControlsCoordinator(mActivity, - mWindowAndroid, mLayoutManager, mCompositorViewHolder.getResourceManager(), - mBrowserControlsSizer, mFullscreenManager, -- (ScrollingBottomViewResourceFrameLayout) root, mTabGroupUi, mTabObscuringHandler, -- mOverlayPanelVisibilitySupplier, mConstraintsProxy)); -+ (ScrollingBottomViewResourceFrameLayout) bottomRoot, mTabGroupUi, mTabObscuringHandler, -+ mOverlayPanelVisibilitySupplier, mConstraintsProxy, -+ mTopUiThemeColorProvider, mActivityTabProvider)); - } - - /** -@@ -2105,6 +2123,15 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve +@@ -1320,7 +1337,8 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve + var bottomControlsCoordinator = new BottomControlsCoordinator(mActivity, mWindowAndroid, + mLayoutManager, mCompositorViewHolder.getResourceManager(), mBrowserControlsSizer, + mFullscreenManager, (ScrollingBottomViewResourceFrameLayout) root, mTabGroupUi, +- mTabObscuringHandler, mOverlayPanelVisibilitySupplier, mConstraintsProxy); ++ mTabObscuringHandler, mOverlayPanelVisibilitySupplier, mConstraintsProxy, ++ mTopUiThemeColorProvider, mActivityTabProvider); + mBottomControlsCoordinatorSupplier.set(bottomControlsCoordinator); + bottomControlsCoordinator.getHandleBackPressChangedSupplier().addObserver( + (x) -> { onBackPressStateChanged(); }); +@@ -2110,6 +2128,15 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve private void setControlContainerTopMargin(int margin) { final ViewGroup.MarginLayoutParams layoutParams = ((ViewGroup.MarginLayoutParams) mControlContainer.getLayoutParams()); @@ -1499,9 +1497,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/BottomContai diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/system/StatusBarColorController.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/system/StatusBarColorController.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ui/system/StatusBarColorController.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/system/StatusBarColorController.java -@@ -14,6 +14,9 @@ import androidx.annotation.ColorInt; +@@ -12,6 +12,9 @@ import android.view.Window; + import androidx.annotation.ColorInt; import androidx.annotation.Nullable; - import androidx.annotation.VisibleForTesting; +import org.chromium.chrome.browser.flags.ChromeFeatureList; +import org.chromium.chrome.browser.flags.CachedFeatureFlags; @@ -1509,10 +1507,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/system/Statu import org.chromium.base.ApiCompatibilityUtils; import org.chromium.base.CallbackController; import org.chromium.base.supplier.ObservableSupplier; -@@ -425,6 +428,12 @@ public class StatusBarColorController +@@ -430,6 +433,12 @@ public class StatusBarColorController boolean needsDarkStatusBarIcons = !ColorUtils.shouldUseLightForegroundOnBackground(color); ApiCompatibilityUtils.setStatusBarIconColor(root, needsDarkStatusBarIcons); - ApiCompatibilityUtils.setStatusBarColor(mWindow, color); + ApiCompatibilityUtils.setStatusBarColor(window, color); + if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM) && + Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + UiUtils.setNavigationBarIconColor(mWindow.getDecorView().getRootView(), @@ -1525,7 +1523,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/system/Statu diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -7578,6 +7578,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7212,6 +7212,11 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kWindowsScrollingPersonalityDescription, kOsAll, FEATURE_VALUE_TYPE(features::kWindowsScrollingPersonality)}, @@ -1548,7 +1546,7 @@ diff --git a/chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer using base::android::JavaParamRef; using base::android::JavaRef; -@@ -81,8 +82,10 @@ void TabStripSceneLayer::SetContentTree( +@@ -89,8 +90,10 @@ void TabStripSceneLayer::SetContentTree( content_tree_ = content_tree; if (content_tree) { layer()->InsertChild(content_tree->layer(), 0); @@ -1561,7 +1559,7 @@ diff --git a/chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer } } } -@@ -115,13 +118,18 @@ void TabStripSceneLayer::UpdateTabStripLayer(JNIEnv* env, +@@ -123,13 +126,18 @@ void TabStripSceneLayer::UpdateTabStripLayer(JNIEnv* env, jboolean should_readd_background, jint background_color) { gfx::RectF content(0, y_offset, width, height); @@ -1624,7 +1622,7 @@ diff --git a/chrome/browser/browser_controls/android/java/src/org/chromium/chrom diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -1693,6 +1693,10 @@ const char kImprovedKeyboardShortcutsDescription[] = +@@ -1706,6 +1706,10 @@ const char kImprovedKeyboardShortcutsDescription[] = "Ensure keyboard shortcuts work consistently with international keyboard " "layouts and deprecate legacy shortcuts."; @@ -1638,7 +1636,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -962,6 +962,9 @@ extern const char kImprovedKeyboardShortcutsDescription[]; +@@ -965,6 +965,9 @@ extern const char kImprovedKeyboardShortcutsDescription[]; extern const char kCompositorThreadedScrollbarScrollingName[]; extern const char kCompositorThreadedScrollbarScrollingDescription[]; @@ -1691,7 +1689,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse #include "base/metrics/field_trial_params.h" #include "base/no_destructor.h" #include "base/strings/string_piece_forward.h" -@@ -255,6 +256,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -253,6 +254,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kIsVoiceSearchEnabledCache, &kLensCameraAssistedSearch, &kLensOnQuickActionSearchWidget, @@ -1737,7 +1735,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java -@@ -389,6 +389,8 @@ public abstract class ChromeFeatureList { +@@ -390,6 +390,8 @@ public abstract class ChromeFeatureList { public static final String MESSAGES_FOR_ANDROID_SYNC_ERROR = "MessagesForAndroidSyncError"; public static final String SEARCH_READY_OMNIBOX = "SearchReadyOmnibox"; public static final String MODAL_PERMISSION_DIALOG_VIEW = "ModalPermissionDialogView"; @@ -1746,10 +1744,10 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f public static final String METRICS_SETTINGS_ANDROID = "MetricsSettingsAndroid"; public static final String NEW_TAB_PAGE_TILES_TITLE_WRAP_AROUND = "NewTabPageTilesTitleWrapAround"; -@@ -677,6 +679,8 @@ public abstract class ChromeFeatureList { +@@ -675,6 +677,8 @@ public abstract class ChromeFeatureList { public static final CachedFlag sInterestFeedV2 = new CachedFlag(INTEREST_FEED_V2, true); public static final CachedFlag sLensCameraAssistedSearch = - new CachedFlag(LENS_CAMERA_ASSISTED_SEARCH, false); + new CachedFlag(LENS_CAMERA_ASSISTED_SEARCH, true); + public static final CachedFlag sMoveTopToolbarToBottom = + new CachedFlag(MOVE_TOP_TOOLBAR_TO_BOTTOM, false); public static final CachedFlag sNewWindowAppMenu = new CachedFlag(NEW_WINDOW_APP_MENU, true); @@ -1758,7 +1756,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java b/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java --- a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java +++ b/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java -@@ -42,6 +42,8 @@ import org.chromium.base.SysUtils; +@@ -41,6 +41,8 @@ import org.chromium.base.SysUtils; import org.chromium.base.metrics.RecordHistogram; import org.chromium.base.task.PostTask; import org.chromium.base.task.TaskTraits; @@ -1767,7 +1765,7 @@ diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/ch import org.chromium.chrome.browser.ui.appmenu.internal.R; import org.chromium.components.browser_ui.styles.ChromeColors; import org.chromium.components.browser_ui.widget.chips.ChipView; -@@ -263,6 +265,12 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler +@@ -258,6 +260,12 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler } mListView = (ListView) contentView.findViewById(R.id.app_menu_list); @@ -1780,7 +1778,7 @@ diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/ch int footerHeight = inflateFooter(footerResourceId, contentView, menuWidth); int headerHeight = inflateHeader(headerResourceId, contentView, menuWidth); -@@ -302,6 +310,11 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler +@@ -296,6 +304,11 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler if (popupHeight + popupPosition[1] > visibleDisplayFrame.bottom) { mPopup.setHeight(visibleDisplayFrame.height()); } @@ -1792,7 +1790,7 @@ diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/ch try { mPopup.showAtLocation(anchorView.getRootView(), Gravity.NO_GRAVITY, popupPosition[0], -@@ -349,6 +362,14 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler +@@ -343,6 +356,14 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler int anchorViewX = tempLocation[0]; int anchorViewY = tempLocation[1]; @@ -1807,7 +1805,7 @@ diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/ch int[] offsets = new int[2]; // If we have a hardware menu button, locate the app menu closer to the estimated // hardware menu button location. -@@ -539,6 +560,15 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler +@@ -533,6 +554,15 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler } int availableScreenSpace = Math.max( anchorViewY, appDimensions.height() - anchorViewY - anchorViewImpactHeight); @@ -1993,7 +1991,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.List; -@@ -1010,7 +1013,9 @@ class AutocompleteMediator implements OnSuggestionsReceivedListener, +@@ -1014,7 +1017,9 @@ class AutocompleteMediator implements OnSuggestionsReceivedListener, @Override public void onSuggestionDropdownScroll() { mSuggestionsListScrolled = true; @@ -2017,7 +2015,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow /** A widget for showing a list of omnibox suggestions. */ public class OmniboxSuggestionsDropdown extends RecyclerView { private static final long DEFERRED_INITIAL_SHRINKING_LAYOUT_FROM_IME_DURATION_MS = 300; -@@ -246,7 +249,8 @@ public class OmniboxSuggestionsDropdown extends RecyclerView { +@@ -245,7 +248,8 @@ public class OmniboxSuggestionsDropdown extends RecyclerView { * Constructs a new list designed for containing omnibox suggestions. * @param context Context used for contained views. */ @@ -2027,7 +2025,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow super(context, null, android.R.attr.dropDownListViewStyle); setFocusable(true); setFocusableInTouchMode(true); -@@ -256,13 +260,25 @@ public class OmniboxSuggestionsDropdown extends RecyclerView { +@@ -255,13 +259,25 @@ public class OmniboxSuggestionsDropdown extends RecyclerView { setItemAnimator(null); mLayoutScrollListener = new SuggestionLayoutScrollListener(context); @@ -2080,7 +2078,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 -@@ -1480,6 +1480,12 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1777,6 +1777,12 @@ Your Google account may have other forms of browsing history like searches and a Force Tablet Mode @@ -2320,9 +2318,9 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java -@@ -48,6 +48,11 @@ import org.chromium.ui.resources.dynamics.ViewResourceAdapter; - import org.chromium.ui.util.TokenHolder; - import org.chromium.ui.widget.OptimizedFrameLayout; +@@ -49,6 +49,11 @@ import org.chromium.ui.widget.OptimizedFrameLayout; + + import java.util.function.BooleanSupplier; +import android.view.Gravity; +import org.chromium.chrome.browser.flags.ChromeFeatureList; @@ -2332,7 +2330,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow /** * Layout for the browser controls (omnibox, menu, tab strip, etc..). */ -@@ -104,6 +109,12 @@ public class ToolbarControlContainer extends OptimizedFrameLayout implements Con +@@ -105,6 +110,12 @@ public class ToolbarControlContainer extends OptimizedFrameLayout implements Con @Override public void initWithToolbar(int toolbarLayoutId) { try (TraceEvent te = TraceEvent.scoped("ToolbarControlContainer.initWithToolbar")) { @@ -2522,7 +2520,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc --- a/content/browser/renderer_host/render_widget_host_view_android.cc +++ b/content/browser/renderer_host/render_widget_host_view_android.cc -@@ -28,6 +28,7 @@ +@@ -27,6 +27,7 @@ #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h" #include "base/threading/thread_task_runner_handle.h" @@ -2530,7 +2528,7 @@ diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/ #include "cc/base/math_util.h" #include "cc/layers/layer.h" #include "cc/layers/surface_layer.h" -@@ -845,6 +846,8 @@ void RenderWidgetHostViewAndroid::OnRenderFrameMetadataChangedBeforeActivation( +@@ -844,6 +845,8 @@ void RenderWidgetHostViewAndroid::OnRenderFrameMetadataChangedBeforeActivation( // factor. Thus, |top_content_offset| in CSS pixels is also in DIPs. float top_content_offset = metadata.top_controls_height * metadata.top_controls_shown_ratio; diff --git a/build/patches/Move-some-account-settings-back-to-privacy-settings.patch b/build/patches/Move-some-account-settings-back-to-privacy-settings.patch index 84e6ee95..2dbd8ce5 100644 --- a/build/patches/Move-some-account-settings-back-to-privacy-settings.patch +++ b/build/patches/Move-some-account-settings-back-to-privacy-settings.patch @@ -14,10 +14,10 @@ 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 -@@ -48,6 +48,19 @@ found in the LICENSE file. +@@ -49,6 +49,19 @@ found in the LICENSE file. android:key="privacy_sandbox" android:title="@string/prefs_privacy_sandbox" - android:fragment="org.chromium.chrome.browser.privacy_sandbox.PrivacySandboxSettingsFragment"/> + android:fragment="org.chromium.chrome.browser.privacy_sandbox.PrivacySandboxSettingsFragmentV3"/> + @@ -37,7 +37,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java -@@ -39,6 +39,12 @@ import org.chromium.components.user_prefs.UserPrefs; +@@ -45,6 +45,12 @@ import org.chromium.components.user_prefs.UserPrefs; import org.chromium.ui.text.NoUnderlineClickableSpan; import org.chromium.ui.text.SpanApplier; @@ -50,9 +50,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting /** * Fragment to keep track of the all the privacy related preferences. */ -@@ -54,6 +60,16 @@ public class PrivacySettings - private static final String PREF_PRIVACY_GUIDE = "privacy_guide"; +@@ -61,6 +67,16 @@ public class PrivacySettings private static final String PREF_INCOGNITO_LOCK = "incognito_lock"; + private static final String PREF_THIRD_PARTY_COOKIES = "third_party_cookies"; + // moved from SyncAndServicesSettings.java + private static final String PREF_SERVICES_CATEGORY = "services_category"; @@ -67,7 +67,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting private ManagedPreferenceDelegate mManagedPreferenceDelegate; private IncognitoLockSettings mIncognitoLockSettings; -@@ -93,6 +109,16 @@ public class PrivacySettings +@@ -111,6 +127,16 @@ public class PrivacySettings mManagedPreferenceDelegate = createManagedPreferenceDelegate(); @@ -84,7 +84,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting ChromeSwitchPreference canMakePaymentPref = (ChromeSwitchPreference) findPreference(PREF_CAN_MAKE_PAYMENT); canMakePaymentPref.setOnPreferenceChangeListener(this); -@@ -121,6 +147,9 @@ public class PrivacySettings +@@ -147,6 +173,9 @@ public class PrivacySettings } else if (PREF_HTTPS_FIRST_MODE.equals(key)) { UserPrefs.get(Profile.getLastUsedRegularProfile()) .setBoolean(Pref.HTTPS_ONLY_MODE_ENABLED, (boolean) newValue); @@ -94,7 +94,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting } return true; } -@@ -135,7 +164,7 @@ public class PrivacySettings +@@ -161,7 +190,7 @@ public class PrivacySettings * Updates the preferences. */ public void updatePreferences() { diff --git a/build/patches/Multiple-fingerprinting-mitigations.patch b/build/patches/Multiple-fingerprinting-mitigations.patch index b85659cb..dcdb919d 100644 --- a/build/patches/Multiple-fingerprinting-mitigations.patch +++ b/build/patches/Multiple-fingerprinting-mitigations.patch @@ -61,7 +61,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 -@@ -2392,6 +2392,7 @@ static_library("browser") { +@@ -2381,6 +2381,7 @@ static_library("browser") { "//services/device/public/cpp:device_features", "//services/device/public/cpp/serial:switches", "//services/device/public/cpp/usb", @@ -72,16 +72,16 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -218,6 +218,8 @@ - #include "ui/native_theme/native_theme_features.h" +@@ -219,6 +219,8 @@ #include "ui/ui_features.h" + #include "url/url_features.h" +#include "third_party/ungoogled/ungoogled_switches.h" + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #include "base/allocator/buildflags.h" #endif -@@ -3715,6 +3717,20 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3387,6 +3389,20 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kWebrtcUseMinMaxVEADimensionsName, flag_descriptions::kWebrtcUseMinMaxVEADimensionsDescription, kOsAll, FEATURE_VALUE_TYPE(blink::features::kWebRtcUseMinMaxVEADimensions)}, @@ -105,7 +105,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn -@@ -248,6 +248,7 @@ source_set("browser") { +@@ -246,6 +246,7 @@ source_set("browser") { "//third_party/libyuv", "//third_party/re2", "//third_party/sqlite", @@ -124,7 +124,7 @@ diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content #if BUILDFLAG(IS_ANDROID) #include "base/android/child_process_binding_types.h" #include "content/browser/android/java_interfaces_impl.h" -@@ -3265,6 +3266,9 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( +@@ -3312,6 +3313,9 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( switches::kDisableBreakpad, switches::kDisableDatabases, switches::kDisableFileSystem, @@ -195,7 +195,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink #include "base/notreached.h" #include "base/ranges/algorithm.h" #include "base/time/time.h" -@@ -824,6 +825,15 @@ Document::Document(const DocumentInit& initializer, +@@ -825,6 +826,15 @@ Document::Document(const DocumentInit& initializer, : nullptr), data_(MakeGarbageCollected(GetExecutionContext())) { DCHECK(agent_); @@ -211,7 +211,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink if (base::FeatureList::IsEnabled(features::kDelayAsyncScriptExecution)) script_runner_delayer_->Activate(); -@@ -2252,6 +2262,14 @@ void Document::UpdateStyleAndLayoutTreeForThisDocument() { +@@ -2254,6 +2264,14 @@ void Document::UpdateStyleAndLayoutTreeForThisDocument() { #endif } @@ -240,7 +240,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/ AtomicString visibilityState() const; bool IsPageVisible() const; bool hidden() const; -@@ -2333,6 +2337,9 @@ class CORE_EXPORT Document : public ContainerNode, +@@ -2338,6 +2342,9 @@ class CORE_EXPORT Document : public ContainerNode, base::ElapsedTimer start_time_; @@ -253,7 +253,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/ diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/renderer/core/dom/element.cc --- a/third_party/blink/renderer/core/dom/element.cc +++ b/third_party/blink/renderer/core/dom/element.cc -@@ -2065,6 +2065,7 @@ void Element::ClientQuads(Vector& quads) const { +@@ -2068,6 +2068,7 @@ void Element::ClientQuads(Vector& quads) const { quads.push_back(element_layout_object->LocalToAbsoluteQuad( gfx::QuadF(element_layout_object->ObjectBoundingBox()))); } @@ -261,7 +261,7 @@ diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/ return; } -@@ -2072,6 +2073,11 @@ void Element::ClientQuads(Vector& quads) const { +@@ -2075,6 +2076,11 @@ void Element::ClientQuads(Vector& quads) const { if (element_layout_object->IsBoxModelObject() || element_layout_object->IsBR()) element_layout_object->AbsoluteQuads(quads); @@ -273,7 +273,7 @@ diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/ } DOMRectList* Element::getClientRects() { -@@ -2110,6 +2116,9 @@ gfx::RectF Element::GetBoundingClientRectNoLifecycleUpdate() const { +@@ -2113,6 +2119,9 @@ gfx::RectF Element::GetBoundingClientRectNoLifecycleUpdate() const { DCHECK(element_layout_object); GetDocument().AdjustRectForScrollAndAbsoluteZoom(result, *element_layout_object); @@ -286,7 +286,7 @@ diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/ diff --git a/third_party/blink/renderer/core/dom/range.cc b/third_party/blink/renderer/core/dom/range.cc --- a/third_party/blink/renderer/core/dom/range.cc +++ b/third_party/blink/renderer/core/dom/range.cc -@@ -1604,6 +1604,12 @@ DOMRectList* Range::getClientRects() const { +@@ -1612,6 +1612,12 @@ DOMRectList* Range::getClientRects() const { Vector quads; GetBorderAndTextQuads(quads); @@ -299,7 +299,7 @@ diff --git a/third_party/blink/renderer/core/dom/range.cc b/third_party/blink/re return MakeGarbageCollected(quads); } -@@ -1743,7 +1749,11 @@ gfx::RectF Range::BoundingRect() const { +@@ -1751,7 +1757,11 @@ gfx::RectF Range::BoundingRect() const { // If all rects are empty, return the first rect. if (result.IsEmpty() && !quads.empty()) @@ -323,7 +323,7 @@ diff --git a/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creat #include "third_party/blink/renderer/platform/graphics/skia/skia_utils.h" #include "third_party/blink/renderer/platform/graphics/unaccelerated_static_bitmap_image.h" #include "third_party/blink/renderer/platform/heap/garbage_collected.h" -@@ -262,6 +263,10 @@ CanvasAsyncBlobCreator::CanvasAsyncBlobCreator( +@@ -208,6 +209,10 @@ CanvasAsyncBlobCreator::CanvasAsyncBlobCreator( std::min(info.height(), max_dimension)); src_data_.reset(info, src_data_.addr(), src_data_.rowBytes()); } @@ -464,7 +464,7 @@ diff --git a/third_party/blink/renderer/core/svg/svg_text_content_element.cc b/t diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc --- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc +++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc -@@ -30,6 +30,7 @@ +@@ -31,6 +31,7 @@ #include "third_party/blink/renderer/modules/webcodecs/video_frame.h" #include "third_party/blink/renderer/platform/graphics/bitmap_image.h" #include "third_party/blink/renderer/platform/graphics/graphics_context.h" @@ -472,7 +472,7 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_c #include "third_party/blink/renderer/platform/graphics/skia/skia_utils.h" #include "third_party/blink/renderer/platform/graphics/stroke_data.h" #include "third_party/blink/renderer/platform/graphics/video_frame_image_util.h" -@@ -2079,6 +2080,10 @@ ImageData* BaseRenderingContext2D::getImageDataInternal( +@@ -2057,6 +2058,10 @@ ImageData* BaseRenderingContext2D::getImageDataInternal( snapshot->PaintImageForCurrentFrame().GetSkImageInfo().bounds(); DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh))); } @@ -486,7 +486,7 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_c diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc --- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc +++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc -@@ -929,9 +929,15 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) { +@@ -938,9 +938,15 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) { TextDirection direction = ToTextDirection(GetState().GetDirection(), canvas()); @@ -506,7 +506,7 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -1613,7 +1613,9 @@ component("platform") { +@@ -1641,7 +1641,9 @@ component("platform") { "//third_party/blink/renderer:non_test_config", ] @@ -517,7 +517,7 @@ diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/re allow_circular_includes_from = [ "//third_party/blink/renderer/platform/blob", -@@ -1682,6 +1684,7 @@ component("platform") { +@@ -1710,6 +1712,7 @@ component("platform") { "//third_party/blink/public/strings", "//third_party/blink/renderer/platform/wtf", "//third_party/ced", @@ -761,7 +761,7 @@ diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -1514,6 +1514,15 @@ +@@ -1536,6 +1536,15 @@ // No plan to support complex UI for date/time INPUT types on Android. status: {"Android": "test", "default": "stable"}, }, diff --git a/build/patches/Never-fetch-popular-sites.patch b/build/patches/Never-fetch-popular-sites.patch index 27183609..069e3de6 100644 --- a/build/patches/Never-fetch-popular-sites.patch +++ b/build/patches/Never-fetch-popular-sites.patch @@ -18,7 +18,7 @@ diff --git a/components/ntp_tiles/popular_sites_impl.cc b/components/ntp_tiles/p const char kIOSDefaultPopularSitesExperimentIncludeApps[] = "https://www.gstatic.com/chrome/ntp/ios/" "suggested_sites_US_2023q1_mvt_experiment_with_popular_sites.json"; -@@ -370,7 +369,12 @@ bool PopularSitesImpl::MaybeStartFetch(bool force_download, +@@ -376,7 +375,12 @@ bool PopularSitesImpl::MaybeStartFetch(bool force_download, DCHECK(!callback_); callback_ = std::move(callback); @@ -32,7 +32,7 @@ diff --git a/components/ntp_tiles/popular_sites_impl.cc b/components/ntp_tiles/p prefs_->GetInt64(prefs::kPopularSitesLastDownloadPref)); const base::TimeDelta time_since_last_download = base::Time::Now() - last_download_time; -@@ -387,7 +391,7 @@ bool PopularSitesImpl::MaybeStartFetch(bool force_download, +@@ -393,7 +397,7 @@ bool PopularSitesImpl::MaybeStartFetch(bool force_download, (time_since_last_download > redownload_interval) || url_changed) { FetchPopularSites(); return true; diff --git a/build/patches/Never-use-HTTP-probes-for-connection-detection.patch b/build/patches/Never-use-HTTP-probes-for-connection-detection.patch index 0e87524f..83d3b15e 100644 --- a/build/patches/Never-use-HTTP-probes-for-connection-detection.patch +++ b/build/patches/Never-use-HTTP-probes-for-connection-detection.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/src/org/chromium/chrome/browser/net/connectivitydetector/ConnectivityDetector.java b/chrome/android/java/src/org/chromium/chrome/browser/net/connectivitydetector/ConnectivityDetector.java --- a/chrome/android/java/src/org/chromium/chrome/browser/net/connectivitydetector/ConnectivityDetector.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/net/connectivitydetector/ConnectivityDetector.java -@@ -180,7 +180,8 @@ public class ConnectivityDetector implements NetworkChangeNotifier.ConnectionTyp +@@ -174,7 +174,8 @@ public class ConnectivityDetector implements NetworkChangeNotifier.ConnectionTyp @Override public boolean shouldSkipHttpProbes() { diff --git a/build/patches/Offer-builtin-autocomplete-for-chrome-flags.patch b/build/patches/Offer-builtin-autocomplete-for-chrome-flags.patch index 87465161..aea944c3 100644 --- a/build/patches/Offer-builtin-autocomplete-for-chrome-flags.patch +++ b/build/patches/Offer-builtin-autocomplete-for-chrome-flags.patch @@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc --- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc +++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc -@@ -278,6 +278,8 @@ std::vector ChromeAutocompleteProviderClient::GetBuiltinURLs() { +@@ -279,6 +279,8 @@ std::vector ChromeAutocompleteProviderClient::GetBuiltinURLs() { std::vector ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() { std::vector builtins_to_provide; diff --git a/build/patches/OpenSearch-miscellaneous.patch b/build/patches/OpenSearch-miscellaneous.patch index f029ced1..def22510 100644 --- a/build/patches/OpenSearch-miscellaneous.patch +++ b/build/patches/OpenSearch-miscellaneous.patch @@ -21,7 +21,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/search_engines/android/java/src/org/chromium/chrome/browser/search_engines/settings/SearchEngineAdapter.java b/chrome/browser/search_engines/android/java/src/org/chromium/chrome/browser/search_engines/settings/SearchEngineAdapter.java --- a/chrome/browser/search_engines/android/java/src/org/chromium/chrome/browser/search_engines/settings/SearchEngineAdapter.java +++ b/chrome/browser/search_engines/android/java/src/org/chromium/chrome/browser/search_engines/settings/SearchEngineAdapter.java -@@ -247,7 +247,9 @@ public class SearchEngineAdapter extends BaseAdapter +@@ -246,7 +246,9 @@ public class SearchEngineAdapter extends BaseAdapter continue; } if (recentEngineNum < MAX_RECENT_ENGINE_NUM @@ -236,7 +236,7 @@ diff --git a/components/search_engines/template_url_fetcher.cc b/components/sear diff --git a/components/search_engines/template_url_service.h b/components/search_engines/template_url_service.h --- a/components/search_engines/template_url_service.h +++ b/components/search_engines/template_url_service.h -@@ -281,7 +281,10 @@ class TemplateURLService : public WebDataServiceConsumer, +@@ -287,7 +287,10 @@ class TemplateURLService : public WebDataServiceConsumer, void UpdateProviderFavicons(const GURL& potential_search_url, const GURL& favicon_url); @@ -248,7 +248,7 @@ diff --git a/components/search_engines/template_url_service.h b/components/searc // regardless of |url| if the default search provider is managed by policy or // controlled by an extension. bool CanMakeDefault(const TemplateURL* url) const; -@@ -645,9 +648,6 @@ class TemplateURLService : public WebDataServiceConsumer, +@@ -654,9 +657,6 @@ class TemplateURLService : public WebDataServiceConsumer, // SetKeywordSearchTermsForURL is invoked. void UpdateKeywordSearchTermsForURL(const URLVisitedDetails& details); diff --git a/build/patches/Override-Navigator-Language.patch b/build/patches/Override-Navigator-Language.patch index a885e8d0..04ebde26 100644 --- a/build/patches/Override-Navigator-Language.patch +++ b/build/patches/Override-Navigator-Language.patch @@ -53,7 +53,7 @@ diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browse diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/AppLanguagePreferenceDelegate.java b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/AppLanguagePreferenceDelegate.java --- a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/AppLanguagePreferenceDelegate.java +++ b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/AppLanguagePreferenceDelegate.java -@@ -87,6 +87,14 @@ public class AppLanguagePreferenceDelegate { +@@ -88,6 +88,14 @@ public class AppLanguagePreferenceDelegate { // Disable preference so a second downloaded cannot be started while one is in progress. mPreference.setEnabled(false); @@ -71,15 +71,15 @@ diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browse diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc -@@ -69,6 +69,7 @@ - #include "cc/base/switches.h" +@@ -68,6 +68,7 @@ + #include "components/attribution_reporting/os_support.mojom.h" #include "components/discardable_memory/public/mojom/discardable_shared_memory_manager.mojom.h" #include "components/discardable_memory/service/discardable_shared_memory_manager.h" +#include "components/language/core/browser/language_prefs.h" #include "components/metrics/single_sample_metrics.h" #include "components/services/storage/privileged/mojom/indexed_db_control.mojom.h" #include "components/services/storage/public/cpp/buckets/bucket_id.h" -@@ -3190,8 +3191,11 @@ void RenderProcessHostImpl::AppendRendererCommandLine( +@@ -3238,8 +3239,11 @@ void RenderProcessHostImpl::AppendRendererCommandLine( PropagateBrowserCommandLineToRenderer(browser_command_line, command_line); // Pass on the browser locale. diff --git a/build/patches/Partition-Blink-memory-cache.patch b/build/patches/Partition-Blink-memory-cache.patch index 6ee27abf..146c779a 100644 --- a/build/patches/Partition-Blink-memory-cache.patch +++ b/build/patches/Partition-Blink-memory-cache.patch @@ -66,7 +66,7 @@ diff --git a/third_party/blink/renderer/core/inspector/inspector_page_agent.cc b diff --git a/third_party/blink/renderer/core/loader/image_loader.cc b/third_party/blink/renderer/core/loader/image_loader.cc --- a/third_party/blink/renderer/core/loader/image_loader.cc +++ b/third_party/blink/renderer/core/loader/image_loader.cc -@@ -729,7 +729,8 @@ bool ImageLoader::ShouldLoadImmediately(const KURL& url) const { +@@ -732,7 +732,8 @@ bool ImageLoader::ShouldLoadImmediately(const KURL& url) const { // content when style recalc is over and DOM mutation is allowed again. if (!url.IsNull()) { Resource* resource = MemoryCache::Get()->ResourceForURL( @@ -79,7 +79,7 @@ diff --git a/third_party/blink/renderer/core/loader/image_loader.cc b/third_part diff --git a/third_party/blink/renderer/platform/loader/fetch/memory_cache.cc b/third_party/blink/renderer/platform/loader/fetch/memory_cache.cc --- a/third_party/blink/renderer/platform/loader/fetch/memory_cache.cc +++ b/third_party/blink/renderer/platform/loader/fetch/memory_cache.cc -@@ -198,7 +198,7 @@ void MemoryCache::RemoveInternal(ResourceMap* resource_map, +@@ -199,7 +199,7 @@ void MemoryCache::RemoveInternal(ResourceMap* resource_map, } bool MemoryCache::Contains(const Resource* resource) const { @@ -88,7 +88,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/memory_cache.cc b/ return false; const auto resource_maps_it = -@@ -214,12 +214,9 @@ bool MemoryCache::Contains(const Resource* resource) const { +@@ -215,12 +215,9 @@ bool MemoryCache::Contains(const Resource* resource) const { return resource == resources_it->value->GetResource(); } @@ -127,7 +127,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/memory_cache.h b/t diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc b/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc --- a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc +++ b/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc -@@ -658,7 +658,8 @@ Resource* ResourceFetcher::CreateResourceForStaticData( +@@ -671,7 +671,8 @@ Resource* ResourceFetcher::CreateResourceForStaticData( if (!archive_ && factory.GetType() == ResourceType::kRaw) return nullptr; @@ -137,7 +137,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.c // Most off-main-thread resource fetches use Resource::kRaw and don't reach // this point, but off-main-thread module fetches might. if (IsMainThread()) { -@@ -1117,7 +1118,9 @@ Resource* ResourceFetcher::RequestResource(FetchParameters& params, +@@ -1154,7 +1155,9 @@ Resource* ResourceFetcher::RequestResource(FetchParameters& params, resource = nullptr; } else { resource = MemoryCache::Get()->ResourceForURL( @@ -148,7 +148,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.c } if (resource) { policy = DetermineRevalidationPolicy(resource_type, params, *resource, -@@ -1335,7 +1338,8 @@ Resource* ResourceFetcher::CreateResourceForLoading( +@@ -1383,7 +1386,8 @@ Resource* ResourceFetcher::CreateResourceForLoading( const FetchParameters& params, const ResourceFactory& factory) { const String cache_identifier = @@ -158,7 +158,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.c if (!base::FeatureList::IsEnabled( blink::features::kScopeMemoryCachePerContext)) { DCHECK(!IsMainThread() || params.IsStaleRevalidation() || -@@ -2259,13 +2263,16 @@ void ResourceFetcher::UpdateAllImageResourcePriorities() { +@@ -2342,13 +2346,16 @@ void ResourceFetcher::UpdateAllImageResourcePriorities() { to_be_removed.clear(); } @@ -178,7 +178,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.c // Requests that can be satisfied via `archive_` (i.e. MHTML) or // `subresource_web_bundles_` should not participate in the global caching, -@@ -2277,7 +2284,7 @@ String ResourceFetcher::GetCacheIdentifier(const KURL& url) const { +@@ -2360,7 +2367,7 @@ String ResourceFetcher::GetCacheIdentifier(const KURL& url) const { if (bundle) return bundle->GetCacheIdentifier(); @@ -190,7 +190,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.c diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.h b/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.h --- a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.h +++ b/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.h -@@ -252,7 +252,8 @@ class PLATFORM_EXPORT ResourceFetcher +@@ -248,7 +248,8 @@ class PLATFORM_EXPORT ResourceFetcher uint32_t inflight_keepalive_bytes); blink::mojom::ControllerServiceWorkerMode IsControlledByServiceWorker() const; diff --git a/build/patches/Re-introduce-kWebAuthCable.patch b/build/patches/Re-introduce-kWebAuthCable.patch index f7024f13..e320eee7 100644 --- a/build/patches/Re-introduce-kWebAuthCable.patch +++ b/build/patches/Re-introduce-kWebAuthCable.patch @@ -67,7 +67,7 @@ diff --git a/chrome/browser/ui/webauthn/authenticator_dialog_browsertest.cc b/ch diff --git a/chrome/browser/webauthn/chrome_webauthn_browsertest.cc b/chrome/browser/webauthn/chrome_webauthn_browsertest.cc --- a/chrome/browser/webauthn/chrome_webauthn_browsertest.cc +++ b/chrome/browser/webauthn/chrome_webauthn_browsertest.cc -@@ -497,6 +497,7 @@ IN_PROC_BROWSER_TEST_F(WebAuthnCableExtension, ServerLinkExperiments) { +@@ -493,6 +493,7 @@ IN_PROC_BROWSER_TEST_F(WebAuthnCableExtension, ServerLinkExperiments) { class WebAuthnCableSecondFactor : public WebAuthnBrowserTest { public: WebAuthnCableSecondFactor() { @@ -75,7 +75,7 @@ diff --git a/chrome/browser/webauthn/chrome_webauthn_browsertest.cc b/chrome/bro // This makes it a little easier to compare against. trace_ << std::endl; } -@@ -757,6 +758,7 @@ class WebAuthnCableSecondFactor : public WebAuthnBrowserTest { +@@ -753,6 +754,7 @@ class WebAuthnCableSecondFactor : public WebAuthnBrowserTest { }; protected: @@ -86,7 +86,7 @@ diff --git a/chrome/browser/webauthn/chrome_webauthn_browsertest.cc b/chrome/bro diff --git a/content/browser/webauth/authenticator_impl_unittest.cc b/content/browser/webauth/authenticator_impl_unittest.cc --- a/content/browser/webauth/authenticator_impl_unittest.cc +++ b/content/browser/webauth/authenticator_impl_unittest.cc -@@ -1221,7 +1221,12 @@ TEST_F(AuthenticatorImplTest, OversizedCredentialId) { +@@ -1222,7 +1222,12 @@ TEST_F(AuthenticatorImplTest, OversizedCredentialId) { } } @@ -100,7 +100,7 @@ diff --git a/content/browser/webauth/authenticator_impl_unittest.cc b/content/br // https://crbug.com/954355 NavigateAndCommit(GURL(kTestOrigin1)); -@@ -3010,7 +3015,13 @@ TEST_F(AuthenticatorContentBrowserClientTest, FilteringFailsOpen) { +@@ -3048,7 +3053,13 @@ TEST_F(AuthenticatorContentBrowserClientTest, FilteringFailsOpen) { AuthenticatorStatus::SUCCESS); } @@ -118,7 +118,7 @@ diff --git a/content/browser/webauth/authenticator_impl_unittest.cc b/content/br 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 -@@ -1301,6 +1301,13 @@ BASE_FEATURE(kWebAssemblyTrapHandler, +@@ -1319,6 +1319,13 @@ BASE_FEATURE(kWebAssemblyTrapHandler, #endif ); @@ -135,10 +135,10 @@ 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 -@@ -296,6 +296,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebPayments); +@@ -308,6 +308,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebOtpBackendAuto); + CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebPayments); CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebRtcUseGpuMemoryBufferVideoFrames); CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebUICodeCache); - CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebUIReportOnlyTrustedTypes); +CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebAuthCable); CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebUsb); CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebXr); diff --git a/build/patches/Re-introduce-modal-dialog-flag-to-close-all-tabs.patch b/build/patches/Re-introduce-modal-dialog-flag-to-close-all-tabs.patch index 3e1a9f0c..2d6b1e7e 100644 --- a/build/patches/Re-introduce-modal-dialog-flag-to-close-all-tabs.patch +++ b/build/patches/Re-introduce-modal-dialog-flag-to-close-all-tabs.patch @@ -132,7 +132,7 @@ diff --git a/chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browse 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 -@@ -9265,6 +9265,13 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8744,6 +8744,13 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kWaylandScreenCoordinatesEnabled)}, #endif @@ -144,12 +144,12 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc +#endif // BUILDFLAG(IS_ANDROID) + #if !BUILDFLAG(IS_ANDROID) - {"screen-ai", flag_descriptions::kScreenAIName, - flag_descriptions::kScreenAIDescription, kOsDesktop, + // TODO(https://crbug.com/1278249): Add Windows once library supports it. + {"layout-extraction", flag_descriptions::kLayoutExtractionName, diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -3564,6 +3564,11 @@ const char kDiscardOccludedBitmapsDescription[] = +@@ -3553,6 +3553,11 @@ const char kDiscardOccludedBitmapsDescription[] = "Proactively discard cached bitmaps that are occluded/offscreen. Applies " "to several UI surfaces. May introduce jank if the bitmap is needed again."; @@ -164,7 +164,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -379,6 +379,9 @@ extern const char kContextMenuSearchWithGoogleLensDescription[]; +@@ -368,6 +368,9 @@ extern const char kContextMenuSearchWithGoogleLensDescription[]; extern const char kClientStorageAccessContextAuditingName[]; extern const char kClientStorageAccessContextAuditingDescription[]; @@ -177,15 +177,15 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -181,6 +181,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -180,6 +180,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { + &kAssistantIntentTranslateInfo, &kAssistantNonPersonalizedVoiceSearch, - &kAppLaunchpad, &kAppMenuMobileSiteOption, + &kCloseAllTabsModalDialog, &kAppToWebAttribution, &kBackgroundThreadPool, &kCastDeviceFilter, -@@ -526,6 +527,10 @@ BASE_FEATURE(kConditionalTabStripAndroid, +@@ -513,6 +514,10 @@ BASE_FEATURE(kConditionalTabStripAndroid, "ConditionalTabStripAndroid", base::FEATURE_DISABLED_BY_DEFAULT); @@ -196,8 +196,8 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse // Used in downstream code. BASE_FEATURE(kCastDeviceFilter, "CastDeviceFilter", -@@ -536,8 +541,8 @@ BASE_FEATURE(kClearOmniboxFocusAfterNavigation, - base::FEATURE_DISABLED_BY_DEFAULT); +@@ -523,8 +528,8 @@ BASE_FEATURE(kClearOmniboxFocusAfterNavigation, + base::FEATURE_ENABLED_BY_DEFAULT); BASE_FEATURE(kCloseTabSuggestions, - "CloseTabSuggestions", @@ -210,7 +210,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 -@@ -31,6 +31,7 @@ BASE_DECLARE_FEATURE(kAppMenuMobileSiteOption); +@@ -30,6 +30,7 @@ BASE_DECLARE_FEATURE(kAppMenuMobileSiteOption); BASE_DECLARE_FEATURE(kAppToWebAttribution); BASE_DECLARE_FEATURE(kBackgroundThreadPool); BASE_DECLARE_FEATURE(kClearOmniboxFocusAfterNavigation); @@ -221,13 +221,13 @@ 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 -@@ -235,6 +235,7 @@ public abstract class ChromeFeatureList { +@@ -237,6 +237,7 @@ public abstract class ChromeFeatureList { public static final String CCT_RESIZABLE_ALWAYS_SHOW_NAVBAR_BUTTONS = "CCTResizableAlwaysShowNavBarButtons"; public static final String CCT_RESIZABLE_FOR_FIRST_PARTIES = "CCTResizableForFirstParties"; + public static final String CLOSE_ALL_TABS_MODAL_DIALOG = "CloseAllTabsModalDialog"; public static final String CCT_RESIZABLE_FOR_THIRD_PARTIES = "CCTResizableForThirdParties"; + public static final String CCT_RESIZABLE_SIDE_SHEET = "CCTResizableSideSheet"; public static final String CCT_RESOURCE_PREFETCH = "CCTResourcePrefetch"; - public static final String CCT_RETAINING_STATE = "CCTRetainingState"; -- 2.25.1 diff --git a/build/patches/Re-introduce-override_build_timestamp.patch b/build/patches/Re-introduce-override_build_timestamp.patch index ab046555..e75ce347 100644 --- a/build/patches/Re-introduce-override_build_timestamp.patch +++ b/build/patches/Re-introduce-override_build_timestamp.patch @@ -16,7 +16,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/base/BUILD.gn b/base/BUILD.gn --- a/base/BUILD.gn +++ b/base/BUILD.gn -@@ -4057,8 +4057,13 @@ action("build_date") { +@@ -4001,8 +4001,13 @@ action("build_date") { args = [ rebase_path("$target_gen_dir/generated_build_date.h", root_build_dir), diff --git a/build/patches/Reduce-HTTP-headers-in-DoH-requests-to-bare-minimum.patch b/build/patches/Reduce-HTTP-headers-in-DoH-requests-to-bare-minimum.patch index bb26c079..5ad228d5 100644 --- a/build/patches/Reduce-HTTP-headers-in-DoH-requests-to-bare-minimum.patch +++ b/build/patches/Reduce-HTTP-headers-in-DoH-requests-to-bare-minimum.patch @@ -24,7 +24,7 @@ diff --git a/net/base/load_flags_list.h b/net/base/load_flags_list.h diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc --- a/net/dns/dns_transaction.cc +++ b/net/dns/dns_transaction.cc -@@ -445,7 +445,7 @@ class DnsHTTPAttempt : public DnsAttempt, public URLRequest::Delegate { +@@ -463,7 +463,7 @@ class DnsHTTPAttempt : public DnsAttempt, public URLRequest::Delegate { // avoid deadlock and enable the use of preconfigured IP addresses. request_->SetSecureDnsPolicy(SecureDnsPolicy::kBootstrap); request_->SetLoadFlags(request_->load_flags() | LOAD_DISABLE_CACHE | @@ -36,7 +36,7 @@ diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc --- a/net/url_request/url_request_http_job.cc +++ b/net/url_request/url_request_http_job.cc -@@ -341,6 +341,7 @@ void URLRequestHttpJob::OnGotFirstPartySetCacheFilterMatchInfo( +@@ -340,6 +340,7 @@ void URLRequestHttpJob::OnGotFirstPartySetCacheFilterMatchInfo( // fields in the referrer. GURL referrer(request_->referrer()); @@ -44,7 +44,7 @@ diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_reque // Our consumer should have made sure that this is a safe referrer (e.g. via // URLRequestJob::ComputeReferrerForPolicy). if (referrer.is_valid()) { -@@ -348,11 +349,14 @@ void URLRequestHttpJob::OnGotFirstPartySetCacheFilterMatchInfo( +@@ -347,11 +348,14 @@ void URLRequestHttpJob::OnGotFirstPartySetCacheFilterMatchInfo( request_info_.extra_headers.SetHeader(HttpRequestHeaders::kReferer, referer_value); } @@ -59,7 +59,7 @@ diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_reque AddExtraHeaders(); -@@ -609,9 +613,9 @@ void URLRequestHttpJob::StartTransactionInternal() { +@@ -606,9 +610,9 @@ void URLRequestHttpJob::StartTransactionInternal() { void URLRequestHttpJob::AddExtraHeaders() { request_info_.extra_headers.SetAcceptEncodingIfMissing( request()->url(), request()->accepted_stream_types(), diff --git a/build/patches/Remove-HTTP-referrals-in-cross-origin-navigation.patch b/build/patches/Remove-HTTP-referrals-in-cross-origin-navigation.patch index ab56d851..c72d29c8 100644 --- a/build/patches/Remove-HTTP-referrals-in-cross-origin-navigation.patch +++ b/build/patches/Remove-HTTP-referrals-in-cross-origin-navigation.patch @@ -21,7 +21,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 -@@ -60,6 +60,10 @@ found in the LICENSE file. +@@ -61,6 +61,10 @@ found in the LICENSE file. android:title="@string/close_tabs_on_exit_title" android:summary="@string/close_tabs_on_exit_summary" android:defaultValue="false" /> @@ -35,7 +35,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 -@@ -61,6 +61,7 @@ public class PrivacySettings +@@ -67,6 +67,7 @@ public class PrivacySettings private static final String PREF_HTTPS_FIRST_MODE = "https_first_mode"; private static final String PREF_SECURE_DNS = "secure_dns"; private static final String PREF_DO_NOT_TRACK = "do_not_track"; @@ -43,7 +43,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data"; private static final String PREF_PRIVACY_GUIDE = "privacy_guide"; private static final String PREF_INCOGNITO_LOCK = "incognito_lock"; -@@ -174,6 +175,9 @@ public class PrivacySettings +@@ -202,6 +203,9 @@ public class PrivacySettings } else if (PREF_CAN_MAKE_PAYMENT.equals(key)) { UserPrefs.get(Profile.getLastUsedRegularProfile()) .setBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue); @@ -53,7 +53,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting } else if (PREF_HTTPS_FIRST_MODE.equals(key)) { UserPrefs.get(Profile.getLastUsedRegularProfile()) .setBoolean(Pref.HTTPS_ONLY_MODE_ENABLED, (boolean) newValue); -@@ -227,6 +231,10 @@ public class PrivacySettings +@@ -255,6 +259,10 @@ public class PrivacySettings : R.string.text_off); } @@ -67,7 +67,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 -@@ -879,6 +879,9 @@ CHAR_LIMIT guidelines: +@@ -891,6 +891,9 @@ CHAR_LIMIT guidelines: For example, some websites may respond to this request by showing you ads that aren’t based on other websites you’ve visited. Many websites will still collect and use your browsing data — for example to improve security, to provide content, ads and recommendations, and to generate reporting statistics. @@ -80,7 +80,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -433,6 +433,13 @@ void AddAdditionalRequestHeaders( +@@ -444,6 +444,13 @@ void AddAdditionalRequestHeaders( blink::mojom::Referrer(GURL(), network::mojom::ReferrerPolicy::kNever); } @@ -97,7 +97,7 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/brows diff --git a/services/network/public/cpp/resource_request.h b/services/network/public/cpp/resource_request.h --- a/services/network/public/cpp/resource_request.h +++ b/services/network/public/cpp/resource_request.h -@@ -130,7 +130,7 @@ struct COMPONENT_EXPORT(NETWORK_CPP_BASE) ResourceRequest { +@@ -131,7 +131,7 @@ struct COMPONENT_EXPORT(NETWORK_CPP_BASE) ResourceRequest { std::vector navigation_redirect_chain; GURL referrer; diff --git a/build/patches/Remove-blocklisted-URLs-upon-bookmark-creation.patch b/build/patches/Remove-blocklisted-URLs-upon-bookmark-creation.patch index 2fabe0a6..35a14fe5 100644 --- a/build/patches/Remove-blocklisted-URLs-upon-bookmark-creation.patch +++ b/build/patches/Remove-blocklisted-URLs-upon-bookmark-creation.patch @@ -45,15 +45,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/TabBo @@ -97,6 +103,13 @@ public class TabBookmarker { // Defense in depth against the UI being erroneously enabled. - BookmarkModel bridge = mBookmarkModelSupplier.get(); -+ // remove blocklisted URL from most visited sites -+ if (mMostVisitedSites == null) { + final BookmarkModel bookmarkModel = mBookmarkModelSupplier.get(); ++ // remove blocklisted URL from most visited sites ++ if (mMostVisitedSites == null) { + mMostVisitedSites = + SuggestionsDependencyFactory.getInstance().createMostVisitedSites(Profile.getLastUsedRegularProfile()); + } + mMostVisitedSites.removeBlocklistedUrl(tabToBookmark.getOriginalUrl()); + - if (bridge == null || !bridge.isEditBookmarksEnabled()) { + if (bookmarkModel == null || !bookmarkModel.isEditBookmarksEnabled()) { assert false; return; -- diff --git a/build/patches/Remove-help-menu-item.patch b/build/patches/Remove-help-menu-item.patch index f2f22d25..7ed23242 100644 --- a/build/patches/Remove-help-menu-item.patch +++ b/build/patches/Remove-help-menu-item.patch @@ -27,7 +27,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/KeyboardShortcuts.java b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java --- a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java -@@ -363,9 +363,6 @@ public class KeyboardShortcuts { +@@ -358,9 +358,6 @@ public class KeyboardShortcuts { case KeyEvent.KEYCODE_BUTTON_START: if (currentTab != null && currentTab.canGoForward()) currentTab.goForward(); return true; @@ -40,7 +40,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcu diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java -@@ -2345,16 +2345,6 @@ public abstract class ChromeActivity +@@ -2318,16 +2318,6 @@ public abstract class ChromeActivity final Tab currentTab = getActivityTab(); diff --git a/build/patches/Remove-preload-of-com.google.android.gms.fonts.patch b/build/patches/Remove-preload-of-com.google.android.gms.fonts.patch index 6a4e7e9a..43b70cd8 100644 --- a/build/patches/Remove-preload-of-com.google.android.gms.fonts.patch +++ b/build/patches/Remove-preload-of-com.google.android.gms.fonts.patch @@ -59,7 +59,7 @@ diff --git a/chrome/android/java/res_base/font/chrome_google_sans_medium.xml b/c diff --git a/chrome/android/java/src/org/chromium/chrome/browser/fonts/FontPreloader.java b/chrome/android/java/src/org/chromium/chrome/browser/fonts/FontPreloader.java --- a/chrome/android/java/src/org/chromium/chrome/browser/fonts/FontPreloader.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/fonts/FontPreloader.java -@@ -70,6 +70,7 @@ public class FontPreloader { +@@ -84,6 +84,7 @@ public class FontPreloader { mThreadChecker.assertOnValidThread(); if (!mInitialized) { mInitialized = true; diff --git a/build/patches/Remove-weblayer-dependency-on-Play-Services.patch b/build/patches/Remove-weblayer-dependency-on-Play-Services.patch index ceb3cf50..46823346 100644 --- a/build/patches/Remove-weblayer-dependency-on-Play-Services.patch +++ b/build/patches/Remove-weblayer-dependency-on-Play-Services.patch @@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/weblayer/browser/java/BUILD.gn b/weblayer/browser/java/BUILD.gn --- a/weblayer/browser/java/BUILD.gn +++ b/weblayer/browser/java/BUILD.gn -@@ -99,7 +99,6 @@ android_library("base_module_java") { +@@ -96,7 +96,6 @@ android_library("base_module_java") { ] deps = [ ":base_module_interfaces_java", diff --git a/build/patches/Remove-window-name-on-cross-origin-navigation.patch b/build/patches/Remove-window-name-on-cross-origin-navigation.patch index 352edd9c..5375028e 100644 --- a/build/patches/Remove-window-name-on-cross-origin-navigation.patch +++ b/build/patches/Remove-window-name-on-cross-origin-navigation.patch @@ -13,7 +13,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/third_party/blink/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 -@@ -2529,7 +2529,7 @@ void DocumentLoader::CommitNavigation() { +@@ -2536,7 +2536,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. @@ -22,7 +22,7 @@ diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_p frame_->Tree().ExperimentalSetNulledName(); } -@@ -2540,6 +2540,7 @@ void DocumentLoader::CommitNavigation() { +@@ -2547,6 +2547,7 @@ void DocumentLoader::CommitNavigation() { // TODO(shuuran): CrossSiteCrossBrowsingContextGroupSetNulledName will just // record the fact that the name would be nulled and if the name is accessed // after we will fire a UseCounter. diff --git a/build/patches/Restore-Search-Ready-Omnibox-flag.patch b/build/patches/Restore-Search-Ready-Omnibox-flag.patch index 230ea746..f0c8df48 100644 --- a/build/patches/Restore-Search-Ready-Omnibox-flag.patch +++ b/build/patches/Restore-Search-Ready-Omnibox-flag.patch @@ -22,9 +22,9 @@ 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 -@@ -9187,6 +9187,9 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kPervasiveSystemAccentColorDescription, kOsWin, - SINGLE_VALUE_TYPE(switches::kPervasiveSystemAccentColor)}, +@@ -8666,6 +8666,9 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kVCPortraitRelightingDescription, kOsCrOS, + FEATURE_VALUE_TYPE(ash::features::kVCPortraitRelighting)}, #endif + {"enable-search-ready-omnibox", flag_descriptions::kSearchReadyOmniboxName, + flag_descriptions::kSearchReadyOmniboxDescription, kOsAndroid, @@ -35,7 +35,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json --- a/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json -@@ -2808,6 +2808,11 @@ +@@ -2793,6 +2793,11 @@ // with neural net palm detection. "expiry_milestone": 90 }, @@ -50,7 +50,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -4013,6 +4013,11 @@ const char kSendTabToSelfV2Description[] = +@@ -3993,6 +3993,11 @@ const char kSendTabToSelfV2Description[] = "Enables new received tab " "UI shown next to the profile icon instead of using system notifications."; @@ -65,7 +65,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -2304,6 +2304,9 @@ extern const char kShowScrollableMVTOnNTPAndroidDescription[]; +@@ -2289,6 +2289,9 @@ extern const char kShowScrollableMVTOnNTPAndroidDescription[]; extern const char kSendTabToSelfV2Name[]; extern const char kSendTabToSelfV2Description[]; @@ -78,7 +78,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -268,6 +268,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -266,6 +266,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kReachedCodeProfiler, &kReaderModeInCCT, &kReengagementNotification, @@ -86,7 +86,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &kRelatedSearches, &kRelatedSearchesInBar, &kRelatedSearchesUi, -@@ -830,6 +831,10 @@ BASE_FEATURE(kOpaqueOriginForIncomingIntents, +@@ -821,6 +822,10 @@ BASE_FEATURE(kOpaqueOriginForIncomingIntents, "OpaqueOriginForIncomingIntents", base::FEATURE_ENABLED_BY_DEFAULT); @@ -96,11 +96,11 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse + BASE_FEATURE(kOptimizeGeolocationHeaderGeneration, "OptimizeGeolocationHeaderGeneration", - base::FEATURE_DISABLED_BY_DEFAULT); + base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h --- a/chrome/browser/flags/android/chrome_feature_list.h +++ b/chrome/browser/flags/android/chrome_feature_list.h -@@ -133,6 +133,7 @@ BASE_DECLARE_FEATURE(kSearchEnginePromoExistingDevice); +@@ -134,6 +134,7 @@ BASE_DECLARE_FEATURE(kSearchEnginePromoExistingDevice); BASE_DECLARE_FEATURE(kSearchEnginePromoExistingDeviceV2); BASE_DECLARE_FEATURE(kSearchEnginePromoNewDevice); BASE_DECLARE_FEATURE(kSearchEnginePromoNewDeviceV2); @@ -111,7 +111,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 -@@ -382,6 +382,7 @@ public abstract class ChromeFeatureList { +@@ -383,6 +383,7 @@ public abstract class ChromeFeatureList { public static final String MESSAGES_FOR_ANDROID_STACKING_ANIMATION = "MessagesForAndroidStackingAnimation"; public static final String MESSAGES_FOR_ANDROID_SYNC_ERROR = "MessagesForAndroidSyncError"; @@ -141,7 +141,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow @@ -99,8 +101,10 @@ class DropdownItemViewInfoListBuilder { mDividerLineProcessor = new DividerLineProcessor(context); } - mHeaderProcessor = new HeaderProcessor(context, host, delegate); + mHeaderProcessor = new HeaderProcessor(context); - registerSuggestionProcessor(new EditUrlSuggestionProcessor( - context, host, delegate, mFaviconFetcher, mActivityTabSupplier, shareSupplier)); + mEditUrlSuggestionProcessor = new EditUrlSuggestionProcessor( diff --git a/build/patches/Restore-Simplified-NTP-launch.patch b/build/patches/Restore-Simplified-NTP-launch.patch index ba9885e6..84a6f8b0 100644 --- a/build/patches/Restore-Simplified-NTP-launch.patch +++ b/build/patches/Restore-Simplified-NTP-launch.patch @@ -30,7 +30,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni --- a/chrome/android/chrome_java_resources.gni +++ b/chrome/android/chrome_java_resources.gni -@@ -550,6 +550,7 @@ chrome_java_resources = [ +@@ -555,6 +555,7 @@ chrome_java_resources = [ "java/res/layout/new_tab_page_incognito.xml", "java/res/layout/new_tab_page_layout.xml", "java/res/layout/new_tab_page_tile_grid_placeholder.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 -@@ -537,6 +537,7 @@ chrome_java_sources = [ +@@ -536,6 +536,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", @@ -139,7 +139,7 @@ new file mode 100644 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 -@@ -59,6 +59,7 @@ public class ChromeFeedbackCollector +@@ -58,6 +58,7 @@ public class ChromeFeedbackCollector sources.add(new LowEndDeviceFeedbackSource()); sources.add(new IMEFeedbackSource()); sources.add(new PermissionFeedbackSource()); @@ -233,7 +233,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL initializeSearchBoxTextView(); initializeVoiceSearchButton(); initializeLensButton(); -@@ -501,16 +505,22 @@ public class NewTabPageLayout extends LinearLayout implements VrModeObserver { +@@ -502,16 +506,22 @@ public class NewTabPageLayout extends LinearLayout implements VrModeObserver { R.dimen.ntp_header_lateral_paddings_v2); marginLayoutParams.leftMargin = -lateralPaddingsForNTP; marginLayoutParams.rightMargin = -lateralPaddingsForNTP; @@ -258,7 +258,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL marginLayoutParams.bottomMargin = getGridMvtBottomMargin(); } } -@@ -847,6 +857,22 @@ public class NewTabPageLayout extends LinearLayout implements VrModeObserver { +@@ -848,6 +858,22 @@ public class NewTabPageLayout extends LinearLayout implements VrModeObserver { return iphCommandBuilder; } @@ -318,7 +318,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/Sug 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 -@@ -4988,6 +4988,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4653,6 +4653,9 @@ const FeatureEntry kFeatureEntries[] = { SINGLE_VALUE_TYPE_AND_VALUE( switches::kForceShowUpdateMenuItemCustomSummary, "Custom Summary")}, @@ -331,7 +331,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -4064,6 +4064,9 @@ const char kStartSurfaceRefactorName[] = "Start Surface Refactor"; +@@ -4044,6 +4044,9 @@ const char kStartSurfaceRefactorName[] = "Start Surface Refactor"; const char kStartSurfaceRefactorDescription[] = "Enable splitting Tab switcher from Start surface"; @@ -344,7 +344,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -2319,6 +2319,9 @@ extern const char kSiteIsolationForPasswordSitesDescription[]; +@@ -2304,6 +2304,9 @@ extern const char kSiteIsolationForPasswordSitesDescription[]; extern const char kSmartSuggestionForLargeDownloadsName[]; extern const char kSmartSuggestionForLargeDownloadsDescription[]; @@ -357,7 +357,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -247,6 +247,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -245,6 +245,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kIncognitoReauthenticationForAndroid, &kIncognitoScreenshot, &kInfobarScrollOptimization, @@ -365,7 +365,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &kInstanceSwitcher, &kInstantStart, &kIsVoiceSearchEnabledCache, -@@ -809,6 +810,10 @@ BASE_FEATURE(kInstanceSwitcher, +@@ -800,6 +801,10 @@ BASE_FEATURE(kInstanceSwitcher, "InstanceSwitcher", base::FEATURE_ENABLED_BY_DEFAULT); @@ -390,7 +390,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 -@@ -376,6 +376,7 @@ public abstract class ChromeFeatureList { +@@ -377,6 +377,7 @@ public abstract class ChromeFeatureList { public static final String MESSAGES_FOR_ANDROID_ADS_BLOCKED = "MessagesForAndroidAdsBlocked"; public static final String MESSAGES_FOR_ANDROID_CHROME_SURVEY = "MessagesForAndroidChromeSurvey"; @@ -423,7 +423,7 @@ diff --git a/components/ntp_snippets/features.cc b/components/ntp_snippets/featu diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json --- a/testing/variations/fieldtrial_testing_config.json +++ b/testing/variations/fieldtrial_testing_config.json -@@ -5428,6 +5428,24 @@ +@@ -5427,6 +5427,24 @@ ] } ], diff --git a/build/patches/Restore-adaptive-button-in-top-toolbar-customization.patch b/build/patches/Restore-adaptive-button-in-top-toolbar-customization.patch index 0e7553ff..0687a954 100644 --- a/build/patches/Restore-adaptive-button-in-top-toolbar-customization.patch +++ b/build/patches/Restore-adaptive-button-in-top-toolbar-customization.patch @@ -89,7 +89,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/ShareButt diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -585,18 +585,12 @@ const FeatureEntry::FeatureParam kAdaptiveButtonCustomization_Share[] = { +@@ -573,18 +573,12 @@ const FeatureEntry::FeatureParam kAdaptiveButtonCustomization_Share[] = { {"default_segment", "share"}, {"show_ui_only_after_ready", "false"}, {"ignore_segmentation_results", "true"}}; @@ -126,7 +126,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/adaptive/AdaptiveToolbarButtonController.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/adaptive/AdaptiveToolbarButtonController.java --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/adaptive/AdaptiveToolbarButtonController.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/adaptive/AdaptiveToolbarButtonController.java -@@ -234,7 +234,11 @@ public class AdaptiveToolbarButtonController +@@ -238,7 +238,11 @@ public class AdaptiveToolbarButtonController @Override public void onFinishNativeInitialization() { @@ -142,7 +142,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/adaptive/AdaptiveToolbarFeatures.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/adaptive/AdaptiveToolbarFeatures.java --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/adaptive/AdaptiveToolbarFeatures.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/adaptive/AdaptiveToolbarFeatures.java -@@ -16,8 +16,18 @@ import java.lang.annotation.RetentionPolicy; +@@ -12,8 +12,18 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList; /** * A utility class for handling feature flags used by {@link AdaptiveToolbarButtonController}. @@ -161,7 +161,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow /** Finch default group for new tab variation. */ static final String NEW_TAB = "new-tab"; /** Finch default group for share variation. */ -@@ -30,6 +40,7 @@ public class AdaptiveToolbarFeatures { +@@ -26,6 +36,7 @@ public class AdaptiveToolbarFeatures { private static final String VARIATION_PARAM_DISABLE_UI = "disable_ui"; private static final String VARIATION_PARAM_IGNORE_SEGMENTATION_RESULTS = "ignore_segmentation_results"; @@ -169,7 +169,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow private static final String VARIATION_PARAM_SHOW_UI_ONLY_AFTER_READY = "show_ui_only_after_ready"; @VisibleForTesting -@@ -117,6 +128,21 @@ public class AdaptiveToolbarFeatures { +@@ -90,6 +101,21 @@ public class AdaptiveToolbarFeatures { } } @@ -191,7 +191,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow /** * Returns whether the adaptive toolbar is enabled with segmentation and customization. * -@@ -203,12 +229,49 @@ public class AdaptiveToolbarFeatures { +@@ -176,12 +202,49 @@ public class AdaptiveToolbarFeatures { ChromeFeatureList.CONTEXTUAL_PAGE_ACTIONS, "enable_ui", true); } @@ -244,7 +244,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/adaptive/AdaptiveToolbarStatePredictor.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/adaptive/AdaptiveToolbarStatePredictor.java --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/adaptive/AdaptiveToolbarStatePredictor.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/adaptive/AdaptiveToolbarStatePredictor.java -@@ -97,7 +97,12 @@ public class AdaptiveToolbarStatePredictor { +@@ -96,7 +96,12 @@ public class AdaptiveToolbarStatePredictor { // Early return if the feature isn't enabled. if (!AdaptiveToolbarFeatures.isCustomizationEnabled()) { @@ -261,7 +261,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/adaptive/AdaptiveToolbarStatePredictorTest.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/adaptive/AdaptiveToolbarStatePredictorTest.java --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/adaptive/AdaptiveToolbarStatePredictorTest.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/adaptive/AdaptiveToolbarStatePredictorTest.java -@@ -70,6 +70,21 @@ public class AdaptiveToolbarStatePredictorTest { +@@ -69,6 +69,21 @@ public class AdaptiveToolbarStatePredictorTest { statePredictor.recomputeUiState(verifyResultCallback(expected)); } diff --git a/build/patches/Restore-offline-indicator-v2-flag.patch b/build/patches/Restore-offline-indicator-v2-flag.patch index 0927f5cd..9314d502 100644 --- a/build/patches/Restore-offline-indicator-v2-flag.patch +++ b/build/patches/Restore-offline-indicator-v2-flag.patch @@ -103,7 +103,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 -@@ -774,7 +774,8 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -798,7 +798,8 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { private void initStatusIndicatorCoordinator(LayoutManagerImpl layoutManager) { // TODO(crbug.com/1035584): Disable on tablets for now as we need to do one or two extra // things for tablets. @@ -113,7 +113,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab return; } -@@ -796,6 +797,11 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -820,6 +821,11 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { mStatusIndicatorCoordinator.addObserver(mStatusIndicatorObserver); mStatusIndicatorCoordinator.addObserver(mStatusBarColorController); @@ -128,7 +128,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab 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 -@@ -4908,6 +4908,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4577,6 +4577,9 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kOfflinePagesLivePageSharingName, flag_descriptions::kOfflinePagesLivePageSharingDescription, kOsAndroid, FEATURE_VALUE_TYPE(offline_pages::kOfflinePagesLivePageSharingFeature)}, @@ -141,9 +141,9 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json --- a/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json -@@ -5006,6 +5006,11 @@ +@@ -5002,6 +5002,11 @@ "owners": [ "adamta", "sczs" ], - "expiry_milestone": 98 + "expiry_milestone": 115 }, + { + "name": "offline-indicator-v2", @@ -156,7 +156,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -3850,6 +3850,10 @@ const char kNotificationPermissionRationaleDescription[] = +@@ -3822,6 +3822,10 @@ const char kNotificationPermissionRationaleDescription[] = "Configure the dialog shown before requesting notification permission. " "Only works with builds targeting Android T."; @@ -170,7 +170,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -2214,6 +2214,9 @@ extern const char kNewWindowAppMenuDescription[]; +@@ -2196,6 +2196,9 @@ extern const char kNewWindowAppMenuDescription[]; extern const char kNotificationPermissionRationaleName[]; extern const char kNotificationPermissionRationaleDescription[]; @@ -183,7 +183,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -258,6 +258,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -256,6 +256,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { &kNewTabPageTilesTitleWrapAround, &kNewWindowAppMenu, &kNotificationPermissionVariant, @@ -191,10 +191,10 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &kPageAnnotationsService, &kInlineUpdateFlow, &kBookmarksImprovedSaveFlow, -@@ -745,6 +746,10 @@ BASE_FEATURE(kDownloadRename, - "DownloadRename", +@@ -732,6 +733,10 @@ BASE_FEATURE(kDownloadAutoResumptionThrottling, + BASE_FEATURE(kDownloadHomeForExternalApp, + "DownloadHomeForExternalApp", base::FEATURE_ENABLED_BY_DEFAULT); - +BASE_FEATURE(kOfflineIndicatorV2, + "OfflineIndicatorV2", + base::FEATURE_ENABLED_BY_DEFAULT); @@ -216,7 +216,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 -@@ -395,6 +395,7 @@ public abstract class ChromeFeatureList { +@@ -396,6 +396,7 @@ public abstract class ChromeFeatureList { public static final String NEW_WINDOW_APP_MENU = "NewWindowAppMenu"; public static final String NOTIFICATION_PERMISSION_VARIANT = "NotificationPermissionVariant"; public static final String OFFLINE_INDICATOR = "OfflineIndicator"; diff --git a/build/patches/Revert-Delete-block-external-form-redirects.patch b/build/patches/Revert-Delete-block-external-form-redirects.patch index 41137724..295ad95f 100644 --- a/build/patches/Revert-Delete-block-external-form-redirects.patch +++ b/build/patches/Revert-Delete-block-external-form-redirects.patch @@ -21,7 +21,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 -@@ -238,6 +238,7 @@ +@@ -239,6 +239,7 @@ #include "components/browser_ui/photo_picker/android/features.h" #include "components/content_creation/notes/core/note_features.h" #include "components/content_creation/reactions/core/reactions_features.h" @@ -29,7 +29,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc #include "components/translate/content/android/translate_message.h" #else // BUILDFLAG(IS_ANDROID) #include "chrome/browser/media/router/discovery/access_code/access_code_cast_sink_service.h" -@@ -7734,6 +7735,12 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7355,6 +7356,12 @@ const FeatureEntry kFeatureEntries[] = { #endif // BUILDFLAG(ENABLE_PAINT_PREVIEW) && BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_ANDROID) @@ -45,7 +45,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json --- a/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json -@@ -702,6 +702,11 @@ +@@ -648,6 +648,11 @@ "owners": [ "ioanap", "vsemeniuk@google.com" ], "expiry_milestone": 108 }, @@ -60,7 +60,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -3726,6 +3726,12 @@ const char kInstantStartName[] = "Instant start"; +@@ -3707,6 +3707,12 @@ const char kInstantStartName[] = "Instant start"; const char kInstantStartDescription[] = "Show start surface before native library is loaded."; @@ -76,7 +76,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -2134,6 +2134,9 @@ extern const char kInstanceSwitcherDescription[]; +@@ -2122,6 +2122,9 @@ extern const char kInstanceSwitcherDescription[]; extern const char kInstantStartName[]; extern const char kInstantStartDescription[]; @@ -89,17 +89,17 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio diff --git a/components/external_intents/android/external_intents_features.cc b/components/external_intents/android/external_intents_features.cc --- a/components/external_intents/android/external_intents_features.cc +++ b/components/external_intents/android/external_intents_features.cc -@@ -19,7 +19,8 @@ namespace { +@@ -18,7 +18,8 @@ namespace { + // Array of features exposed through the Java ExternalIntentsFeatures API. const base::Feature* kFeaturesExposedToJava[] = { - &kAutofillAssistantGoogleInitiatorOriginCheck, - &kBlockExternalFormSubmitWithoutGesture, &kExternalNavigationDebugLogs}; + &kBlockExternalFormSubmitWithoutGesture, &kExternalNavigationDebugLogs, + &kIntentBlockExternalFormRedirectsNoGesture}; } // namespace -@@ -41,6 +42,10 @@ BASE_FEATURE(kExternalNavigationDebugLogs, +@@ -34,6 +35,10 @@ BASE_FEATURE(kExternalNavigationDebugLogs, "ExternalNavigationDebugLogs", base::FEATURE_DISABLED_BY_DEFAULT); @@ -113,9 +113,9 @@ diff --git a/components/external_intents/android/external_intents_features.cc b/ diff --git a/components/external_intents/android/external_intents_features.h b/components/external_intents/android/external_intents_features.h --- a/components/external_intents/android/external_intents_features.h +++ b/components/external_intents/android/external_intents_features.h -@@ -12,6 +12,7 @@ namespace external_intents { +@@ -11,6 +11,7 @@ namespace external_intents { + // Alphabetical: - BASE_DECLARE_FEATURE(kAutofillAssistantGoogleInitiatorOriginCheck); BASE_DECLARE_FEATURE(kBlockExternalFormSubmitWithoutGesture); +BASE_DECLARE_FEATURE(kIntentBlockExternalFormRedirectsNoGesture); BASE_DECLARE_FEATURE(kExternalNavigationDebugLogs); @@ -134,13 +134,13 @@ diff --git a/components/external_intents/android/java/src/org/chromium/component + public static final ExternalIntentsFeatures INTENT_BLOCK_EXTERNAL_FORM_REDIRECT_NO_GESTURE = + new ExternalIntentsFeatures(0, INTENT_BLOCK_EXTERNAL_FORM_REDIRECT_NO_GESTURE_NAME); + - public static final String AUTOFILL_ASSISTANT_GOOGLE_INITIATOR_ORIGIN_CHECK_NAME = - "AutofillAssistantGoogleInitiatorOriginCheck"; public static final String BLOCK_EXTERNAL_FORM_SUBMIT_WITHOUT_GESTURE_NAME = + "BlockExternalFormSubmitWithoutGesture"; + public static final String EXTERNAL_NAVIGATION_DEBUG_LOGS_NAME = "ExternalNavigationDebugLogs"; 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 -@@ -1528,6 +1528,12 @@ public class ExternalNavigationHandler { +@@ -1468,6 +1468,12 @@ public class ExternalNavigationHandler { } } @@ -153,7 +153,7 @@ diff --git a/components/external_intents/android/java/src/org/chromium/component private OverrideUrlLoadingResult shouldOverrideUrlLoadingInternal( ExternalNavigationParams params, Intent targetIntent, GURL browserFallbackUrl, MutableBoolean canLaunchExternalFallbackResult) { -@@ -1577,6 +1583,21 @@ public class ExternalNavigationHandler { +@@ -1513,6 +1519,21 @@ public class ExternalNavigationHandler { return OverrideUrlLoadingResult.forNoOverride(); } @@ -178,7 +178,7 @@ diff --git a/components/external_intents/android/java/src/org/chromium/component diff --git a/components/external_intents/android/javatests/src/org/chromium/components/external_intents/ExternalNavigationHandlerTest.java b/components/external_intents/android/javatests/src/org/chromium/components/external_intents/ExternalNavigationHandlerTest.java --- a/components/external_intents/android/javatests/src/org/chromium/components/external_intents/ExternalNavigationHandlerTest.java +++ b/components/external_intents/android/javatests/src/org/chromium/components/external_intents/ExternalNavigationHandlerTest.java -@@ -293,14 +293,12 @@ public class ExternalNavigationHandlerTest { +@@ -273,14 +273,12 @@ public class ExternalNavigationHandlerTest { .withIsRedirect(true) .withHasUserGesture(true) .withRedirectHandler(handler) @@ -195,7 +195,7 @@ diff --git a/components/external_intents/android/javatests/src/org/chromium/comp // If the page matches the referrer, then continue loading in Chrome. checkUrl("http://youtube.com://") -@@ -2738,6 +2736,11 @@ public class ExternalNavigationHandlerTest { +@@ -2616,6 +2614,11 @@ public class ExternalNavigationHandlerTest { && !packageName.equals(INVALID_WEBAPK_PACKAGE_NAME); } diff --git a/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch b/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch index d2fe8a56..f42cfbbf 100644 --- a/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch +++ b/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch @@ -16,7 +16,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 -@@ -4391,6 +4391,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4061,6 +4061,10 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kEnableVulkanDescription, kOsWin | kOsLinux | kOsAndroid, FEATURE_VALUE_TYPE(features::kVulkan)}, #if BUILDFLAG(IS_ANDROID) @@ -30,9 +30,9 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json --- a/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json -@@ -1455,6 +1455,10 @@ +@@ -1419,6 +1419,10 @@ "yangsharon@google.com", "alexmos@google.com", "creis@google.com" ], - "expiry_milestone": 110 + "expiry_milestone": 122 }, + { + "name": "disable-pull-to-refresh-effect", @@ -44,7 +44,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -3892,6 +3892,10 @@ const char kReadLaterDescription[] = +@@ -3864,6 +3864,10 @@ const char kReadLaterDescription[] = "Allow users to save tabs for later. Enables a new button and menu for " "accessing tabs saved for later."; @@ -58,7 +58,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -2235,6 +2235,9 @@ extern const char kQueryTilesSegmentationDescription[]; +@@ -2217,6 +2217,9 @@ extern const char kQueryTilesSegmentationDescription[]; extern const char kQueryTilesSwapTrendingName[]; extern const char kQueryTilesSwapTrendingDescription[]; diff --git a/build/patches/Revert-flags-remove-num-raster-threads.patch b/build/patches/Revert-flags-remove-num-raster-threads.patch index 2feaa5de..d545aeeb 100644 --- a/build/patches/Revert-flags-remove-num-raster-threads.patch +++ b/build/patches/Revert-flags-remove-num-raster-threads.patch @@ -31,7 +31,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = { {flags_ui::kGenericExperimentChoiceDefault, "", ""}, {flag_descriptions::kTouchSelectionStrategyCharacter, -@@ -4615,6 +4624,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4275,6 +4284,9 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(mojo::core::kMojoLinuxChannelSharedMem)}, #endif #if BUILDFLAG(IS_ANDROID) @@ -44,9 +44,9 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json --- a/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json -@@ -4688,6 +4688,10 @@ - "owners": [ "pavely", "lazzzis" ], - "expiry_milestone": 105 +@@ -4704,6 +4704,10 @@ + "owners": [ "lazzzis", "aishwaryarj"], + "expiry_milestone": 118 }, + { + "name": "num-raster-threads", @@ -58,7 +58,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -1917,6 +1917,14 @@ const char kOmitCorsClientCertDescription[] = +@@ -1930,6 +1930,14 @@ const char kOmitCorsClientCertDescription[] = "credential mode disallows. Without this flag enabled, Chrome will always " "try sending client certificates regardless of the credential mode."; @@ -76,7 +76,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -1095,6 +1095,13 @@ extern const char kOriginAgentClusterDefaultDescription[]; +@@ -1098,6 +1098,13 @@ extern const char kOriginAgentClusterDefaultDescription[]; extern const char kOmitCorsClientCertName[]; extern const char kOmitCorsClientCertDescription[]; diff --git a/build/patches/Revert-removal-of-execution-context-address-space.patch b/build/patches/Revert-removal-of-execution-context-address-space.patch index f9d7bd7a..89a2e674 100644 --- a/build/patches/Revert-removal-of-execution-context-address-space.patch +++ b/build/patches/Revert-removal-of-execution-context-address-space.patch @@ -58,7 +58,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/third_party/blink/renderer/core/execution_context/execution_context.cc b/third_party/blink/renderer/core/execution_context/execution_context.cc --- a/third_party/blink/renderer/core/execution_context/execution_context.cc +++ b/third_party/blink/renderer/core/execution_context/execution_context.cc -@@ -551,6 +551,15 @@ void ExecutionContext::SetReferrerPolicy( +@@ -554,6 +554,15 @@ void ExecutionContext::SetReferrerPolicy( policy_container_->UpdateReferrerPolicy(referrer_policy); } @@ -85,7 +85,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context #include "services/network/public/mojom/referrer_policy.mojom-blink-forward.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/blink/public/common/tokens/tokens.h" -@@ -396,6 +397,9 @@ class CORE_EXPORT ExecutionContext : public Supplementable, +@@ -403,6 +404,9 @@ class CORE_EXPORT ExecutionContext : public Supplementable, const String& message = g_empty_string, const String& source_file = g_empty_string) const {} @@ -109,7 +109,7 @@ diff --git a/third_party/blink/renderer/core/exported/web_shared_worker_impl.cc diff --git a/third_party/blink/renderer/core/frame/policy_container.cc b/third_party/blink/renderer/core/frame/policy_container.cc --- a/third_party/blink/renderer/core/frame/policy_container.cc +++ b/third_party/blink/renderer/core/frame/policy_container.cc -@@ -52,12 +52,22 @@ network::mojom::blink::ReferrerPolicy PolicyContainer::GetReferrerPolicy() +@@ -53,12 +53,22 @@ network::mojom::blink::ReferrerPolicy PolicyContainer::GetReferrerPolicy() return policies_->referrer_policy; } @@ -163,7 +163,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 -@@ -8043,6 +8043,40 @@ TEST_F(WebFrameTest, PushStateStartsAndStops) { +@@ -8046,6 +8046,40 @@ TEST_F(WebFrameTest, PushStateStartsAndStops) { EXPECT_EQ(client.StopLoadingCount(), 2); } @@ -324,7 +324,7 @@ diff --git a/third_party/blink/renderer/core/workers/dedicated_worker.cc b/third base::UnguessableToken parent_devtools_token; std::unique_ptr settings; ExecutionContext* execution_context = GetExecutionContext(); -@@ -495,6 +500,7 @@ DedicatedWorker::CreateGlobalScopeCreationParams( +@@ -493,6 +498,7 @@ DedicatedWorker::CreateGlobalScopeCreationParams( execution_context->GetSecurityOrigin(), execution_context->IsSecureContext(), execution_context->GetHttpsState(), MakeGarbageCollected(), CreateWebContentSettingsClient(), diff --git a/build/patches/Show-site-settings-for-cookies-javascript-and-ads.patch b/build/patches/Show-site-settings-for-cookies-javascript-and-ads.patch index b62b2973..e544b5e9 100644 --- a/build/patches/Show-site-settings-for-cookies-javascript-and-ads.patch +++ b/build/patches/Show-site-settings-for-cookies-javascript-and-ads.patch @@ -22,7 +22,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c } else if (type == ContentSettingsType.GEOLOCATION) { setUpLocationPreference(preference); } else if (type == ContentSettingsType.IMAGES) { -@@ -878,16 +880,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment +@@ -875,16 +877,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment private void setUpAdsInformationalBanner() { // Add the informational banner which shows at the top of the UI if ad blocking is // activated on this site. @@ -39,7 +39,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c } private SiteSettingsCategory getWarningCategory() { -@@ -1072,17 +1066,35 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment +@@ -1070,17 +1064,35 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment @Nullable Integer currentValue = mSite.getContentSetting(browserContextHandle, ContentSettingsType.JAVASCRIPT); @@ -81,7 +81,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c private void setUpJavascriptJitPreference(Preference preference) { BrowserContextHandle browserContextHandle = getSiteSettingsDelegate().getBrowserContextHandle(); -@@ -1115,22 +1127,10 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment +@@ -1113,22 +1125,10 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment setupContentSettingsPreference(preference, null, false); return; } diff --git a/build/patches/Unexpire-tab-groups-flags.patch b/build/patches/Unexpire-tab-groups-flags.patch index 0915b8fe..6a3553aa 100644 --- a/build/patches/Unexpire-tab-groups-flags.patch +++ b/build/patches/Unexpire-tab-groups-flags.patch @@ -13,7 +13,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 -@@ -3138,7 +3138,7 @@ +@@ -3133,7 +3133,7 @@ { "name": "enable-tab-groups", "owners": [ "memex-team@google.com" ], @@ -22,7 +22,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js }, { "name": "enable-tab-groups-continuation", -@@ -3153,7 +3153,7 @@ +@@ -3148,7 +3148,7 @@ { "name": "enable-tab-groups-ui-improvements", "owners": [ "memex-team@google.com" ], @@ -34,7 +34,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -965,16 +965,16 @@ BASE_FEATURE(kTabEngagementReportingAndroid, +@@ -960,16 +960,16 @@ BASE_FEATURE(kTabEngagementReportingAndroid, base::FEATURE_DISABLED_BY_DEFAULT); BASE_FEATURE(kTabGroupsAndroid, diff --git a/build/patches/Update-i18n-zh_CN-support.patch b/build/patches/Update-i18n-zh_CN-support.patch index 04fcfdbe..28340161 100644 --- a/build/patches/Update-i18n-zh_CN-support.patch +++ b/build/patches/Update-i18n-zh_CN-support.patch @@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/app/resources/generated_resources_zh-CN.xtb b/chrome/app/resources/generated_resources_zh-CN.xtb --- a/chrome/app/resources/generated_resources_zh-CN.xtb +++ b/chrome/app/resources/generated_resources_zh-CN.xtb -@@ -8874,4 +8874,6 @@ +@@ -8986,4 +8986,6 @@ 网站会在您访问时自动采用此设置。网站通常会传送通知，以便您知悉重大新闻或聊天消息。 您需要开启 Chrome 同步才能使用 Wi-Fi 同步功能。了解详情 检查(&N) @@ -26,7 +26,7 @@ diff --git a/chrome/app/resources/generated_resources_zh-CN.xtb b/chrome/app/res diff --git a/chrome/app/resources/google_chrome_strings_zh-CN.xtb b/chrome/app/resources/google_chrome_strings_zh-CN.xtb --- a/chrome/app/resources/google_chrome_strings_zh-CN.xtb +++ b/chrome/app/resources/google_chrome_strings_zh-CN.xtb -@@ -416,4 +416,5 @@ +@@ -415,4 +415,5 @@ 如需在您的所有设备上访问自己的 Chrome 信息，请登录您的帐号，然后开启同步功能。 Google Chrome 是您的默认浏览器 可用于切换 Chrome 个人资料 @@ -37,7 +37,7 @@ diff --git a/chrome/app/resources/google_chrome_strings_zh-CN.xtb b/chrome/app/r 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 --- 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 -@@ -1563,4 +1563,74 @@ Privacy Sandbox 试用版功能尚处于积极开发阶段，目前只能在部 +@@ -1566,4 +1566,74 @@ Privacy Sandbox 试用版功能尚处于积极开发阶段，目前只能在部 常规 个标签页 动态卡片上的菜单已关闭 @@ -117,7 +117,7 @@ diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strin 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 --- 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 -@@ -409,4 +409,28 @@ +@@ -412,4 +412,28 @@ 这是一个危险网页 移除此网站？ 已存储的数据 @@ -151,7 +151,7 @@ diff --git a/components/browser_ui/strings/android/translations/browser_ui_strin diff --git a/components/strings/components_strings_zh-CN.xtb b/components/strings/components_strings_zh-CN.xtb --- a/components/strings/components_strings_zh-CN.xtb +++ b/components/strings/components_strings_zh-CN.xtb -@@ -3244,4 +3244,33 @@ +@@ -3252,4 +3252,33 @@ </ul> JIS B1 来自 Google Pay diff --git a/build/patches/Use-4-tile-rows-never-show-logo.patch b/build/patches/Use-4-tile-rows-never-show-logo.patch index e1a81a07..2e464860 100644 --- a/build/patches/Use-4-tile-rows-never-show-logo.patch +++ b/build/patches/Use-4-tile-rows-never-show-logo.patch @@ -22,7 +22,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL private boolean mSearchProviderIsGoogle; private boolean mShowingNonStandardLogo; -@@ -328,7 +328,7 @@ public class NewTabPageLayout extends LinearLayout implements VrModeObserver { +@@ -329,7 +329,7 @@ public class NewTabPageLayout extends LinearLayout implements VrModeObserver { boolean isScrollableMvtEnabled, boolean searchProviderIsGoogle) { assert mMvTilesContainerLayout != null; @@ -31,7 +31,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL if (searchProviderIsGoogle && QueryTileUtils.isQueryTilesEnabledOnNTP()) { maxRows = QueryTileSection.getMaxRowsForMostVisitedTiles(getContext()); } -@@ -473,7 +473,7 @@ public class NewTabPageLayout extends LinearLayout implements VrModeObserver { +@@ -474,7 +474,7 @@ public class NewTabPageLayout extends LinearLayout implements VrModeObserver { && mInitialized) { return; } diff --git a/build/patches/Use-64-bit-WebView-processes.patch b/build/patches/Use-64-bit-WebView-processes.patch index a2f31a50..b801b12c 100644 --- a/build/patches/Use-64-bit-WebView-processes.patch +++ b/build/patches/Use-64-bit-WebView-processes.patch @@ -33,7 +33,7 @@ diff --git a/android_webview/nonembedded/java/AndroidManifest.xml b/android_webv android:name="{{ application_name|default('org.chromium.android_webview.nonembedded.WebViewApkApplication') }}" android:multiArch="true" - {{ use32bitAbi|default('android:use32bitAbi="true"') }} - android:extractNativeLibs="{{ trichrome_library is not defined }}"> + android:extractNativeLibs="false"> {# This part is shared between stand-alone WebView and Monochrome #} {% macro common(manifest_package, webview_lib) %} -- diff --git a/build/patches/Use-dummy-DFM-installer.patch b/build/patches/Use-dummy-DFM-installer.patch index 6d454718..02527917 100644 --- a/build/patches/Use-dummy-DFM-installer.patch +++ b/build/patches/Use-dummy-DFM-installer.patch @@ -5,7 +5,7 @@ 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 | 2 - - .../engine/SplitCompatEngine.java | 53 ++++--------------- + .../engine/SplitCompatEngine.java | 52 ++++--------------- .../engine/SplitCompatEngineFacade.java | 28 +++------- .../module_installer/logger/Logger.java | 16 ++---- .../logger/PlayCoreLogger.java | 36 ++----------- @@ -13,7 +13,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../logger/SplitInstallStatusLogger.java | 30 +---------- .../module_installer/util/ModuleUtil.java | 5 -- .../util/SplitCompatInitializer.java | 6 --- - 9 files changed, 25 insertions(+), 179 deletions(-) + 9 files changed, 25 insertions(+), 178 deletions(-) diff --git a/components/module_installer/android/BUILD.gn b/components/module_installer/android/BUILD.gn --- a/components/module_installer/android/BUILD.gn @@ -47,7 +47,7 @@ diff --git a/components/module_installer/android/java/src/org/chromium/component import org.chromium.base.ThreadUtils; import java.util.ArrayList; -@@ -28,7 +23,6 @@ import java.util.Set; +@@ -27,7 +22,6 @@ import java.util.Set; */ class SplitCompatEngine implements InstallEngine { private final SplitCompatEngineFacade mFacade; @@ -55,7 +55,7 @@ diff --git a/components/module_installer/android/java/src/org/chromium/component private static final Map> sSessions = new HashMap<>(); public SplitCompatEngine() { -@@ -46,49 +40,20 @@ class SplitCompatEngine implements InstallEngine { +@@ -45,48 +39,20 @@ class SplitCompatEngine implements InstallEngine { @Override public boolean isInstalled(String moduleName) { @@ -74,16 +74,17 @@ diff --git a/components/module_installer/android/java/src/org/chromium/component public void install(String moduleName, InstallListener listener) { ThreadUtils.assertOnUiThread(); - -- if (sSessions.containsKey(moduleName)) { -- sSessions.get(moduleName).add(listener); +- List listeners = sSessions.get(moduleName); +- if (listeners != null) { +- listeners.add(listener); - return; - } - - registerUpdateListener(); - -- sSessions.put(moduleName, new ArrayList() { -- { add(listener); } -- }); +- listeners = new ArrayList<>(); +- listeners.add(listener); +- sSessions.put(moduleName, listeners); - - SplitInstallRequest request = mFacade.createSplitInstallRequest(moduleName); - @@ -94,8 +95,6 @@ diff --git a/components/module_installer/android/java/src/org/chromium/component - ex instanceof SplitInstallException - ? ((SplitInstallException) ex).getErrorCode() - : mFacade.getLogger().getUnknownRequestErrorCode()); -- -- String message = String.format(Locale.US, "Request Exception: %s", ex.getMessage()); - notifyListeners(moduleName, false); - }); - @@ -107,7 +106,7 @@ diff --git a/components/module_installer/android/java/src/org/chromium/component return state -> { assert !state.moduleNames().isEmpty(); -@@ -112,12 +77,12 @@ class SplitCompatEngine implements InstallEngine { +@@ -110,12 +76,12 @@ class SplitCompatEngine implements InstallEngine { mFacade.getLogger().logStatus(moduleName, status); } }; @@ -123,7 +122,7 @@ diff --git a/components/module_installer/android/java/src/org/chromium/component sSessions.remove(moduleName); -@@ -133,15 +98,15 @@ class SplitCompatEngine implements InstallEngine { +@@ -131,15 +97,15 @@ class SplitCompatEngine implements InstallEngine { } private void registerUpdateListener() { diff --git a/build/patches/User-agent-customization.patch b/build/patches/User-agent-customization.patch index 5b184f1d..ea635ee6 100644 --- a/build/patches/User-agent-customization.patch +++ b/build/patches/User-agent-customization.patch @@ -73,8 +73,8 @@ 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 -@@ -657,4 +657,6 @@ chrome_java_resources = [ - "java/res/xml/privacy_preferences.xml", +@@ -662,4 +662,6 @@ chrome_java_resources = [ + "java/res/xml/privacy_preferences_v2.xml", "java/res/xml/search_widget_info.xml", "java/res/xml/tracing_preferences.xml", + "java/res/xml/useragent_preferences.xml", @@ -83,7 +83,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 -@@ -891,6 +891,7 @@ chrome_java_sources = [ +@@ -883,6 +883,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", @@ -256,7 +256,7 @@ new file mode 100644 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java --- a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java -@@ -50,6 +50,7 @@ import org.chromium.content_public.browser.DeviceUtils; +@@ -49,6 +49,7 @@ import org.chromium.content_public.browser.DeviceUtils; import org.chromium.content_public.browser.SpeechRecognition; import org.chromium.content_public.browser.UiThreadTaskTraits; import org.chromium.net.NetworkChangeNotifier; @@ -264,7 +264,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrow import java.io.File; import java.util.ArrayList; -@@ -319,11 +320,13 @@ public class ChromeBrowserInitializer { +@@ -316,11 +317,13 @@ public class ChromeBrowserInitializer { @Override public void onSuccess() { @@ -1069,7 +1069,7 @@ diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc 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 -@@ -1255,6 +1255,14 @@ extern const char kDesktopSharingHubEnabled[]; +@@ -1267,6 +1267,14 @@ extern const char kDesktopSharingHubEnabled[]; #if !BUILDFLAG(IS_ANDROID) extern const char kLastWhatsNewVersion[]; #endif @@ -1108,7 +1108,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 -@@ -430,6 +430,13 @@ std::string GetUserAgent( +@@ -443,6 +443,13 @@ std::string GetUserAgent( std::string GetReducedUserAgent( ForceMajorVersionToMinorPosition force_major_to_minor) { @@ -1122,7 +1122,7 @@ diff --git a/components/embedder_support/user_agent_utils.cc b/components/embedd return content::GetReducedUserAgent( base::CommandLine::ForCurrentProcess()->HasSwitch( switches::kUseMobileUserAgent), -@@ -602,6 +609,10 @@ blink::UserAgentMetadata GetUserAgentMetadata(const PrefService* pref_service) { +@@ -615,6 +622,10 @@ blink::UserAgentMetadata GetUserAgentMetadata(const PrefService* pref_service) { policy::policy_prefs::kUserAgentClientHintsGREASEUpdateEnabled); ua_options.force_major_to_minor = GetMajorToMinorFromPrefs(pref_service); } @@ -1133,7 +1133,7 @@ diff --git a/components/embedder_support/user_agent_utils.cc b/components/embedd metadata.brand_version_list = GetBrandMajorVersionList( enable_updated_grease_by_policy, ua_options.force_major_to_minor); metadata.brand_full_version_list = GetBrandFullVersionList( -@@ -639,7 +650,9 @@ void SetDesktopUserAgentOverride(content::WebContents* web_contents, +@@ -652,7 +663,9 @@ void SetDesktopUserAgentOverride(content::WebContents* web_contents, blink::UserAgentOverride spoofed_ua; spoofed_ua.ua_string_override = content::BuildUserAgentFromOSAndProduct( @@ -1147,7 +1147,7 @@ diff --git a/components/embedder_support/user_agent_utils.cc b/components/embedd diff --git a/content/browser/renderer_host/navigation_controller_android.cc b/content/browser/renderer_host/navigation_controller_android.cc --- a/content/browser/renderer_host/navigation_controller_android.cc +++ b/content/browser/renderer_host/navigation_controller_android.cc -@@ -255,6 +255,7 @@ NavigationControllerAndroid::LoadUrl( +@@ -252,6 +252,7 @@ NavigationControllerAndroid::LoadUrl( jboolean can_load_local_resources, jboolean is_renderer_initiated, jboolean should_replace_current_entry, @@ -1155,7 +1155,7 @@ diff --git a/content/browser/renderer_host/navigation_controller_android.cc b/co const JavaParamRef& j_initiator_origin, jboolean has_user_gesture, jboolean should_clear_history_list, -@@ -327,6 +328,9 @@ NavigationControllerAndroid::LoadUrl( +@@ -324,6 +325,9 @@ NavigationControllerAndroid::LoadUrl( params.navigation_ui_data = std::move(navigation_ui_data); @@ -1179,7 +1179,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 -@@ -3451,6 +3451,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( +@@ -3500,6 +3500,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( switches::kLacrosUseChromeosProtectedMedia, switches::kLacrosUseChromeosProtectedAv1, #endif @@ -1198,7 +1198,7 @@ diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser #include "base/bind.h" #include "base/check_op.h" #include "base/command_line.h" -@@ -2822,6 +2823,9 @@ const blink::web_pref::WebPreferences WebContentsImpl::ComputeWebPreferences() { +@@ -2882,6 +2883,9 @@ const blink::web_pref::WebPreferences WebContentsImpl::ComputeWebPreferences() { !renderer_preferences_.user_agent_override.ua_metadata_override->mobile) #endif prefs.viewport_meta_enabled = false; @@ -1231,10 +1231,10 @@ 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 -@@ -922,7 +922,6 @@ void RenderThreadImpl::InitializeRenderer( +@@ -911,7 +911,6 @@ void RenderThreadImpl::InitializeRenderer( const blink::UserAgentMetadata& user_agent_metadata, const std::vector& cors_exempt_header_list, - blink::mojom::AttributionOsSupport attribution_os_support) { + attribution_reporting::mojom::OsSupport attribution_os_support) { - DCHECK(user_agent_.IsNull()); DCHECK(reduced_user_agent_.IsNull()); DCHECK(full_user_agent_.IsNull()); diff --git a/build/patches/Welcome-screen.patch b/build/patches/Welcome-screen.patch index 3d54d860..7407a92d 100644 --- a/build/patches/Welcome-screen.patch +++ b/build/patches/Welcome-screen.patch @@ -68,7 +68,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ChildA diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java -@@ -32,9 +32,6 @@ import org.chromium.chrome.browser.customtabs.CustomTabActivity; +@@ -31,9 +31,6 @@ import org.chromium.chrome.browser.customtabs.CustomTabActivity; import org.chromium.chrome.browser.fonts.FontPreloader; import org.chromium.chrome.browser.metrics.UmaUtils; import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory; @@ -160,7 +160,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR // SigninFirstRunFragment doesn't use getProperties() and can be shown right away, // without waiting for FirstRunFlowSequencer. createFirstPage(); -@@ -540,10 +506,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa +@@ -547,10 +513,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa public void acceptTermsOfService(boolean allowMetricsAndCrashUploading) { assert mNativeInitializationPromise.isFulfilled(); @@ -671,7 +671,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAnd 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 -@@ -2907,11 +2907,30 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

%1$sGoogle Maps will open in Chrome. By continuing, you agree to the <LINK1>Google Terms of Service</LINK1>, and the <LINK2>Google Chrome and ChromeOS Additional Terms of Service</LINK2>. The <LINK3>Privacy Policy</LINK3> also applies. diff --git a/build/patches/build-remove-calling-untrusted-hooks.patch b/build/patches/build-remove-calling-untrusted-hooks.patch index 29fc51ad..f5efaae4 100644 --- a/build/patches/build-remove-calling-untrusted-hooks.patch +++ b/build/patches/build-remove-calling-untrusted-hooks.patch @@ -7,13 +7,13 @@ sysroot. License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - DEPS | 124 ++--------------------------------------------------------- - 1 file changed, 3 insertions(+), 121 deletions(-) + DEPS | 122 +---------------------------------------------------------- + 1 file changed, 2 insertions(+), 120 deletions(-) diff --git a/DEPS b/DEPS --- a/DEPS +++ b/DEPS -@@ -121,7 +121,7 @@ vars = { +@@ -110,7 +110,7 @@ vars = { # Check out and download nacl by default, unless on an arm mac. # This can be disabled e.g. with custom_vars. @@ -22,7 +22,7 @@ diff --git a/DEPS b/DEPS # By default, do not check out src-internal. This can be overridden e.g. with # custom_vars. -@@ -174,7 +174,7 @@ vars = { +@@ -163,7 +163,7 @@ vars = { # support for other platforms may be added in the future. 'checkout_openxr' : 'checkout_win', @@ -31,16 +31,7 @@ diff --git a/DEPS b/DEPS # By default bot checkouts the WPR archive files only when this # flag is set True. -@@ -196,7 +196,7 @@ vars = { - # - workstation.qemu-x64 - # Hardware: - # - workstation_eng.chromebook-x64 -- # - workstation_eng.chromebook-x64-dfv2 -+ # - workstation_eng.chromebook-x64-dfv2 - # - # Since the images are hundreds of MB, default to only downloading the image - # most commonly useful for developers. Bots and developers that need to use -@@ -3974,49 +3974,6 @@ hooks = [ +@@ -3956,49 +3956,6 @@ hooks = [ 'sync', '--extract', ], }, @@ -90,7 +81,7 @@ diff --git a/DEPS b/DEPS { # Case-insensitivity for the Win SDK. Must run before win_toolchain below. 'name': 'ciopfs_linux', -@@ -4188,57 +4145,6 @@ hooks = [ +@@ -4170,57 +4127,6 @@ hooks = [ ], }, @@ -148,7 +139,7 @@ diff --git a/DEPS b/DEPS # Pull rc binaries using checked-in hashes. { 'name': 'rc_win', -@@ -4264,30 +4170,6 @@ hooks = [ +@@ -4246,30 +4152,6 @@ hooks = [ '-s', 'src/build/toolchain/win/rc/mac/rc.sha1', ], }, diff --git a/build/patches/dns-send-IPv6-connectivity-probes-to-RIPE-DNS.patch b/build/patches/dns-send-IPv6-connectivity-probes-to-RIPE-DNS.patch index 08a9cb21..7ecab059 100644 --- a/build/patches/dns-send-IPv6-connectivity-probes-to-RIPE-DNS.patch +++ b/build/patches/dns-send-IPv6-connectivity-probes-to-RIPE-DNS.patch @@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc --- a/net/dns/host_resolver_manager.cc +++ b/net/dns/host_resolver_manager.cc -@@ -151,12 +151,12 @@ const unsigned kMinimumTTLSeconds = kCacheEntryTTLSeconds; +@@ -154,12 +154,12 @@ const unsigned kMinimumTTLSeconds = kCacheEntryTTLSeconds; // Time between IPv6 probes, i.e. for how long results of each IPv6 probe are // cached. diff --git a/build/patches/do-not-add-suffix-to-package-name.patch b/build/patches/do-not-add-suffix-to-package-name.patch index 7e72146c..80fd8dbd 100644 --- a/build/patches/do-not-add-suffix-to-package-name.patch +++ b/build/patches/do-not-add-suffix-to-package-name.patch @@ -10,7 +10,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 -@@ -54,7 +54,7 @@ if (current_toolchain == default_toolchain) { +@@ -50,7 +50,7 @@ if (current_toolchain == default_toolchain) { _default_package = "org.chromium.chrome" if (use_stable_package_name_for_trichrome) { _default_package += ".stable" diff --git a/build/patches/kill-Location-fall-back-to-system.patch b/build/patches/kill-Location-fall-back-to-system.patch index 8f288533..e9817f07 100644 --- a/build/patches/kill-Location-fall-back-to-system.patch +++ b/build/patches/kill-Location-fall-back-to-system.patch @@ -11,7 +11,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/services/device/geolocation/BUILD.gn b/services/device/geolocation/BUILD.gn --- a/services/device/geolocation/BUILD.gn +++ b/services/device/geolocation/BUILD.gn -@@ -159,7 +159,6 @@ if (is_android) { +@@ -160,7 +160,6 @@ if (is_android) { "android/java/src/org/chromium/device/geolocation/LocationProviderAdapter.java", "android/java/src/org/chromium/device/geolocation/LocationProviderAndroid.java", "android/java/src/org/chromium/device/geolocation/LocationProviderFactory.java", diff --git a/build/patches/mime_util-force-text-x-suse-ymp-to-be-downloaded.patch b/build/patches/mime_util-force-text-x-suse-ymp-to-be-downloaded.patch index ba37c8c4..6249fa4f 100644 --- a/build/patches/mime_util-force-text-x-suse-ymp-to-be-downloaded.patch +++ b/build/patches/mime_util-force-text-x-suse-ymp-to-be-downloaded.patch @@ -13,7 +13,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/third_party/blink/common/mime_util/mime_util.cc b/third_party/blink/common/mime_util/mime_util.cc --- a/third_party/blink/common/mime_util/mime_util.cc +++ b/third_party/blink/common/mime_util/mime_util.cc -@@ -83,6 +83,7 @@ static const char* const kUnsupportedTextTypes[] = { +@@ -82,6 +82,7 @@ static const char* const kUnsupportedTextTypes[] = { "text/x-csv", "text/x-vcf", "text/rtf", diff --git a/build/patches/openH264-enable-ARM-ARM64-optimizations.patch b/build/patches/openH264-enable-ARM-ARM64-optimizations.patch index 8ac884ba..b3367460 100644 --- a/build/patches/openH264-enable-ARM-ARM64-optimizations.patch +++ b/build/patches/openH264-enable-ARM-ARM64-optimizations.patch @@ -33,7 +33,7 @@ diff --git a/third_party/blink/renderer/modules/mediarecorder/h264_encoder.cc b/ diff --git a/third_party/openh264/BUILD.gn b/third_party/openh264/BUILD.gn --- a/third_party/openh264/BUILD.gn +++ b/third_party/openh264/BUILD.gn -@@ -139,8 +139,12 @@ if (use_assembler) { +@@ -131,8 +131,12 @@ if (use_assembler) { source_set("common") { sources = openh264_common_sources @@ -48,7 +48,7 @@ diff --git a/third_party/openh264/BUILD.gn b/third_party/openh264/BUILD.gn } include_dirs = openh264_common_include_dirs -@@ -165,8 +169,12 @@ source_set("common") { +@@ -157,8 +161,12 @@ source_set("common") { source_set("processing") { sources = openh264_processing_sources @@ -63,7 +63,7 @@ diff --git a/third_party/openh264/BUILD.gn b/third_party/openh264/BUILD.gn } include_dirs = openh264_processing_include_dirs -@@ -182,8 +190,12 @@ source_set("processing") { +@@ -174,8 +182,12 @@ source_set("processing") { source_set("encoder") { sources = openh264_encoder_sources diff --git a/build/patches/ungoogled-chromium-Disable-intranet-detector.patch b/build/patches/ungoogled-chromium-Disable-intranet-detector.patch index 12cbcffd..b275de4f 100644 --- a/build/patches/ungoogled-chromium-Disable-intranet-detector.patch +++ b/build/patches/ungoogled-chromium-Disable-intranet-detector.patch @@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/intranet_redirect_detector.cc b/chrome/browser/intranet_redirect_detector.cc --- a/chrome/browser/intranet_redirect_detector.cc +++ b/chrome/browser/intranet_redirect_detector.cc -@@ -119,9 +119,7 @@ void IntranetRedirectDetector::FinishSleep() { +@@ -118,9 +118,7 @@ void IntranetRedirectDetector::FinishSleep() { simple_loaders_.clear(); resulting_origins_.clear(); diff --git a/build/patches/ungoogled-chromium-Disable-profile-avatar.patch b/build/patches/ungoogled-chromium-Disable-profile-avatar.patch index 2316c1b4..30e71d2f 100644 --- a/build/patches/ungoogled-chromium-Disable-profile-avatar.patch +++ b/build/patches/ungoogled-chromium-Disable-profile-avatar.patch @@ -13,7 +13,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 -@@ -1436,8 +1436,6 @@ static_library("browser") { +@@ -1430,8 +1430,6 @@ static_library("browser") { "profiles/profile_attributes_storage.cc", "profiles/profile_attributes_storage.h", "profiles/profile_attributes_storage_observer.h", diff --git a/build/patches/ungoogled-chromium-Disable-translate-integration.patch b/build/patches/ungoogled-chromium-Disable-translate-integration.patch index a7960132..00927bae 100644 --- a/build/patches/ungoogled-chromium-Disable-translate-integration.patch +++ b/build/patches/ungoogled-chromium-Disable-translate-integration.patch @@ -167,7 +167,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 -@@ -1557,9 +1557,6 @@ Your Google account may have other forms of browsing history like searches and a +@@ -1854,9 +1854,6 @@ Your Google account may have other forms of browsing history like searches and a Websites will show text in your preferred language, when possible. @@ -180,8 +180,8 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro diff --git a/components/translate/core/browser/translate_manager.cc b/components/translate/core/browser/translate_manager.cc --- a/components/translate/core/browser/translate_manager.cc +++ b/components/translate/core/browser/translate_manager.cc -@@ -888,8 +888,9 @@ void TranslateManager::FilterIsTranslatePossible( - ->LogAutofillAssistantDeferredTriggerDecision(); +@@ -865,8 +865,9 @@ void TranslateManager::FilterIsTranslatePossible( + TriggerDecision::kDisabledOffline); } - if (!ignore_missing_key_for_testing_ && @@ -195,7 +195,7 @@ diff --git a/components/translate/core/browser/translate_manager.cc b/components diff --git a/components/translate/core/browser/translate_script.cc b/components/translate/core/browser/translate_script.cc --- a/components/translate/core/browser/translate_script.cc +++ b/components/translate/core/browser/translate_script.cc -@@ -126,19 +126,12 @@ void TranslateScript::OnScriptFetchComplete(bool success, +@@ -125,19 +125,12 @@ void TranslateScript::OnScriptFetchComplete(bool success, data_ = base::StringPrintf("var translateApiKey = '%s';\n", google_apis::GetAPIKey().c_str()); diff --git a/build/patches/ungoogled-chromium-no-special-hosts-domains.patch b/build/patches/ungoogled-chromium-no-special-hosts-domains.patch index afb7747c..572675b1 100644 --- a/build/patches/ungoogled-chromium-no-special-hosts-domains.patch +++ b/build/patches/ungoogled-chromium-no-special-hosts-domains.patch @@ -654,7 +654,7 @@ diff --git a/components/search_engines/template_url.cc b/components/search_engin 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 -@@ -474,27 +474,6 @@ bool HasGoogleHost(const GURL& url) { +@@ -485,27 +485,6 @@ bool HasGoogleHost(const GURL& url) { } bool IsGoogleHost(base::StringPiece host) { @@ -685,7 +685,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 -@@ -2719,7 +2719,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( +@@ -2561,7 +2561,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( } #endif // BUILDFLAG(IS_CT_SUPPORTED) diff --git a/build/patches/updater-disable-updater-pings.patch b/build/patches/updater-disable-updater-pings.patch index a3c2d54b..f8ae7db4 100644 --- a/build/patches/updater-disable-updater-pings.patch +++ b/build/patches/updater-disable-updater-pings.patch @@ -31,7 +31,7 @@ diff --git a/components/component_updater/component_updater_url_constants.cc b/c 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 -@@ -45,8 +45,7 @@ ConfiguratorImpl::ConfiguratorImpl( +@@ -38,8 +38,7 @@ ConfiguratorImpl::ConfiguratorImpl( : background_downloads_enabled_(config_policy.BackgroundDownloadsEnabled()), deltas_enabled_(config_policy.DeltaUpdatesEnabled()), fast_update_(config_policy.FastUpdate()), @@ -41,7 +41,7 @@ diff --git a/components/component_updater/configurator_impl.cc b/components/comp url_source_override_(config_policy.UrlSourceOverride()), initial_delay_(config_policy.InitialDelay()) { if (config_policy.TestRequest()) { -@@ -81,8 +80,6 @@ std::vector ConfiguratorImpl::UpdateUrl() const { +@@ -74,8 +73,6 @@ std::vector ConfiguratorImpl::UpdateUrl() const { std::vector urls{GURL(kUpdaterJSONDefaultUrl), GURL(kUpdaterJSONFallbackUrl)}; @@ -59,7 +59,7 @@ diff --git a/components/component_updater/configurator_impl.h b/components/compo const bool pings_enabled_; - const bool require_encryption_; const GURL url_source_override_; - const double initial_delay_; + const base::TimeDelta initial_delay_; }; -- 2.25.1 diff --git a/build/patches/webRTC-do-not-expose-local-IP-addresses.patch b/build/patches/webRTC-do-not-expose-local-IP-addresses.patch index d1e2de34..e1684a41 100644 --- a/build/patches/webRTC-do-not-expose-local-IP-addresses.patch +++ b/build/patches/webRTC-do-not-expose-local-IP-addresses.patch @@ -29,7 +29,7 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_u diff --git a/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc b/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc --- a/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc +++ b/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc -@@ -105,7 +105,9 @@ WebRTCIPHandlingPolicy GetWebRTCIPHandlingPolicy(const String& preference) { +@@ -123,7 +123,9 @@ WebRTCIPHandlingPolicy GetWebRTCIPHandlingPolicy(const String& preference) { return kDefaultPublicInterfaceOnly; if (preference == kWebRTCIPHandlingDisableNonProxiedUdp) return kDisableNonProxiedUdp; @@ -40,7 +40,7 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/peer_connection_d } bool IsValidPortRange(uint16_t min_port, uint16_t max_port) { -@@ -830,7 +832,7 @@ PeerConnectionDependencyFactory::CreatePortAllocator( +@@ -776,7 +778,7 @@ PeerConnectionDependencyFactory::CreatePortAllocator( break; }