Merge pull request #7061 from brave/87.0.4280.49

Updated patches from Chromium 87.0.4280.47 to Chromium 87.0.4280.49.

android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java

@@ -70,6 +70,7 @@ public class BraveToolbarManager extends ToolbarManager {
  private LocationBarModel mLocationBarModel;
  private TopToolbarCoordinator mToolbar;
  private ObservableSupplier<BookmarkBridge> mBookmarkBridgeSupplier;
+ private ObservableSupplier<Boolean> mOmniboxFocusStateSupplier;
 
  private boolean mIsBottomToolbarVisible;
  private View mRootBottomView;
@@ -88,14 +89,16 @@ public BraveToolbarManager(ChromeActivity activity, BrowserControlsSizer control
  OneshotSupplier<OverviewModeBehavior> overviewModeBehaviorSupplier,
  OneshotSupplier<AppMenuCoordinator> appMenuCoordinatorSupplier,
  boolean shouldShowUpdateBadge,
- ObservableSupplier<TabModelSelector> tabModelSelectorSupplier) {
+ ObservableSupplier<TabModelSelector> tabModelSelectorSupplier,
+ ObservableSupplier<Boolean> omniboxFocusStateSupplier) {
  super(activity, controlsSizer, fullscreenManager, controlContainer, invalidator,
  urlFocusChangedCallback, themeColorProvider, tabObscuringHandler,
  shareDelegateSupplier, identityDiscController, buttonDataProviders, tabProvider,
  scrimCoordinator, toolbarActionModeCallback, findToolbarManager, profileSupplier,
  bookmarkBridgeSupplier, canAnimateNativeBrowserControls,
  overviewModeBehaviorSupplier, appMenuCoordinatorSupplier, shouldShowUpdateBadge,
- tabModelSelectorSupplier);
+ tabModelSelectorSupplier, omniboxFocusStateSupplier);
+ mOmniboxFocusStateSupplier = omniboxFocusStateSupplier;
  }
 
  @Override
@@ -111,7 +114,7 @@ public void enableBottomControls() {
  mToolbarTabController::openHomepage,
  (reason)
  -> setUrlBarFocus(true, reason),
- mOverviewModeBehaviorSupplier, mScrimCoordinator);
+ mOverviewModeBehaviorSupplier, mScrimCoordinator, mOmniboxFocusStateSupplier);
  ((BraveBottomControlsCoordinator) mBottomControlsCoordinator).setRootView(mRootBottomView);
  boolean isBottomToolbarVisible = BottomToolbarConfiguration.isBottomToolbarEnabled()
  && mActivity.getResources().getConfiguration().orientation

android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsCoordinator.java

@@ -57,11 +57,12 @@ public BraveBottomControlsCoordinator(OnLongClickListener tabSwitcherLongclickLi
  Supplier<Boolean> showStartSurfaceCallable, Runnable openHomepageAction,
  Callback<Integer> setUrlBarFocusAction,
  OneshotSupplier<OverviewModeBehavior> overviewModeBehaviorSupplier,
- ScrimCoordinator scrimCoordinator) {
+ ScrimCoordinator scrimCoordinator,
+ ObservableSupplier<Boolean> omniboxFocusStateSupplier) {
  super(controlsSizer, fullscreenManager, stub, tabProvider, themeColorProvider,
  shareDelegateSupplier, menuButtonHelperSupplier, showStartSurfaceCallable,
  openHomepageAction, setUrlBarFocusAction, overviewModeBehaviorSupplier,
- scrimCoordinator);
+ scrimCoordinator, omniboxFocusStateSupplier);
 
  mTabSwitcherLongclickListener = tabSwitcherLongclickListener;
  mTabProvider = tabProvider;

patches/base-BUILD.gn.patch

@@ -1,8 +1,8 @@
 diff --git a/base/BUILD.gn b/base/BUILD.gn
-index 1d449b35bf403ffc933cceabffc1f1e570fdae16..9c196bbfae226682d064e801c2f1e2625ef45eb8 100644
+index 28b43b5781c3d8b59b16d487b059c7fffb7a7307..7013999044ca8d9a1d87dc3dc67d77502a8ecded 100644
 --- a/base/BUILD.gn
 +++ b/base/BUILD.gn
-@@ -3686,6 +3686,7 @@ if (is_android) {
+@@ -3690,6 +3690,7 @@ if (is_android) {
  "android/java/src/org/chromium/base/task/TaskTraits.java",
  "android/java/src/org/chromium/base/task/TaskTraitsExtensionDescriptor.java",
  ]

patches/chrome-VERSION.patch

@@ -1,12 +1,12 @@
 diff --git a/chrome/VERSION b/chrome/VERSION
-index 7f09f12c5b476b720163cb3f64625ab365d42904..80a1c987165668b2d0cc96bebe946bfc0a2f0124 100644
+index 2dc793b184d0d26ab10245128eb6c54a970217fe..d9af09609851504264c0479bad3ea87b164b58e7 100644
 --- a/chrome/VERSION
 +++ b/chrome/VERSION
 @@ -1,4 +1,4 @@
  MAJOR=87
 -MINOR=0
 -BUILD=4280
--PATCH=47
+-PATCH=49
 +MINOR=1
 +BUILD=17
 +PATCH=62

patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch

@@ -1,8 +1,8 @@
 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
-index f47d98236abb257f3a87e44c216f15bec6928b3c..0b8d4f7d51be81e3258ff399e427c20b4718f9f9 100644
+index cdeb6d2ebb3d550265e00ac74a3455da20c590a7..47df8bb6927003fb6fd5e66646360b22c7ca15de 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
-@@ -304,7 +304,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
+@@ -308,7 +308,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
  ThemeColorProvider overviewModeThemeColorProvider = mAppThemeColorProvider;
  ToolbarLayout toolbarLayout = mActivity.findViewById(R.id.toolbar);
 
@@ -11,7 +11,7 @@ index f47d98236abb257f3a87e44c216f15bec6928b3c..0b8d4f7d51be81e3258ff399e427c20b
  mControlsVisibilityDelegate, mActivity,
  (focus, type)
  -> setUrlBarFocus(focus, type),
-@@ -313,7 +313,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
+@@ -317,7 +317,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
  mActivity.isCustomTab() ? mCustomTabThemeColorProvider
  : browsingModeThemeColorProvider,
  R.id.menu_button_wrapper);
@@ -20,7 +20,7 @@ index f47d98236abb257f3a87e44c216f15bec6928b3c..0b8d4f7d51be81e3258ff399e427c20b
  appMenuCoordinatorSupplier, mControlsVisibilityDelegate, mActivity,
  (focus, type)
  -> setUrlBarFocus(focus, type),
-@@ -631,7 +631,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
+@@ -635,7 +635,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
  ThemeColorProvider browsingModeThemeColorProvider,
  MenuButtonCoordinator startSurfaceMenuButtonCoordinator, Invalidator invalidator,
  IdentityDiscController identityDiscController) {

patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomControlsCoordinator.java.patch

@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator.java
-index 43d168eed3178c3fe45769d48dadbb9e8e108729..7e2767c6c8b271e3ad0f8b12c21bfbe0915fe80c 100644
+index 16658d24fa113947cdba81456df81af11fe3f5ba..a0a8fe960bbfdbe28a864612d427c16d3e562a17 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator.java
-@@ -101,7 +101,7 @@ public class BottomControlsCoordinator {
+@@ -103,7 +103,7 @@ public class BottomControlsCoordinator {
  View container = root.findViewById(R.id.bottom_container_slot);
  ViewGroup.LayoutParams params = container.getLayoutParams();
  params.height = root.getResources().getDimensionPixelOffset(bottomControlsHeightId);

patches/chrome-android-java-src-org-chromium-chrome-browser-ui-RootUiCoordinator.java.patch

@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
-index f5c9abcf96848d471fce3858b6595f19ff84f01b..2fb35b036e013fa80ed02cef6d2765ab7708d4a3 100644
+index ff49f8f2fc9e3f0a0a91126048e0e0c5cd901ea3..c1560a4390df3d816d549cbe25c05cb81f80ea53 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
 @@ -528,7 +528,7 @@ public class RootUiCoordinator

patches/chrome-browser-BUILD.gn.patch

@@ -1,16 +1,16 @@
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index 4dd4cabe46e19061e944174a64ef7b6ee5b49737..1e8249fc5b802bf6f7b48386358468e5323fccbf 100644
+index 5777c231b6bb7640695c55a636b654202885b8ed..43ef10984534a8a3a9734999d72b8cdc1e2abd8e 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2283,6 +2283,7 @@ static_library("browser") {
+@@ -2281,6 +2281,7 @@ static_library("browser") {
  "//ui/web_dialogs",
  "//ui/webui",
  "//ui/webui/resources/cr_components/customize_themes:mojom",
 + "//brave/browser:browser_process",
  ]
  if (is_chromeos) {
  deps += [
-@@ -4026,6 +4027,7 @@ static_library("browser") {
+@@ -4025,6 +4026,7 @@ static_library("browser") {
  sources += [ "first_run/first_run_internal_posix.cc" ]
  }
  }

patches/chrome-browser-about_flags.cc.patch

@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
-index 4a01f629e3d45f5dbda273a85b985bf684cacf22..55222ed1fc7cc323a8a599bf9ca773b25cbb76ca 100644
+index 78bf907f995cf7ee8e2bf3b6d40a30ebed658ab9..efda7e0096ff5ecbdd4c00ffb6015d3d8f938438 100644
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
 @@ -294,14 +294,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = {
@@ -21,7 +21,7 @@ index 4a01f629e3d45f5dbda273a85b985bf684cacf22..55222ed1fc7cc323a8a599bf9ca773b2
 
  const FeatureEntry::Choice kPassiveListenersChoices[] = {
  {flags_ui::kGenericExperimentChoiceDefault, "", ""},
-@@ -6726,6 +6726,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -6727,6 +6727,7 @@ const FeatureEntry kFeatureEntries[] = {
  // "LoginCustomFlags" in tools/metrics/histograms/enums.xml. See "Flag
  // Histograms" in tools/metrics/histograms/README.md (run the
  // AboutFlagsHistogramTest unit test to verify this process).

patches/chrome-browser-browser_process_impl.h.patch

@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
-index 8a8d8a8206907722a2d4db3288c90f9ad7e7b3c4..f9d1eae11e3f2472bac157573bcc0143840aff58 100644
+index 7cc470fe599d4c462cabad81fb205c63ee84ad77..ed7453e1519bbfe65fe6b5d3ffce1e60842743b3 100644
 --- a/chrome/browser/browser_process_impl.h
 +++ b/chrome/browser/browser_process_impl.h
-@@ -202,6 +202,7 @@ class BrowserProcessImpl : public BrowserProcess,
+@@ -204,6 +204,7 @@ class BrowserProcessImpl : public BrowserProcess,
  static void RegisterPrefs(PrefRegistrySimple* registry);
 
  private:

patches/chrome-browser-flags-android-chrome_feature_list.cc.patch

@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
-index 25f87f116a2d71a0f1e724d4ebfa976642d19fd0..fab08bce97c87184ae206175d60434d092d95ed8 100644
+index 159823b3dffc8f5f1d3aa8f97c4f73b7c43c7933..623c8e7a9d49833f0dc4c605741d76dabb95ed07 100644
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -269,6 +269,7 @@ const base::Feature* kFeaturesExposedToJava[] = {
+@@ -271,6 +271,7 @@ const base::Feature* kFeaturesExposedToJava[] = {
  };
 
  const base::Feature* FindFeatureExposedToJava(const std::string& feature_name) {

patches/chrome-browser-prefs-browser_prefs.cc.patch

@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
-index 2f6a9715096328f39c9b67b1074c5b3de5a1b55e..88daac16530cb15bf373e6fc73598937eb5e0262 100644
+index 04e00fcda68dd94d210a6b92f8d8bdfa5245336d..f6b00ab8c8fc84c2e2ef28435e6afa9ec494ced8 100644
 --- a/chrome/browser/prefs/browser_prefs.cc
 +++ b/chrome/browser/prefs/browser_prefs.cc
 @@ -731,6 +731,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {