Upgrade from Chromium 94 to Chromium 95

android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/BraveTabGroupUiCoordinator.java

@@ -21,9 +21,9 @@
 import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;
 import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
 import org.chromium.chrome.browser.share.ShareDelegate;
+import org.chromium.chrome.browser.tabmodel.IncognitoStateProvider;
 import org.chromium.chrome.browser.tabmodel.TabCreatorManager;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
-import org.chromium.chrome.browser.theme.ThemeColorProvider;
 import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
 import org.chromium.chrome.tab_ui.R;
 import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
@@ -36,7 +36,7 @@ public class BraveTabGroupUiCoordinator extends TabGroupUiCoordinator {
     private TabGroupUiToolbarView mToolbarView;
 
     public BraveTabGroupUiCoordinator(@NonNull Activity activity, @NonNull ViewGroup parentView,
-            @NonNull ThemeColorProvider themeColorProvider,
+            @NonNull IncognitoStateProvider incognitoStateProvider,
             @NonNull ScrimCoordinator scrimCoordinator,
             @NonNull ObservableSupplier<Boolean> omniboxFocusStateSupplier,
             @NonNull BottomSheetController bottomSheetController,
@@ -49,15 +49,13 @@ public BraveTabGroupUiCoordinator(@NonNull Activity activity, @NonNull ViewGroup
             @NonNull Supplier<ShareDelegate> shareDelegateSupplier,
             @NonNull OneshotSupplier<OverviewModeBehavior> overviewModeBehaviorSupplier,
             @NonNull SnackbarManager snackbarManager) {
-        super(activity, parentView, themeColorProvider, scrimCoordinator, omniboxFocusStateSupplier,
-                bottomSheetController, activityLifecycleDispatcher, isWarmOnResumeSupplier,
-                tabModelSelector, tabContentManager, rootView, dynamicResourceLoaderSupplier,
-                tabCreatorManager, shareDelegateSupplier, overviewModeBehaviorSupplier,
-                snackbarManager);
+        super(activity, parentView, incognitoStateProvider, scrimCoordinator,
+                omniboxFocusStateSupplier, bottomSheetController, activityLifecycleDispatcher,
+                isWarmOnResumeSupplier, tabModelSelector, tabContentManager, rootView,
+                dynamicResourceLoaderSupplier, tabCreatorManager, shareDelegateSupplier,
+                overviewModeBehaviorSupplier, snackbarManager);
 
         assert mToolbarView != null : "Make sure mToolbarView is properly patched in bytecode.";
-        mToolbarView.setBackgroundColor(ApiCompatibilityUtils.getColor(
-                mToolbarView.getResources(), R.color.toolbar_background_primary));
         ChromeImageView fadingEdgeStart =
                 mToolbarView.findViewById(R.id.tab_strip_fading_edge_start);
         assert fadingEdgeStart != null : "Something has changed in upstream.";

android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java

@@ -219,6 +219,7 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         removePreferenceIfPresent(PREF_AD_BLOCK);
         removePreferenceIfPresent(PREF_SYNC_AND_SERVICES_LINK);
         removePreferenceIfPresent(PREF_NETWORK_PREDICTIONS);
+        removePreferenceIfPresent(PREF_PRIVACY_SANDBOX);
 
         updatePreferences();
     }

android/java/org/chromium/chrome/browser/shields/BraveShieldsHandler.java

@@ -451,7 +451,7 @@ public void onClick(View view) {
         ImageView mPrivacyReportIcon = mPrivacyReportLayout.findViewById(R.id.toggle_favicon);
         mPrivacyReportIcon.setImageResource(R.drawable.ic_arrow_forward);
         mPrivacyReportIcon.setColorFilter(
-                mContext.getResources().getColor(R.color.default_icon_color_tint_list));
+                mContext.getResources().getColor(R.color.default_icon_color));
         TextView mViewPrivacyReportText = mPrivacyReportLayout.findViewById(R.id.toggle_text);
         mViewPrivacyReportText.setText(R.string.view_full_privacy_report);
         mPrivacyReportLayout.setOnClickListener(new View.OnClickListener() {
@@ -579,7 +579,7 @@ public void onClick(View view) {
             ImageView mBlockShieldsIcon = mShieldsLayout.findViewById(R.id.toggle_favicon);
             mBlockShieldsIcon.setImageResource(R.drawable.ic_chevron_right);
             mBlockShieldsIcon.setColorFilter(
-                    mContext.getResources().getColor(R.color.default_icon_color_tint_list));
+                    mContext.getResources().getColor(R.color.default_icon_color));
             TextView mBlockShieldsText = mShieldsLayout.findViewById(R.id.toggle_text);
             mBlockShieldsText.setText(titleStringId);
 

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

@@ -61,7 +61,7 @@ public void signinAndEnableSync(@SigninAccessPoint int accessPoint, Account acco
             @Nullable SignInCallback callback) {}
 
     @Override
-    public void signin(CoreAccountInfo accountInfo, @Nullable SignInCallback callback) {}
+    public void signin(Account account, @Nullable SignInCallback callback) {}
 
     @Override
     public void removeSignInStateObserver(SignInStateObserver observer) {}

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

@@ -12,13 +12,13 @@
 import org.chromium.base.Callback;
 import org.chromium.chrome.browser.ChromeTabbedActivity;
 import org.chromium.chrome.browser.app.BraveActivity;
+import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.site_settings.ChromeSiteSettingsDelegate;
-import org.chromium.content_public.browser.BrowserContextHandle;
 import org.chromium.url.GURL;
 
 public class BraveSiteSettingsDelegate extends ChromeSiteSettingsDelegate {
-    public BraveSiteSettingsDelegate(Context context, BrowserContextHandle browserContextHandle) {
-        super(context, browserContextHandle);
+    public BraveSiteSettingsDelegate(Context context, Profile profile) {
+        super(context, profile);
     }
 
     @Override

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

@@ -207,7 +207,7 @@ public void enableBottomControls() {
                     || TabUiFeatureUtilities.isConditionalTabStripEnabled()) {
                 mTabGroupUi = TabManagementModuleProvider.getDelegate().createTabGroupUi(mActivity,
                         mBottomControls.findViewById(R.id.bottom_container_slot),
-                        mAppThemeColorProvider, mScrimCoordinator, mOmniboxFocusStateSupplier,
+                        mIncognitoStateProvider, mScrimCoordinator, mOmniboxFocusStateSupplier,
                         mBottomSheetController, mActivityLifecycleDispatcher,
                         mIsWarmOnResumeSupplier, mTabModelSelector, mTabContentManager,
                         mCompositorViewHolder, mCompositorViewHolder::getDynamicResourceLoader,
@@ -220,11 +220,11 @@ public void enableBottomControls() {
                             id -> ((ChromeActivity) mActivity).onOptionsItemSelected(id, null)),
                     mActivityTabProvider, mToolbarTabController::openHomepage,
                     mCallbackController.makeCancelable((reason) -> setUrlBarFocus(true, reason)),
-                    mMenuButtonCoordinator.getMenuButtonHelperSupplier(),
+                    mMenuButtonCoordinator.getMenuButtonHelperSupplier(), mAppThemeColorProvider,
                     /* Below are parameters for BottomControlsCoordinator */
                     mActivity, mWindowAndroid, mLayoutManager,
                     mCompositorViewHolder.getResourceManager(), mBrowserControlsSizer,
-                    mFullscreenManager, mBottomControls, mAppThemeColorProvider, mTabGroupUi,
+                    mFullscreenManager, mBottomControls, mTabGroupUi,
                     mOverlayPanelVisibilitySupplier));
             mBottomControls.setBottomControlsCoordinatorSupplier(
                     mBottomControlsCoordinatorSupplier);

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

@@ -28,6 +28,7 @@
 import org.chromium.chrome.browser.ActivityTabProvider;
 import org.chromium.chrome.browser.app.BraveActivity;
 import org.chromium.chrome.browser.app.ChromeActivity;
+import org.chromium.chrome.browser.compositor.CompositorViewHolder;
 import org.chromium.chrome.browser.feature_engagement.TrackerFactory;
 import org.chromium.chrome.browser.homepage.HomepageManager;
 import org.chromium.chrome.browser.layouts.LayoutStateProvider;
@@ -256,8 +257,9 @@ public void onStartedHiding(
         }
 
         if (mScrollingBottomView != null && activity != null) {
+            Supplier<CompositorViewHolder> cvh = activity.getCompositorViewHolderSupplier();
             mScrollingBottomView.setSwipeDetector(
-                    activity.getCompositorViewHolder().getLayoutManager().getToolbarSwipeHandler());
+                    cvh.get().getLayoutManager().getToolbarSwipeHandler());
         }
     }
 

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

@@ -56,15 +56,15 @@ public BraveBottomControlsCoordinator(
             OnLongClickListener tabSwitcherLongclickListener, ActivityTabProvider tabProvider,
             Runnable openHomepageAction, Callback<Integer> setUrlBarFocusAction,
             ObservableSupplier<AppMenuButtonHelper> menuButtonHelperSupplier,
+            ThemeColorProvider themeColorProvider,
             /* Below are parameters from BottomControlsCoordinator */
             Activity activity, WindowAndroid windowAndroid, LayoutManager layoutManager,
             ResourceManager resourceManager, BrowserControlsSizer controlsSizer,
             FullscreenManager fullscreenManager, ScrollingBottomViewResourceFrameLayout root,
-            ThemeColorProvider themeColorProvider, BottomControlsContentDelegate contentDelegate,
+            BottomControlsContentDelegate contentDelegate,
             ObservableSupplier<Boolean> overlayPanelVisibilitySupplier) {
         super(activity, windowAndroid, layoutManager, resourceManager, controlsSizer,
-                fullscreenManager, root, themeColorProvider, contentDelegate,
-                overlayPanelVisibilitySupplier);
+                fullscreenManager, root, contentDelegate, overlayPanelVisibilitySupplier);
 
         mTabSwitcherLongclickListener = tabSwitcherLongclickListener;
         mTabProvider = tabProvider;

android/java/res/layout/new_tab_page_incognito.xml

@@ -60,7 +60,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:text="@string/brave_new_tab_private_header"
-                android:textAppearance="@style/TextAppearance.Headline.Primary.Light" />
+                android:textAppearance="@style/TextAppearance.Headline.Primary.Baseline.Light" />
 
             <TextView
                 android:layout_width="wrap_content"

android/java/res/values-night/brave_colors.xml

@@ -11,6 +11,7 @@
     <color name="baseline_primary_100">#5B2A23</color>
     <color name="baseline_primary_200">#F35333</color>
     <color name="default_text_color_on_accent1">@color/default_text_color_on_accent1_light</color>
+    <color name="dialog_bg_color_dark">@color/toolbar_background_primary</color>
 
     <color name="onboarding_text_color">#F0F2FF</color>
     <color name="onboarding_bg_color">#1E2029</color>

android/java/res/values/brave_colors.xml

@@ -19,6 +19,7 @@
     <color name="modern_blue_300">#FF7654</color>
     <color name="modern_blue_600">#EA3A0D</color>
     <color name="modern_blue_700">#C22700</color>
+    <color name="dialog_bg_color_dark">@color/toolbar_background_primary_dark</color>
 
     <!-- Onborading colors -->
     <color name="onboarding_orange">#fb542b</color>

android/javatests/org/chromium/chrome/browser/BytecodeTest.java

@@ -47,10 +47,12 @@
 import org.chromium.chrome.browser.omnibox.status.PageInfoIPHController;
 import org.chromium.chrome.browser.omnibox.suggestions.SuggestionHost;
 import org.chromium.chrome.browser.omnibox.suggestions.UrlBarDelegate;
+import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.share.ShareDelegateImpl;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tabmodel.AsyncTabParamsManager;
 import org.chromium.chrome.browser.tabmodel.ChromeTabCreator;
+import org.chromium.chrome.browser.tabmodel.IncognitoStateProvider;
 import org.chromium.chrome.browser.tabmodel.TabCreatorManager;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.theme.ThemeColorProvider;
@@ -435,15 +437,15 @@ public void testConstructorsExistAndMatch() throws Exception {
         Assert.assertTrue(constructorsMatch(
                 "org/chromium/chrome/browser/tasks/tab_management/TabGroupUiCoordinator",
                 "org/chromium/chrome/browser/tasks/tab_management/BraveTabGroupUiCoordinator",
-                Activity.class, ViewGroup.class, ThemeColorProvider.class, ScrimCoordinator.class,
-                ObservableSupplier.class, BottomSheetController.class,
+                Activity.class, ViewGroup.class, IncognitoStateProvider.class,
+                ScrimCoordinator.class, ObservableSupplier.class, BottomSheetController.class,
                 ActivityLifecycleDispatcher.class, Supplier.class, TabModelSelector.class,
                 TabContentManager.class, ViewGroup.class, Supplier.class, TabCreatorManager.class,
                 Supplier.class, OneshotSupplier.class, SnackbarManager.class));
         Assert.assertTrue(constructorsMatch(
                 "org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate",
                 "org/chromium/chrome/browser/site_settings/BraveSiteSettingsDelegate",
-                Context.class, BrowserContextHandle.class));
+                Context.class, Profile.class));
         Assert.assertTrue(constructorsMatch(
                 "org/chromium/components/browser_ui/notifications/NotificationManagerProxyImpl",
                 "org/chromium/chrome/browser/notifications/BraveNotificationManagerProxyImpl",

android/javatests/org/chromium/chrome/browser/privacy/settings/BravePrivacySettingsTest.java

@@ -91,7 +91,6 @@ private void checkPreferenceRemoved(String pref) {
     @SmallTest
     public void testDisabledOptions() {
         TestThreadUtils.runOnUiThreadBlocking(() -> {
-            assertFalse(PrivacySandboxBridge.isPrivacySandboxSettingsFunctional());
             assertFalse(PrivacyPreferencesManagerImpl.getInstance().getNetworkPredictionEnabled());
         });
     }

app/app_management_strings.grdp

@@ -19,8 +19,8 @@
   <message name="IDS_APP_MANAGEMENT_PERMISSIONS" desc="Label for permissions section in the app settings page.">
     Permissions
   </message>
-  <message name="IDS_APP_MANAGEMENT_MORE_SETTINGS" desc="Label for a link to more settings and permissions for an app.">
-    More settings and permissions
+  <message name="IDS_APP_MANAGEMENT_MORE_PERMISSIONS" desc="Label for a link to more permissions for an app.">
+    More permissions
   </message>
   <message name="IDS_APP_MANAGEMENT_PIN_TO_SHELF" desc="Label for the pin to shelf button in the app settings page.">
     Pin to shelf
@@ -49,8 +49,8 @@
   <message name="IDS_APP_MANAGEMENT_POLICY_APP_POLICY_STRING" desc="Tooltip label explaining that an app cannot be uninstalled as it has been installed by an adminstrator.">
     This app has been installed by your administrator.
   </message>
-  <message name="IDS_APP_MANAGEMENT_INTENT_SHARING" desc="Label for the intent sharing settings section.">
-    Opening supported links
+  <message name="IDS_APP_MANAGEMENT_INTENT_SETTINGS_TITLE" desc="Title for the intent sharing settings section.">
+    Opening <ph name="BEGIN_LINK">&lt;a href="#"&gt;</ph>supported links<ph name="END_LINK">&lt;/a&gt;</ph>
   </message>
   <message name="IDS_APP_MANAGEMENT_INTENT_SHARING_APP_OPEN" desc="Label for the intent sharing option to open in a specified app.">
     Open in <ph name="APP_NAME">$1<ex>Brave browser</ex></ph>
@@ -59,9 +59,9 @@
     Open in Brave browser
   </message>
   <message name="IDS_APP_MANAGEMENT_INTENT_SHARING_TAB_EXPLANATION" desc="Label for the intent sharing description for when the app is set to open in tab mode.">
-    <ph name="APP_NAME">$1<ex>Gmail</ex></ph> is set to open in a new browser tab, supported links will also open in the browser.
+    <ph name="APP_NAME">$1<ex>Gmail</ex></ph> is set to open in a new browser tab, supported links will also open in the browser. <ph name="BEGIN_LINK_LEARN_MORE">&lt;a href="https://support.google.com/chromebook?p=app_intent" target="_blank"&gt;</ph>Learn more<ph name="END_LINK_LEARN_MORE">&lt;/a&gt;</ph>
   </message>
-  <message name="IDS_APP_MANAGEMENT_INTENT_SHARING_TAB_LEARN_MORE" desc="Label for the learn more link for when the app is set to open in tab mode.">
-    Learn more.
+<message name="IDS_APP_MANAGEMENT_INTENT_SETTINGS_DIALOG_TITLE" desc="Title for the dialog which shows a list of supported links for a specified app.">
+    Supported links
   </message>
 </grit-part>

app/brave_main_delegate.cc

@@ -61,6 +61,7 @@
 #include "brave/build/android/jni_headers/BraveQAPreferences_jni.h"
 #include "components/signin/public/base/account_consistency_method.h"
 #else
+#include "chrome/browser/apps/app_discovery_service/app_discovery_features.h"
 #include "chrome/browser/browser_features.h"
 #include "chrome/browser/ui/profile_picker.h"
 #endif
@@ -228,15 +229,18 @@ bool BraveMainDelegate::BasicStartupComplete(int* exit_code) {
 
   // Disabled features.
   std::unordered_set<const char*> disabled_features = {
+#if !defined(OS_ANDROID)
+    apps::kAppDiscoveryRemoteUrlSearch.name,
+#endif
     autofill::features::kAutofillEnableAccountWalletStorage.name,
     autofill::features::kAutofillServerCommunication.name,
+    blink::features::kComputePressure.name,
     blink::features::kConversionMeasurement.name,
     blink::features::kFledgeInterestGroupAPI.name,
     blink::features::kFledgeInterestGroups.name,
     blink::features::kHandwritingRecognitionWebPlatformApiFinch.name,
     blink::features::kInterestCohortAPIOriginTrial.name,
     blink::features::kInterestCohortFeaturePolicy.name,
-    blink::features::kLangClientHintHeader.name,
     blink::features::kNavigatorPluginsFixed.name,
     blink::features::kTextFragmentAnchor.name,
 #if !defined(OS_ANDROID)
@@ -245,25 +249,33 @@ bool BraveMainDelegate::BasicStartupComplete(int* exit_code) {
     features::kDirectSockets.name,
     features::kIdleDetection.name,
     features::kNotificationTriggers.name,
-    features::kPrivacySandboxSettings.name,
+    features::kPrivacySandboxSettings2.name,
+#if !defined(OS_ANDROID)
+    features::kSettingsLandingPageRedesign.name,
+#endif
     features::kSignedExchangePrefetchCacheForNavigations.name,
     features::kSignedExchangeSubresourcePrefetch.name,
     features::kSubresourceWebBundles.name,
+#if defined(OS_ANDROID)
+    features::kWebNfc.name,
+#endif
     features::kWebOTP.name,
     features::kTabGroupsFeedback.name,
     federated_learning::kFederatedLearningOfCohorts.name,
     federated_learning::kFlocIdComputedEventLogging.name,
+#if defined(OS_ANDROID)
+    feed::kInterestFeedContentSuggestions.name,
+    feed::kInterestFeedV2.name,
+#endif
     media::kLiveCaption.name,
     net::features::kFirstPartySets.name,
     network::features::kTrustTokens.name,
     network_time::kNetworkTimeServiceQuerying.name,
-    reading_list::switches::kReadLater.name,
 #if defined(OS_ANDROID)
-    features::kWebNfc.name,
-    feed::kInterestFeedContentSuggestions.name,
-    feed::kInterestFeedV2.name,
     offline_pages::kPrefetchingOfflinePagesFeature.name,
-    signin::kMobileIdentityConsistency.name,
+#endif
+    reading_list::switches::kReadLater.name,
+#if defined(OS_ANDROID)
     translate::kTranslate.name,
 #endif
   };