Merge pull request #13946 from brave/cr105

Upgrade from Chromium 104 to Chromium 105.

android/java/apk_for_test.flags

@@ -448,10 +448,6 @@
     public <init>(...);
 }
 
--keep class org.chromium.chrome.browser.omnibox.suggestions.AutocompleteCoordinator {
-    *** createViewProvider(...);
-}
-
 -keep class org.chromium.chrome.browser.omnibox.suggestions.BraveAutocompleteCoordinator {
     *** createViewProvider(...);
 }
@@ -470,8 +466,6 @@
     *** mDropdownHeight;
     *** mPriorityOrderedSuggestionProcessors;
     public <init>(...);
-    *** getVisibleSuggestionsCount(...);
-    *** getProcessorForSuggestion(...);
 }
 
 -keep class org.chromium.chrome.browser.omnibox.suggestions.BraveDropdownItemViewInfoListBuilder {

android/java/org/chromium/chrome/browser/externalnav/BraveExternalNavigationHandler.java

@@ -65,6 +65,7 @@ public class BraveExternalNavigationHandler extends ExternalNavigationHandler {
             params.getRedirectHandler().setShouldNotOverrideUrlLoadingOnCurrentRedirectChain();
         }
         GURL browserFallbackGURL = new GURL(browserFallbackUrl);
-        return clobberCurrentTab(browserFallbackGURL, params.getReferrerUrl());
+        return clobberCurrentTab(browserFallbackGURL, params.getReferrerUrl(),
+                params.getInitiatorOrigin(), params.isRendererInitiated());
     }
 }

android/java/org/chromium/chrome/browser/settings/BraveSettingsActivity.java

@@ -38,4 +38,10 @@ public class BraveSettingsActivity extends SettingsActivity {
         }
         return super.onOptionsItemSelected(item);
     }
+
+    @Override
+    protected boolean supportsDynamicColors() {
+        // Dynamic colors cause styling issues with Brave theme.
+        return false;
+    }
 }

android/java/org/chromium/chrome/browser/site_settings/BraveSiteSettingsDelegate.java

@@ -7,7 +7,7 @@ package org.chromium.chrome.browser.site_settings;
 
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.Bitmap;
+import android.graphics.drawable.Drawable;
 
 import org.chromium.base.Callback;
 import org.chromium.chrome.browser.ChromeTabbedActivity;
@@ -22,19 +22,12 @@ public class BraveSiteSettingsDelegate extends ChromeSiteSettingsDelegate {
     }
 
     @Override
-    public void closeButton() {
-        Intent intent =
-                new Intent(BraveActivity.getChromeTabbedActivity(), ChromeTabbedActivity.class);
-        intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
-        BraveActivity.getChromeTabbedActivity().startActivity(intent);
-    }
-
-    @Override
-    public void getFaviconImageForURL(GURL faviconUrl, Callback<Bitmap> callback) {
+    public void getFaviconImageForURL(GURL faviconUrl, Callback<Drawable> callback) {
         if (!faviconUrl.isValid()) {
             callback.onResult(null);
             return;
         }
+
         super.getFaviconImageForURL(faviconUrl, callback);
     }
 }

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

@@ -55,8 +55,6 @@ public class BraveTopToolbarCoordinator extends TopToolbarCoordinator {
             ObservableSupplier<AppMenuButtonHelper> appMenuButtonHelperSupplier,
             ObservableSupplier<TabModelSelector> tabModelSelectorSupplier,
             ObservableSupplier<Boolean> homepageEnabledSupplier,
-            ObservableSupplier<Boolean> startSurfaceAsHomepageSupplier,
-            ObservableSupplier<Boolean> homepageManagedByPolicySupplier,
             ObservableSupplier<Boolean> identityDiscStateSupplier,
             Callback<Runnable> invalidatorCallback, Supplier<ButtonData> identityDiscButtonSupplier,
             Supplier<ResourceManager> resourceManagerSupplier,
@@ -73,7 +71,6 @@ public class BraveTopToolbarCoordinator extends TopToolbarCoordinator {
                 layoutStateProviderSupplier, normalThemeColorProvider, overviewThemeColorProvider,
                 browsingModeMenuButtonCoordinator, overviewModeMenuButtonCoordinator,
                 appMenuButtonHelperSupplier, tabModelSelectorSupplier, homepageEnabledSupplier,
-                startSurfaceAsHomepageSupplier, homepageManagedByPolicySupplier,
                 identityDiscStateSupplier, invalidatorCallback, identityDiscButtonSupplier,
                 resourceManagerSupplier, isProgressBarVisibleSupplier,
                 isIncognitoModeEnabledSupplier, isGridTabSwitcherEnabled, isTabletGtsPolishEnabled,

android/java/res/layout/new_tab_page_layout.xml

@@ -115,6 +115,13 @@
                 android:layout_marginTop="16dp"
                 android:visibility="gone"/>
 
+            <ViewStub
+                android:id="@+id/search_resumption_module_container_stub"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/search_resumption_module_margin_top"
+                android:layout="@layout/search_resumption_module_layout" />
+
             <!-- Video tutorial IPH card -->
             <ViewStub
                 android:id="@+id/video_iph_stub"