Upgrade from Chromium 78.0.3904.108 to Chromium 79.0.3945.45

android/java/org/chromium/chrome/browser/BraveRewardsHelper.java

@@ -35,7 +35,7 @@
 import org.chromium.chrome.browser.favicon.LargeIconBridge;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tabmodel.TabModelImpl;
-import org.chromium.chrome.browser.widget.RoundedIconGenerator;
+import org.chromium.chrome.browser.ui.widget.RoundedIconGenerator;
 import org.chromium.chrome.R;
 
 

android/java/org/chromium/chrome/browser/BraveRewardsSiteBannerActivity.java

@@ -35,7 +35,7 @@
 import android.graphics.Bitmap;
 import android.widget.ImageView;
 import org.chromium.chrome.browser.tab.Tab;
-import org.chromium.chrome.browser.widget.RoundedIconGenerator;
+import org.chromium.chrome.browser.ui.widget.RoundedIconGenerator;
 import org.chromium.base.task.AsyncTask;
 import android.graphics.BitmapFactory;
 import org.chromium.base.annotations.CalledByNative;

android/java/org/chromium/chrome/browser/appmenu/BraveAppMenuPropertiesDelegateImpl.java

@@ -15,6 +15,7 @@
 import org.chromium.base.ObservableSupplier;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ActivityTabProvider;
+import org.chromium.chrome.browser.bookmarks.BookmarkBridge;
 import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior;
 import org.chromium.chrome.browser.multiwindow.MultiWindowModeStateDispatcher;
 import org.chromium.chrome.browser.notifications.BraveSetDefaultBrowserNotificationService;
@@ -24,12 +25,14 @@
 public class BraveAppMenuPropertiesDelegateImpl extends AppMenuPropertiesDelegateImpl {
     private Menu mMenu;
 
-    public BraveAppMenuPropertiesDelegateImpl(Context context, ActivityTabProvider activityTabProvider,
+    public BraveAppMenuPropertiesDelegateImpl(Context context,
+            ActivityTabProvider activityTabProvider,
             MultiWindowModeStateDispatcher multiWindowModeStateDispatcher,
             TabModelSelector tabModelSelector, ToolbarManager toolbarManager, View decorView,
-            @Nullable ObservableSupplier<OverviewModeBehavior> overviewModeBehaviorSupplier) {
+            @Nullable ObservableSupplier<OverviewModeBehavior> overviewModeBehaviorSupplier,
+            ObservableSupplier<BookmarkBridge> bookmarkBridgeSupplier) {
         super(context, activityTabProvider, multiWindowModeStateDispatcher, tabModelSelector,
-              toolbarManager, decorView, overviewModeBehaviorSupplier);
+                toolbarManager, decorView, overviewModeBehaviorSupplier, bookmarkBridgeSupplier);
     }
 
     @Override

android/java/org/chromium/chrome/browser/preferences/themes/BraveThemePreferences.java

@@ -5,13 +5,15 @@
 
 package org.chromium.chrome.browser.preferences.themes;
 
+import static org.chromium.chrome.browser.preferences.ChromePreferenceManager.DARKEN_WEBSITES_ENABLED_KEY;
 import static org.chromium.chrome.browser.preferences.ChromePreferenceManager.UI_THEME_SETTING_KEY;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 
 import org.chromium.chrome.R;
 import org.chromium.base.BuildInfo;
+import org.chromium.chrome.browser.ChromeFeatureList;
 import org.chromium.chrome.browser.night_mode.GlobalNightModeStateProviderHolder;
 import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
 import org.chromium.chrome.browser.preferences.PreferenceUtils;
@@ -22,6 +24,7 @@ public void onCreatePreferences(@Nullable Bundle savedInstanceState, String root
         PreferenceUtils.addPreferencesFromResource(this, R.xml.brave_theme_preferences);
         getActivity().setTitle(getResources().getString(R.string.prefs_themes));
 
+        ChromePreferenceManager chromePreferenceManager = ChromePreferenceManager.getInstance();
         BraveRadioButtonGroupThemePreference radioButtonGroupThemePreference =
                 (BraveRadioButtonGroupThemePreference) findPreference(PREF_UI_THEME_PREF);
 
@@ -31,12 +34,18 @@ public void onCreatePreferences(@Nullable Bundle savedInstanceState, String root
                     ? ThemeSetting.DARK
                     : ThemeSetting.LIGHT;
         }
-        radioButtonGroupThemePreference.initialize(ChromePreferenceManager.getInstance().readInt(
-                UI_THEME_SETTING_KEY, defaultThemePref));
+        radioButtonGroupThemePreference.initialize(
+                chromePreferenceManager.readInt(UI_THEME_SETTING_KEY, defaultThemePref),
+                chromePreferenceManager.readBoolean(DARKEN_WEBSITES_ENABLED_KEY, false));
 
         radioButtonGroupThemePreference.setOnPreferenceChangeListener((preference, newValue) -> {
+            if (ChromeFeatureList.isEnabled(
+                        ChromeFeatureList.DARKEN_WEBSITES_CHECKBOX_IN_THEMES_SETTING)) {
+                chromePreferenceManager.writeBoolean(DARKEN_WEBSITES_ENABLED_KEY,
+                        radioButtonGroupThemePreference.isDarkenWebsitesEnabled());
+            }
             int theme = (int) newValue;
-            ChromePreferenceManager.getInstance().writeInt(UI_THEME_SETTING_KEY, theme);
+            chromePreferenceManager.writeInt(UI_THEME_SETTING_KEY, theme);
             return true;
         });
     }

android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java

@@ -10,12 +10,14 @@
 import org.chromium.base.ContextUtils;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.components.signin.AccountTrackerService;
+import org.chromium.components.signin.identitymanager.IdentityManager;
+import org.chromium.components.signin.identitymanager.IdentityMutator;
 import org.chromium.components.sync.AndroidSyncSettings;
 
 public class BraveSigninManager extends SigninManager {
-    BraveSigninManager(Context context, long nativeSigninManagerAndroid,
-            AccountTrackerService accountTrackerService) {
-        super(context, nativeSigninManagerAndroid, accountTrackerService,
+    BraveSigninManager(long nativeSigninManagerAndroid, AccountTrackerService accountTrackerService,
+            IdentityManager identityManager, IdentityMutator identityMutator) {
+        super(nativeSigninManagerAndroid, accountTrackerService, identityManager, identityMutator,
                 AndroidSyncSettings.get());
     }
 
@@ -30,11 +32,14 @@ public boolean isSigninSupported() {
     }
 
     @CalledByNative
-    private static SigninManager create(
-            long nativeSigninManagerAndroid, AccountTrackerService accountTrackerService) {
+    private static SigninManager create(long nativeSigninManagerAndroid,
+            AccountTrackerService accountTrackerService, IdentityManager identityManager,
+            IdentityMutator identityMutator) {
         assert nativeSigninManagerAndroid != 0;
         assert accountTrackerService != null;
-        return new BraveSigninManager(ContextUtils.getApplicationContext(),
-                nativeSigninManagerAndroid, accountTrackerService);
+        assert identityManager != null;
+        assert identityMutator != null;
+        return new BraveSigninManager(nativeSigninManagerAndroid, accountTrackerService,
+                identityManager, identityMutator);
     }
 }

android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java

@@ -48,11 +48,11 @@
 import org.chromium.chrome.browser.tabmodel.TabModelSelectorTabObserver;
 import org.chromium.chrome.browser.tabmodel.TabSelectionType;
 import org.chromium.chrome.browser.toolbar.top.ToolbarLayout;
-import org.chromium.chrome.browser.util.AccessibilityUtil;
 import org.chromium.chrome.browser.util.ColorUtils;
 import org.chromium.chrome.browser.util.MathUtils;
 import org.chromium.chrome.browser.util.PackageUtils;
 import org.chromium.ui.interpolators.BakedBezierInterpolator;
+import org.chromium.ui.widget.Toast;
 
 import java.net.URL;
 import java.util.List;
@@ -266,7 +266,7 @@ public boolean onLongClick(View v) {
           description = resources.getString(R.string.accessibility_toolbar_btn_brave_rewards);
       }*/
 
-      return AccessibilityUtil.showAccessibilityToast(context, v, description);
+      return Toast.showAnchoredToast(context, v, description);
   }
 
   public void populateUrlAnimatorSet(boolean hasFocus, int urlFocusToolbarButtonsDuration,