diff --git a/android/brave_java_sources.gni b/android/brave_java_sources.gni index c761d3ccd427f..412a7c1ebf299 100644 --- a/android/brave_java_sources.gni +++ b/android/brave_java_sources.gni @@ -287,6 +287,7 @@ brave_java_sources = [ "../../brave/android/java/org/chromium/chrome/browser/site_settings/BraveWalletEthereumConnectedSitesPreference.java", "../../brave/android/java/org/chromium/chrome/browser/site_settings/DesktopModePreferences.java", "../../brave/android/java/org/chromium/chrome/browser/site_settings/PlayYTVideoInBrowserPreferences.java", + "../../brave/android/java/org/chromium/chrome/browser/suggestions/tile/BraveMostVisitedTilesMediator.java", "../../brave/android/java/org/chromium/chrome/browser/suggestions/tile/BraveTileView.java", "../../brave/android/java/org/chromium/chrome/browser/sync/BraveSyncDevices.java", "../../brave/android/java/org/chromium/chrome/browser/sync/settings/BraveManageSyncSettings.java", @@ -295,7 +296,6 @@ brave_java_sources = [ "../../brave/android/java/org/chromium/chrome/browser/toolbar/BraveIncognitoToggleTabLayout.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BookmarksButton.java", - "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomTabSwitcherActionMenuCoordinator.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarConfiguration.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarNewTabButton.java", @@ -308,7 +308,6 @@ brave_java_sources = [ "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarModel.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarViewBinder.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/SearchAccelerator.java", - "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/ShareButton.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarCoordinator.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarMediator.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarModel.java", @@ -389,6 +388,7 @@ brave_browser_ui_android_appmenu_internal_sources = [ brave_browser_ui_android_toolbar_sources = [ "//brave/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsMediator.java", + "//brave/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/BottomTabSwitcherActionMenuCoordinator.java", "//brave/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java", ] diff --git a/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/BraveTabGroupUiCoordinator.java b/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/BraveTabGroupUiCoordinator.java index e649876797ba2..edcec7ed5be2e 100644 --- a/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/BraveTabGroupUiCoordinator.java +++ b/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/BraveTabGroupUiCoordinator.java @@ -18,8 +18,8 @@ import org.chromium.base.supplier.ObservableSupplier; import org.chromium.base.supplier.OneshotSupplier; import org.chromium.base.supplier.Supplier; -import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior; import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager; +import org.chromium.chrome.browser.layouts.LayoutStateProvider; import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher; import org.chromium.chrome.browser.share.ShareDelegate; import org.chromium.chrome.browser.tabmodel.IncognitoStateProvider; @@ -54,13 +54,13 @@ public BraveTabGroupUiCoordinator(@NonNull Activity activity, @NonNull ViewGroup @NonNull Supplier dynamicResourceLoaderSupplier, @NonNull TabCreatorManager tabCreatorManager, @NonNull Supplier shareDelegateSupplier, - @NonNull OneshotSupplier overviewModeBehaviorSupplier, + @NonNull OneshotSupplier layoutStateProviderSupplier, @NonNull SnackbarManager snackbarManager) { super(activity, parentView, incognitoStateProvider, scrimCoordinator, omniboxFocusStateSupplier, bottomSheetController, activityLifecycleDispatcher, isWarmOnResumeSupplier, tabModelSelector, tabContentManager, rootView, dynamicResourceLoaderSupplier, tabCreatorManager, shareDelegateSupplier, - overviewModeBehaviorSupplier, snackbarManager); + layoutStateProviderSupplier, snackbarManager); mIncognitoStateProvider = incognitoStateProvider; diff --git a/android/feed/core/java/src/org/chromium/chrome/browser/feed/BraveFeedSurfaceCoordinator.java b/android/feed/core/java/src/org/chromium/chrome/browser/feed/BraveFeedSurfaceCoordinator.java index 0b7821b09f625..2b0a7b3f21323 100644 --- a/android/feed/core/java/src/org/chromium/chrome/browser/feed/BraveFeedSurfaceCoordinator.java +++ b/android/feed/core/java/src/org/chromium/chrome/browser/feed/BraveFeedSurfaceCoordinator.java @@ -31,6 +31,7 @@ import org.chromium.chrome.browser.tabmodel.TabModelSelector; import org.chromium.chrome.browser.toolbar.top.Toolbar; import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager; +import org.chromium.chrome.browser.xsurface.FeedLaunchReliabilityLogger.SurfaceType; import org.chromium.components.browser_ui.bottomsheet.BottomSheetController; import org.chromium.ui.UiUtils; import org.chromium.ui.base.WindowAndroid; @@ -52,17 +53,17 @@ public BraveFeedSurfaceCoordinator(Activity activity, SnackbarManager snackbarMa @Nullable ScrollableContainerDelegate externalScrollableContainerDelegate, @NewTabPageLaunchOrigin int launchOrigin, PrivacyPreferencesManagerImpl privacyPreferencesManager, - @NonNull Supplier toolbarSupplier, - FeedLaunchReliabilityLoggingState launchReliabilityLoggingState, - @Nullable FeedSwipeRefreshLayout swipeRefreshLayout, boolean overScrollDisabled, - @Nullable ViewGroup viewportView, FeedActionDelegate actionDelegate, - HelpAndFeedbackLauncher helpAndFeedbackLauncher) { + @NonNull Supplier toolbarSupplier, @SurfaceType int surfaceType, + long embeddingSurfaceCreatedTimeNs, @Nullable FeedSwipeRefreshLayout swipeRefreshLayout, + boolean overScrollDisabled, @Nullable ViewGroup viewportView, + FeedActionDelegate actionDelegate, HelpAndFeedbackLauncher helpAndFeedbackLauncher, + TabModelSelector tabModelSelector) { super(activity, snackbarManager, windowAndroid, snapScrollHelper, ntpHeader, toolbarHeight, showDarkBackground, delegate, profile, isPlaceholderShownInitially, bottomSheetController, shareDelegateSupplier, externalScrollableContainerDelegate, - launchOrigin, privacyPreferencesManager, toolbarSupplier, - launchReliabilityLoggingState, swipeRefreshLayout, overScrollDisabled, viewportView, - actionDelegate, helpAndFeedbackLauncher); + launchOrigin, privacyPreferencesManager, toolbarSupplier, surfaceType, + embeddingSurfaceCreatedTimeNs, swipeRefreshLayout, overScrollDisabled, viewportView, + actionDelegate, helpAndFeedbackLauncher, tabModelSelector); } public void createScrollViewForPolicy() { @@ -98,8 +99,4 @@ public void createScrollViewForPolicy() { public NestedScrollView getScrollViewForPolicy() { return mScrollViewForPolicy; } - - public boolean isReliabilityLoggingEnabled() { - return false; - } } diff --git a/android/java/apk_for_test.flags b/android/java/apk_for_test.flags index d0ec7c9d92c31..d6b5168f02ec4 100644 --- a/android/java/apk_for_test.flags +++ b/android/java/apk_for_test.flags @@ -36,9 +36,17 @@ } -keep class org.chromium.chrome.browser.ntp.NewTabPageLayout { + *** mMvTilesContainerLayout; *** insertSiteSectionView(...); - *** mSiteSectionView; - *** mTileGroup; +} + +-keep class org.chromium.chrome.browser.suggestions.tile.MostVisitedTilesMediator { + public (...); + *** updateTileGridPlaceholderVisibility(...); +} + +-keep class org.chromium.chrome.browser.suggestions.tile.BraveMostVisitedTilesMediator { + public (...); *** updateTileGridPlaceholderVisibility(...); } @@ -48,6 +56,7 @@ *** mNewTabPageLayout; *** mFeedSurfaceProvider; *** mToolbarSupplier; + *** mTabModelSelector; *** updateSearchProviderHasLogo(...); } @@ -69,6 +78,7 @@ *** mSyncEncryption; *** mReviewSyncData; *** mSyncPaymentsIntegration; + *** mSyncReadingList; *** mTurnOffSync; } @@ -129,7 +139,6 @@ *** mIsWarmOnResumeSupplier; *** mTabContentManager; *** mTabCreatorManager; - *** mOverviewModeBehaviorSupplier; *** mSnackbarManager; *** onOrientationChange(...); *** updateBookmarkButtonStatus(...); @@ -195,8 +204,7 @@ } -keep class org.chromium.chrome.browser.bookmarks.BookmarkUtils { - *** showBookmarkBottomSheet(...); - *** addBookmarkAndShowSnackbar(...); + *** addOrEditBookmark(...); } -keep class org.chromium.chrome.browser.toolbar.BraveToolbarManager { @@ -326,14 +334,12 @@ *** mActivity; *** mNtpHeader; *** mRootView; - *** isReliabilityLoggingEnabled(...); } -keep class org.chromium.chrome.browser.feed.BraveFeedSurfaceCoordinator { *** mScrollViewForPolicy; *** mNtpHeader; *** mRootView; - *** isReliabilityLoggingEnabled(...); } -keep class org.chromium.chrome.browser.feed.FeedSurfaceMediator { @@ -471,3 +477,7 @@ public (...); *** createManageDevicesLink(...); } + +-keep class org.chromium.chrome.browser.ChromeApplicationImpl + +-keep class org.chromium.chrome.browser.BraveApplicationImplBase diff --git a/android/java/org/chromium/chrome/browser/app/BraveActivity.java b/android/java/org/chromium/chrome/browser/app/BraveActivity.java index 9a574aead09b3..bf81087a73038 100644 --- a/android/java/org/chromium/chrome/browser/app/BraveActivity.java +++ b/android/java/org/chromium/chrome/browser/app/BraveActivity.java @@ -1438,7 +1438,7 @@ public ObservableSupplier getBrowserControlsManagerSuppl } public int getToolbarShadowHeight() { - View toolbarShadow = findViewById(R.id.toolbar_shadow); + View toolbarShadow = findViewById(R.id.toolbar_hairline); assert toolbarShadow != null; if (toolbarShadow != null) { return toolbarShadow.getHeight(); @@ -1447,7 +1447,7 @@ public int getToolbarShadowHeight() { } public int getToolbarBottom() { - View toolbarShadow = findViewById(R.id.toolbar_shadow); + View toolbarShadow = findViewById(R.id.toolbar_hairline); assert toolbarShadow != null; if (toolbarShadow != null) { return toolbarShadow.getBottom(); diff --git a/android/java/org/chromium/chrome/browser/app/appmenu/BraveAppMenuPropertiesDelegateImpl.java b/android/java/org/chromium/chrome/browser/app/appmenu/BraveAppMenuPropertiesDelegateImpl.java index 1d29ad9cc5701..4748b5c7f068d 100644 --- a/android/java/org/chromium/chrome/browser/app/appmenu/BraveAppMenuPropertiesDelegateImpl.java +++ b/android/java/org/chromium/chrome/browser/app/appmenu/BraveAppMenuPropertiesDelegateImpl.java @@ -18,8 +18,8 @@ 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.feed.webfeed.WebFeedBridge; +import org.chromium.chrome.browser.layouts.LayoutStateProvider; import org.chromium.chrome.browser.multiwindow.MultiWindowModeStateDispatcher; import org.chromium.chrome.browser.tabmodel.TabModelSelector; import org.chromium.chrome.browser.toolbar.ToolbarManager; @@ -36,11 +36,11 @@ public BraveAppMenuPropertiesDelegateImpl(Context context, ActivityTabProvider activityTabProvider, MultiWindowModeStateDispatcher multiWindowModeStateDispatcher, TabModelSelector tabModelSelector, ToolbarManager toolbarManager, View decorView, - @Nullable OneshotSupplier overviewModeBehaviorSupplier, + @Nullable OneshotSupplier layoutStateProvidersSupplier, @Nullable OneshotSupplier startSurfaceSupplier, ObservableSupplier bookmarkBridgeSupplier) { super(context, activityTabProvider, multiWindowModeStateDispatcher, tabModelSelector, - toolbarManager, decorView, overviewModeBehaviorSupplier, startSurfaceSupplier, + toolbarManager, decorView, layoutStateProvidersSupplier, startSurfaceSupplier, bookmarkBridgeSupplier); } diff --git a/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java b/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java index 387f58d13ee8f..0987c9282181f 100644 --- a/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java +++ b/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java @@ -23,10 +23,10 @@ import org.chromium.chrome.browser.BraveFeatureList; import org.chromium.chrome.browser.app.appmenu.AppMenuIconRowFooter; import org.chromium.chrome.browser.bookmarks.BookmarkBridge; -import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior; import org.chromium.chrome.browser.feed.webfeed.WebFeedBridge; import org.chromium.chrome.browser.feed.webfeed.WebFeedSnackbarController; import org.chromium.chrome.browser.flags.ChromeFeatureList; +import org.chromium.chrome.browser.layouts.LayoutStateProvider; import org.chromium.chrome.browser.multiwindow.MultiWindowModeStateDispatcher; import org.chromium.chrome.browser.preferences.BravePrefServiceBridge; import org.chromium.chrome.browser.set_default_browser.BraveSetDefaultBrowserUtils; @@ -55,13 +55,13 @@ public BraveTabbedAppMenuPropertiesDelegate(Context context, MultiWindowModeStateDispatcher multiWindowModeStateDispatcher, TabModelSelector tabModelSelector, ToolbarManager toolbarManager, View decorView, AppMenuDelegate appMenuDelegate, - OneshotSupplier overviewModeBehaviorSupplier, + OneshotSupplier layoutStateProvider, OneshotSupplier startSurfaceSupplier, ObservableSupplier bookmarkBridgeSupplier, WebFeedSnackbarController.FeedLauncher feedLauncher, ModalDialogManager modalDialogManager, SnackbarManager snackbarManager) { super(context, activityTabProvider, multiWindowModeStateDispatcher, tabModelSelector, - toolbarManager, decorView, appMenuDelegate, overviewModeBehaviorSupplier, + toolbarManager, decorView, appMenuDelegate, layoutStateProvider, startSurfaceSupplier, bookmarkBridgeSupplier, feedLauncher, modalDialogManager, snackbarManager); diff --git a/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkUtils.java b/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkUtils.java index c6444f13cabb5..9ddc17ccdcee6 100644 --- a/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkUtils.java +++ b/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkUtils.java @@ -31,25 +31,11 @@ * A class holding static util functions for bookmark. */ public class BraveBookmarkUtils extends BookmarkUtils { - private static final String TAG = "BraveBookmarkUtils"; - /** - * If the tab has already been bookmarked, start {@link BookmarkEditActivity} for the - * normal bookmark or show the reading list page for reading list bookmark. - * If not, add the bookmark to {@link BookmarkModel}, and show a snackbar notifying the user. - * - * @param existingBookmarkItem The {@link BookmarkItem} if the tab has already been bookmarked. - * @param bookmarkModel The bookmark model. - * @param tab The tab to add or edit a bookmark. - * @param snackbarManager The {@link SnackbarManager} used to show the snackbar. - * @param bottomSheetController The {@link BottomSheetController} used to show the bottom sheet. - * @param activity Current activity. - * @param fromCustomTab boolean indicates whether it is called by Custom Tab. - * @param callback Invoked with the resulting bookmark ID, which could be null if unsuccessful. - */ public static void addOrEditBookmark(@Nullable BookmarkItem existingBookmarkItem, BookmarkModel bookmarkModel, Tab tab, SnackbarManager snackbarManager, BottomSheetController bottomSheetController, Activity activity, boolean fromCustomTab, - Callback callback) { + @BookmarkType int bookmarkType, Callback callback, + boolean fromExplicitTrackUi) { assert bookmarkModel.isBookmarkModelLoaded(); if (existingBookmarkItem != null) { if (snackbarManager.isShowing()) { @@ -61,28 +47,8 @@ public static void addOrEditBookmark(@Nullable BookmarkItem existingBookmarkItem return; } - if (CachedFeatureFlags.isEnabled(ChromeFeatureList.READ_LATER)) { - // Show a bottom sheet to let the user select target bookmark folder. - showBookmarkBottomSheet(bookmarkModel, tab, snackbarManager, bottomSheetController, - activity, fromCustomTab, callback); - return; - } - - BookmarkId newBookmarkId = addBookmarkAndShowSnackbar( - bookmarkModel, tab, snackbarManager, activity, fromCustomTab); - callback.onResult(newBookmarkId); - } - - protected static void showBookmarkBottomSheet(BookmarkModel bookmarkModel, Tab tab, - SnackbarManager snackbarManager, BottomSheetController bottomSheetController, - Activity activity, boolean fromCustomTab, Callback callback) { - assert (false); - } - - // The legacy code path to add or edit bookmark without triggering the bookmark bottom sheet. - protected static BookmarkId addBookmarkAndShowSnackbar(BookmarkModel bookmarkModel, Tab tab, - SnackbarManager snackbarManager, Activity activity, boolean fromCustomTab) { - assert (false); - return null; + BookmarkUtils.addOrEditBookmark(existingBookmarkItem, bookmarkModel, tab, snackbarManager, + bottomSheetController, activity, fromCustomTab, bookmarkType, callback, + fromExplicitTrackUi); } } diff --git a/android/java/org/chromium/chrome/browser/firstrun/BraveFirstRunFlowSequencer.java b/android/java/org/chromium/chrome/browser/firstrun/BraveFirstRunFlowSequencer.java index 54e82ac86e8a4..e09cbb1cbd11e 100644 --- a/android/java/org/chromium/chrome/browser/firstrun/BraveFirstRunFlowSequencer.java +++ b/android/java/org/chromium/chrome/browser/firstrun/BraveFirstRunFlowSequencer.java @@ -4,12 +4,15 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ package org.chromium.chrome.browser.firstrun; - import android.app.Activity; +import org.chromium.base.supplier.OneshotSupplier; +import org.chromium.components.signin.AccountManagerFacadeProvider; + public abstract class BraveFirstRunFlowSequencer extends FirstRunFlowSequencer { public BraveFirstRunFlowSequencer(Activity activity) { - super(activity); + super(activity, + new ChildAccountStatusSupplier(AccountManagerFacadeProvider.getInstance(), null)); } @Override diff --git a/android/java/org/chromium/chrome/browser/firstrun/P3aOnboardingActivity.java b/android/java/org/chromium/chrome/browser/firstrun/P3aOnboardingActivity.java index b229fec513d34..eb967da8bc42b 100644 --- a/android/java/org/chromium/chrome/browser/firstrun/P3aOnboardingActivity.java +++ b/android/java/org/chromium/chrome/browser/firstrun/P3aOnboardingActivity.java @@ -29,6 +29,7 @@ import org.chromium.chrome.browser.BraveRewardsHelper; import org.chromium.chrome.browser.app.BraveActivity; import org.chromium.chrome.browser.customtabs.CustomTabActivity; +import org.chromium.chrome.browser.firstrun.BraveFirstRunFlowSequencer; import org.chromium.chrome.browser.night_mode.GlobalNightModeStateProviderHolder; import org.chromium.chrome.browser.onboarding.OnboardingPrefManager; import org.chromium.chrome.browser.preferences.BravePrefServiceBridge; @@ -44,7 +45,7 @@ public class P3aOnboardingActivity extends FirstRunActivityBase { private boolean mInitializeViewsDone; private boolean mInvokePostWorkAtInitializeViews; private boolean mIsP3aEnabled; - private FirstRunFlowSequencer mFirstRunFlowSequencer; + private BraveFirstRunFlowSequencer mFirstRunFlowSequencer; private CheckBox mP3aOnboardingCheckbox; private Button mBtnContinue; @@ -168,8 +169,9 @@ public void finishNativeInitialization() { public void onBackPressed() {} @Override - protected void triggerLayoutInflation() { - mFirstRunFlowSequencer = new FirstRunFlowSequencer(this) { + public void triggerLayoutInflation() { + super.triggerLayoutInflation(); + mFirstRunFlowSequencer = new BraveFirstRunFlowSequencer(this) { @Override public void onFlowIsKnown(Bundle freProperties) { initializeViews(); diff --git a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java index e65ff1819821d..75be6cb79ff13 100644 --- a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java +++ b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java @@ -16,10 +16,9 @@ import org.chromium.chrome.R; import org.chromium.chrome.browser.bookmarks.BookmarkBridge; import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider; -import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior; import org.chromium.chrome.browser.feed.BraveFeedSurfaceCoordinator; import org.chromium.chrome.browser.feed.FeedFeatures; -import org.chromium.chrome.browser.feed.FeedLaunchReliabilityLoggingState; +import org.chromium.chrome.browser.feed.FeedSurfaceCoordinator; import org.chromium.chrome.browser.feed.FeedSurfaceProvider; import org.chromium.chrome.browser.feed.FeedSwipeRefreshLayout; import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncherImpl; @@ -42,6 +41,7 @@ public class BraveNewTabPage extends NewTabPage { private NewTabPageLayout mNewTabPageLayout; private FeedSurfaceProvider mFeedSurfaceProvider; private Supplier mToolbarSupplier; + private TabModelSelector mTabModelSelector; public BraveNewTabPage(Activity activity, BrowserControlsStateProvider browserControlsStateProvider, @@ -60,6 +60,7 @@ public BraveNewTabPage(Activity activity, assert mNewTabPageLayout instanceof BraveNewTabPageLayout; if (mNewTabPageLayout instanceof BraveNewTabPageLayout) { ((BraveNewTabPageLayout) mNewTabPageLayout).setTab(tab); + ((BraveNewTabPageLayout) mNewTabPageLayout).setTabProvider(activityTabProvider); } } @@ -75,18 +76,21 @@ protected void initializeMainView(Activity activity, WindowAndroid windowAndroid mNewTabPageLayout = (NewTabPageLayout) inflater.inflate(R.layout.new_tab_page_layout, null); assert !FeedFeatures.isFeedEnabled(); - mFeedSurfaceProvider = new BraveFeedSurfaceCoordinator(activity, snackbarManager, - windowAndroid, new SnapScrollHelperImpl(mNewTabPageManager, mNewTabPageLayout), - mNewTabPageLayout, mBrowserControlsStateProvider.getTopControlsHeight(), - isInNightMode, this, profile, + FeedSurfaceCoordinator feedSurfaceCoordinator = new BraveFeedSurfaceCoordinator(activity, + snackbarManager, windowAndroid, + new SnapScrollHelperImpl(mNewTabPageManager, mNewTabPageLayout), mNewTabPageLayout, + mBrowserControlsStateProvider.getTopControlsHeight(), isInNightMode, this, profile, /* isPlaceholderShownInitially= */ false, bottomSheetController, shareDelegateSupplier, /* externalScrollableContainerDelegate= */ null, NewTabPageUtils.decodeOriginFromNtpUrl(url), PrivacyPreferencesManagerImpl.getInstance(), mToolbarSupplier, - new FeedLaunchReliabilityLoggingState(SurfaceType.NEW_TAB_PAGE, mConstructedTimeNs), + SurfaceType.NEW_TAB_PAGE, mConstructedTimeNs, FeedSwipeRefreshLayout.create(activity, R.id.toolbar_container), /* overScrollDisabled= */ false, /* viewportView= */ null, - /* actionDelegate= */ null, HelpAndFeedbackLauncherImpl.getInstance()); + /* actionDelegate= */ null, HelpAndFeedbackLauncherImpl.getInstance(), + mTabModelSelector); + + mFeedSurfaceProvider = feedSurfaceCoordinator; } public void updateSearchProviderHasLogo() { diff --git a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java index a94ccf3d76c3e..3fa32d4920398 100644 --- a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java +++ b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java @@ -166,6 +166,10 @@ public class BraveNewTabPageLayout extends NewTabPageLayout implements Connectio private static final String BRAVE_RECYCLERVIEW_OFFSET_POSITION = "recyclerview_offset_position_"; + // To delete in bytecode, parent variable will be used instead. + private ViewGroup mMvTilesContainerLayout; + + // Own members. private View mBraveStatsViewFallBackLayout; private ImageView mBgImageView; @@ -183,14 +187,11 @@ public class BraveNewTabPageLayout extends NewTabPageLayout implements Connectio private ViewGroup mainLayout; private DatabaseHelper mDatabaseHelper; - private ViewGroup mSiteSectionView; - private TileGroup mTileGroup; private LottieAnimationView mBadgeAnimationView; private Tab mTab; private Activity mActivity; private LinearLayout superReferralSitesLayout; - private TextView mTopsiteErrorMessage; // Brave news private BraveNewsAdapterFeedCard mAdapterFeedCard; @@ -331,13 +332,14 @@ public void onClick(View v) { BackgroundImagesPreferences.PREF_SHOW_TOP_SITES, true)) { int insertionPoint = mainLayout.indexOfChild(findViewById(R.id.ntp_middle_spacer)) + 1; - if (mSiteSectionView.getParent() != null) { - ((ViewGroup) mSiteSectionView.getParent()).removeView(mSiteSectionView); + if (mMvTilesContainerLayout.getParent() != null) { + ((ViewGroup) mMvTilesContainerLayout.getParent()) + .removeView(mMvTilesContainerLayout); } - mSiteSectionView.setBackgroundResource(R.drawable.rounded_dark_bg_alpha); - mSiteSectionView.setLayoutParams(layoutParams); - mSiteSectionView.requestLayout(); - mainLayout.addView(mSiteSectionView, insertionPoint); + mMvTilesContainerLayout.setBackgroundResource(R.drawable.rounded_dark_bg_alpha); + mMvTilesContainerLayout.setLayoutParams(layoutParams); + mMvTilesContainerLayout.requestLayout(); + mainLayout.addView(mMvTilesContainerLayout, insertionPoint); } } @@ -359,21 +361,15 @@ private void checkForBraveStats() { } } - @SuppressLint("VisibleForTests") protected void insertSiteSectionView() { mainLayout = findViewById(R.id.ntp_main_layout); - - mSiteSectionView = NewTabPageLayout.inflateSiteSection(mainLayout); - ViewGroup.LayoutParams layoutParams = mSiteSectionView.getLayoutParams(); - layoutParams.width = ViewGroup.LayoutParams.WRAP_CONTENT; - // If the explore sites section exists as its own section, then space it more closely. - int variation = ExploreSitesBridge.getVariation(); - if (ExploreSitesBridge.isEnabled(variation)) { - ((MarginLayoutParams) layoutParams).bottomMargin = - getResources().getDimensionPixelOffset( - R.dimen.tile_grid_layout_vertical_spacing); - } - mSiteSectionView.setLayoutParams(layoutParams); + mMvTilesContainerLayout = (ViewGroup) LayoutInflater.from(mainLayout.getContext()) + .inflate(R.layout.mv_tiles_container, mainLayout, false); + mMvTilesContainerLayout.setVisibility(View.VISIBLE); + // The page contents are initially hidden; otherwise they'll be drawn centered on the + // page before the tiles are available and then jump upwards to make space once the + // tiles are available. + if (getVisibility() != View.VISIBLE) setVisibility(View.VISIBLE); } @Override @@ -592,7 +588,7 @@ private void correctPosition(boolean toTop) { (LinearLayout.LayoutParams) mImageCreditLayout.getLayoutParams(); int imageCreditCorrection = NTPUtil.correctImageCreditLayoutTopPosition( - mNtpImageGlobal, mSiteSectionView.getHeight()); + mNtpImageGlobal, mMvTilesContainerLayout.getHeight()); if (toTop) { imageCreditCorrection = 0; } @@ -1406,32 +1402,35 @@ private void processFeed() { public void initialize(NewTabPageManager manager, Activity activity, TileGroup.Delegate tileGroupDelegate, boolean searchProviderHasLogo, boolean searchProviderIsGoogle, FeedSurfaceScrollDelegate scrollDelegate, - ContextMenuManager contextMenuManager, TouchEnabledDelegate touchEnabledDelegate, - UiConfig uiConfig, Supplier tabProvider, + TouchEnabledDelegate touchEnabledDelegate, UiConfig uiConfig, ActivityLifecycleDispatcher lifecycleDispatcher, NewTabPageUma uma, boolean isIncognito, WindowAndroid windowAndroid) { super.initialize(manager, activity, tileGroupDelegate, searchProviderHasLogo, - searchProviderIsGoogle, scrollDelegate, contextMenuManager, touchEnabledDelegate, - uiConfig, tabProvider, lifecycleDispatcher, uma, isIncognito, windowAndroid); + searchProviderIsGoogle, scrollDelegate, touchEnabledDelegate, uiConfig, + lifecycleDispatcher, uma, isIncognito, windowAndroid); assert (activity instanceof BraveActivity); mActivity = activity; - mTabProvider = tabProvider; ((BraveActivity) mActivity).dismissShieldsTooltip(); } + public void setTabProvider(Supplier tabProvider) { + mTabProvider = tabProvider; + } + private void showNTPImage(NTPImage ntpImage) { Display display = mActivity.getWindowManager().getDefaultDisplay(); Point size = new Point(); display.getSize(size); - mSiteSectionView.post(new Runnable() { + mMvTilesContainerLayout.post(new Runnable() { @Override public void run() { correctPosition(false); } }); - NTPUtil.updateOrientedUI(mActivity, this, size, ntpImage, mSiteSectionView.getHeight()); + NTPUtil.updateOrientedUI( + mActivity, this, size, ntpImage, mMvTilesContainerLayout.getHeight()); ImageView mSponsoredLogo = (ImageView) findViewById(R.id.sponsored_logo); FloatingActionButton mSuperReferralLogo = (FloatingActionButton) findViewById(R.id.super_referral_logo); @@ -1789,27 +1788,6 @@ private TabImpl getTabImpl() { return (TabImpl) getTab(); } - @Override - public void onTileCountChanged() { - new Handler().postDelayed(() -> { - if (mTileGroup != null && mTileGroup.isEmpty()) { - correctPosition(false); - } - }, 100); - - if (mTopsiteErrorMessage == null) { - return; - } - - boolean showPlaceholder = - mTileGroup != null && mTileGroup.hasReceivedData() && mTileGroup.isEmpty(); - if (!showPlaceholder) { - mTopsiteErrorMessage.setVisibility(View.GONE); - } else { - mTopsiteErrorMessage.setVisibility(View.VISIBLE); - } - } - @Override public void onConnectionError(MojoException e) { if (mBraveNewsController != null) { diff --git a/android/java/org/chromium/chrome/browser/search_engines/settings/BUILD.gn b/android/java/org/chromium/chrome/browser/search_engines/settings/BUILD.gn index 22c9717b15eb5..2c67e16f4e705 100644 --- a/android/java/org/chromium/chrome/browser/search_engines/settings/BUILD.gn +++ b/android/java/org/chromium/chrome/browser/search_engines/settings/BUILD.gn @@ -17,6 +17,8 @@ android_library("java") { deps = [ ":java_resources", "//base:base_java", + "//base:jni_java", + "//build/android:build_java", "//chrome/browser/search_engines/android:java", "//components/search_engines/android:java", "//third_party/androidx:androidx_annotation_annotation_java", diff --git a/android/java/org/chromium/chrome/browser/settings/BraveLicensePreferences.java b/android/java/org/chromium/chrome/browser/settings/BraveLicensePreferences.java index e3ec69491eb5b..c80dc559ea814 100644 --- a/android/java/org/chromium/chrome/browser/settings/BraveLicensePreferences.java +++ b/android/java/org/chromium/chrome/browser/settings/BraveLicensePreferences.java @@ -34,6 +34,7 @@ public void onCreatePreferences(Bundle savedInstanceState, String s) { assert R.string.chrome_additional_terms_of_service_title > 0 : "Something has changed in the upstream!"; assert R.string.google_privacy_policy_url > 0 : "Something has changed in the upstream!"; + assert R.string.sync_reading_list > 0 : "Something has changed in the upstream!"; SettingsUtils.addPreferencesFromResource(this, R.xml.brave_license_preferences); getActivity().setTitle(R.string.brave_license_text); diff --git a/android/java/org/chromium/chrome/browser/settings/BravePreferenceFragment.java b/android/java/org/chromium/chrome/browser/settings/BravePreferenceFragment.java index 790d3dd7e8619..9d98eadf7b5ce 100644 --- a/android/java/org/chromium/chrome/browser/settings/BravePreferenceFragment.java +++ b/android/java/org/chromium/chrome/browser/settings/BravePreferenceFragment.java @@ -28,12 +28,6 @@ public class BravePreferenceFragment extends PreferenceFragmentCompat { protected static final int STORAGE_PERMISSION_EXPORT_REQUEST_CODE = 8000; protected static final int STORAGE_PERMISSION_IMPORT_REQUEST_CODE = STORAGE_PERMISSION_EXPORT_REQUEST_CODE + 1; - @Override - public void onActivityCreated(Bundle savedInstanceState) { - setHasOptionsMenu(true); - super.onActivityCreated(savedInstanceState); - } - @Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { menu.clear(); @@ -52,6 +46,7 @@ public boolean onOptionsItemSelected(MenuItem item) { @Override public void onCreatePreferences(Bundle bundle, String s) { + setHasOptionsMenu(true); } @Override diff --git a/android/java/org/chromium/chrome/browser/settings/BraveSettingsActivity.java b/android/java/org/chromium/chrome/browser/settings/BraveSettingsActivity.java index 9e6bf18baf760..88c71ac9e3779 100644 --- a/android/java/org/chromium/chrome/browser/settings/BraveSettingsActivity.java +++ b/android/java/org/chromium/chrome/browser/settings/BraveSettingsActivity.java @@ -19,7 +19,13 @@ public class BraveSettingsActivity extends SettingsActivity { public boolean onCreateOptionsMenu(Menu menu) { menu.clear(); getMenuInflater().inflate(R.menu.exit_settings_menu, menu); - return true; + return super.onCreateOptionsMenu(menu); + } + + @Override + public boolean onPrepareOptionsMenu(Menu menu) { + menu.removeItem(R.id.menu_id_general_help); + return super.onPrepareOptionsMenu(menu); } @Override diff --git a/android/java/org/chromium/chrome/browser/settings/BraveSettingsLauncherImpl.java b/android/java/org/chromium/chrome/browser/settings/BraveSettingsLauncherImpl.java index 8837bb0f51a60..87d8a3775b31d 100644 --- a/android/java/org/chromium/chrome/browser/settings/BraveSettingsLauncherImpl.java +++ b/android/java/org/chromium/chrome/browser/settings/BraveSettingsLauncherImpl.java @@ -5,6 +5,7 @@ package org.chromium.chrome.browser.settings; +import android.app.Activity; import android.content.Context; import android.content.Intent; import android.os.Bundle; @@ -37,6 +38,16 @@ public Intent createSettingsActivityIntent( Context context, @Nullable String fragmentName, @Nullable Bundle fragmentArgs) { Intent intent = super.createSettingsActivityIntent(context, fragmentName, fragmentArgs); intent.setClass(context, BraveSettingsActivity.class); + if (!(context instanceof Activity)) { + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); + } + if (fragmentName != null) { + intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT, fragmentName); + } + if (fragmentArgs != null) { + intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS, fragmentArgs); + } return intent; } } diff --git a/android/java/org/chromium/chrome/browser/suggestions/tile/BraveMostVisitedTilesMediator.java b/android/java/org/chromium/chrome/browser/suggestions/tile/BraveMostVisitedTilesMediator.java new file mode 100644 index 0000000000000..7c897b295ff57 --- /dev/null +++ b/android/java/org/chromium/chrome/browser/suggestions/tile/BraveMostVisitedTilesMediator.java @@ -0,0 +1,32 @@ +/* Copyright (c) 2020 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +package org.chromium.chrome.browser.suggestions.tile; + +import android.content.res.Resources; +import android.view.ViewGroup; +import android.view.ViewStub; + +import androidx.annotation.Nullable; + +import org.chromium.components.browser_ui.widget.displaystyle.UiConfig; +import org.chromium.ui.modelutil.PropertyModel; + +public class BraveMostVisitedTilesMediator extends MostVisitedTilesMediator { + public BraveMostVisitedTilesMediator(Resources resources, UiConfig uiConfig, + ViewGroup mvTilesLayout, ViewStub noMvPlaceholderStub, TileRenderer renderer, + PropertyModel propertyModel, boolean shouldShowSkeletonUIPreNative, + boolean isScrollableMVTEnabled, boolean isTablet, + @Nullable Runnable snapshotTileGridChangedRunnable, + @Nullable Runnable tileCountChangedRunnable) { + super(resources, uiConfig, mvTilesLayout, noMvPlaceholderStub, renderer, propertyModel, + shouldShowSkeletonUIPreNative, isScrollableMVTEnabled, isTablet, + snapshotTileGridChangedRunnable, tileCountChangedRunnable); + } + + protected void updateTileGridPlaceholderVisibility() { + // This function is kept empty to avoid placeholder implementation + } +} diff --git a/android/java/org/chromium/chrome/browser/sync/settings/BraveManageSyncSettings.java b/android/java/org/chromium/chrome/browser/sync/settings/BraveManageSyncSettings.java index 93df5139d8897..a75126ac90731 100644 --- a/android/java/org/chromium/chrome/browser/sync/settings/BraveManageSyncSettings.java +++ b/android/java/org/chromium/chrome/browser/sync/settings/BraveManageSyncSettings.java @@ -23,6 +23,7 @@ public class BraveManageSyncSettings extends ManageSyncSettings { private Preference mReviewSyncData; private CheckBoxPreference mSyncPaymentsIntegration; + private CheckBoxPreference mSyncReadingList; @Override public void onCreatePreferences(@Nullable Bundle savedInstanceState, String rootKey) { @@ -36,5 +37,6 @@ public void onCreatePreferences(@Nullable Bundle savedInstanceState, String root findPreference(PREF_ADVANCED_CATEGORY).setVisible(false); mSyncPaymentsIntegration.setVisible(false); + mSyncReadingList.setVisible(false); } } diff --git a/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java b/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java index 3f73c04b7d422..821fa38fe32ef 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java +++ b/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java @@ -31,8 +31,8 @@ import org.chromium.chrome.browser.browser_controls.BrowserControlsSizer; import org.chromium.chrome.browser.compositor.CompositorViewHolder; import org.chromium.chrome.browser.compositor.Invalidator; +import org.chromium.chrome.browser.compositor.bottombar.ephemeraltab.EphemeralTabCoordinator; import org.chromium.chrome.browser.compositor.layouts.LayoutManagerImpl; -import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior; import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager; import org.chromium.chrome.browser.findinpage.FindToolbarManager; import org.chromium.chrome.browser.fullscreen.FullscreenManager; @@ -56,7 +56,6 @@ import org.chromium.chrome.browser.tasks.tab_management.TabUiFeatureUtilities; import org.chromium.chrome.browser.theme.TopUiThemeColorProvider; import org.chromium.chrome.browser.toolbar.bottom.BottomControlsCoordinator; -import org.chromium.chrome.browser.toolbar.bottom.BottomTabSwitcherActionMenuCoordinator; import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarConfiguration; import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarVariationManager; import org.chromium.chrome.browser.toolbar.bottom.BraveBottomControlsCoordinator; @@ -65,6 +64,7 @@ import org.chromium.chrome.browser.toolbar.menu_button.BraveMenuButtonCoordinator; import org.chromium.chrome.browser.toolbar.menu_button.MenuButtonCoordinator; import org.chromium.chrome.browser.toolbar.top.ActionModeController; +import org.chromium.chrome.browser.toolbar.top.BottomTabSwitcherActionMenuCoordinator; import org.chromium.chrome.browser.toolbar.top.BraveTopToolbarCoordinator; import org.chromium.chrome.browser.toolbar.top.ToolbarActionModeCallback; import org.chromium.chrome.browser.toolbar.top.ToolbarControlContainer; @@ -111,7 +111,6 @@ public class BraveToolbarManager extends ToolbarManager { private Supplier mIsWarmOnResumeSupplier; private TabContentManager mTabContentManager; private TabCreatorManager mTabCreatorManager; - private OneshotSupplier mOverviewModeBehaviorSupplier; private SnackbarManager mSnackbarManager; // Own members. @@ -154,13 +153,13 @@ public BraveToolbarManager(AppCompatActivity activity, BrowserControlsSizer cont @NonNull BottomSheetController bottomSheetController, @NonNull Supplier isWarmOnResumeSupplier, @NonNull TabContentManager tabContentManager, - @NonNull TabCreatorManager tabCreatorManager, - @NonNull OneshotSupplier overviewModeBehaviorSupplier, - @NonNull SnackbarManager snackbarManager, JankTracker jankTracker, + @NonNull TabCreatorManager tabCreatorManager, @NonNull SnackbarManager snackbarManager, + JankTracker jankTracker, @NonNull Supplier merchantTrustSignalsCoordinatorSupplier, OneshotSupplier tabReparentingControllerSupplier, @NonNull OmniboxPedalDelegate omniboxPedalDelegate, + Supplier ephemeralTabCoordinatorSupplier, boolean initializeWithIncognitoColors) { super(activity, controlsSizer, fullscreenManager, controlContainer, compositorViewHolder, urlFocusChangedCallback, topUiThemeColorProvider, tabObscuringHandler, @@ -173,9 +172,9 @@ public BraveToolbarManager(AppCompatActivity activity, BrowserControlsSizer cont isInOverviewModeSupplier, modalDialogManagerSupplier, statusBarColorController, appMenuDelegate, activityLifecycleDispatcher, startSurfaceParentTabSupplier, bottomSheetController, isWarmOnResumeSupplier, tabContentManager, tabCreatorManager, - overviewModeBehaviorSupplier, snackbarManager, jankTracker, - merchantTrustSignalsCoordinatorSupplier, tabReparentingControllerSupplier, - omniboxPedalDelegate, initializeWithIncognitoColors); + snackbarManager, jankTracker, merchantTrustSignalsCoordinatorSupplier, + tabReparentingControllerSupplier, omniboxPedalDelegate, + ephemeralTabCoordinatorSupplier, initializeWithIncognitoColors); mOmniboxFocusStateSupplier = omniboxFocusStateSupplier; mLayoutStateProviderSupplier = layoutStateProviderSupplier; @@ -222,7 +221,7 @@ public void enableBottomControls() { mBottomSheetController, mActivityLifecycleDispatcher, mIsWarmOnResumeSupplier, mTabModelSelector, mTabContentManager, mCompositorViewHolder, mCompositorViewHolder::getDynamicResourceLoader, - mTabCreatorManager, mShareDelegateSupplier, mOverviewModeBehaviorSupplier, + mTabCreatorManager, mShareDelegateSupplier, mLayoutStateProviderSupplier, mSnackbarManager); } mBottomControlsCoordinatorSupplier.set(new BraveBottomControlsCoordinator( diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BookmarksButton.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BookmarksButton.java index fcad0d69c9d01..3ec52b94c162a 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BookmarksButton.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BookmarksButton.java @@ -15,7 +15,6 @@ import org.chromium.base.ApiCompatibilityUtils; import org.chromium.chrome.R; import org.chromium.chrome.browser.ActivityTabProvider; -import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior; import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.theme.ThemeColorProvider; import org.chromium.chrome.browser.theme.ThemeColorProvider.ThemeColorObserver; @@ -50,8 +49,7 @@ public void setThemeColorProvider(ThemeColorProvider themeColorProvider) { } @Override - public void onThemeColorChanged(int color, boolean shouldAnimate) { - } + public void onThemeColorChanged(int color, boolean shouldAnimate) {} @Override public void onTintChanged(ColorStateList tint, int brandedColorScheme) { @@ -69,15 +67,10 @@ public void updateBookmarkButton(boolean isBookmarked, boolean editingAllowed) { } else { setImageResource(R.drawable.btn_bookmark); ApiCompatibilityUtils.setImageTintList(this, mCurrentTint); - setContentDescription( - getContext().getString(R.string.accessibility_menu_bookmark)); + setContentDescription(getContext().getString(R.string.accessibility_menu_bookmark)); } setEnabled(editingAllowed); } - - public void setOverviewModeBehavior(OverviewModeBehavior overviewModeBehavior) { - } - - public void updateButtonEnabledState(Tab tab) { - } + + public void updateButtonEnabledState(Tab tab) {} } diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java index 89119fd12a54f..dfa28d5a1b84a 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java @@ -37,7 +37,7 @@ import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.tabmodel.IncognitoStateProvider; -import org.chromium.chrome.browser.tasks.ReturnToChromeExperimentsUtil; +import org.chromium.chrome.browser.tasks.ReturnToChromeUtil; import org.chromium.chrome.browser.tasks.tab_management.TabUiFeatureUtilities; import org.chromium.chrome.browser.theme.ThemeColorProvider; import org.chromium.chrome.browser.toolbar.HomeButton; @@ -166,7 +166,7 @@ void initializeWithNative(OnClickListener tabSwitcherListener, ChromeActivity activity = BraveActivity.getBraveActivity(); // Do not change bottom bar if StartSurface Single Pane is enabled and HomePage is not // customized. - if (!ReturnToChromeExperimentsUtil.shouldShowStartSurfaceAsTheHomePage( + if (!ReturnToChromeUtil.shouldShowStartSurfaceAsTheHomePage( activity != null ? activity : mContext) && BottomToolbarVariationManager.shouldBottomToolbarBeVisibleInOverviewMode()) { mLayoutStateObserver = new LayoutStateProvider.LayoutStateObserver() { @@ -177,9 +177,6 @@ public void onStartedShowing(@LayoutType int layoutType, boolean showToolbar) { BrowsingModeBottomToolbarCoordinator browsingModeCoordinator = (BrowsingModeBottomToolbarCoordinator) mBrowsingModeCoordinator; browsingModeCoordinator.getSearchAccelerator().setVisibility(View.GONE); - if (BottomToolbarVariationManager.isShareButtonOnBottom()) { - browsingModeCoordinator.getShareButton().setVisibility(View.GONE); - } if (BottomToolbarVariationManager.isHomeButtonOnBottom()) { browsingModeCoordinator.getHomeButton().setVisibility(View.INVISIBLE); } @@ -205,11 +202,6 @@ public void onStartedHiding( BrowsingModeBottomToolbarCoordinator browsingModeCoordinator = (BrowsingModeBottomToolbarCoordinator) mBrowsingModeCoordinator; browsingModeCoordinator.getSearchAccelerator().setVisibility(View.VISIBLE); - if (BottomToolbarVariationManager.isShareButtonOnBottom()) { - browsingModeCoordinator.getShareButton().setVisibility(View.VISIBLE); - browsingModeCoordinator.getShareButton().updateButtonEnabledState( - mTabProvider.get()); - } if (BottomToolbarVariationManager.isHomeButtonOnBottom()) { browsingModeCoordinator.getHomeButton().setVisibility(View.VISIBLE); } diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarVariationManager.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarVariationManager.java index 1a9bdf8e96db4..fc5f0ebb17934 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarVariationManager.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarVariationManager.java @@ -25,14 +25,6 @@ * through {@link BottomToolbarVariationManager} rather than calling {@link CachedFeatureFlags}. */ public class BottomToolbarVariationManager { - /** - * @return Whether or not share button should be visible on the top toolbar in portrait mode - * in the current variation. - */ - public static boolean isShareButtonOnBottom() { - return false; - } - /** * @return Whether or not new tab button should be visible on the bottom toolbar * in portrait mode in the current variation. diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java index b7de24d8423c0..5b7a638a1ff76 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java @@ -18,7 +18,6 @@ import org.chromium.chrome.R; import org.chromium.chrome.browser.ActivityTabProvider; import org.chromium.chrome.browser.app.BraveActivity; -import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior; import org.chromium.chrome.browser.feature_engagement.TrackerFactory; import org.chromium.chrome.browser.omaha.UpdateMenuItemHelper; import org.chromium.chrome.browser.profiles.Profile; @@ -26,7 +25,6 @@ import org.chromium.chrome.browser.tab.TabImpl; import org.chromium.chrome.browser.tab.TabUtils; import org.chromium.chrome.browser.tabmodel.IncognitoStateProvider; -import org.chromium.chrome.browser.tasks.ReturnToChromeExperimentsUtil; import org.chromium.chrome.browser.theme.ThemeColorProvider; import org.chromium.chrome.browser.toolbar.BraveHomeButton; import org.chromium.chrome.browser.toolbar.TabCountProvider; @@ -52,9 +50,6 @@ public class BrowsingModeBottomToolbarCoordinator { /** The home button that lives in the bottom toolbar. */ private final BraveHomeButton mBraveHomeButton; - /** The share button that lives in the bottom toolbar. */ - private final ShareButton mShareButton; - /** The new tab button that lives in the bottom toolbar. */ private final BottomToolbarNewTabButton mNewTabButton; @@ -87,15 +82,6 @@ public class BrowsingModeBottomToolbarCoordinator { private final MenuButton mMenuButton; private ThemeColorProvider mThemeColorProvider; - /** - * Build the coordinator that manages the browsing mode bottom toolbar. - * @param root The root {@link View} for locating the views to inflate. - * @param tabProvider The {@link ActivityTabProvider} used for making the IPH. - * @param homeButtonListener The {@link OnClickListener} for the home button. - * @param searchAcceleratorListener The {@link OnClickListener} for the search accelerator. - * @param shareButtonListener The {@link OnClickListener} for the share button. - * @param overviewModeBehaviorSupplier Supplier for the overview mode manager. - */ BrowsingModeBottomToolbarCoordinator(View root, ActivityTabProvider tabProvider, OnClickListener homeButtonListener, OnClickListener searchAcceleratorListener, ObservableSupplier shareButtonListenerSupplier, @@ -114,8 +100,6 @@ public class BrowsingModeBottomToolbarCoordinator { mNewTabButton = mToolbarRoot.findViewById(R.id.bottom_new_tab_button); - mShareButton = mToolbarRoot.findViewById(R.id.bottom_share_button); - mSearchAccelerator = mToolbarRoot.findViewById(R.id.search_accelerator); mSearchAccelerator.setOnClickListener(searchAcceleratorListener); @@ -134,15 +118,6 @@ public class BrowsingModeBottomToolbarCoordinator { if (BottomToolbarVariationManager.isTabSwitcherOnBottom()) { mTabSwitcherButtonView.setVisibility(View.VISIBLE); } - if (BottomToolbarVariationManager.isShareButtonOnBottom()) { - mShareButton.setVisibility(View.VISIBLE); - mShareButtonListenerSupplierCallback = shareButtonListener -> { - mShareButton.setOnClickListener(shareButtonListener); - }; - mShareButtonListenerSupplier = shareButtonListenerSupplier; - mShareButton.setActivityTabProvider(mTabProvider); - mShareButtonListenerSupplier.addObserver(mShareButtonListenerSupplierCallback); - } mBookmarkButton = mToolbarRoot.findViewById(R.id.bottom_bookmark_button); if (BottomToolbarVariationManager.isBookmarkButtonOnBottom()) { @@ -201,10 +176,6 @@ void initializeWithNative(OnClickListener newTabListener, OnClickListener tabSwi mNewTabButton.setIncognitoStateProvider(incognitoStateProvider); } - if (BottomToolbarVariationManager.isShareButtonOnBottom()) { - mShareButton.setThemeColorProvider(themeColorProvider); - } - if (BottomToolbarVariationManager.isHomeButtonOnBottom()) { mBraveHomeButton.setThemeColorProvider(themeColorProvider); } @@ -247,13 +218,6 @@ void setVisible(boolean visible) { mModel.set(BrowsingModeBottomToolbarModel.IS_VISIBLE, visible); } - /** - * @return The browsing mode bottom toolbar's share button. - */ - ShareButton getShareButton() { - return mShareButton; - } - /** * @return The browsing mode bottom toolbar's tab switcher button. */ @@ -284,7 +248,6 @@ public void destroy() { } mMediator.destroy(); mBraveHomeButton.destroy(); - mShareButton.destroy(); mSearchAccelerator.destroy(); mTabSwitcherButtonCoordinator.destroy(); mBookmarkButton.destroy(); diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarMediator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarMediator.java index a8e9fb745e93d..caca527e1c72c 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarMediator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarMediator.java @@ -16,7 +16,6 @@ import org.chromium.base.ApiCompatibilityUtils; import org.chromium.chrome.R; import org.chromium.chrome.browser.AppHooks; -import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior; import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.theme.ThemeColorProvider; import org.chromium.chrome.browser.theme.ThemeColorProvider.ThemeColorObserver; @@ -41,9 +40,6 @@ class BrowsingModeBottomToolbarMediator implements ThemeColorObserver { /** The model for the browsing mode bottom toolbar that holds all of its state. */ private final BrowsingModeBottomToolbarModel mModel; - /** The overview mode manager. */ - private OverviewModeBehavior mOverviewModeBehavior; - /** A provider that notifies components when the theme color changes.*/ private ThemeColorProvider mThemeColorProvider; diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/ShareButton.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/ShareButton.java deleted file mode 100644 index 505e8bce074e8..0000000000000 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/ShareButton.java +++ /dev/null @@ -1,106 +0,0 @@ -/* Copyright (c) 2020 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -package org.chromium.chrome.browser.toolbar.bottom; - -import android.content.Context; -import android.content.res.ColorStateList; -import android.util.AttributeSet; - -import org.chromium.base.ApiCompatibilityUtils; -import org.chromium.chrome.browser.ActivityTabProvider; -import org.chromium.chrome.browser.ActivityTabProvider.ActivityTabTabObserver; -import org.chromium.chrome.browser.compositor.layouts.EmptyOverviewModeObserver; -import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior; -import org.chromium.chrome.browser.share.ShareUtils; -import org.chromium.chrome.browser.tab.Tab; -import org.chromium.chrome.browser.theme.ThemeColorProvider; -import org.chromium.chrome.browser.theme.ThemeColorProvider.TintObserver; -import org.chromium.ui.widget.ChromeImageButton; -import org.chromium.url.GURL; - -/** - * The share button. - */ -class ShareButton extends ChromeImageButton implements TintObserver { - /** A provider that notifies components when the theme color changes.*/ - private ThemeColorProvider mThemeColorProvider; - - /** The {@link ActivityTabTabObserver} used to know when the active page changed. */ - private ActivityTabTabObserver mActivityTabTabObserver; - - /** The {@link OverviewModeBehavior} used to observe overview state changes. */ - private OverviewModeBehavior mOverviewModeBehavior; - - /** The {@link OvervieModeObserver} observing the OverviewModeBehavior */ - private OverviewModeBehavior.OverviewModeObserver mOverviewModeObserver; - - /** A collection of sharing utility functions.*/ - private ShareUtils mShareUtils; - - public ShareButton(Context context, AttributeSet attrs) { - super(context, attrs); - - mOverviewModeObserver = new EmptyOverviewModeObserver() { - @Override - public void onOverviewModeStartedShowing(boolean showTabSwitcherToolbar) { - setEnabled(false); - } - }; - - mShareUtils = new ShareUtils(); - } - - void setThemeColorProvider(ThemeColorProvider themeColorProvider) { - mThemeColorProvider = themeColorProvider; - mThemeColorProvider.addTintObserver(this); - } - - void setActivityTabProvider(ActivityTabProvider activityTabProvider) { - mActivityTabTabObserver = new ActivityTabTabObserver(activityTabProvider) { - @Override - public void onObservingDifferentTab(Tab tab, boolean hint) { - updateButtonEnabledState(tab); - } - - @Override - public void onUpdateUrl(Tab tab, GURL url) { - updateButtonEnabledState(tab); - } - }; - } - - public void setOverviewModeBehavior(OverviewModeBehavior overviewModeBehavior) { - assert overviewModeBehavior != null; - mOverviewModeBehavior = overviewModeBehavior; - mOverviewModeBehavior.addOverviewModeObserver(mOverviewModeObserver); - } - - void destroy() { - if (mThemeColorProvider != null) { - mThemeColorProvider.removeTintObserver(this); - mThemeColorProvider = null; - } - if (mActivityTabTabObserver != null) { - mActivityTabTabObserver.destroy(); - mActivityTabTabObserver = null; - } - - if (mOverviewModeBehavior != null) { - mOverviewModeBehavior.removeOverviewModeObserver(mOverviewModeObserver); - mOverviewModeObserver = null; - } - } - - public void updateButtonEnabledState(Tab tab) { - final boolean isEnabled = mShareUtils.shouldEnableShare(tab); - setEnabled(isEnabled); - } - - @Override - public void onTintChanged(ColorStateList tint, int brandedColorScheme) { - ApiCompatibilityUtils.setImageTintList(this, tint); - } -} diff --git a/android/java/org/chromium/chrome/browser/upgrade/BraveUpgradeJobIntentService.java b/android/java/org/chromium/chrome/browser/upgrade/BraveUpgradeJobIntentService.java index ff1e6eeab2b4c..09657d6efb506 100644 --- a/android/java/org/chromium/chrome/browser/upgrade/BraveUpgradeJobIntentService.java +++ b/android/java/org/chromium/chrome/browser/upgrade/BraveUpgradeJobIntentService.java @@ -5,12 +5,15 @@ package org.chromium.chrome.browser.upgrade; -import org.chromium.base.BundleUtils; +import org.chromium.base.annotations.IdentifierNameString; import org.chromium.chrome.browser.base.SplitCompatJobIntentService; public class BraveUpgradeJobIntentService extends SplitCompatJobIntentService { + @IdentifierNameString + private static String sImplClassName = + "org.chromium.chrome.browser.upgrade.BraveUpgradeJobIntentServiceImpl"; + public BraveUpgradeJobIntentService() { - super(BundleUtils.getIdentifierName( - "org.chromium.chrome.browser.upgrade.BraveUpgradeJobIntentServiceImpl")); + super(sImplClassName); } } diff --git a/android/java/org/chromium/chrome/browser/vpn/wireguard/WireguardService.java b/android/java/org/chromium/chrome/browser/vpn/wireguard/WireguardService.java index f665ab659551a..67a42c84b2b46 100644 --- a/android/java/org/chromium/chrome/browser/vpn/wireguard/WireguardService.java +++ b/android/java/org/chromium/chrome/browser/vpn/wireguard/WireguardService.java @@ -11,10 +11,10 @@ /** See {@link WireguardServiceImpl}. */ public class WireguardService extends SplitCompatService { @IdentifierNameString - private static final String IMPL_CLASS_NAME = + private static String sImplClassName = "org.chromium.chrome.browser.vpn.wireguard.WireguardServiceImpl"; public WireguardService() { - super(IMPL_CLASS_NAME); + super(sImplClassName); } } \ No newline at end of file diff --git a/android/java/res/layout/bottom_toolbar_browsing.xml b/android/java/res/layout/bottom_toolbar_browsing.xml index d1683320a2fc6..12325074b7d5e 100644 --- a/android/java/res/layout/bottom_toolbar_browsing.xml +++ b/android/java/res/layout/bottom_toolbar_browsing.xml @@ -66,15 +66,6 @@ android:contentDescription="@string/accessibility_toolbar_btn_tabswitcher_toggle_default" app:menuVerticalOverlapAnchor="false" /> - - diff --git a/android/java/res/layout/suggestions_site_tile_grid_modern.xml b/android/java/res/layout/mv_tiles_grid.xml similarity index 59% rename from android/java/res/layout/suggestions_site_tile_grid_modern.xml rename to android/java/res/layout/mv_tiles_grid.xml index 4a077eb4f8ae2..7fcc21de0c2fc 100644 --- a/android/java/res/layout/suggestions_site_tile_grid_modern.xml +++ b/android/java/res/layout/mv_tiles_grid.xml @@ -1,12 +1,12 @@ - - \ No newline at end of file + android:layout_gravity="center_horizontal" /> diff --git a/android/java/res/xml/manage_sync_preferences.xml b/android/java/res/xml/manage_sync_preferences.xml index b3b11477a242d..59ef77bd71a36 100644 --- a/android/java/res/xml/manage_sync_preferences.xml +++ b/android/java/res/xml/manage_sync_preferences.xml @@ -43,13 +43,18 @@ android:persistent="false"/> + + Type the access code to start casting + + {DAYS, plural, + =1 {This device will be saved for 1 day and you can connect without a code next time. This is set by your administrator.} + other {This device will be saved for {DAYS} days and you can connect without a code next time. This is set by your administrator.}} + + + {HOURS, plural, + =1 {This device will be saved for 1 hour and you can connect without a code next time. This is set by your administrator.} + other {This device will be saved for {HOURS} hours and you can connect without a code next time. This is set by your administrator.}} + + + {MONTHS, plural, + =1 {This device will be saved for 1 month and you can connect without a code next time. This is set by your administrator.} + other {This device will be saved for {MONTHS} months and you can connect without a code next time. This is set by your administrator.}} + + + {YEARS, plural, + =1 {This device will be saved for 1 year and you can connect without a code next time. This is set by your administrator.} + other {This device will be saved for {YEARS} years and you can connect without a code next time. This is set by your administrator.}} + Submit diff --git a/app/app_management_strings.grdp b/app/app_management_strings.grdp index bc4e813445e3c..2ad359d9694c3 100644 --- a/app/app_management_strings.grdp +++ b/app/app_management_strings.grdp @@ -130,8 +130,8 @@ Google Play Store - - Brave browser + + Web App installed from Brave browser $1Web App installed from <a href="#">$2Google Play Store</a> @@ -139,6 +139,15 @@ Version: $117.2 + + Storage + + + App size: $1100 MB + + + Data stored in app: $1100 MB + @@ -154,7 +163,7 @@ You can open and edit supported files with this app from the File Explorer or other apps. To control which files open in this app by default, go to <a href="#">Windows settings</a>. - + You can open and edit supported files with this app from the Files app or other apps. To control which files open this app by default, <a href="#">learn how to set default apps on your device</a>. @@ -164,8 +173,8 @@ You can open and edit supported files with this app from Finder or other apps. To control which files open this app by default, <a href="#">learn how to set default apps on your device</a>. - - + + You can open and edit supported files with this app from your file browser or other apps. To control which files open this app by default, <a href="#">learn how to set default apps on your device</a>. diff --git a/app/app_management_strings_override.grdp b/app/app_management_strings_override.grdp index ee62c00497efe..15bd41ae1f6b1 100644 --- a/app/app_management_strings_override.grdp +++ b/app/app_management_strings_override.grdp @@ -5,11 +5,11 @@ - + - + diff --git a/app/brave_main_delegate.cc b/app/brave_main_delegate.cc index 7844667c97b16..d4be51fc075b9 100644 --- a/app/brave_main_delegate.cc +++ b/app/brave_main_delegate.cc @@ -12,7 +12,6 @@ #include "base/base_switches.h" #include "base/lazy_instance.h" #include "base/path_service.h" -#include "base/task/post_task.h" #include "base/time/time.h" #include "brave/app/brave_command_line_helper.h" #include "brave/browser/brave_content_browser_client.h" diff --git a/app/brave_main_delegate_browsertest.cc b/app/brave_main_delegate_browsertest.cc index b95035b5ef792..d3a75915e3d6d 100644 --- a/app/brave_main_delegate_browsertest.cc +++ b/app/brave_main_delegate_browsertest.cc @@ -25,7 +25,6 @@ #include "components/permissions/features.h" #include "components/privacy_sandbox/privacy_sandbox_features.h" #include "components/reading_list/features/reading_list_switches.h" -#include "components/security_state/core/features.h" #include "components/shared_highlighting/core/common/shared_highlighting_features.h" #include "content/public/browser/render_view_host.h" #include "content/public/common/content_features.h" @@ -94,7 +93,9 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) { const base::Feature* disabled_features[] = { &autofill::features::kAutofillEnableAccountWalletStorage, &autofill::features::kAutofillEnableOfferNotificationForPromoCodes, + &autofill::features::kAutofillSaveCardUiExperiment, &autofill::features::kAutofillServerCommunication, + &autofill::features::kAutofillUpstreamAllowAdditionalEmailDomains, &blink::features::kAdInterestGroupAPI, &blink::features::kBrowsingTopics, &blink::features::kAllowURNsInIframes, @@ -107,6 +108,7 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) { &blink::features::kParakeet, &blink::features::kPrerender2, &blink::features::kPrivacySandboxAdsAPIs, + &blink::features::kSharedStorageAPI, &blink::features::kSpeculationRulesPrefetchProxy, &blink::features::kTextFragmentAnchor, &commerce::kCommerceDeveloper, @@ -119,6 +121,7 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) { &features::kCopyLinkToText, #endif &features::kDigitalGoodsApi, + &features::kEarlyHintsPreloadForNavigation, &features::kFedCm, &features::kFirstPartySets, &features::kIdleDetection, @@ -132,6 +135,9 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) { &features::kPrivacySandboxAdsAPIsOverride, &features::kSignedExchangeSubresourcePrefetch, &features::kSubresourceWebBundles, +#if !BUILDFLAG(IS_ANDROID) + &features::kTrustSafetySentimentSurvey, +#endif &features::kWebOTP, &history_clusters::features::kOnDeviceClustering, &history_clusters::internal::kHistoryClustersInternalsPage, @@ -156,7 +162,6 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) { &privacy_sandbox::kPrivacySandboxSettings3, &reading_list::switches::kReadLater, &shared_highlighting::kSharedHighlightingAmp, - &shared_highlighting::kSharedHighlightingV2, #if !BUILDFLAG(IS_ANDROID) &translate::kTFLiteLanguageDetectionEnabled, #endif @@ -168,19 +173,19 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) { IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, EnabledFeatures) { const base::Feature* enabled_features[] = { - &media::kEnableTabMuting, + &autofill::features::kAutofillDisableShadowHeuristics, &blink::features::kPrefetchPrivacyChanges, &blink::features::kReducedReferrerGranularity, #if BUILDFLAG(IS_WIN) &features::kWinrtGeolocationImplementation, #endif + &media::kEnableTabMuting, &net::features::kPartitionConnectionsByNetworkIsolationKey, &net::features::kPartitionExpectCTStateByNetworkIsolationKey, &net::features::kPartitionHttpServerPropertiesByNetworkIsolationKey, &net::features::kPartitionSSLSessionsByNetworkIsolationKey, &net::features::kSplitHostCacheByNetworkIsolationKey, &password_manager::features::kPasswordImport, - &security_state::features::kSafetyTipUI, }; for (const auto* feature : enabled_features) diff --git a/app/brave_settings_strings.grdp b/app/brave_settings_strings.grdp index a9304f65aeeae..d30c509ba59c4 100644 --- a/app/brave_settings_strings.grdp +++ b/app/brave_settings_strings.grdp @@ -5,9 +5,6 @@ - - Additional settings - Your changes will take effect the next time you relaunch Brave. diff --git a/app/brave_strings.grd b/app/brave_strings.grd index bf88ee72bb153..7d935979a8ee2 100644 --- a/app/brave_strings.grd +++ b/app/brave_strings.grd @@ -406,6 +406,11 @@ If you update this file, be sure also to update google_chrome_strings.grd. --> Brave may not function correctly because it is no longer supported on Windows XP or Windows Vista + + + Brave may not function correctly because it is no longer supported on this Linux distribution + + Brave @@ -511,10 +516,10 @@ Permissions you've already given to websites and apps may apply to this account. Password Manager - + To Password Manager on this device - + In Password Manager on this device @@ -622,6 +627,9 @@ Permissions you've already given to websites and apps may apply to this account. + + Brave blocked this file because this type of file is dangerous + Brave blocked this file because it is dangerous @@ -663,10 +671,6 @@ Permissions you've already given to websites and apps may apply to this account. This file may be dangerous, so Brave has blocked it. - - Brave recommends that you don't download or open this file - - @@ -898,17 +902,6 @@ Permissions you've already given to websites and apps may apply to this account. - - - Brave could not sync your data because your account sign-in details are out of date. - - - Brave could not sync your data because Sync is not available for your domain. - - - Brave could not sync your data due to an error signing in. - - ChromeOS System @@ -962,7 +955,7 @@ Permissions you've already given to websites and apps may apply to this account. - + The profile appears to be in use by another Brave process ($112345) on another computer ($2example.com). Brave has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Brave. @@ -1329,7 +1322,7 @@ Permissions you've already given to websites and apps may apply to this account. To access your Brave browser stuff across all your devices, sign in, then turn on sync - The following accounts are not signed into any Brave profiles. If you want to use an account in another profile, remove that profile first. + The following accounts are available for this Brave profile @@ -1446,6 +1439,97 @@ Permissions you've already given to websites and apps may apply to this account. You can learn more about these features in Brave settings. + + + + + Brave + + + No update is available. + + + Installation failed. Please try again. + + + $1Brave Installer + + + Close + + + Minimize + + + Initializing... + + + Connecting to the Internet... + + + Downloading... $10 second(s) remaining + + + Downloading... $10 minute(s) remaining + + + Downloading... $10 hour(s) remaining + + + Download complete. + + + Downloading... + + + Waiting to install... + + + Installing... + + + Canceling... + + + Thanks for installing. You must restart your browser before using $1Brave. + + + Thanks for installing. You must restart all your browsers before using $1Brave. + + + Thanks for installing. You must restart your computer before using $1Brave. + + + Close + + + Restart Now + + + Restart Later + + + Help + + + Installation Stopped. + + + Installation not complete. Are you sure you want to cancel? + + + Resume Installation + + + Cancel Installation + + + On your marks... + + + Installation complete. + + diff --git a/app/brave_strings_override.grd b/app/brave_strings_override.grd index ea54ca40ad4b0..6b3f0d986c685 100644 --- a/app/brave_strings_override.grd +++ b/app/brave_strings_override.grd @@ -119,6 +119,8 @@ If you update this file, be sure also to update google_chrome_strings.grd. --> + + @@ -209,8 +211,6 @@ Permissions you've already given to websites and apps may apply to this account. - - @@ -223,7 +223,7 @@ Permissions you've already given to websites and apps may apply to this account. - + @@ -321,6 +321,8 @@ Permissions you've already given to websites and apps may apply to this account. - + + + diff --git a/app/generated_resources.grd b/app/generated_resources.grd index 20bdb90cbdddd..c9445539a590a 100644 --- a/app/generated_resources.grd +++ b/app/generated_resources.grd @@ -330,7 +330,7 @@ are declared in tools/grit/grit_rule.gni. - + @@ -381,7 +381,7 @@ are declared in tools/grit/grit_rule.gni. - + Permission requested, press Ctrl + Forward to respond @@ -391,7 +391,7 @@ are declared in tools/grit/grit_rule.gni. Permission requested, press ⌘ + Option + Down arrow to respond - + Permission requested, press F6 to respond @@ -1814,9 +1814,6 @@ are declared in tools/grit/grit_rule.gni. Extensions, apps, and themes can harm your computer. Are you sure you want to continue? - - $1bla.exe could let attackers steal your personal information. - $1bla.exe is not commonly downloaded and may be dangerous. @@ -1862,12 +1859,9 @@ are declared in tools/grit/grit_rule.gni. $1bla.exe may be dangerous. Send to Brave Advanced Protection for scanning? - + $1bla.exe may be dangerous. Send to Brave for scanning? - - Download $1bla.exe? Anyone using the device can see it. - This file is not commonly downloaded and may be dangerous. @@ -1880,9 +1874,6 @@ are declared in tools/grit/grit_rule.gni. This file can't be downloaded securely - - This file will be stored on the device and everyone will be able to see it. - This file is being scanned. @@ -1935,9 +1926,6 @@ are declared in tools/grit/grit_rule.gni. Keep file? - - This file is dangerous - This file may be harmful for your computer. @@ -1966,9 +1954,6 @@ are declared in tools/grit/grit_rule.gni. Continue - - Download Anyway - Discard @@ -2433,9 +2418,6 @@ are declared in tools/grit/grit_rule.gni. This file may have been read or edited because this site isn't using a secure connection - - This file may let attackers steal your personal information - Dangerous @@ -3440,8 +3422,8 @@ are declared in tools/grit/grit_rule.gni. Microsoft Domain GUID - - Any Extended Key Usage + + Any TLS WWW Server Authentication @@ -4360,9 +4342,6 @@ are declared in tools/grit/grit_rule.gni. Change your privacy-related settings - - Read the list of your signed-in devices - Manage your downloads @@ -4545,7 +4524,7 @@ are declared in tools/grit/grit_rule.gni. Could not load '$1/path/to/file' for theme. - + $1Brave Keep installed @@ -4641,6 +4620,12 @@ are declared in tools/grit/grit_rule.gni. Allow $13? + + $1Extension A is requesting to read and change $2google.com + + + Requesting to read and change $1google.com: + Can't read or change site's data @@ -5392,6 +5377,18 @@ Keep your key file in a safe place. You will need it to create new versions of y Use suggested password + + + + Use strong password + + + + + Use Strong Password + + + Saved password @@ -5423,13 +5420,19 @@ Keep your key file in a safe place. You will need it to create new versions of y Brave Password Manager - You can use saved passwords on any device. They're saved to $1Brave Password Manager for $2user@gmail.com + You can use saved passwords on any device. They're saved to $1Brave Password Manager for $2user@gmail.com. - Passwords are saved to $1Brave Password Manager on this device + Passwords are saved to $1Brave Password Manager on this device. + + + You can view and manage saved passwords in $1Brave Password Manager. + + + You won't need to remember this password. It will be saved to $1Brave Password Manager for $2user@gmail.com. - Passwords are saved to $1Brave Password Manager + Passwords are saved to $1Brave Password Manager. You can view and manage saved passwords in Brave Password Manager @@ -6261,6 +6264,15 @@ Keep your key file in a safe place. You will need it to create new versions of y these recipe ideas + + Recently viewed recipes + + + recently viewed recipes + + + these recently viewed recipes + Your carts @@ -6612,6 +6624,14 @@ Keep your key file in a safe place. You will need it to create new versions of y Notes + + Add note... + + + + + Feed + @@ -6775,6 +6795,9 @@ Keep your key file in a safe place. You will need it to create new versions of y Bookmarks + + Saved Tab Groups + Menu containing hidden bookmarks @@ -6784,6 +6807,9 @@ Keep your key file in a safe place. You will need it to create new versions of y Bookmark folder button + + Saved Tab Group button + Experiments @@ -6881,12 +6907,6 @@ Keep your key file in a safe place. You will need it to create new versions of y Brave tip - - Close tutorial - - - Close help bubble - New! Control your music, videos, and more. @@ -6944,39 +6964,11 @@ Keep your key file in a safe place. You will need it to create new versions of y Click the speaker icon to mute this tab - - - Got It - - - Remind Me Later - - - Show Me How - - - - - Got it - - - Remind me later - - - Show me how - - To create a highlight like this one, select any text and right-click. - - Restart tutorial - - - Close - Right-click on a tab and select "Add Tab To New Group" @@ -7149,15 +7141,38 @@ Keep your key file in a safe place. You will need it to create new versions of y =1 {Successfully changed the compromised password. You have # more compromised password. Brave recommends checking this password now.} other {Successfully changed the compromised password. You have # more compromised passwords. Brave recommends checking these passwords now.}} + + {COUNT, plural, + =1 {Successfully changed the compromised password. + +You have # more compromised password. Brave Password Manager recommends checking this password now.} + other {Successfully changed the compromised password. + +You have # more compromised passwords. Brave Password Manager recommends checking these passwords now.}} + Successfully changed the compromised password. Check your passwords anytime in $1Settings. + + Successfully changed the compromised password. + +Check your passwords anytime in $1Brave Password Manager. + Settings - - Check remaining passwords - + + + + Check remaining passwords + + + + + Check Remaining Passwords + + + Save @@ -7228,15 +7243,39 @@ Keep your key file in a safe place. You will need it to create new versions of y Passwords not saved + + Save passwords? + Brave couldn't save these passwords in your Brave sync chain. You can still save them on this device. + + Brave Password Manager couldn't save these passwords in your Brave sync chain. You can save them to this device. + Save - - No thanks - + + + + Save to device + + + + + Save to Device + + + + + No thanks + + + + + No Thanks + + @@ -7284,9 +7323,6 @@ Keep your key file in a safe place. You will need it to create new versions of y Confirm your username - - Passwords are saved in your Brave sync chain (%1$suser@gmail.com) so you can use them on any device - Never for this site @@ -7395,6 +7431,9 @@ Keep your key file in a safe place. You will need it to create new versions of y Do not include email address + + We may email you for more information or updates + Include this screenshot and titles of open tabs @@ -7913,40 +7952,6 @@ Keep your key file in a safe place. You will need it to create new versions of y - - - - Side Search - - - Close search in side panel. Search is open in the side panel. - - - Open search in side panel. Search is not open in the side panel. - - - Close search in side panel - - - Submit Feedback - - - See more search results in side panel - - - Close search in side panel - - - Open search in side panel - - - Close search in side panel - - - Submit Feedback - - - To search your tabs, click here @@ -8472,6 +8477,9 @@ Keep your key file in a safe place. You will need it to create new versions of y $1Your devices$2 · $3foo@gmail.com + + You can send tabs between devices that are signed in with the same Brave sync chain + @@ -9600,39 +9608,6 @@ Please help our engineers fix this problem. Tell us what happened right before y - - - OK... - - - - Sign out then sign in again... - - - Sign out then sign in again... - - - - - Sign in again... - - - Sign in again... - - - - - - OK... - - - Sign in Again... - - - Sign in Again... - - - @@ -11070,7 +11045,7 @@ Please help our engineers fix this problem. Tell us what happened right before y $1Brave Search - Part of group $2 - + $1Brave Search - Permission requested, press Ctrl + Forward to respond @@ -11080,7 +11055,7 @@ Please help our engineers fix this problem. Tell us what happened right before y $1Brave Search - Permission requested, press ⌘ + Option + Up arrow to respond - + $1Brave Search - Permission requested, press F6 to respond @@ -11544,6 +11519,9 @@ Please help our engineers fix this problem. Tell us what happened right before y Quarantine Service + + System Signals Utilities + @@ -11895,6 +11873,9 @@ Please help our engineers fix this problem. Tell us what happened right before y Check your phone + + Unlock your phone + A notification was sent to your phone to confirm it's you. @@ -11905,6 +11886,9 @@ Please help our engineers fix this problem. Tell us what happened right before y Didn't get it? + + Try another way + Connect your phone with a cable @@ -12065,6 +12049,38 @@ Please help our engineers fix this problem. Tell us what happened right before y Manage devices + + + + Side Search + + + Close search in side panel. Search is open in the side panel. + + + Open search in side panel. Search is not open in the side panel. + + + Close search in side panel + + + Submit Feedback + + + See more search results in side panel + + + Close search in side panel + + + Open search in side panel + + + Close search in side panel + + + Submit Feedback + @@ -12574,18 +12590,27 @@ Please help our engineers fix this problem. Tell us what happened right before y - + Sign in to $1rp.example with $2idp.example - + Continue as $1Albus (or Albus Dumbledore) - + + To continue, $1idp.com will share your name, email address, and profile picture with this site. + + + To continue, $1idp.com will share your name, email address, and profile picture with this site. See this site's $2terms of service$3. + + To continue, $1idp.com will share your name, email address, and profile picture with this site. See this site's $2privacy policy$3. - + To continue, $1idp.com will share your name, email address, and profile picture with this site. See this site's $2privacy policy$3 and $4terms of service$5. + + Verifying… + @@ -12628,15 +12653,36 @@ Please help our engineers fix this problem. Tell us what happened right before y Cancel + + Game Control + + + You’ve been invited to try out keyboard control for this game. + + + Got it + + + Beta + Help us build a more private web + + Help us build a better web + Limited sharing between sites + + During trials, Brave is exploring ways to limit spam, fraud, and sharing between sites. Brave also $1estimates your interests that sites can use to show you ads. You can manage your interests in settings. + + + estimates your interests + We’re exploring ways to restrict cross-site tracking while enabling sites to stop ad spam and fraud. diff --git a/app/generated_resources_override.grd b/app/generated_resources_override.grd index 0521e0c7ee9d5..18bfb3ecb2c08 100644 --- a/app/generated_resources_override.grd +++ b/app/generated_resources_override.grd @@ -123,7 +123,7 @@ are declared in tools/grit/grit_rule.gni. - + @@ -144,11 +144,11 @@ are declared in tools/grit/grit_rule.gni. - + - + @@ -457,7 +457,7 @@ are declared in tools/grit/grit_rule.gni. - + @@ -508,8 +508,13 @@ are declared in tools/grit/grit_rule.gni. + + + + + @@ -591,10 +596,6 @@ are declared in tools/grit/grit_rule.gni. To browse privately, click the dots icon menu to open a Private window - - - - @@ -619,11 +620,24 @@ are declared in tools/grit/grit_rule.gni. + + + + + - + + + + + + + + + @@ -680,9 +694,6 @@ are declared in tools/grit/grit_rule.gni. - - - @@ -831,15 +842,6 @@ are declared in tools/grit/grit_rule.gni. - - - - - - - - - @@ -936,11 +938,11 @@ are declared in tools/grit/grit_rule.gni. - + - + diff --git a/app/os_settings_search_tag_strings.grdp b/app/os_settings_search_tag_strings.grdp index cdc5404077c71..26fb6318e30bc 100644 --- a/app/os_settings_search_tag_strings.grdp +++ b/app/os_settings_search_tag_strings.grdp @@ -742,78 +742,6 @@ Art gallery album - - Dark theme - - - Dark mode - - - Light theme - - - Light mode - - - Turn dark theme on - - - Enable dark theme - - - Turn dark mode on - - - Enable dark mode - - - Turn light theme off - - - Disable light theme - - - Turn dark theme off - - - Disable dark theme - - - Turn dark mode off - - - Disable dark mode - - - Turn light theme on - - - Enable light theme - - - Accent color - - - Color mode - - - Color theme - - - Dark theme schedule - - - Dark mode schedule - - - Automatic dark mode - - - Automatic light mode - - - Automatic dark theme - diff --git a/app/os_settings_strings.grdp b/app/os_settings_strings.grdp index 347b8f5ee88ec..16b5008f0dee1 100644 --- a/app/os_settings_strings.grdp +++ b/app/os_settings_strings.grdp @@ -226,6 +226,24 @@ Firmware updates + + Updates + + + Get the latest features and security improvements. + + + Turn off automatic updates? + + + Your device may no longer work properly, and you may experience security and performance issues. Turning off updates may also impact your right to make legal claims if you experience any issues. + + + Turn off + + + Keep updates + @@ -786,59 +804,6 @@ Celsius - - - Dark theme - - - On - - - Off - - - Accent color - - - Choose the color theme for Launcher, shelf, Quick Settings, and more - - - Based on your wallpaper - - - Neutral - - - Dark mode will turn on automatically at sunset - - - Dark mode will turn off automatically at sunrise - - - Custom - - - Schedule - - - Never - - - Sunset to sunrise - - - Off / Will turn on automatically at sunset - - - On / Will turn off automatically at sunrise - - - Off / Will turn on automatically at $16:30 PM - - - On / Will turn off automatically at $110:45 AM - - Preferred search engine @@ -3104,25 +3069,25 @@ Press an assigned switch or key to remove assignment. Recent Brave tabs - Messaging apps + Apps - Notifications and messaging apps + Notifications and apps Recent photos and notifications - Recent photos and messaging apps + Recent photos and apps - Recent photos, notifications, and messaging apps + Recent photos, notifications, and apps Access your phone's capabilities from your $1Chromebook - - View your phone's recent photos and media on your $1Chromebook + + View your phone's photos and media View, dismiss, and reply to your phone’s notifications @@ -3130,20 +3095,20 @@ Press an assigned switch or key to remove assignment. View recent Brave tabs from your phone - - Stream your phone’s messaging apps + + Stream your phone's apps - - View, dismiss, and reply to your phone’s notifications. Stream your phone’s messaging apps. + + View your phone's notifications and apps - View your phone's recent photos, media, and notifications on your $1Chromebook + View your phone's photos, media, and notifications - View your phone's recent photos and media. Stream your phone’s messaging apps. + View your phone's photos, media, and apps - View your phone's recent photos, media, and notifications. Stream your phone’s messaging apps. + View your phone's photos, media, notifications, and apps Turn on <a id="chromeSyncLink">Brave Sync</a> to view recent Brave tabs. <a target="_blank" id="learnMoreLink" href="$1https://google.com/">Learn More</a> @@ -3208,6 +3173,9 @@ Press an assigned switch or key to remove assignment. Notification syncing is disabled by your phone's administrator + + Apps streaming is disabled by your phone's administrator. + Get started @@ -3250,6 +3218,21 @@ Press an assigned switch or key to remove assignment. Go to your phone to review a few more permissions. Make sure your phone's Bluetooth and Wi-Fi are turned on. + + Can't establish connection + + + Something went wrong. Make sure your phone is close by, unlocked, and Bluetooth and Wi-Fi are turned on. + + + Can't maintain a connection with your phone. Make sure your phone is close by, unlocked, and Bluetooth and Wi-Fi are turned on. + + + Can't use this account + + + You can't view your phone's notifications on this managed account. Try again with a different account. <a target="_blank" href="$1https://google.com/">Learn more</a> + Your phone and $1Chromebook are connected @@ -4187,12 +4170,9 @@ Press an assigned switch or key to remove assignment. Help improve ChromeOS features and performance - + Automatically sends crash reports as well as diagnostic and usage data to Brave - - Automatically sends diagnostic and usage data to Brave - Suggest new content to explore diff --git a/app/settings_strings.grdp b/app/settings_strings.grdp index 92a3691f189e4..fdf269820647b 100644 --- a/app/settings_strings.grdp +++ b/app/settings_strings.grdp @@ -300,10 +300,10 @@ $1Visa ending in $21234 - Add virtual card + Turn on virtual card - Remove virtual card + Turn off virtual card Edit in Google Pay @@ -1059,6 +1059,9 @@ Signs you out of most sites. You'll stay signed in to your Brave sync chain so your synced data can be cleared. + + Signs you out of most sites. You won't be signed out of your Brave sync chain. + Clears history, including in the search box @@ -1450,7 +1453,7 @@ Help sites fight fraud and distinguish bots from profiles - About ad personalization + About Browser-based ad personalization Sites you visit that define your interests @@ -1501,7 +1504,7 @@ For example, if you visit a site to buy shoes for a marathon, the site might define your interest as running marathons. Later, if you visit a different site to register for a race, that site can show you an ad for running shoes based on your interests. - The list of sites that define your interests is deleted and refreshed each month. A site you visit again might appear on the list again. Or you can remove a site if you don't want that site to ever define interests for you. + To protect your privacy, we auto-delete sites from the list that are older than 4 weeks. A site you visit again might appear on the list again. Or you can remove a site if you don't want that site to ever define interests for you. Ad measurement @@ -2386,6 +2389,21 @@ Not allowed to know when you're actively using your device + + Lets you sign in to websites using the account you have with an identity service + + + Sites can show sign-in prompts from identity services + + + Block sign-in prompts from identity services + + + Allowed to show third-party sign-in prompts + + + Not allowed to show third-party sign-in prompts + Sites usually access files and folders on your device for features like automatically saving your work @@ -2608,7 +2626,7 @@ Media with a copyright might not play - + Sites may also need to recognize your device using an identifier @@ -2631,6 +2649,11 @@ Not allowed to use identifiers to play protected content + + + Brave Live Caption might not work + + Sites can handle special tasks when you click on certain types of links, like creating a new message in your email client or adding new events to your online calendar @@ -3533,6 +3556,9 @@ Fixed-width font + + Mathematical font + Minimum font size diff --git a/app/settings_strings_override.grdp b/app/settings_strings_override.grdp index 001ccf392c24c..98211f344171f 100644 --- a/app/settings_strings_override.grdp +++ b/app/settings_strings_override.grdp @@ -103,7 +103,9 @@ - + + + Block third-party cookies in Private diff --git a/browser/autoplay/autoplay_browsertest.cc b/browser/autoplay/autoplay_browsertest.cc index a3f524097dde3..c84cd81bd5832 100644 --- a/browser/autoplay/autoplay_browsertest.cc +++ b/browser/autoplay/autoplay_browsertest.cc @@ -5,7 +5,6 @@ #include "base/path_service.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/test/thread_test_helper.h" #include "brave/browser/brave_content_browser_client.h" #include "brave/common/brave_paths.h" diff --git a/browser/binance/binance_protocol_handler.cc b/browser/binance/binance_protocol_handler.cc index b4a461688a7a2..d2821f48ab67b 100644 --- a/browser/binance/binance_protocol_handler.cc +++ b/browser/binance/binance_protocol_handler.cc @@ -11,7 +11,6 @@ #include "base/strings/strcat.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "brave/browser/binance/binance_service_factory.h" #include "brave/common/url_constants.h" #include "brave/components/binance/browser/binance_service.h" @@ -20,7 +19,6 @@ #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_frame_host.h" -#include "net/base/escape.h" #include "net/base/url_util.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "url/origin.h" @@ -80,8 +78,8 @@ void HandleBinanceProtocol(const GURL& url, bool has_user_gesture, const absl::optional& initiator) { DCHECK(IsBinanceProtocol(url)); - base::PostTask( - FROM_HERE, {content::BrowserThread::UI}, + content::GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(&LoadNewTabURL, url, std::move(web_contents_getter), page_transition, has_user_gesture, initiator)); } diff --git a/browser/brave_ads/ads_service_impl.cc b/browser/brave_ads/ads_service_impl.cc index 6da3e952a1055..69a0add31637a 100644 --- a/browser/brave_ads/ads_service_impl.cc +++ b/browser/brave_ads/ads_service_impl.cc @@ -27,7 +27,6 @@ #include "base/no_destructor.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" diff --git a/browser/brave_browser_process_impl.cc b/browser/brave_browser_process_impl.cc index 988c16313459b..f1e42ee38d921 100644 --- a/browser/brave_browser_process_impl.cc +++ b/browser/brave_browser_process_impl.cc @@ -10,7 +10,6 @@ #include "base/bind.h" #include "base/path_service.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "brave/browser/brave_shields/ad_block_subscription_download_manager_getter.h" #include "brave/browser/brave_stats/brave_stats_updater.h" diff --git a/browser/brave_content_browser_client.cc b/browser/brave_content_browser_client.cc index 7bcad183e7f19..a7246c062de74 100644 --- a/browser/brave_content_browser_client.cc +++ b/browser/brave_content_browser_client.cc @@ -14,7 +14,6 @@ #include "base/json/json_reader.h" #include "base/strings/strcat.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "brave/browser/brave_browser_main_extra_parts.h" #include "brave/browser/brave_browser_process.h" #include "brave/browser/brave_shields/brave_shields_web_contents_observer.h" @@ -370,10 +369,9 @@ BraveContentBrowserClient::BraveContentBrowserClient() {} BraveContentBrowserClient::~BraveContentBrowserClient() {} std::unique_ptr -BraveContentBrowserClient::CreateBrowserMainParts( - content::MainFunctionParams parameters) { +BraveContentBrowserClient::CreateBrowserMainParts(bool is_integration_test) { std::unique_ptr main_parts = - ChromeContentBrowserClient::CreateBrowserMainParts(std::move(parameters)); + ChromeContentBrowserClient::CreateBrowserMainParts(is_integration_test); ChromeBrowserMainParts* chrome_main_parts = static_cast(main_parts.get()); chrome_main_parts->AddParts(std::make_unique()); diff --git a/browser/brave_content_browser_client.h b/browser/brave_content_browser_client.h index 7ceece36231b2..95ef08c282c7c 100644 --- a/browser/brave_content_browser_client.h +++ b/browser/brave_content_browser_client.h @@ -42,7 +42,7 @@ class BraveContentBrowserClient : public ChromeContentBrowserClient { // Overridden from ChromeContentBrowserClient: std::unique_ptr CreateBrowserMainParts( - content::MainFunctionParams parameters) override; + bool is_integration_test) override; void BrowserURLHandlerCreated(content::BrowserURLHandler* handler) override; void RenderProcessWillLaunch(content::RenderProcessHost* host) override; void RegisterAssociatedInterfaceBindersForRenderFrameHost( diff --git a/browser/brave_search/brave_search_browsertest.cc b/browser/brave_search/brave_search_browsertest.cc index 14ed4102702fb..05f607119324c 100644 --- a/browser/brave_search/brave_search_browsertest.cc +++ b/browser/brave_search/brave_search_browsertest.cc @@ -5,7 +5,6 @@ #include "base/path_service.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/test/scoped_feature_list.h" #include "base/test/thread_test_helper.h" #include "brave/common/brave_paths.h" diff --git a/browser/brave_shields/ad_block_service_browsertest.cc b/browser/brave_shields/ad_block_service_browsertest.cc index 280f64349a4cf..c9cdc9f7dface 100644 --- a/browser/brave_shields/ad_block_service_browsertest.cc +++ b/browser/brave_shields/ad_block_service_browsertest.cc @@ -15,7 +15,6 @@ #include "base/memory/raw_ptr.h" #include "base/path_service.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/test/thread_test_helper.h" #include "brave/browser/brave_browser_process.h" #include "brave/browser/net/brave_ad_block_tp_network_delegate_helper.h" diff --git a/browser/brave_wallet/BUILD.gn b/browser/brave_wallet/BUILD.gn index 75ed795e034b9..f956e6f48ffa9 100644 --- a/browser/brave_wallet/BUILD.gn +++ b/browser/brave_wallet/BUILD.gn @@ -56,12 +56,14 @@ source_set("brave_wallet_delegate") { "//brave/browser/brave_wallet", "//brave/components/brave_wallet/browser", "//brave/components/brave_wallet/browser:constants", + "//brave/components/brave_wallet/browser:permission_utils", "//brave/components/brave_wallet/browser:utils", "//brave/components/brave_wallet/common:mojom", "//brave/components/resources:strings_grit", "//chrome/browser/profiles:profile", "//components/content_settings/core/common", "//components/permissions", + "//components/permissions:permissions", "//content/public/browser", "//mojo/public/cpp/bindings", ] diff --git a/browser/brave_wallet/blockchain_images_source.cc b/browser/brave_wallet/blockchain_images_source.cc index e84befc48c35b..f3ad2bb17e64f 100644 --- a/browser/brave_wallet/blockchain_images_source.cc +++ b/browser/brave_wallet/blockchain_images_source.cc @@ -11,7 +11,7 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/memory/ref_counted_memory.h" -#include "base/task/post_task.h" +#include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "brave/components/brave_wallet/browser/brave_wallet_constants.h" #include "brave/components/brave_wallet/browser/wallet_data_files_installer.h" diff --git a/browser/brave_wallet/brave_wallet_ethereum_chain_browsertest.cc b/browser/brave_wallet/brave_wallet_ethereum_chain_browsertest.cc index 0d9ad5692f247..6827d9f748dce 100644 --- a/browser/brave_wallet/brave_wallet_ethereum_chain_browsertest.cc +++ b/browser/brave_wallet/brave_wallet_ethereum_chain_browsertest.cc @@ -4,7 +4,6 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "base/path_service.h" -#include "base/task/post_task.h" #include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/thread_test_helper.h" diff --git a/browser/brave_wallet/brave_wallet_event_emitter_browsertest.cc b/browser/brave_wallet/brave_wallet_event_emitter_browsertest.cc index 489a9f0c37e1a..75f5af738f6df 100644 --- a/browser/brave_wallet/brave_wallet_event_emitter_browsertest.cc +++ b/browser/brave_wallet/brave_wallet_event_emitter_browsertest.cc @@ -4,7 +4,6 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "base/path_service.h" -#include "base/task/post_task.h" #include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/thread_test_helper.h" diff --git a/browser/brave_wallet/brave_wallet_provider_delegate_impl.cc b/browser/brave_wallet/brave_wallet_provider_delegate_impl.cc index 3c0b591553dbe..40051d6966d76 100644 --- a/browser/brave_wallet/brave_wallet_provider_delegate_impl.cc +++ b/browser/brave_wallet/brave_wallet_provider_delegate_impl.cc @@ -13,6 +13,7 @@ #include "brave/browser/brave_wallet/brave_wallet_provider_delegate_impl_helper.h" #include "brave/components/brave_wallet/browser/brave_wallet_constants.h" #include "brave/components/brave_wallet/browser/brave_wallet_utils.h" +#include "brave/components/brave_wallet/browser/permission_utils.h" #include "brave/components/permissions/contexts/brave_wallet_permission_context.h" #include "components/content_settings/core/common/content_settings.h" #include "content/public/browser/render_frame_host.h" @@ -34,12 +35,12 @@ bool IsAccountAllowed(const std::vector& allowed_accounts, void OnRequestPermissions( const std::vector& accounts, BraveWalletProviderDelegate::RequestPermissionsCallback callback, - const std::vector& responses) { + const std::vector& responses) { DCHECK(responses.empty() || responses.size() == accounts.size()); std::vector granted_accounts; for (size_t i = 0; i < responses.size(); i++) { - if (responses[i] == CONTENT_SETTING_ALLOW) { + if (responses[i] == blink::mojom::PermissionStatus::GRANTED) { granted_accounts.push_back(accounts[i]); } } @@ -108,14 +109,14 @@ void BraveWalletProviderDelegateImpl::GetAllowedAccounts( mojom::CoinType type, const std::vector& accounts, GetAllowedAccountsCallback callback) { - auto content_setting_type = CoinTypeToContentSettingsType(type); - if (!content_setting_type) { + auto permission = CoinTypeToPermissionType(type); + if (!permission) { std::move(callback).Run(false, std::vector()); return; } permissions::BraveWalletPermissionContext::GetAllowedAccounts( - *content_setting_type, content::RenderFrameHost::FromID(host_id_), - accounts, std::move(callback)); + *permission, content::RenderFrameHost::FromID(host_id_), accounts, + std::move(callback)); } void BraveWalletProviderDelegateImpl::RequestPermissions( @@ -123,8 +124,8 @@ void BraveWalletProviderDelegateImpl::RequestPermissions( const std::vector& accounts, RequestPermissionsCallback callback) { auto request_type = CoinTypeToPermissionRequestType(type); - auto content_setting_type = CoinTypeToContentSettingsType(type); - if (!request_type || !content_setting_type) { + auto permission = CoinTypeToPermissionType(type); + if (!request_type || !permission) { std::move(callback).Run(mojom::RequestPermissionsError::kInternal, absl::nullopt); return; @@ -139,8 +140,7 @@ void BraveWalletProviderDelegateImpl::RequestPermissions( } permissions::BraveWalletPermissionContext::RequestPermissions( - *content_setting_type, content::RenderFrameHost::FromID(host_id_), - accounts, + *permission, content::RenderFrameHost::FromID(host_id_), accounts, base::BindOnce(&OnRequestPermissions, accounts, std::move(callback))); } @@ -148,15 +148,14 @@ void BraveWalletProviderDelegateImpl::IsAccountAllowed( mojom::CoinType type, const std::string& account, IsAccountAllowedCallback callback) { - auto content_setting_type = CoinTypeToContentSettingsType(type); - if (!content_setting_type) { + auto permission = CoinTypeToPermissionType(type); + if (!permission) { std::move(callback).Run(false); return; } permissions::BraveWalletPermissionContext::GetAllowedAccounts( - *content_setting_type, content::RenderFrameHost::FromID(host_id_), - {account}, + *permission, content::RenderFrameHost::FromID(host_id_), {account}, base::BindOnce(&OnIsAccountAllowed, account, std::move(callback))); } diff --git a/browser/brave_wallet/brave_wallet_service_delegate_impl.cc b/browser/brave_wallet/brave_wallet_service_delegate_impl.cc index 01d8c27ec52aa..0f2d67debdfbb 100644 --- a/browser/brave_wallet/brave_wallet_service_delegate_impl.cc +++ b/browser/brave_wallet/brave_wallet_service_delegate_impl.cc @@ -8,6 +8,7 @@ #include #include "brave/components/brave_wallet/browser/brave_wallet_utils.h" +#include "brave/components/brave_wallet/browser/permission_utils.h" #include "brave/components/permissions/contexts/brave_wallet_permission_context.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" @@ -118,7 +119,7 @@ void BraveWalletServiceDelegateImpl::AddPermission( const url::Origin& origin, const std::string& account, AddPermissionCallback callback) { - auto type = CoinTypeToContentSettingsType(coin); + auto type = CoinTypeToPermissionType(coin); if (!type) { std::move(callback).Run(false); return; @@ -134,7 +135,7 @@ void BraveWalletServiceDelegateImpl::HasPermission( const std::string& account, HasPermissionCallback callback) { bool has_permission = false; - auto type = CoinTypeToContentSettingsType(coin); + auto type = CoinTypeToPermissionType(coin); if (!type) { std::move(callback).Run(false, has_permission); return; @@ -149,7 +150,7 @@ void BraveWalletServiceDelegateImpl::ResetPermission( const url::Origin& origin, const std::string& account, ResetPermissionCallback callback) { - auto type = CoinTypeToContentSettingsType(coin); + auto type = CoinTypeToPermissionType(coin); if (!type) { std::move(callback).Run(false); return; diff --git a/browser/brave_wallet/brave_wallet_service_delegate_impl_android.cc b/browser/brave_wallet/brave_wallet_service_delegate_impl_android.cc index 48dc9481f7192..ad1b2b488f19b 100644 --- a/browser/brave_wallet/brave_wallet_service_delegate_impl_android.cc +++ b/browser/brave_wallet/brave_wallet_service_delegate_impl_android.cc @@ -9,6 +9,7 @@ #include #include "brave/components/brave_wallet/browser/brave_wallet_utils.h" +#include "brave/components/brave_wallet/browser/permission_utils.h" #include "brave/components/permissions/contexts/brave_wallet_permission_context.h" #include "chrome/browser/profiles/profile.h" #include "content/public/browser/browser_context.h" @@ -28,7 +29,7 @@ void BraveWalletServiceDelegateImpl::AddPermission( const url::Origin& origin, const std::string& account, AddPermissionCallback callback) { - auto type = CoinTypeToContentSettingsType(coin); + auto type = CoinTypeToPermissionType(coin); if (!type) { std::move(callback).Run(false); return; @@ -44,7 +45,7 @@ void BraveWalletServiceDelegateImpl::HasPermission( const std::string& account, HasPermissionCallback callback) { bool has_permission = false; - auto type = CoinTypeToContentSettingsType(coin); + auto type = CoinTypeToPermissionType(coin); if (!type) { std::move(callback).Run(false, has_permission); return; @@ -59,7 +60,7 @@ void BraveWalletServiceDelegateImpl::ResetPermission( const url::Origin& origin, const std::string& account, ResetPermissionCallback callback) { - auto type = CoinTypeToContentSettingsType(coin); + auto type = brave_wallet::CoinTypeToPermissionType(coin); if (!type) { std::move(callback).Run(false); return; @@ -73,7 +74,7 @@ void BraveWalletServiceDelegateImpl::GetWebSitesWithPermission( mojom::CoinType coin, GetWebSitesWithPermissionCallback callback) { std::vector result; - auto type = CoinTypeToContentSettingsType(coin); + auto type = CoinTypeToPermissionType(coin); if (!type) { std::move(callback).Run(result); return; @@ -87,7 +88,7 @@ void BraveWalletServiceDelegateImpl::ResetWebSitePermission( mojom::CoinType coin, const std::string& formed_website, ResetWebSitePermissionCallback callback) { - auto type = CoinTypeToContentSettingsType(coin); + auto type = CoinTypeToPermissionType(coin); if (!type) { std::move(callback).Run(false); return; diff --git a/browser/brave_wallet/brave_wallet_tab_helper_browsertest.cc b/browser/brave_wallet/brave_wallet_tab_helper_browsertest.cc index 8b1f55ca49e4e..578825d53dc07 100644 --- a/browser/brave_wallet/brave_wallet_tab_helper_browsertest.cc +++ b/browser/brave_wallet/brave_wallet_tab_helper_browsertest.cc @@ -4,7 +4,6 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "base/path_service.h" -#include "base/task/post_task.h" #include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/thread_test_helper.h" diff --git a/browser/brave_wallet/ethereum_provider_impl_unittest.cc b/browser/brave_wallet/ethereum_provider_impl_unittest.cc index 93144971cedb0..29bdc112f7b40 100644 --- a/browser/brave_wallet/ethereum_provider_impl_unittest.cc +++ b/browser/brave_wallet/ethereum_provider_impl_unittest.cc @@ -399,7 +399,7 @@ class EthereumProviderImplUnitTest : public testing::Test { void ResetEthereumPermission(const url::Origin& origin, size_t from_index = 0) { permissions::BraveWalletPermissionContext::ResetPermission( - ContentSettingsType::BRAVE_ETHEREUM, browser_context(), origin, + blink::PermissionType::BRAVE_ETHEREUM, browser_context(), origin, from(from_index)); } diff --git a/browser/browsing_data/brave_clear_browsing_data.cc b/browser/browsing_data/brave_clear_browsing_data.cc index 1a443e79a6a00..7ba2c0a456d2f 100644 --- a/browser/browsing_data/brave_clear_browsing_data.cc +++ b/browser/browsing_data/brave_clear_browsing_data.cc @@ -40,8 +40,8 @@ class BrowsingDataRemovalWatcher private: bool GetClearBrowsingDataOnExitSettings(const Profile* profile, - int* remove_mask, - int* origin_mask); + uint64_t* remove_mask, + uint64_t* origin_mask); void Wait(); int num_profiles_to_clear_ = 0; @@ -58,15 +58,15 @@ class BrowsingDataRemovalWatcher // remove_mask and the origin_mask for the same functionality not on exit. bool BrowsingDataRemovalWatcher::GetClearBrowsingDataOnExitSettings( const Profile* profile, - int* remove_mask, - int* origin_mask) { + uint64_t* remove_mask, + uint64_t* origin_mask) { DCHECK(remove_mask); DCHECK(origin_mask); const PrefService* prefs = profile->GetPrefs(); *remove_mask = 0; *origin_mask = 0; - int site_data_mask = chrome_browsing_data_remover::DATA_TYPE_SITE_DATA; + uint64_t site_data_mask = chrome_browsing_data_remover::DATA_TYPE_SITE_DATA; // Don't try to clear LSO data if it's not supported. if (!prefs->GetBoolean(prefs::kClearPluginLSODataEnabled)) site_data_mask &= ~chrome_browsing_data_remover::DATA_TYPE_PLUGIN_DATA; @@ -129,8 +129,8 @@ void BrowsingDataRemovalWatcher::ClearBrowsingDataForLoadedProfiles( for (Profile* profile : profiles) { if (profile->IsOffTheRecord()) continue; - int remove_mask; - int origin_mask; + uint64_t remove_mask; + uint64_t origin_mask; if (!GetClearBrowsingDataOnExitSettings(profile, &remove_mask, &origin_mask)) continue; diff --git a/browser/browsing_data/brave_clear_browsing_data.h b/browser/browsing_data/brave_clear_browsing_data.h index 2fee030bdace5..0b0ac285eeef1 100644 --- a/browser/browsing_data/brave_clear_browsing_data.h +++ b/browser/browsing_data/brave_clear_browsing_data.h @@ -6,6 +6,8 @@ #ifndef BRAVE_BROWSER_BROWSING_DATA_BRAVE_CLEAR_BROWSING_DATA_H_ #define BRAVE_BROWSER_BROWSING_DATA_BRAVE_CLEAR_BROWSING_DATA_H_ +#include + namespace content { class BrowsingDataRemover; } @@ -30,8 +32,8 @@ class BraveClearBrowsingData { // to remove data. virtual void BeforeClearOnExitRemoveData( content::BrowsingDataRemover* remover, - int remove_mask, - int origin_mask) = 0; + uint64_t remove_mask, + uint64_t origin_mask) = 0; }; protected: diff --git a/browser/browsing_data/brave_clear_browsing_data_browsertest.cc b/browser/browsing_data/brave_clear_browsing_data_browsertest.cc index 3e42164ee5e6e..22b939d60d8c8 100644 --- a/browser/browsing_data/brave_clear_browsing_data_browsertest.cc +++ b/browser/browsing_data/brave_clear_browsing_data_browsertest.cc @@ -11,7 +11,6 @@ #include "base/memory/raw_ptr.h" #include "base/path_service.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/test/scoped_feature_list.h" #include "brave/browser/browsing_data/brave_clear_browsing_data.h" @@ -41,6 +40,7 @@ #include "content/public/test/browser_test.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_navigation_observer.h" +#include "third_party/abseil-cpp/absl/types/optional.h" #include "url/url_constants.h" using content::BraveClearBrowsingData; @@ -141,7 +141,8 @@ class BraveClearDataOnExitTest expected_remove_data_call_count_ = count; } - void SetExpectedRemoveDataRemovalMasks(int remove_mask, int origin_mask) { + void SetExpectedRemoveDataRemovalMasks(uint64_t remove_mask, + uint64_t origin_mask) { expected_remove_mask_ = remove_mask; expected_origin_mask_ = origin_mask; } @@ -161,7 +162,7 @@ class BraveClearDataOnExitTest true); } - int GetRemoveMaskAll() { + uint64_t GetRemoveMaskAll() { return chrome_browsing_data_remover::DATA_TYPE_HISTORY | content::BrowsingDataRemover::DATA_TYPE_DOWNLOADS | content::BrowsingDataRemover::DATA_TYPE_CACHE | @@ -171,20 +172,20 @@ class BraveClearDataOnExitTest chrome_browsing_data_remover::DATA_TYPE_CONTENT_SETTINGS; } - int GetOriginMaskAll() { + uint64_t GetOriginMaskAll() { return content::BrowsingDataRemover::ORIGIN_TYPE_PROTECTED_WEB | content::BrowsingDataRemover::ORIGIN_TYPE_UNPROTECTED_WEB; } // BraveClearBrowsingData::OnExitTestingCallback implementation. void BeforeClearOnExitRemoveData(content::BrowsingDataRemover* remover, - int remove_mask, - int origin_mask) override { + uint64_t remove_mask, + uint64_t origin_mask) override { remove_data_call_count_++; - if (expected_remove_mask_ != -1) + if (expected_remove_mask_) EXPECT_EQ(expected_remove_mask_, remove_mask); - if (expected_origin_mask_ != -1) + if (expected_origin_mask_) EXPECT_EQ(expected_origin_mask_, origin_mask); } @@ -192,8 +193,8 @@ class BraveClearDataOnExitTest unsigned int browsers_count_ = 1u; int remove_data_call_count_ = 0; int expected_remove_data_call_count_ = 0; - int expected_remove_mask_ = -1; - int expected_origin_mask_ = -1; + absl::optional expected_remove_mask_; + absl::optional expected_origin_mask_; }; IN_PROC_BROWSER_TEST_F(BraveClearDataOnExitTest, NoPrefsSet) { diff --git a/browser/component_updater/brave_component_updater_delegate.cc b/browser/component_updater/brave_component_updater_delegate.cc index ac6ad07865cc3..e410f7867761e 100644 --- a/browser/component_updater/brave_component_updater_delegate.cc +++ b/browser/component_updater/brave_component_updater_delegate.cc @@ -7,7 +7,6 @@ #include -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "brave/browser/component_updater/brave_component_installer.h" diff --git a/browser/ethereum_remote_client/ethereum_remote_client_service.cc b/browser/ethereum_remote_client/ethereum_remote_client_service.cc index d59bebc1ef0b7..d88e6d6dbc0c6 100644 --- a/browser/ethereum_remote_client/ethereum_remote_client_service.cc +++ b/browser/ethereum_remote_client/ethereum_remote_client_service.cc @@ -13,7 +13,6 @@ #include "base/files/file_util.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "brave/browser/ethereum_remote_client/ethereum_remote_client_constants.h" diff --git a/browser/extensions/api/ipfs_api.cc b/browser/extensions/api/ipfs_api.cc index 8cf452b126f87..b7061edcbff6f 100644 --- a/browser/extensions/api/ipfs_api.cc +++ b/browser/extensions/api/ipfs_api.cc @@ -12,7 +12,7 @@ #include "base/files/file_util.h" #include "base/json/json_writer.h" -#include "base/task/post_task.h" +#include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/values.h" #include "brave/browser/ipfs/ipfs_service_factory.h" diff --git a/browser/extensions/brave_base_local_data_files_browsertest.cc b/browser/extensions/brave_base_local_data_files_browsertest.cc index 8074ec33b73a3..729d3010a0410 100644 --- a/browser/extensions/brave_base_local_data_files_browsertest.cc +++ b/browser/extensions/brave_base_local_data_files_browsertest.cc @@ -7,7 +7,7 @@ #include "base/path_service.h" #include "base/run_loop.h" -#include "base/task/post_task.h" +#include "base/task/thread_pool.h" #include "base/test/thread_test_helper.h" #include "brave/browser/brave_browser_process.h" #include "brave/common/brave_paths.h" @@ -62,7 +62,8 @@ void BaseLocalDataFilesBrowserTest::WaitForService() { g_brave_browser_process->local_data_files_service()->GetTaskRunner())); ASSERT_TRUE(tr_helper->Run()); scoped_refptr io_helper(new base::ThreadTestHelper( - base::CreateSingleThreadTaskRunner({BrowserThread::IO}).get())); + base::ThreadPool::CreateSingleThreadTaskRunner({BrowserThread::IO}) + .get())); ASSERT_TRUE(io_helper->Run()); base::RunLoop().RunUntilIdle(); } diff --git a/browser/farbling/brave_dark_mode_fingerprint_protection_browsertest.cc b/browser/farbling/brave_dark_mode_fingerprint_protection_browsertest.cc index 65e864cb77d99..858bf8aa5a5e3 100644 --- a/browser/farbling/brave_dark_mode_fingerprint_protection_browsertest.cc +++ b/browser/farbling/brave_dark_mode_fingerprint_protection_browsertest.cc @@ -5,7 +5,6 @@ #include "base/path_service.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/test/scoped_feature_list.h" #include "base/test/thread_test_helper.h" #include "brave/browser/brave_content_browser_client.h" diff --git a/browser/farbling/brave_enumeratedevices_farbling_browsertest.cc b/browser/farbling/brave_enumeratedevices_farbling_browsertest.cc index 511417243c742..0d14bc27f278d 100644 --- a/browser/farbling/brave_enumeratedevices_farbling_browsertest.cc +++ b/browser/farbling/brave_enumeratedevices_farbling_browsertest.cc @@ -5,7 +5,6 @@ #include "base/path_service.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/test/thread_test_helper.h" #include "brave/browser/brave_content_browser_client.h" #include "brave/browser/extensions/brave_base_local_data_files_browsertest.h" diff --git a/browser/farbling/brave_navigator_devicememory_farbling_browsertest.cc b/browser/farbling/brave_navigator_devicememory_farbling_browsertest.cc index 6e47be4035d6a..aca3f0a497247 100644 --- a/browser/farbling/brave_navigator_devicememory_farbling_browsertest.cc +++ b/browser/farbling/brave_navigator_devicememory_farbling_browsertest.cc @@ -5,7 +5,6 @@ #include "base/path_service.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/test/thread_test_helper.h" #include "brave/browser/brave_content_browser_client.h" #include "brave/browser/extensions/brave_base_local_data_files_browsertest.h" diff --git a/browser/farbling/brave_navigator_hardwareconcurrency_farbling_browsertest.cc b/browser/farbling/brave_navigator_hardwareconcurrency_farbling_browsertest.cc index 2b11e850af39b..4223ffeff833c 100644 --- a/browser/farbling/brave_navigator_hardwareconcurrency_farbling_browsertest.cc +++ b/browser/farbling/brave_navigator_hardwareconcurrency_farbling_browsertest.cc @@ -6,7 +6,6 @@ #include "base/path_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/test/thread_test_helper.h" #include "brave/browser/brave_content_browser_client.h" #include "brave/browser/extensions/brave_base_local_data_files_browsertest.h" diff --git a/browser/farbling/brave_navigator_languages_farbling_browsertest.cc b/browser/farbling/brave_navigator_languages_farbling_browsertest.cc index 80b5123d0ad69..6c2ef9ac84aaa 100644 --- a/browser/farbling/brave_navigator_languages_farbling_browsertest.cc +++ b/browser/farbling/brave_navigator_languages_farbling_browsertest.cc @@ -5,7 +5,6 @@ #include "base/path_service.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/test/thread_test_helper.h" #include "brave/browser/brave_browser_process.h" #include "brave/browser/brave_content_browser_client.h" diff --git a/browser/farbling/brave_navigator_plugins_farbling_browsertest.cc b/browser/farbling/brave_navigator_plugins_farbling_browsertest.cc index bb287a52c3260..945d7dd8c18d0 100644 --- a/browser/farbling/brave_navigator_plugins_farbling_browsertest.cc +++ b/browser/farbling/brave_navigator_plugins_farbling_browsertest.cc @@ -5,7 +5,6 @@ #include "base/path_service.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/test/thread_test_helper.h" #include "brave/browser/brave_content_browser_client.h" #include "brave/browser/extensions/brave_base_local_data_files_browsertest.h" diff --git a/browser/farbling/brave_navigator_useragent_farbling_browsertest.cc b/browser/farbling/brave_navigator_useragent_farbling_browsertest.cc index 6765941237b01..c644337be9e9b 100644 --- a/browser/farbling/brave_navigator_useragent_farbling_browsertest.cc +++ b/browser/farbling/brave_navigator_useragent_farbling_browsertest.cc @@ -6,7 +6,6 @@ #include "base/path_service.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/test/thread_test_helper.h" #include "brave/browser/brave_content_browser_client.h" #include "brave/browser/extensions/brave_base_local_data_files_browsertest.h" diff --git a/browser/farbling/brave_offscreencanvas_farbling_browsertest.cc b/browser/farbling/brave_offscreencanvas_farbling_browsertest.cc index 2560d2de5997f..4ee9c986fa3bb 100644 --- a/browser/farbling/brave_offscreencanvas_farbling_browsertest.cc +++ b/browser/farbling/brave_offscreencanvas_farbling_browsertest.cc @@ -5,7 +5,6 @@ #include "base/path_service.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/test/thread_test_helper.h" #include "brave/browser/brave_content_browser_client.h" #include "brave/browser/extensions/brave_base_local_data_files_browsertest.h" diff --git a/browser/farbling/brave_webaudio_farbling_browsertest.cc b/browser/farbling/brave_webaudio_farbling_browsertest.cc index f13be578c1fda..12bf980d16877 100644 --- a/browser/farbling/brave_webaudio_farbling_browsertest.cc +++ b/browser/farbling/brave_webaudio_farbling_browsertest.cc @@ -5,7 +5,6 @@ #include "base/path_service.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/test/thread_test_helper.h" #include "brave/browser/brave_content_browser_client.h" #include "brave/browser/extensions/brave_base_local_data_files_browsertest.h" diff --git a/browser/farbling/brave_webgl_farbling_browsertest.cc b/browser/farbling/brave_webgl_farbling_browsertest.cc index 26ad89afd28e4..8f2d0d2e91748 100644 --- a/browser/farbling/brave_webgl_farbling_browsertest.cc +++ b/browser/farbling/brave_webgl_farbling_browsertest.cc @@ -6,7 +6,6 @@ #include "base/path_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/test/thread_test_helper.h" #include "brave/browser/brave_content_browser_client.h" #include "brave/browser/extensions/brave_base_local_data_files_browsertest.h" diff --git a/browser/ftx/ftx_protocol_handler.cc b/browser/ftx/ftx_protocol_handler.cc index 23ad66d2d3273..f9077131eef34 100644 --- a/browser/ftx/ftx_protocol_handler.cc +++ b/browser/ftx/ftx_protocol_handler.cc @@ -11,7 +11,6 @@ #include "base/strings/strcat.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "brave/browser/ftx/ftx_service_factory.h" #include "brave/common/url_constants.h" #include "brave/components/ftx/browser/ftx_service.h" @@ -20,7 +19,6 @@ #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_frame_host.h" -#include "net/base/escape.h" #include "net/base/url_util.h" #include "url/origin.h" @@ -93,8 +91,8 @@ void HandleFTXProtocol(const GURL& url, bool has_user_gesture, const absl::optional& initiator) { DCHECK(IsFTXProtocol(url)); - base::PostTask( - FROM_HERE, {content::BrowserThread::UI}, + content::GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(&LoadNewTabURL, url, std::move(web_contents_getter), page_transition, has_user_gesture, initiator)); } diff --git a/browser/gemini/gemini_protocol_handler.cc b/browser/gemini/gemini_protocol_handler.cc index 525a8a3ac7648..6c86c2f99202e 100644 --- a/browser/gemini/gemini_protocol_handler.cc +++ b/browser/gemini/gemini_protocol_handler.cc @@ -11,7 +11,7 @@ #include "base/strings/strcat.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" +#include "base/task/thread_pool.h" #include "brave/browser/gemini/gemini_service_factory.h" #include "brave/common/url_constants.h" #include "brave/components/gemini/browser/gemini_service.h" @@ -21,7 +21,6 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_frame_host.h" #include "content/public/browser/web_contents.h" -#include "net/base/escape.h" #include "net/base/url_util.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/base/page_transition_types.h" @@ -81,8 +80,8 @@ void HandleGeminiProtocol(const GURL& url, bool has_user_gesture, const absl::optional& initiator) { DCHECK(IsGeminiProtocol(url)); - base::PostTask( - FROM_HERE, {content::BrowserThread::UI}, + content::GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(&LoadNewTabURL, url, std::move(web_contents_getter), page_transition, has_user_gesture, initiator)); } diff --git a/browser/greaselion/greaselion_browsertest.cc b/browser/greaselion/greaselion_browsertest.cc index 609891bb7d21d..994477646300c 100644 --- a/browser/greaselion/greaselion_browsertest.cc +++ b/browser/greaselion/greaselion_browsertest.cc @@ -8,7 +8,6 @@ #include "base/path_service.h" #include "base/run_loop.h" #include "base/scoped_observation.h" -#include "base/task/post_task.h" #include "base/test/thread_test_helper.h" #include "brave/browser/brave_browser_process.h" #include "brave/browser/brave_rewards/rewards_service_factory.h" diff --git a/browser/importer/brave_external_process_importer_host.cc b/browser/importer/brave_external_process_importer_host.cc index 1d5a3e2643cec..573578535075e 100644 --- a/browser/importer/brave_external_process_importer_host.cc +++ b/browser/importer/brave_external_process_importer_host.cc @@ -11,7 +11,6 @@ #include "base/bind.h" #include "base/files/file_util.h" #include "base/json/json_reader.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "brave/browser/importer/brave_importer_p3a.h" #include "brave/common/importer/chrome_importer_utils.h" diff --git a/browser/ipfs/content_browser_client_helper.cc b/browser/ipfs/content_browser_client_helper.cc index 3d25bc640892e..0a784db2ba63f 100644 --- a/browser/ipfs/content_browser_client_helper.cc +++ b/browser/ipfs/content_browser_client_helper.cc @@ -9,7 +9,6 @@ #include #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "brave/browser/ipfs/ipfs_service_factory.h" #include "brave/browser/profiles/profile_util.h" #include "brave/common/url_constants.h" diff --git a/browser/ipfs/import/ipfs_import_controller.cc b/browser/ipfs/import/ipfs_import_controller.cc index 56fd4a70026de..39e1981dfc2f8 100644 --- a/browser/ipfs/import/ipfs_import_controller.cc +++ b/browser/ipfs/import/ipfs_import_controller.cc @@ -12,7 +12,7 @@ #include "base/files/file_util.h" #include "base/guid.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" +#include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "brave/browser/ipfs/import/save_package_observer.h" #include "brave/browser/ipfs/ipfs_service_factory.h" @@ -223,8 +223,7 @@ void IpfsImportController::OnDownloadFinished( case download::DownloadItem::CANCELLED: base::ThreadPool::PostTask( FROM_HERE, {base::TaskPriority::BEST_EFFORT, base::MayBlock()}, - base::BindOnce(base::GetDeletePathRecursivelyCallback(), - path.DirName())); + base::GetDeletePathRecursivelyCallback(path.DirName())); break; default: NOTREACHED(); @@ -289,8 +288,7 @@ void IpfsImportController::OnWebPageImportCompleted( const ipfs::ImportedData& data) { base::ThreadPool::PostTask( FROM_HERE, {base::TaskPriority::BEST_EFFORT, base::MayBlock()}, - base::BindOnce(base::GetDeletePathRecursivelyCallback(), - imported_direcory.DirName())); + GetDeletePathRecursivelyCallback(imported_direcory.DirName())); OnImportCompleted(data); } diff --git a/browser/mac/sparkle_glue.mm b/browser/mac/sparkle_glue.mm index 8c7d5625f2abf..1ecbaf6b7634b 100644 --- a/browser/mac/sparkle_glue.mm +++ b/browser/mac/sparkle_glue.mm @@ -16,7 +16,6 @@ #include "base/memory/ref_counted.h" #include "base/strings/sys_string_conversions.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #import "brave/browser/mac/su_updater.h" #include "brave/browser/update_util.h" diff --git a/browser/net/brave_httpse_network_delegate_helper.cc b/browser/net/brave_httpse_network_delegate_helper.cc index ca81d4baaabf4..ec65cffe12b40 100644 --- a/browser/net/brave_httpse_network_delegate_helper.cc +++ b/browser/net/brave_httpse_network_delegate_helper.cc @@ -9,7 +9,6 @@ #include #include -#include "base/task/post_task.h" #include "base/threading/scoped_blocking_call.h" #include "brave/browser/brave_browser_process.h" #include "brave/browser/brave_shields/brave_shields_web_contents_observer.h" diff --git a/browser/net/brave_proxying_url_loader_factory.cc b/browser/net/brave_proxying_url_loader_factory.cc index 5bcaa0c2e313a..56534314bc61d 100644 --- a/browser/net/brave_proxying_url_loader_factory.cc +++ b/browser/net/brave_proxying_url_loader_factory.cc @@ -11,7 +11,6 @@ #include "base/feature_list.h" #include "base/metrics/histogram_macros.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "brave/browser/net/brave_request_handler.h" #include "brave/components/brave_shields/browser/adblock_stub_response.h" #include "brave/components/brave_shields/common/features.h" diff --git a/browser/net/brave_proxying_web_socket.cc b/browser/net/brave_proxying_web_socket.cc index 0d58260f1c698..321c13dae836c 100644 --- a/browser/net/brave_proxying_web_socket.cc +++ b/browser/net/brave_proxying_web_socket.cc @@ -11,7 +11,6 @@ #include "base/containers/flat_set.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "brave/browser/net/brave_request_handler.h" #include "brave/common/network_constants.h" #include "content/public/browser/browser_context.h" diff --git a/browser/net/brave_request_handler.cc b/browser/net/brave_request_handler.cc index 11c9a5cb5fd23..23e82d2e38e5f 100644 --- a/browser/net/brave_request_handler.cc +++ b/browser/net/brave_request_handler.cc @@ -10,7 +10,6 @@ #include "base/containers/contains.h" #include "base/feature_list.h" -#include "base/task/post_task.h" #include "brave/browser/net/brave_ad_block_csp_network_delegate_helper.h" #include "brave/browser/net/brave_ad_block_tp_network_delegate_helper.h" #include "brave/browser/net/brave_common_static_redirect_network_delegate_helper.h" @@ -201,8 +200,8 @@ void BraveRequestHandler::RunCallbackForRequestIdentifier( callbacks_.find(request_identifier); // We intentionally do the async call to maintain the proper flow // of URLLoader callbacks. - base::PostTask(FROM_HERE, {content::BrowserThread::UI}, - base::BindOnce(std::move(it->second), rv)); + content::GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(std::move(it->second), rv)); } // TODO(iefremov): Merge all callback containers into one and run only one loop diff --git a/browser/ntp_background_images/android/ntp_background_images_bridge.cc b/browser/ntp_background_images/android/ntp_background_images_bridge.cc index b52a64c212ba3..ce40da5b2cb63 100644 --- a/browser/ntp_background_images/android/ntp_background_images_bridge.cc +++ b/browser/ntp_background_images/android/ntp_background_images_bridge.cc @@ -17,7 +17,6 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/guid.h" -#include "base/task/post_task.h" #include "brave/browser/brave_browser_process.h" #include "brave/browser/ntp_background_images/view_counter_service_factory.h" #include "brave/build/android/jni_headers/NTPBackgroundImagesBridge_jni.h" diff --git a/browser/permissions/brave_wallet_permission_context_browsertest.cc b/browser/permissions/brave_wallet_permission_context_browsertest.cc index f32c2cebf7120..06285aea73a8d 100644 --- a/browser/permissions/brave_wallet_permission_context_browsertest.cc +++ b/browser/permissions/brave_wallet_permission_context_browsertest.cc @@ -110,7 +110,7 @@ IN_PROC_BROWSER_TEST_F(BraveWalletPermissionContextBrowserTest, // Fail if rfh is null. bool was_called = false; BraveWalletPermissionContext::GetAllowedAccounts( - ContentSettingsType::BRAVE_ETHEREUM, nullptr /* rfh */, addresses, + blink::PermissionType::BRAVE_ETHEREUM, nullptr /* rfh */, addresses, base::BindOnce(&OnGetAllowedAccountsResult, &was_called, false, std::vector())); content::RunAllTasksUntilIdle(); @@ -122,7 +122,7 @@ IN_PROC_BROWSER_TEST_F(BraveWalletPermissionContextBrowserTest, // No allowed accounts before setting permissions. BraveWalletPermissionContext::GetAllowedAccounts( - ContentSettingsType::BRAVE_ETHEREUM, web_contents()->GetMainFrame(), + blink::PermissionType::BRAVE_ETHEREUM, web_contents()->GetMainFrame(), addresses, base::BindOnce(&OnGetAllowedAccountsResult, &was_called, true, std::vector())); @@ -145,7 +145,7 @@ IN_PROC_BROWSER_TEST_F(BraveWalletPermissionContextBrowserTest, ContentSetting::CONTENT_SETTING_ALLOW); } BraveWalletPermissionContext::GetAllowedAccounts( - ContentSettingsType::BRAVE_ETHEREUM, web_contents()->GetMainFrame(), + blink::PermissionType::BRAVE_ETHEREUM, web_contents()->GetMainFrame(), addresses, base::BindOnce(&OnGetAllowedAccountsResult, &was_called, true, expected_allowed_accounts)); @@ -167,7 +167,7 @@ IN_PROC_BROWSER_TEST_F(BraveWalletPermissionContextBrowserTest, bool was_called = false; auto* iframe_rfh = ChildFrameAt(web_contents()->GetMainFrame(), 0); BraveWalletPermissionContext::GetAllowedAccounts( - ContentSettingsType::BRAVE_ETHEREUM, iframe_rfh, addresses, + blink::PermissionType::BRAVE_ETHEREUM, iframe_rfh, addresses, base::BindOnce(&OnGetAllowedAccountsResult, &was_called, false, std::vector())); content::RunAllTasksUntilIdle(); diff --git a/browser/permissions/brave_wallet_permission_context_unittest.cc b/browser/permissions/brave_wallet_permission_context_unittest.cc index e6321b8865528..5d3e7366fced7 100644 --- a/browser/permissions/brave_wallet_permission_context_unittest.cc +++ b/browser/permissions/brave_wallet_permission_context_unittest.cc @@ -36,11 +36,11 @@ TEST_F(BraveWalletPermissionContextUnitTest, AddPermission) { url::Origin origin = url::Origin::Create(GURL("https://www.brave.com/")); const struct { const char* address; - ContentSettingsType type; + blink::PermissionType type; } cases[] = {{"0x407637cC04893DA7FA4A7C0B58884F82d69eD448", - ContentSettingsType::BRAVE_ETHEREUM}, + blink::PermissionType::BRAVE_ETHEREUM}, {"BrG44HdsEhzapvs8bEqzvkq4egwevS3fRE6ze2ENo6S8", - ContentSettingsType::BRAVE_SOLANA}}; + blink::PermissionType::BRAVE_SOLANA}}; for (size_t i = 0; i < sizeof(cases) / sizeof(cases[0]); ++i) { bool has_permission; bool success = permissions::BraveWalletPermissionContext::HasPermission( @@ -66,11 +66,11 @@ TEST_F(BraveWalletPermissionContextUnitTest, ResetPermission) { url::Origin origin = url::Origin::Create(GURL("https://www.brave.com/")); const struct { const char* address; - ContentSettingsType type; + blink::PermissionType type; } cases[] = {{"0x407637cC04893DA7FA4A7C0B58884F82d69eD448", - ContentSettingsType::BRAVE_ETHEREUM}, + blink::PermissionType::BRAVE_ETHEREUM}, {"BrG44HdsEhzapvs8bEqzvkq4egwevS3fRE6ze2ENo6S8", - ContentSettingsType::BRAVE_SOLANA}}; + blink::PermissionType::BRAVE_SOLANA}}; for (size_t i = 0; i < sizeof(cases) / sizeof(cases[0]); ++i) { bool success = permissions::BraveWalletPermissionContext::AddPermission( cases[i].type, browser_context(), origin, cases[i].address); @@ -107,18 +107,21 @@ TEST_F(BraveWalletPermissionContextUnitTest, GetWebSitesWithPermission) { const struct { const char* address; ContentSettingsType type; - } cases[] = {{"0x407637cC04893DA7FA4A7C0B58884F82d69eD448", - ContentSettingsType::BRAVE_ETHEREUM}, - {"BrG44HdsEhzapvs8bEqzvkq4egwevS3fRE6ze2ENo6S8", - ContentSettingsType::BRAVE_SOLANA}}; + blink::PermissionType permission; + } cases[] = { + {"0x407637cC04893DA7FA4A7C0B58884F82d69eD448", + ContentSettingsType::BRAVE_ETHEREUM, + blink::PermissionType::BRAVE_ETHEREUM}, + {"BrG44HdsEhzapvs8bEqzvkq4egwevS3fRE6ze2ENo6S8", + ContentSettingsType::BRAVE_SOLANA, blink::PermissionType::BRAVE_SOLANA}}; for (size_t i = 0; i < sizeof(cases) / sizeof(cases[0]); ++i) { bool success = permissions::BraveWalletPermissionContext::AddPermission( - cases[i].type, browser_context(), origin, cases[i].address); + cases[i].permission, browser_context(), origin, cases[i].address); EXPECT_TRUE(success) << "case: " << i; std::vector web_sites = permissions::BraveWalletPermissionContext::GetWebSitesWithPermission( - cases[i].type, browser_context()); + cases[i].permission, browser_context()); EXPECT_EQ(web_sites.size(), (uint32_t)1); url::Origin origin_wallet_address; @@ -140,32 +143,35 @@ TEST_F(BraveWalletPermissionContextUnitTest, ResetWebSitePermission) { const struct { const char* address; ContentSettingsType type; - } cases[] = {{"0x407637cC04893DA7FA4A7C0B58884F82d69eD448", - ContentSettingsType::BRAVE_ETHEREUM}, - {"BrG44HdsEhzapvs8bEqzvkq4egwevS3fRE6ze2ENo6S8", - ContentSettingsType::BRAVE_SOLANA}}; + blink::PermissionType permission; + } cases[] = { + {"0x407637cC04893DA7FA4A7C0B58884F82d69eD448", + ContentSettingsType::BRAVE_ETHEREUM, + blink::PermissionType::BRAVE_ETHEREUM}, + {"BrG44HdsEhzapvs8bEqzvkq4egwevS3fRE6ze2ENo6S8", + ContentSettingsType::BRAVE_SOLANA, blink::PermissionType::BRAVE_SOLANA}}; for (size_t i = 0; i < sizeof(cases) / sizeof(cases[0]); ++i) { bool success = permissions::BraveWalletPermissionContext::AddPermission( - cases[i].type, browser_context(), origin, cases[i].address); + cases[i].permission, browser_context(), origin, cases[i].address); EXPECT_TRUE(success) << "case: " << i; std::vector web_sites = permissions::BraveWalletPermissionContext::GetWebSitesWithPermission( - cases[i].type, browser_context()); + cases[i].permission, browser_context()); EXPECT_EQ(web_sites.size(), (uint32_t)1); // Not a valid URL test EXPECT_FALSE( permissions::BraveWalletPermissionContext::ResetWebSitePermission( - cases[i].type, browser_context(), "not_valid")); + cases[i].permission, browser_context(), "not_valid")); EXPECT_TRUE( permissions::BraveWalletPermissionContext::ResetWebSitePermission( - cases[i].type, browser_context(), web_sites[0])); + cases[i].permission, browser_context(), web_sites[0])); web_sites = permissions::BraveWalletPermissionContext::GetWebSitesWithPermission( - cases[i].type, browser_context()); + cases[i].permission, browser_context()); EXPECT_EQ(web_sites.size(), (uint32_t)0); } } diff --git a/browser/permissions/brave_wallet_permission_prompt_android.cc b/browser/permissions/brave_wallet_permission_prompt_android.cc index b174a418b08c9..e87c705d03a52 100644 --- a/browser/permissions/brave_wallet_permission_prompt_android.cc +++ b/browser/permissions/brave_wallet_permission_prompt_android.cc @@ -10,7 +10,7 @@ #include "brave/browser/permissions/brave_ethereum_permission_prompt_dialog_controller_android.h" #include "brave/components/brave_wallet/browser/permission_utils.h" #include "brave/components/permissions/contexts/brave_wallet_permission_context.h" -#include "components/permissions/android/permission_prompt_android.h" +#include "components/permissions/android/permission_prompt/permission_prompt_android.h" #include "content/public/browser/web_contents.h" BraveWalletPermissionPrompt::BraveWalletPermissionPrompt( diff --git a/browser/permissions/permission_manager_browsertest.cc b/browser/permissions/permission_manager_browsertest.cc index 8767dbe5b2f9c..5f14237067703 100644 --- a/browser/permissions/permission_manager_browsertest.cc +++ b/browser/permissions/permission_manager_browsertest.cc @@ -10,6 +10,7 @@ #include "base/test/scoped_feature_list.h" #include "brave/components/brave_wallet/browser/permission_utils.h" #include "brave/components/brave_wallet/common/features.h" +#include "brave/components/permissions/brave_permission_manager.h" #include "brave/components/permissions/contexts/brave_wallet_permission_context.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/permissions/permission_manager_factory.h" @@ -85,8 +86,8 @@ class PermissionManagerBrowserTest : public InProcessBrowserTest { https_server()->ServeFilesFromSourceDirectory(GetChromeTestDataDir()); ASSERT_TRUE(https_server()->Start()); - permission_manager_ = - PermissionManagerFactory::GetForProfile(browser()->profile()); + permission_manager_ = static_cast( + PermissionManagerFactory::GetForProfile(browser()->profile())); } PermissionRequestManager* GetPermissionRequestManager() { @@ -106,7 +107,7 @@ class PermissionManagerBrowserTest : public InProcessBrowserTest { } net::EmbeddedTestServer* https_server() { return &https_server_; } - PermissionManager* permission_manager() { return permission_manager_; } + BravePermissionManager* permission_manager() { return permission_manager_; } bool IsPendingGroupedRequestsEmpty(ContentSettingsType type) { PermissionContextBase* context = @@ -116,7 +117,7 @@ class PermissionManagerBrowserTest : public InProcessBrowserTest { protected: net::test_server::EmbeddedTestServer https_server_; - raw_ptr permission_manager_ = nullptr; + raw_ptr permission_manager_ = nullptr; private: base::test::ScopedFeatureList scoped_feature_list_; @@ -131,18 +132,22 @@ IN_PROC_BROWSER_TEST_F(PermissionManagerBrowserTest, RequestPermissions) { struct { std::vector addresses; ContentSettingsType type; + blink::PermissionType permission; } cases[] = {{{"0xaf5Ad1E10926C0Ee4af4eDAC61DD60E853753f8A", "0xaf5Ad1E10926C0Ee4af4eDAC61DD60E853753f8B"}, - ContentSettingsType::BRAVE_ETHEREUM}, + ContentSettingsType::BRAVE_ETHEREUM, + blink::PermissionType::BRAVE_ETHEREUM}, {{"BrG44HdsEhzapvs8bEqzvkq4egwevS3fRE6ze2ENo6S8", "JDqrvDz8d8tFCADashbUKQDKfJZFobNy13ugN65t1wvV"}, - ContentSettingsType::BRAVE_SOLANA}}; + ContentSettingsType::BRAVE_SOLANA, + blink::PermissionType::BRAVE_SOLANA}}; for (size_t i = 0; i < sizeof(cases) / sizeof(cases[0]); ++i) { const std::vector& addresses = cases[i].addresses; RequestType request_type = ContentSettingsTypeToRequestType(cases[i].type); EXPECT_TRUE(IsPendingGroupedRequestsEmpty(cases[i].type)) << "case: " << i; - std::vector types(addresses.size(), cases[i].type); + std::vector permissions(addresses.size(), + cases[i].permission); std::vector sub_request_origins(addresses.size()); for (size_t j = 0; j < addresses.size(); ++j) { ASSERT_TRUE(brave_wallet::GetSubRequestOrigin( @@ -158,8 +163,8 @@ IN_PROC_BROWSER_TEST_F(PermissionManagerBrowserTest, RequestPermissions) { auto observer = std::make_unique( permission_request_manager); - permission_manager()->RequestPermissions( - types, web_contents()->GetMainFrame(), origin.GetURL(), true, + permission_manager()->RequestPermissionsForOrigin( + permissions, web_contents()->GetMainFrame(), origin.GetURL(), true, base::DoNothing()); content::RunAllTasksUntilIdle(); @@ -195,8 +200,8 @@ IN_PROC_BROWSER_TEST_F(PermissionManagerBrowserTest, RequestPermissions) { } observer->Reset(); - permission_manager()->RequestPermissions( - types, web_contents()->GetMainFrame(), origin.GetURL(), true, + permission_manager()->RequestPermissionsForOrigin( + permissions, web_contents()->GetMainFrame(), origin.GetURL(), true, base::DoNothing()); content::RunAllTasksUntilIdle(); @@ -243,12 +248,15 @@ IN_PROC_BROWSER_TEST_F(PermissionManagerBrowserTest, struct { std::vector addresses; ContentSettingsType type; + blink::PermissionType permission; } cases[] = {{{"0xaf5Ad1E10926C0Ee4af4eDAC61DD60E853753f8C", "0xaf5Ad1E10926C0Ee4af4eDAC61DD60E853753f8D"}, - ContentSettingsType::BRAVE_ETHEREUM}, + ContentSettingsType::BRAVE_ETHEREUM, + blink::PermissionType::BRAVE_ETHEREUM}, {{"BrG44HdsEhzapvs8bEqzvkq4egwevS3fRE6ze2ENo6S8", "JDqrvDz8d8tFCADashbUKQDKfJZFobNy13ugN65t1wvV"}, - ContentSettingsType::BRAVE_SOLANA}}; + ContentSettingsType::BRAVE_SOLANA, + blink::PermissionType::BRAVE_SOLANA}}; for (size_t i = 0; i < sizeof(cases) / sizeof(cases[0]); ++i) { ASSERT_TRUE(AddTabAtIndexToBrowser(browser(), 0, url, ui::PAGE_TRANSITION_TYPED, true)); @@ -258,7 +266,8 @@ IN_PROC_BROWSER_TEST_F(PermissionManagerBrowserTest, RequestType request_type = ContentSettingsTypeToRequestType(cases[i].type); EXPECT_TRUE(IsPendingGroupedRequestsEmpty(cases[i].type)) << "case: " << i; - std::vector types(addresses.size(), cases[i].type); + std::vector permissions(addresses.size(), + cases[i].permission); std::vector sub_request_origins(addresses.size()); for (size_t j = 0; j < addresses.size(); ++j) { ASSERT_TRUE(brave_wallet::GetSubRequestOrigin( @@ -275,8 +284,8 @@ IN_PROC_BROWSER_TEST_F(PermissionManagerBrowserTest, auto observer = std::make_unique( permission_request_manager); - permission_manager()->RequestPermissions( - types, web_contents()->GetMainFrame(), origin.GetURL(), true, + permission_manager()->RequestPermissionsForOrigin( + permissions, web_contents()->GetMainFrame(), origin.GetURL(), true, base::DoNothing()); content::RunAllTasksUntilIdle(); @@ -314,12 +323,15 @@ IN_PROC_BROWSER_TEST_F(PermissionManagerBrowserTest, struct { std::vector addresses; ContentSettingsType type; + blink::PermissionType permission; } cases[] = {{{"0xaf5Ad1E10926C0Ee4af4eDAC61DD60E853753f8A", "0xaf5Ad1E10926C0Ee4af4eDAC61DD60E853753f8B"}, - ContentSettingsType::BRAVE_ETHEREUM}, + ContentSettingsType::BRAVE_ETHEREUM, + blink::PermissionType::BRAVE_ETHEREUM}, {{"BrG44HdsEhzapvs8bEqzvkq4egwevS3fRE6ze2ENo6S8", "JDqrvDz8d8tFCADashbUKQDKfJZFobNy13ugN65t1wvV"}, - ContentSettingsType::BRAVE_SOLANA}}; + ContentSettingsType::BRAVE_SOLANA, + blink::PermissionType::BRAVE_SOLANA}}; GURL top_url(https_server()->GetURL("a.test", "/iframe.html")); ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), top_url)); @@ -331,10 +343,11 @@ IN_PROC_BROWSER_TEST_F(PermissionManagerBrowserTest, for (size_t i = 0; i < sizeof(cases) / sizeof(cases[0]); ++i) { // Will return empty responses without prompt. BraveWalletPermissionContext::RequestPermissions( - cases[i].type, iframe_rfh, cases[i].addresses, - base::BindOnce([](const std::vector& responses) { - EXPECT_TRUE(responses.empty()); - })); + cases[i].permission, iframe_rfh, cases[i].addresses, + base::BindOnce( + [](const std::vector& responses) { + EXPECT_TRUE(responses.empty()); + })); content::RunAllTasksUntilIdle(); EXPECT_TRUE(IsPendingGroupedRequestsEmpty(cases[i].type)) << "case: " << i; diff --git a/browser/profiles/brave_profile_impl.cc b/browser/profiles/brave_profile_impl.cc index 4ddf04c5a95d7..ed26be04529f8 100644 --- a/browser/profiles/brave_profile_impl.cc +++ b/browser/profiles/brave_profile_impl.cc @@ -5,7 +5,6 @@ #include "brave/browser/profiles/brave_profile_impl.h" -#include "base/task/post_task.h" #include "brave/browser/profiles/profile_util.h" #include "brave/common/pref_names.h" #include "chrome/browser/browser_process.h" diff --git a/browser/resources/settings/brave_appearance_page/super_referral.js b/browser/resources/settings/brave_appearance_page/super_referral.js index 8c3225baf997c..12802cf79d007 100644 --- a/browser/resources/settings/brave_appearance_page/super_referral.js +++ b/browser/resources/settings/brave_appearance_page/super_referral.js @@ -57,7 +57,7 @@ Polymer({ observers: [ 'themeChanged_(prefs.extensions.theme.id.value, useSystemTheme_)', - // + // // NOTE: this pref only exists on Linux. 'useSystemThemePrefChanged_(prefs.extensions.theme.use_system.value)', // @@ -85,7 +85,7 @@ Polymer({ this.appearanceBrowserProxy_.useDefaultTheme(); }, - // + // /** * @param {boolean} useSystemTheme * @private @@ -162,10 +162,10 @@ Polymer({ } let i18nId; - // + // i18nId = useSystemTheme ? 'systemTheme' : 'classicTheme'; // - // + // i18nId = 'chooseFromWebStore'; // this.themeSublabel_ = this.i18n(i18nId); @@ -184,7 +184,7 @@ Polymer({ this.appearanceBrowserProxy_.useDefaultTheme(); }, - // + // /** * @param {boolean} useSystemTheme * @private @@ -261,10 +261,10 @@ Polymer({ } let i18nId; - // + // i18nId = useSystemTheme ? 'systemTheme' : 'classicTheme'; // - // + // i18nId = 'chooseFromWebStore'; // this.themeSublabel_ = this.i18n(i18nId); diff --git a/browser/resources/settings/brave_overrides/settings_menu.js b/browser/resources/settings/brave_overrides/settings_menu.js index 66658ff88c87a..ddbd640014f6e 100644 --- a/browser/resources/settings/brave_overrides/settings_menu.js +++ b/browser/resources/settings/brave_overrides/settings_menu.js @@ -206,18 +206,12 @@ RegisterPolymerTemplateModifications({ const titleEl = document.createElement('h1') titleEl.id = 'settingsHeader' titleEl.textContent = loadTimeData.getString('settings') - const topMenuEl = templateContent.querySelector('#topMenu') - if (!topMenuEl) { - console.error('[Brave Settings Overrides] Could not find topMenu element to add title after') + const menuEl = templateContent.querySelector('#menu') + if (!menuEl) { + console.error('[Brave Settings Overrides] Could not find menu element to add title after') } else { - topMenuEl.insertAdjacentElement('afterbegin', titleEl) + menuEl.insertAdjacentElement('afterbegin', titleEl) } - // Advanced text - const advancedToggle = templateContent.querySelector('#advancedButton span') - if (!advancedToggle) { - console.error('[Brave Settings Overrides] Could not find advancedButton to modify text') - } - advancedToggle.textContent = loadTimeData.getString('braveAdditionalSettingsTitle') // Add 'Get Started' item const peopleEl = getMenuElement(templateContent, '/people') const getStartedEl = createMenuElement( diff --git a/browser/resources/sidebar/bookmarks/bookmark_folder.ts b/browser/resources/sidebar/bookmarks/bookmark_folder.ts index bedae0319c1bf..6bf101bfd6453 100644 --- a/browser/resources/sidebar/bookmarks/bookmark_folder.ts +++ b/browser/resources/sidebar/bookmarks/bookmark_folder.ts @@ -4,7 +4,7 @@ import 'chrome://resources/cr_elements/cr_icon_button/cr_icon_button.m.js'; import 'chrome://resources/cr_elements/shared_vars_css.m.js'; -import 'chrome://resources/cr_elements/mwb_element_shared_style.js'; +import 'chrome://resources/cr_elements/mwb_element_shared_style.css.js'; import {getFaviconForPageURL} from 'chrome://resources/js/icon.js'; import {html, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; diff --git a/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/BraveDevicePickerBottomSheetContent.java b/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/BraveDevicePickerBottomSheetContent.java index 25508519b46b2..636121f8a0287 100644 --- a/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/BraveDevicePickerBottomSheetContent.java +++ b/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/BraveDevicePickerBottomSheetContent.java @@ -11,9 +11,9 @@ import org.chromium.components.browser_ui.bottomsheet.BottomSheetController; public class BraveDevicePickerBottomSheetContent extends DevicePickerBottomSheetContent { - public BraveDevicePickerBottomSheetContent(Context context, String url, String title, - long navigationTime, BottomSheetController controller) { - super(context, url, title, navigationTime, controller); + public BraveDevicePickerBottomSheetContent( + Context context, String url, String title, BottomSheetController controller) { + super(context, url, title, controller); } public void createManageDevicesLink(ListView deviceListView) { diff --git a/browser/sync/brave_sync_service_impl_delegate.cc b/browser/sync/brave_sync_service_impl_delegate.cc index 8bba457da7189..a3cfe6b75c3ff 100644 --- a/browser/sync/brave_sync_service_impl_delegate.cc +++ b/browser/sync/brave_sync_service_impl_delegate.cc @@ -10,7 +10,6 @@ #include "base/callback_helpers.h" #include "base/metrics/histogram_functions.h" -#include "base/task/post_task.h" #include "base/threading/thread_task_runner_handle.h" #include "brave/components/sync/driver/brave_sync_service_impl.h" #include "components/sync_device_info/device_info_sync_service.h" diff --git a/browser/themes/theme_properties.cc b/browser/themes/theme_properties.cc index af48e1c2a20b4..d9ba95e3fc4c7 100644 --- a/browser/themes/theme_properties.cc +++ b/browser/themes/theme_properties.cc @@ -46,8 +46,6 @@ absl::optional MaybeGetDefaultColorForBraveLightUi(int id) { return kLightToolbarIcon; case ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON_INACTIVE: return color_utils::AlphaBlend(kLightToolbarIcon, kLightToolbar, 0.3f); - case ThemeProperties::COLOR_DOWNLOAD_SHELF_BUTTON_TEXT: - return gfx::kBraveGrey800; // 0x3b, 0x3e, 0x4f case BraveThemeProperties::COLOR_ICON_BASE: return SkColorSetRGB(0x49, 0x50, 0x57); case BraveThemeProperties::COLOR_TOGGLE_BUTTON_THUMB_ON_COLOR: @@ -144,8 +142,6 @@ absl::optional MaybeGetDefaultColorForBraveDarkUi(int id) { return kDarkToolbarIcon; case ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON_INACTIVE: return color_utils::AlphaBlend(kDarkToolbarIcon, kDarkToolbar, 0.3f); - case ThemeProperties::COLOR_DOWNLOAD_SHELF_BUTTON_TEXT: - return SK_ColorWHITE; case BraveThemeProperties::COLOR_ICON_BASE: return SkColorSetRGB(0xC2, 0xC4, 0xCF); case BraveThemeProperties::COLOR_TOGGLE_BUTTON_THUMB_ON_COLOR: diff --git a/browser/touch_to_fill/android/internal/java/res/values/dimens.xml b/browser/touch_to_fill/android/internal/java/res/values/dimens.xml index 36f127c55c4d0..514db3afa4fef 100644 --- a/browser/touch_to_fill/android/internal/java/res/values/dimens.xml +++ b/browser/touch_to_fill/android/internal/java/res/values/dimens.xml @@ -1,11 +1,14 @@ - 24dp + 32dp 16dp + 24dp + 1dp 170dp + + 230dp 80dp + + 73dp 60dp + + 64dp 16dp 8dp + 24dp + 16dp diff --git a/browser/ui/android/strings/android_chrome_strings.grd b/browser/ui/android/strings/android_chrome_strings.grd index 6ae680e816138..f1870b0885a62 100644 --- a/browser/ui/android/strings/android_chrome_strings.grd +++ b/browser/ui/android/strings/android_chrome_strings.grd @@ -269,6 +269,9 @@ CHAR_LIMIT guidelines: Brave tips + + Bluetooth + Unsupported @@ -551,9 +554,18 @@ CHAR_LIMIT guidelines: Virtual card + + Linked with %1$sVisa ....1234 + linked with + + Turn on + + + Turn off + @@ -581,8 +593,8 @@ CHAR_LIMIT guidelines: Passwords - - Password Manager + + Password Manager <new>New</new> Save passwords @@ -1037,6 +1049,24 @@ Trust tokens improve privacy on the web and can’t be used to find out who you You can learn more about these features in Brave settings. + + Privacy Sandbox prompt + + + Privacy Sandbox prompt opened at half height + + + Privacy Sandbox prompt opened at full height + + + Privacy Sandbox prompt closed + + + Help us build a better web + + + During trials, Brave is exploring ways to limit spam, fraud, and sharing between sites. Brave also estimates your interests that sites can use to show you ads. You can manage your interests in settings. + @@ -1939,6 +1969,9 @@ Your Brave account may have other forms of browsing history like searches and ac Passwords + + Reading list + Open tabs @@ -2387,9 +2420,6 @@ To change this setting, <resetlink>reset sync

Add - - Still adding previous site - Adding %1$sProgressive Web Apps... @@ -2399,9 +2429,6 @@ To change this setting, <resetlink>reset sync

Install this app - - The site’s connection is secure unless Brave tells you otherwise. - To get here quicker, add this page to your Home screen @@ -2437,6 +2464,9 @@ To change this setting, <resetlink>reset sync

You are viewing a preview of this page + + More about this page + Change your site settings here @@ -2870,24 +2900,48 @@ To change this setting, <resetlink>reset sync

%1$sjohn.doe@example.com? + + Get all your bookmarks + + + Sync to get your bookmarks from your other devices + To get your bookmarks on all your devices, turn on sync To get your bookmarks on all your devices, sign in and turn on sync + + See stories for you + + + Sync to get the most relevant content form Brave + To get personalized content suggested by Brave, turn on sync To get personalized content suggested by Brave, sign in and turn on sync + + Continue from another device + + + Sync to get your tabs from your other devices + To get your tabs from your other devices, turn on sync To get your tabs from your other devices, sign in and turn on sync + + Browse more easily + + + Sync to get your passwords, bookmarks and more on all your other devices. + To sync and personalize across devices, turn on sync @@ -2900,6 +2954,9 @@ To change this setting, <resetlink>reset sync

Turn on sync + + Continue + Brave does not have access to the requested resource. @@ -3078,6 +3135,15 @@ To change this setting, <resetlink>reset sync

Back to top + + %1$s6 tabs + + + Tab group - %1$sshopping + + + Tab group - %1$s5 tabs + @@ -3458,21 +3524,6 @@ To change this setting, <resetlink>reset sync

Can’t find that bookmark. Check your spelling or add a new bookmark. - - Add to - - - List of bookmark folders - - - List of bookmark folders opened at half height - - - List of bookmark folders opened at full height - - - List of bookmark folders is closed - Edit bookmark @@ -3570,9 +3621,6 @@ To change this setting, <resetlink>reset sync

- - Reading list <new>New</new> - Read @@ -3601,9 +3649,6 @@ To change this setting, <resetlink>reset sync

No unread pages - - Save this page for later and get a reminder - Add pages to your reading list for later @@ -3739,13 +3784,8 @@ To change this setting, <resetlink>reset sync

- - {OPEN_TABS, plural, - =1 {%1$d1 open tab, tap to switch tabs} - other {%1$d8 open tabs, tap to switch tabs}} - - open tabs + Switch or close tabs Manage account @@ -3813,6 +3853,9 @@ To change this setting, <resetlink>reset sync

Brave action button: %sclear browsing data + + %d12 suggested items in list below. + {NUM_SELECTED, plural, @@ -5197,6 +5240,11 @@ To change this setting, <resetlink>reset sync

%1$s1582667748515 + + + Show thanks to this creator + + Brave Notifications Platform @@ -5385,7 +5433,13 @@ To change this setting, <resetlink>reset sync

Sign in to %1$srp.example with %2$sidp.com - + + To continue, %1$sidp.com will share your name, email address, and profile picture with this site. + + + To continue, %1$sidp.com will share your name, email address, and profile picture with this site. See this site's <link_terms_of_service>terms of service</link_terms_of_service>. + + To continue, %1$sidp.com will share your name, email address, and profile picture with this site. See this site's <link_privacy_policy>privacy policy</link_privacy_policy>. @@ -5499,6 +5553,18 @@ To change this setting, <resetlink>reset sync

<LINK>Learn More</LINK> + + Update password? + + + You can use saved passwords on any device. They're saved to Brave Password Manager for %1$suser@gmail.com. + + + Passwords are saved to Brave Password Manager on this device + + + Passwords are saved to Password Manager on this device + diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomTabSwitcherActionMenuCoordinator.java b/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/BottomTabSwitcherActionMenuCoordinator.java similarity index 92% rename from android/java/org/chromium/chrome/browser/toolbar/bottom/BottomTabSwitcherActionMenuCoordinator.java rename to browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/BottomTabSwitcherActionMenuCoordinator.java index d19d568b55f9f..a3e1108495c19 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BottomTabSwitcherActionMenuCoordinator.java +++ b/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/BottomTabSwitcherActionMenuCoordinator.java @@ -3,13 +3,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.chromium.chrome.browser.toolbar.bottom; +package org.chromium.chrome.browser.toolbar.top; import android.view.View; import android.view.View.OnLongClickListener; import org.chromium.base.Callback; -import org.chromium.chrome.R; import org.chromium.chrome.browser.toolbar.top.TabSwitcherActionMenuCoordinator; import org.chromium.ui.modelutil.MVCListAdapter.ModelList; import org.chromium.ui.widget.RectProvider; @@ -26,7 +25,7 @@ public static OnLongClickListener createOnLongClickListener(Callback on } @Override - public ModelList buildMenuItems() { + ModelList buildMenuItems() { ModelList itemList = new ModelList(); itemList.add(buildListItemByMenuItemType(MenuItemType.NEW_TAB)); itemList.add(buildListItemByMenuItemType(MenuItemType.NEW_INCOGNITO_TAB)); diff --git a/browser/ui/brave_actions/brave_action_view_controller.cc b/browser/ui/brave_actions/brave_action_view_controller.cc index 0cfb9297f261b..de7fcad213e79 100644 --- a/browser/ui/brave_actions/brave_action_view_controller.cc +++ b/browser/ui/brave_actions/brave_action_view_controller.cc @@ -24,6 +24,7 @@ #include "chrome/browser/ui/toolbar/toolbar_action_view_delegate.h" #include "components/sessions/content/session_tab_helper.h" #include "components/vector_icons/vector_icons.h" +#include "content/public/browser/web_contents.h" #include "extensions/browser/extension_action.h" #include "extensions/browser/extension_action_manager.h" #include "extensions/browser/extension_registry.h" diff --git a/browser/ui/views/brave_actions/brave_rewards_action_stub_view.cc b/browser/ui/views/brave_actions/brave_rewards_action_stub_view.cc index 8bdfef64574c9..48d57230cf8bf 100644 --- a/browser/ui/views/brave_actions/brave_rewards_action_stub_view.cc +++ b/browser/ui/views/brave_actions/brave_rewards_action_stub_view.cc @@ -19,6 +19,7 @@ #include "chrome/browser/ui/views/toolbar/toolbar_ink_drop_util.h" #include "components/grit/brave_components_strings.h" #include "components/prefs/pref_service.h" +#include "content/public/browser/web_contents.h" #include "extensions/common/constants.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/resource/resource_bundle.h" diff --git a/browser/ui/views/brave_actions/brave_shields_action_view.cc b/browser/ui/views/brave_actions/brave_shields_action_view.cc index 98003cc7e470d..cffcfe0e4dfbd 100644 --- a/browser/ui/views/brave_actions/brave_shields_action_view.cc +++ b/browser/ui/views/brave_actions/brave_shields_action_view.cc @@ -21,6 +21,7 @@ #include "components/grit/brave_components_resources.h" #include "components/grit/brave_components_strings.h" #include "components/prefs/pref_service.h" +#include "content/public/browser/web_contents.h" #include "content/public/common/url_constants.h" #include "extensions/common/constants.h" #include "ui/base/l10n/l10n_util.h" diff --git a/browser/ui/views/brave_default_browser_dialog_view.cc b/browser/ui/views/brave_default_browser_dialog_view.cc index 45f000d692e6c..7ae668b5b1340 100644 --- a/browser/ui/views/brave_default_browser_dialog_view.cc +++ b/browser/ui/views/brave_default_browser_dialog_view.cc @@ -131,9 +131,8 @@ BraveDefaultBrowserDialogView::CreateNonClientFrameView(views::Widget* widget) { const views::BubbleBorder::Shadow kShadow = views::BubbleBorder::DIALOG_SHADOW; std::unique_ptr border = - std::make_unique(views::BubbleBorder::FLOAT, kShadow, - gfx::kPlaceholderColor); - border->set_use_theme_background_color(true); + std::make_unique(views::BubbleBorder::FLOAT, + kShadow); if (GetParams().round_corners) border->SetCornerRadius(GetCornerRadius()); frame->SetFootnoteView(DisownFootnoteView()); diff --git a/browser/ui/views/sidebar/bubble_border_with_arrow.cc b/browser/ui/views/sidebar/bubble_border_with_arrow.cc index 6d3dbc2537cb7..03a3584387324 100644 --- a/browser/ui/views/sidebar/bubble_border_with_arrow.cc +++ b/browser/ui/views/sidebar/bubble_border_with_arrow.cc @@ -72,7 +72,7 @@ void BubbleBorderWithArrow::Paint(const views::View& view, cc::PaintFlags flags; flags.setAntiAlias(true); flags.setStyle(cc::PaintFlags::kFill_Style); - flags.setColor(background_color()); + flags.setColor(color()); gfx::RectF bounds(view.GetLocalBounds()); bounds.Inset(gfx::InsetsF( diff --git a/browser/ui/views/sidebar/sidebar_bubble_background.cc b/browser/ui/views/sidebar/sidebar_bubble_background.cc index 7bc8f1eacb356..75b523ad76241 100644 --- a/browser/ui/views/sidebar/sidebar_bubble_background.cc +++ b/browser/ui/views/sidebar/sidebar_bubble_background.cc @@ -23,7 +23,7 @@ void SidebarBubbleBackground::Paint(gfx::Canvas* canvas, cc::PaintFlags flags; flags.setAntiAlias(true); flags.setStyle(cc::PaintFlags::kFill_Style); - flags.setColor(border_->background_color()); + flags.setColor(border_->color()); gfx::RectF bounds(view->GetLocalBounds()); bounds.Inset(gfx::InsetsF(border_->GetInsets())); diff --git a/browser/ui/views/translate/brave_translate_bubble_view_unittest.cc b/browser/ui/views/translate/brave_translate_bubble_view_unittest.cc index 3de38284c5efd..9cae3594cd429 100644 --- a/browser/ui/views/translate/brave_translate_bubble_view_unittest.cc +++ b/browser/ui/views/translate/brave_translate_bubble_view_unittest.cc @@ -18,8 +18,7 @@ namespace { class MockTranslateBubbleModel : public TranslateBubbleModel { public: explicit MockTranslateBubbleModel(TranslateBubbleModel::ViewState view_state) - : view_state_transition_(view_state), - error_type_(translate::TranslateErrors::NONE), + : error_type_(translate::TranslateErrors::NONE), original_language_index_(0), target_language_index_(1), never_translate_language_(false), @@ -32,24 +31,24 @@ class MockTranslateBubbleModel : public TranslateBubbleModel { translation_declined_(false), original_language_index_on_translation_(-1), target_language_index_on_translation_(-1), - can_add_site_to_never_prompt_list_(true) {} + can_add_site_to_never_prompt_list_(true) { + DCHECK_NE(VIEW_STATE_SOURCE_LANGUAGE, view_state); + DCHECK_NE(VIEW_STATE_TARGET_LANGUAGE, view_state); + current_view_state_ = view_state; + } TranslateBubbleModel::ViewState GetViewState() const override { - return view_state_transition_.view_state(); + return current_view_state_; } void SetViewState(TranslateBubbleModel::ViewState view_state) override { - view_state_transition_.SetViewState(view_state); + current_view_state_ = view_state; } void ShowError(translate::TranslateErrors::Type error_type) override { error_type_ = error_type; } - void GoBackFromAdvanced() override { - view_state_transition_.GoBackFromAdvanced(); - } - int GetNumberOfSourceLanguages() const override { return 1000; } int GetNumberOfTargetLanguages() const override { return 1000; } @@ -137,7 +136,7 @@ class MockTranslateBubbleModel : public TranslateBubbleModel { can_add_site_to_never_prompt_list_ = value; } - TranslateBubbleViewStateTransition view_state_transition_; + ViewState current_view_state_; translate::TranslateErrors::Type error_type_; int original_language_index_; int target_language_index_; @@ -187,7 +186,7 @@ class MockBraveTranslateBubbleView : public BraveTranslateBubbleView { class BraveTranslateBubbleViewTest : public ChromeViewsTestBase { public: - BraveTranslateBubbleViewTest() {} + BraveTranslateBubbleViewTest() = default; protected: void SetUp() override { diff --git a/browser/ui/webui/brave_vpn/vpn_panel_ui.h b/browser/ui/webui/brave_vpn/vpn_panel_ui.h index a8ff232ec2bfd..25760a22215ed 100644 --- a/browser/ui/webui/brave_vpn/vpn_panel_ui.h +++ b/browser/ui/webui/brave_vpn/vpn_panel_ui.h @@ -13,12 +13,12 @@ #include "brave/components/brave_vpn/mojom/brave_vpn.mojom.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/web_ui_message_handler.h" +#include "content/public/browser/webui_config.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/pending_remote.h" #include "mojo/public/cpp/bindings/receiver.h" #include "ui/webui/mojo_bubble_web_ui_controller.h" #include "ui/webui/untrusted_web_ui_controller.h" -#include "ui/webui/webui_config.h" // In the style of MojoBubbleWebUIController but for UntrustedWebUI instead class VPNPanelUI : public ui::UntrustedWebUIController, @@ -58,7 +58,7 @@ class VPNPanelUI : public ui::UntrustedWebUIController, WEB_UI_CONTROLLER_TYPE_DECL(); }; -class UntrustedVPNPanelUIConfig : public ui::WebUIConfig { +class UntrustedVPNPanelUIConfig : public content::WebUIConfig { public: UntrustedVPNPanelUIConfig(); ~UntrustedVPNPanelUIConfig() override = default; diff --git a/browser/ui/webui/brave_wallet/trezor/trezor_ui.h b/browser/ui/webui/brave_wallet/trezor/trezor_ui.h index e6eb6d303147d..625ee3cbdcd71 100644 --- a/browser/ui/webui/brave_wallet/trezor/trezor_ui.h +++ b/browser/ui/webui/brave_wallet/trezor/trezor_ui.h @@ -9,9 +9,9 @@ #include #include "content/public/browser/web_ui.h" +#include "content/public/browser/webui_config.h" #include "content/public/common/url_constants.h" #include "ui/webui/untrusted_web_ui_controller.h" -#include "ui/webui/webui_config.h" namespace trezor { @@ -23,7 +23,7 @@ class UntrustedTrezorUI : public ui::UntrustedWebUIController { ~UntrustedTrezorUI() override; }; -class UntrustedTrezorUIConfig : public ui::WebUIConfig { +class UntrustedTrezorUIConfig : public content::WebUIConfig { public: UntrustedTrezorUIConfig(); ~UntrustedTrezorUIConfig() override = default; diff --git a/browser/ui/webui/new_tab_page/brave_new_tab_page_handler.cc b/browser/ui/webui/new_tab_page/brave_new_tab_page_handler.cc index bcbadc7294d92..83053852b00d4 100644 --- a/browser/ui/webui/new_tab_page/brave_new_tab_page_handler.cc +++ b/browser/ui/webui/new_tab_page/brave_new_tab_page_handler.cc @@ -12,7 +12,6 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/memory/ref_counted_memory.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "brave/browser/ntp_background_images/constants.h" #include "brave/common/pref_names.h" @@ -29,11 +28,21 @@ #include "content/public/browser/web_contents.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/pending_remote.h" +#include "services/data_decoder/public/cpp/data_decoder.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/codec/png_codec.h" #include "ui/gfx/image/image.h" #include "url/gurl.h" +namespace { + +data_decoder::DataDecoder* GetDataDecoder() { + static base::NoDestructor data_decoder; + return data_decoder.get(); +} + +} // namespace + BraveNewTabPageHandler::BraveNewTabPageHandler( mojo::PendingReceiver pending_page_handler, @@ -136,7 +145,7 @@ void BraveNewTabPageHandler::OnGotImageFile(absl::optional input) { // Send image body to image decoder in isolated process. GetImageDecoder()->DecodeImage( - *input, gfx::Size() /* No particular size desired. */, + *input, gfx::Size() /* No particular size desired. */, GetDataDecoder(), base::BindOnce(&BraveNewTabPageHandler::OnImageDecoded, weak_factory_.GetWeakPtr())); } @@ -170,9 +179,9 @@ void BraveNewTabPageHandler::OnSavedEncodedImage(bool success) { } void BraveNewTabPageHandler::DeleteSanitizedImageFile() { - base::ThreadPool::PostTask(FROM_HERE, {base::MayBlock()}, - base::BindOnce(base::GetDeleteFileCallback(), - GetSanitizedImageFilePath())); + base::ThreadPool::PostTask( + FROM_HERE, {base::MayBlock()}, + base::GetDeleteFileCallback(GetSanitizedImageFilePath())); } base::FilePath BraveNewTabPageHandler::GetSanitizedImageFilePath() const { diff --git a/browser/ui/webui/settings/brave_import_data_handler_mac.mm b/browser/ui/webui/settings/brave_import_data_handler_mac.mm index 18a221d14ea95..a1d55efaa00b7 100644 --- a/browser/ui/webui/settings/brave_import_data_handler_mac.mm +++ b/browser/ui/webui/settings/brave_import_data_handler_mac.mm @@ -11,7 +11,6 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/mac/foundation_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/values.h" #include "brave/common/url_constants.h" diff --git a/build/android/bytecode/BUILD.gn b/build/android/bytecode/BUILD.gn index 8edb909c99244..c8991250a9e21 100644 --- a/build/android/bytecode/BUILD.gn +++ b/build/android/bytecode/BUILD.gn @@ -36,6 +36,7 @@ java_binary("java_bytecode_rewriter") { "//brave/build/android/bytecode/java/org/brave/bytecode/BraveManageSyncSettingsClassAdapter.java", "//brave/build/android/bytecode/java/org/brave/bytecode/BraveMenuButtonCoordinatorClassAdapter.java", "//brave/build/android/bytecode/java/org/brave/bytecode/BraveMimeUtilsClassAdapter.java", + "//brave/build/android/bytecode/java/org/brave/bytecode/BraveMostVisitedTilesMediatorClassAdapter.java", "//brave/build/android/bytecode/java/org/brave/bytecode/BraveNewTabPageClassAdapter.java", "//brave/build/android/bytecode/java/org/brave/bytecode/BraveNewTabPageLayoutClassAdapter.java", "//brave/build/android/bytecode/java/org/brave/bytecode/BraveNotificationManagerProxyImplClassAdapter.java", diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveBookmarkUtilsClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveBookmarkUtilsClassAdapter.java index 5b098f7850fa9..399ed684247e0 100644 --- a/build/android/bytecode/java/org/brave/bytecode/BraveBookmarkUtilsClassAdapter.java +++ b/build/android/bytecode/java/org/brave/bytecode/BraveBookmarkUtilsClassAdapter.java @@ -14,12 +14,7 @@ public class BraveBookmarkUtilsClassAdapter extends BraveClassVisitor { public BraveBookmarkUtilsClassAdapter(ClassVisitor visitor) { super(visitor); - makePublicMethod(sBookmarkUtilsClassName, "showBookmarkBottomSheet"); - changeMethodOwner( - sBraveBookmarkUtilsClassName, "showBookmarkBottomSheet", sBookmarkUtilsClassName); - makePublicMethod(sBookmarkUtilsClassName, "addBookmarkAndShowSnackbar"); - changeMethodOwner(sBraveBookmarkUtilsClassName, "addBookmarkAndShowSnackbar", - sBookmarkUtilsClassName); + changeMethodOwner( sBookmarkUtilsClassName, "addOrEditBookmark", sBraveBookmarkUtilsClassName); } diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveClassAdapter.java index 9e302e771f84a..0db9ed14d6c39 100644 --- a/build/android/bytecode/java/org/brave/bytecode/BraveClassAdapter.java +++ b/build/android/bytecode/java/org/brave/bytecode/BraveClassAdapter.java @@ -35,6 +35,7 @@ public static ClassVisitor createAdapter(ClassVisitor chain) { chain = new BraveManageSyncSettingsClassAdapter(chain); chain = new BraveMenuButtonCoordinatorClassAdapter(chain); chain = new BraveMimeUtilsClassAdapter(chain); + chain = new BraveMostVisitedTilesMediatorClassAdapter(chain); chain = new BraveNewTabPageClassAdapter(chain); chain = new BraveNewTabPageLayoutClassAdapter(chain); chain = new BraveNotificationManagerProxyImplClassAdapter(chain); diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveFeedSurfaceCoordinatorClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveFeedSurfaceCoordinatorClassAdapter.java index 1c7107b4da278..507f81e9be026 100644 --- a/build/android/bytecode/java/org/brave/bytecode/BraveFeedSurfaceCoordinatorClassAdapter.java +++ b/build/android/bytecode/java/org/brave/bytecode/BraveFeedSurfaceCoordinatorClassAdapter.java @@ -16,10 +16,6 @@ public class BraveFeedSurfaceCoordinatorClassAdapter extends BraveClassVisitor { public BraveFeedSurfaceCoordinatorClassAdapter(ClassVisitor visitor) { super(visitor); - makePublicMethod(sFeedSurfaceCoordinatorClassName, "isReliabilityLoggingEnabled"); - addMethodAnnotation(sBraveFeedSurfaceCoordinatorClassName, "isReliabilityLoggingEnabled", - "Ljava/lang/Override;"); - deleteField(sBraveFeedSurfaceCoordinatorClassName, "mNtpHeader"); makeProtectedField(sFeedSurfaceCoordinatorClassName, "mNtpHeader"); diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveManageSyncSettingsClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveManageSyncSettingsClassAdapter.java index d4fc780b52785..c12556177e0c2 100644 --- a/build/android/bytecode/java/org/brave/bytecode/BraveManageSyncSettingsClassAdapter.java +++ b/build/android/bytecode/java/org/brave/bytecode/BraveManageSyncSettingsClassAdapter.java @@ -30,5 +30,8 @@ public class BraveManageSyncSettingsClassAdapter extends BraveClassVisitor { deleteField(sBraveManageSyncSettingsClassName, "mSyncPaymentsIntegration"); makeProtectedField(sManageSyncSettingsClassName, "mSyncPaymentsIntegration"); + + deleteField(sBraveManageSyncSettingsClassName, "mSyncReadingList"); + makeProtectedField(sManageSyncSettingsClassName, "mSyncReadingList"); } } diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveMostVisitedTilesMediatorClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveMostVisitedTilesMediatorClassAdapter.java new file mode 100644 index 0000000000000..eac233ed2047c --- /dev/null +++ b/build/android/bytecode/java/org/brave/bytecode/BraveMostVisitedTilesMediatorClassAdapter.java @@ -0,0 +1,26 @@ +/* Copyright (c) 2022 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +package org.brave.bytecode; + +import org.objectweb.asm.ClassVisitor; + +public class BraveMostVisitedTilesMediatorClassAdapter extends BraveClassVisitor { + static String sMostVisitedTilesMediatorClassName = + "org/chromium/chrome/browser/suggestions/tile/MostVisitedTilesMediator"; + static String sBraveMostVisitedTilesMediatorClassName = + "org/chromium/chrome/browser/suggestions/tile/BraveMostVisitedTilesMediator"; + + public BraveMostVisitedTilesMediatorClassAdapter(ClassVisitor visitor) { + super(visitor); + + redirectConstructor( + sMostVisitedTilesMediatorClassName, sBraveMostVisitedTilesMediatorClassName); + + makePublicMethod(sMostVisitedTilesMediatorClassName, "updateTileGridPlaceholderVisibility"); + addMethodAnnotation(sBraveMostVisitedTilesMediatorClassName, + "updateTileGridPlaceholderVisibility", "Ljava/lang/Override;"); + } +} diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveNewTabPageClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveNewTabPageClassAdapter.java index 82994cf69fe1e..fafb85e4473d9 100644 --- a/build/android/bytecode/java/org/brave/bytecode/BraveNewTabPageClassAdapter.java +++ b/build/android/bytecode/java/org/brave/bytecode/BraveNewTabPageClassAdapter.java @@ -28,6 +28,9 @@ public BraveNewTabPageClassAdapter(ClassVisitor visitor) { deleteField(sBraveNewTabPageClassName, "mToolbarSupplier"); makeProtectedField(sNewTabPageClassName, "mToolbarSupplier"); + deleteField(sBraveNewTabPageClassName, "mTabModelSelector"); + makeProtectedField(sNewTabPageClassName, "mTabModelSelector"); + makePublicMethod(sNewTabPageClassName, "updateSearchProviderHasLogo"); addMethodAnnotation( sBraveNewTabPageClassName, "updateSearchProviderHasLogo", "Ljava/lang/Override;"); diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveNewTabPageLayoutClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveNewTabPageLayoutClassAdapter.java index c60b1b4a2cfbc..a4b1c9aae05c5 100644 --- a/build/android/bytecode/java/org/brave/bytecode/BraveNewTabPageLayoutClassAdapter.java +++ b/build/android/bytecode/java/org/brave/bytecode/BraveNewTabPageLayoutClassAdapter.java @@ -15,19 +15,13 @@ public class BraveNewTabPageLayoutClassAdapter extends BraveClassVisitor { public BraveNewTabPageLayoutClassAdapter(ClassVisitor visitor) { super(visitor); - makePublicMethod(sNewTabPageLayoutClassName, "insertSiteSectionView"); - addMethodAnnotation(sBraveNewTabPageLayoutClassName, "insertSiteSectionView", - "Ljava/lang/Override;"); - - deleteField(sBraveNewTabPageLayoutClassName, "mSiteSectionView"); - makeProtectedField(sNewTabPageLayoutClassName, "mSiteSectionView"); - deleteField(sBraveNewTabPageLayoutClassName, "mTileGroup"); - makeProtectedField(sNewTabPageLayoutClassName, "mTileGroup"); + deleteField(sBraveNewTabPageLayoutClassName, "mMvTilesContainerLayout"); + makeProtectedField(sNewTabPageLayoutClassName, "mMvTilesContainerLayout"); - makePublicMethod(sNewTabPageLayoutClassName, "updateTileGridPlaceholderVisibility"); - addMethodAnnotation(sBraveNewTabPageLayoutClassName, "updateTileGridPlaceholderVisibility", - "Ljava/lang/Override;"); + makePublicMethod(sNewTabPageLayoutClassName, "insertSiteSectionView"); + addMethodAnnotation( + sBraveNewTabPageLayoutClassName, "insertSiteSectionView", "Ljava/lang/Override;"); changeSuperName(sNewTabPageLayoutClassName, sNewTabPageLayoutSuperClassName); } diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveToolbarManagerClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveToolbarManagerClassAdapter.java index aae6d0d1f47fe..38dec478d85de 100644 --- a/build/android/bytecode/java/org/brave/bytecode/BraveToolbarManagerClassAdapter.java +++ b/build/android/bytecode/java/org/brave/bytecode/BraveToolbarManagerClassAdapter.java @@ -98,9 +98,6 @@ public BraveToolbarManagerClassAdapter(ClassVisitor visitor) { deleteField(sBraveToolbarManagerClassName, "mTabCreatorManager"); makeProtectedField(sToolbarManagerClassName, "mTabCreatorManager"); - deleteField(sBraveToolbarManagerClassName, "mOverviewModeBehaviorSupplier"); - makeProtectedField(sToolbarManagerClassName, "mOverviewModeBehaviorSupplier"); - deleteField(sBraveToolbarManagerClassName, "mSnackbarManager"); makeProtectedField(sToolbarManagerClassName, "mSnackbarManager"); diff --git a/build/ios/mojom/objc_templates/private_union_implementation.tmpl b/build/ios/mojom/objc_templates/private_union_implementation.tmpl index dc99c4fe9c7ef..be095c69349cc 100644 --- a/build/ios/mojom/objc_templates/private_union_implementation.tmpl +++ b/build/ios/mojom/objc_templates/private_union_implementation.tmpl @@ -95,7 +95,7 @@ - ({{cpp_namespace}}::{{union.name}}Ptr)cppObjPtr { - auto obj = {{cpp_namespace}}::{{union.name}}::New(); + auto obj = {{cpp_namespace}}::{{union.name}}Ptr(absl::in_place); switch (self.tag) { case {{tag_enum_name}}Null: { break; diff --git a/chromium_src/android_webview/browser/aw_permission_manager.cc b/chromium_src/android_webview/browser/aw_permission_manager.cc new file mode 100644 index 0000000000000..39800853e45e6 --- /dev/null +++ b/chromium_src/android_webview/browser/aw_permission_manager.cc @@ -0,0 +1,24 @@ +/* Copyright (c) 2022 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#include "components/permissions/permission_util.h" +#include "third_party/blink/public/common/permissions/permission_utils.h" + +#define NUM \ + BRAVE_ADS: \ + case PermissionType::BRAVE_COSMETIC_FILTERING: \ + case PermissionType::BRAVE_TRACKERS: \ + case PermissionType::BRAVE_HTTP_UPGRADABLE_RESOURCES: \ + case PermissionType::BRAVE_FINGERPRINTING_V2: \ + case PermissionType::BRAVE_SHIELDS: \ + case PermissionType::BRAVE_REFERRERS: \ + case PermissionType::BRAVE_COOKIES: \ + case PermissionType::BRAVE_SPEEDREADER: \ + case PermissionType::BRAVE_ETHEREUM: \ + case PermissionType::BRAVE_SOLANA: \ + case PermissionType::NUM + +#include "src/android_webview/browser/aw_permission_manager.cc" +#undef NUM diff --git a/chromium_src/base/task/task_features.cc b/chromium_src/base/task/task_features.cc new file mode 100644 index 0000000000000..60d326605b1f6 --- /dev/null +++ b/chromium_src/base/task/task_features.cc @@ -0,0 +1,16 @@ +/* Copyright (c) 2022 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#include "src/base/task/task_features.cc" + +#include "base/feature_override.h" + +namespace base { + +OVERRIDE_FEATURE_DEFAULT_STATES({{ + {kExplicitHighResolutionTimerWin, base::FEATURE_DISABLED_BY_DEFAULT}, +}}); + +} // namespace base diff --git a/chromium_src/chrome/browser/extensions/chrome_content_verifier_delegate.cc b/chromium_src/chrome/browser/extensions/chrome_content_verifier_delegate.cc index d38f765068878..6eaa5249331c5 100644 --- a/chromium_src/chrome/browser/extensions/chrome_content_verifier_delegate.cc +++ b/chromium_src/chrome/browser/extensions/chrome_content_verifier_delegate.cc @@ -38,7 +38,6 @@ #include "extensions/common/manifest.h" #include "extensions/common/manifest_url_handlers.h" #include "net/base/backoff_entry.h" -#include "net/base/escape.h" #if BUILDFLAG(IS_CHROMEOS_ASH) #include "chrome/browser/extensions/extension_assets_manager_chromeos.h" diff --git a/chromium_src/chrome/browser/permissions/chrome_permissions_client.cc b/chromium_src/chrome/browser/permissions/chrome_permissions_client.cc index 9ec5dd97d5192..b6336e3350a38 100644 --- a/chromium_src/chrome/browser/permissions/chrome_permissions_client.cc +++ b/chromium_src/chrome/browser/permissions/chrome_permissions_client.cc @@ -19,7 +19,7 @@ #if BUILDFLAG(IS_ANDROID) #include "brave/browser/permissions/brave_wallet_permission_prompt_android.h" -#include "components/permissions/android/permission_prompt_android.h" +#include "components/permissions/android/permission_prompt/permission_prompt_android.h" #endif bool ChromePermissionsClient::BraveCanBypassEmbeddingOriginCheck( diff --git a/chromium_src/chrome/browser/privacy_sandbox/privacy_sandbox_service_unittest.cc b/chromium_src/chrome/browser/privacy_sandbox/privacy_sandbox_service_unittest.cc index 1e296e0709b22..1093980c6aae6 100644 --- a/chromium_src/chrome/browser/privacy_sandbox/privacy_sandbox_service_unittest.cc +++ b/chromium_src/chrome/browser/privacy_sandbox/privacy_sandbox_service_unittest.cc @@ -41,6 +41,10 @@ #include "ui/base/l10n/l10n_util.h" #include "url/origin.h" +#if !BUILDFLAG(IS_ANDROID) +#include "chrome/browser/ui/hats/mock_trust_safety_sentiment_service.h" +#endif + namespace { class TestInterestGroupManager : public content::InterestGroupManager { @@ -70,12 +74,20 @@ class PrivacySandboxServiceTest : public testing::Test { void SetUp() override { InitializePrefsBeforeStart(); +#if !BUILDFLAG(IS_ANDROID) + mock_sentiment_service_ = + std::make_unique<::testing::NiceMock>( + profile()); +#endif privacy_sandbox_service_ = std::make_unique( PrivacySandboxSettingsFactory::GetForProfile(profile()), CookieSettingsFactory::GetForProfile(profile()).get(), profile()->GetPrefs(), policy_service(), sync_service(), identity_test_env()->identity_manager(), test_interest_group_manager(), profile_metrics::BrowserProfileType::kRegular, browsing_data_remover(), +#if !BUILDFLAG(IS_ANDROID) + mock_sentiment_service(), +#endif mock_browsing_topics_service()); } @@ -110,6 +122,11 @@ class PrivacySandboxServiceTest : public testing::Test { browsing_topics::MockBrowsingTopicsService* mock_browsing_topics_service() { return mock_browsing_topics_service_; } +#if !BUILDFLAG(IS_ANDROID) + MockTrustSafetySentimentService* mock_sentiment_service() { + return mock_sentiment_service_.get(); + } +#endif private: content::BrowserTaskEnvironment browser_task_environment_; @@ -123,4 +140,7 @@ class PrivacySandboxServiceTest : public testing::Test { std::unique_ptr privacy_sandbox_service_; browsing_topics::MockBrowsingTopicsService* mock_browsing_topics_service_; +#if !BUILDFLAG(IS_ANDROID) + std::unique_ptr mock_sentiment_service_; +#endif }; diff --git a/chromium_src/chrome/browser/ui/browser.h b/chromium_src/chrome/browser/ui/browser.h index c2408257ff62a..4cdb7c88d6334 100644 --- a/chromium_src/chrome/browser/ui/browser.h +++ b/chromium_src/chrome/browser/ui/browser.h @@ -13,14 +13,14 @@ #define ShouldDisplayFavicon virtual ShouldDisplayFavicon #define TryToCloseWindow virtual TryToCloseWindow #define ResetTryToCloseWindow virtual ResetTryToCloseWindow -#define BRAVE_BROWSER_H \ - private: \ - friend class BookmarkPrefsService; \ - friend class BraveBrowser; +#define FullscreenControllerInteractiveTest \ + FullscreenControllerInteractiveTest; \ + friend class BookmarkPrefsService; \ + friend class BraveBrowser #include "src/chrome/browser/ui/browser.h" -#undef BRAVE_BROWSER_H +#undef FullscreenControllerInteractiveTest #undef ResetTryToCloseWindow #undef TryToCloseWindow #undef ShouldDisplayFavicon diff --git a/chromium_src/chrome/browser/ui/views/frame/browser_view.h b/chromium_src/chrome/browser/ui/views/frame/browser_view.h index 2c12eed6318db..a4ece2950ce5d 100644 --- a/chromium_src/chrome/browser/ui/views/frame/browser_view.h +++ b/chromium_src/chrome/browser/ui/views/frame/browser_view.h @@ -8,7 +8,9 @@ #include "brave/browser/ui/brave_browser_window.h" -#define BRAVE_BROWSER_VIEW_H friend class BraveBrowserView; +#define BrowserViewLayoutDelegateImpl \ + BrowserViewLayoutDelegateImpl; \ + friend class BraveBrowserView #define BrowserWindow BraveBrowserWindow #define GetContentsLayoutManager \ GetContentsLayoutManager_Unused(); \ @@ -18,7 +20,7 @@ virtual MaybeShowReadingListInSidePanelIPH #include "src/chrome/browser/ui/views/frame/browser_view.h" -#undef BRAVE_BROWSER_VIEW_H +#undef BrowserViewLayoutDelegateImpl #undef BrowserWindow #undef MaybeShowReadingListInSidePanelIPH #undef GetContentsLayoutManager diff --git a/chromium_src/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_bubble_view_impl.cc b/chromium_src/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_device_picker_bubble_view.cc similarity index 68% rename from chromium_src/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_bubble_view_impl.cc rename to chromium_src/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_device_picker_bubble_view.cc index 2d412c549242f..4b139e42e0fe7 100644 --- a/chromium_src/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_bubble_view_impl.cc +++ b/chromium_src/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_device_picker_bubble_view.cc @@ -5,10 +5,10 @@ // CreateManageDevicesLink requires Google account, which causes a crash so we // need to early return before getting CreateManageDevicesLink() called. -#define BRAVE_SENT_TAB_TO_SELF_BUBBLE_VIEW_IMPL_INIT \ - if (true) \ +#define BRAVE_SEND_TAB_TO_SELFDEVICE_PICKER_BUBBLE_VIEW_INIT \ + if (true) \ return; -#include "src/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_bubble_view_impl.cc" +#include "src/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_device_picker_bubble_view.cc" -#undef BRAVE_SENT_TAB_TO_SELF_BUBBLE_VIEW_IMPL_INIT +#undef BRAVE_SEND_TAB_TO_SELFDEVICE_PICKER_BUBBLE_VIEW_INIT diff --git a/chromium_src/chrome/browser/ui/views/tabs/tab_style_views.cc b/chromium_src/chrome/browser/ui/views/tabs/tab_style_views.cc index 3c4240a022e9a..3605a32be679f 100644 --- a/chromium_src/chrome/browser/ui/views/tabs/tab_style_views.cc +++ b/chromium_src/chrome/browser/ui/views/tabs/tab_style_views.cc @@ -40,7 +40,8 @@ TabStyle::TabColors BraveGM2TabStyle::CalculateColors() const { const SkColor final_fg_color = (tab_->IsActive() || tab_->mouse_hovered()) ? colors.foreground_color : inactive_non_hovered_fg_color; - return {final_fg_color, colors.background_color}; + return {final_fg_color, colors.background_color, colors.focus_ring_color, + colors.close_button_focus_ring_color}; } const gfx::FontList& BraveGM2TabStyle::GetFontList() const { diff --git a/chromium_src/chrome/browser/ui/webui/help/version_updater_mac.mm b/chromium_src/chrome/browser/ui/webui/help/version_updater_mac.mm index 68d5690732aec..dda0ee77e3f8a 100644 --- a/chromium_src/chrome/browser/ui/webui/help/version_updater_mac.mm +++ b/chromium_src/chrome/browser/ui/webui/help/version_updater_mac.mm @@ -5,6 +5,7 @@ #include "chrome/browser/ui/webui/help/version_updater_mac.h" #include "base/mac/foundation_util.h" +#include "base/strings/escape.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" #include "brave/browser/sparkle_buildflags.h" @@ -13,7 +14,6 @@ #include "chrome/browser/obsolete_system/obsolete_system.h" #include "chrome/grit/chromium_strings.h" #include "chrome/grit/generated_resources.h" -#include "net/base/escape.h" #include "ui/base/l10n/l10n_util.h" #if BUILDFLAG(ENABLE_SPARKLE) @@ -191,7 +191,7 @@ - (void)handleStatusNotification:(NSNotification*)notification { message += brave_l10n::GetLocalizedResourceUTF16String( IDS_UPGRADE_ERROR_DETAILS); message += u"

";
-      message += base::UTF8ToUTF16(net::EscapeForHTML(error_messages));
+      message += base::UTF8ToUTF16(base::EscapeForHTML(error_messages));
       message += u"
"; } } diff --git a/chromium_src/chrome/browser/ui/webui/settings/import_data_handler.cc b/chromium_src/chrome/browser/ui/webui/settings/import_data_handler.cc index cd444ca505e12..4c821fbc3b2fd 100644 --- a/chromium_src/chrome/browser/ui/webui/settings/import_data_handler.cc +++ b/chromium_src/chrome/browser/ui/webui/settings/import_data_handler.cc @@ -17,11 +17,10 @@ if (*types.FindBoolKey(kImportDialogPayments)) \ selected_items |= importer::PAYMENTS; -#define BRAVE_SEND_BROWSER_PROFILE_DATA \ - browser_profile->SetBoolean("extensions", \ - (browser_services & importer::EXTENSIONS) != 0); \ - browser_profile->SetBoolean("payments", \ - (browser_services & importer::PAYMENTS) != 0); +#define BRAVE_SEND_BROWSER_PROFILE_DATA \ + browser_profile.Set("extensions", \ + (browser_services & importer::EXTENSIONS) != 0); \ + browser_profile.Set("payments", (browser_services & importer::PAYMENTS) != 0); #include "src/chrome/browser/ui/webui/settings/import_data_handler.cc" #undef ExternalProcessImporterHost diff --git a/chromium_src/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chromium_src/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc index 53743b163abab..31abc63c0fffe 100644 --- a/chromium_src/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chromium_src/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc @@ -95,7 +95,6 @@ void BraveAddCommonStrings(content::WebUIDataSource* html_source, {"siteSettingsSolanaAsk", IDS_SETTINGS_SITE_SETTINGS_SOLANA_ASK}, {"siteSettingsSolanaBlock", IDS_SETTINGS_SITE_SETTINGS_SOLANA_BLOCK}, {"braveGetStartedTitle", IDS_SETTINGS_BRAVE_GET_STARTED_TITLE}, - {"braveAdditionalSettingsTitle", IDS_SETTINGS_BRAVE_ADDITIONAL_SETTINGS}, {"appearanceSettingsBraveTheme", IDS_SETTINGS_APPEARANCE_SETTINGS_BRAVE_THEMES}, {"appearanceSettingsShowBookmarksButton", diff --git a/chromium_src/chrome/common/chrome_features.cc b/chromium_src/chrome/common/chrome_features.cc index 5ad322c09b263..121b4aa16fc26 100644 --- a/chromium_src/chrome/common/chrome_features.cc +++ b/chromium_src/chrome/common/chrome_features.cc @@ -16,6 +16,9 @@ namespace features { OVERRIDE_FEATURE_DEFAULT_STATES({{ {kOmniboxTriggerForNoStatePrefetch, base::FEATURE_DISABLED_BY_DEFAULT}, {kPrivacyGuide2, base::FEATURE_DISABLED_BY_DEFAULT}, +#if !BUILDFLAG(IS_ANDROID) + {kTrustSafetySentimentSurvey, base::FEATURE_DISABLED_BY_DEFAULT}, +#endif // Enable webui dark theme: @media (prefers-color-scheme: dark) is gated // on this feature. {kWebUIDarkMode, base::FEATURE_ENABLED_BY_DEFAULT}, diff --git a/chromium_src/components/autofill/core/common/autofill_features.cc b/chromium_src/components/autofill/core/common/autofill_features.cc index effe792c572cf..9043bf4fc9b0d 100644 --- a/chromium_src/components/autofill/core/common/autofill_features.cc +++ b/chromium_src/components/autofill/core/common/autofill_features.cc @@ -11,6 +11,7 @@ namespace autofill { namespace features { OVERRIDE_FEATURE_DEFAULT_STATES({{ + {kAutofillDisableShadowHeuristics, base::FEATURE_ENABLED_BY_DEFAULT}, {kAutofillEnableAccountWalletStorage, base::FEATURE_DISABLED_BY_DEFAULT}, {kAutofillServerCommunication, base::FEATURE_DISABLED_BY_DEFAULT}, }}); diff --git a/chromium_src/components/autofill/core/common/autofill_payments_features.cc b/chromium_src/components/autofill/core/common/autofill_payments_features.cc index af9bd73370c5d..e82d6fd5fc8a5 100644 --- a/chromium_src/components/autofill/core/common/autofill_payments_features.cc +++ b/chromium_src/components/autofill/core/common/autofill_payments_features.cc @@ -13,6 +13,9 @@ namespace features { OVERRIDE_FEATURE_DEFAULT_STATES({{ {kAutofillEnableOfferNotificationForPromoCodes, base::FEATURE_DISABLED_BY_DEFAULT}, + {kAutofillSaveCardUiExperiment, base::FEATURE_DISABLED_BY_DEFAULT}, + {kAutofillUpstreamAllowAdditionalEmailDomains, + base::FEATURE_DISABLED_BY_DEFAULT}, }}); } // namespace features diff --git a/chromium_src/components/error_page/common/localized_error.cc b/chromium_src/components/error_page/common/localized_error.cc index f83978af39a34..4969eeb57fb81 100644 --- a/chromium_src/components/error_page/common/localized_error.cc +++ b/chromium_src/components/error_page/common/localized_error.cc @@ -4,7 +4,6 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "components/url_formatter/url_formatter.h" -#include "net/base/escape.h" #include "url/gurl.h" namespace error_page { @@ -33,6 +32,6 @@ std::u16string GetFailedUrlString(GURL failed_url) { return url_formatter::FormatUrl( failed_url, url_formatter::kFormatUrlOmitNothing, - net::UnescapeRule::NORMAL, nullptr, nullptr, nullptr); + base::UnescapeRule::NORMAL, nullptr, nullptr, nullptr); } } // namespace error_page diff --git a/chromium_src/components/external_intents/android/intercept_navigation_delegate_impl.cc b/chromium_src/components/external_intents/android/intercept_navigation_delegate_impl.cc index 325461dc40377..1aba3eae83326 100644 --- a/chromium_src/components/external_intents/android/intercept_navigation_delegate_impl.cc +++ b/chromium_src/components/external_intents/android/intercept_navigation_delegate_impl.cc @@ -6,6 +6,7 @@ #include #include "base/memory/raw_ptr.h" +#include "base/strings/escape.h" #include "brave/common/pref_names.h" #include "components/external_intents/android/jni_headers/InterceptNavigationDelegateImpl_jni.h" #include "components/navigation_interception/intercept_navigation_delegate.h" @@ -15,7 +16,6 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/navigation_handle.h" #include "content/public/browser/web_contents.h" -#include "net/base/escape.h" #include "url/gurl.h" namespace external_intents { @@ -34,7 +34,7 @@ class BraveInterceptNavigationDelegate : public InterceptNavigationDelegate { bool ShouldIgnoreNavigation( content::NavigationHandle* navigation_handle) override { - if (ShouldPlayVideoInBrowser(GURL(net::EscapeExternalHandlerValue( + if (ShouldPlayVideoInBrowser(GURL(base::EscapeExternalHandlerValue( navigation_handle->GetURL().spec())))) return false; diff --git a/chromium_src/components/permissions/android/permission_dialog_delegate.cc b/chromium_src/components/permissions/android/permission_prompt/permission_dialog_delegate.cc similarity index 92% rename from chromium_src/components/permissions/android/permission_dialog_delegate.cc rename to chromium_src/components/permissions/android/permission_prompt/permission_dialog_delegate.cc index 99027976d6534..a159c17974b67 100644 --- a/chromium_src/components/permissions/android/permission_dialog_delegate.cc +++ b/chromium_src/components/permissions/android/permission_prompt/permission_dialog_delegate.cc @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "components/permissions/android/permission_dialog_delegate.h" +#include "components/permissions/android/permission_prompt/permission_dialog_delegate.h" #include "base/android/jni_array.h" #include "base/android/jni_string.h" @@ -12,7 +12,7 @@ #include "brave/components/permissions/permission_lifetime_utils.h" #include "components/grit/brave_components_strings.h" #include "components/permissions/android/jni_headers/PermissionDialogController_jni.h" -#include "components/permissions/android/permission_prompt_android.h" +#include "components/permissions/android/permission_prompt/permission_prompt_android.h" #include "components/permissions/features.h" #include "components/strings/grit/components_strings.h" @@ -79,7 +79,7 @@ void Java_PermissionDialogController_createDialog_BraveImpl( #define Java_PermissionDialogController_createDialog \ Java_PermissionDialogController_createDialog_BraveImpl -#include "src/components/permissions/android/permission_dialog_delegate.cc" +#include "src/components/permissions/android/permission_prompt/permission_dialog_delegate.cc" #undef Java_PermissionDialogController_createDialog #undef BRAVE_PERMISSION_DIALOG_DELEGATE_CANCEL diff --git a/chromium_src/components/permissions/android/permission_prompt_android.h b/chromium_src/components/permissions/android/permission_prompt/permission_prompt_android.h similarity index 75% rename from chromium_src/components/permissions/android/permission_prompt_android.h rename to chromium_src/components/permissions/android/permission_prompt/permission_prompt_android.h index 4ab7bf7f4da6a..6243b33c7acf4 100644 --- a/chromium_src/components/permissions/android/permission_prompt_android.h +++ b/chromium_src/components/permissions/android/permission_prompt/permission_prompt_android.h @@ -3,16 +3,16 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef BRAVE_CHROMIUM_SRC_COMPONENTS_PERMISSIONS_ANDROID_PERMISSION_PROMPT_ANDROID_H_ -#define BRAVE_CHROMIUM_SRC_COMPONENTS_PERMISSIONS_ANDROID_PERMISSION_PROMPT_ANDROID_H_ +#ifndef BRAVE_CHROMIUM_SRC_COMPONENTS_PERMISSIONS_ANDROID_PERMISSION_PROMPT_PERMISSION_PROMPT_ANDROID_H_ +#define BRAVE_CHROMIUM_SRC_COMPONENTS_PERMISSIONS_ANDROID_PERMISSION_PROMPT_PERMISSION_PROMPT_ANDROID_H_ #define PermissionCount \ NotUsed() { return 0; } \ Delegate* delegate() const { return delegate_; } \ size_t PermissionCount -#include "src/components/permissions/android/permission_prompt_android.h" +#include "src/components/permissions/android/permission_prompt/permission_prompt_android.h" #undef PermissionCount -#endif // BRAVE_CHROMIUM_SRC_COMPONENTS_PERMISSIONS_ANDROID_PERMISSION_PROMPT_ANDROID_H_ +#endif // BRAVE_CHROMIUM_SRC_COMPONENTS_PERMISSIONS_ANDROID_PERMISSION_PROMPT_PERMISSION_PROMPT_ANDROID_H_ diff --git a/chromium_src/components/permissions/permission_manager.cc b/chromium_src/components/permissions/permission_manager.cc new file mode 100644 index 0000000000000..bd08baaf553af --- /dev/null +++ b/chromium_src/components/permissions/permission_manager.cc @@ -0,0 +1,11 @@ +/* Copyright (c) 2022 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#define BRAVE_FORCED_REQUESTING_ORIGIN \ + !forced_requesting_origin_.is_empty() ? forced_requesting_origin_: + +#include "src/components/permissions/permission_manager.cc" + +#undef BRAVE_FORCED_REQUESTING_ORIGIN diff --git a/chromium_src/components/permissions/permission_manager.h b/chromium_src/components/permissions/permission_manager.h index fa5453532bc62..7073b5c2aab7b 100644 --- a/chromium_src/components/permissions/permission_manager.h +++ b/chromium_src/components/permissions/permission_manager.h @@ -11,7 +11,8 @@ // affect other included header files from this header file. #define devtools_global_overrides_origin_ \ devtools_global_overrides_origin_; \ - friend class BravePermissionManager + friend class BravePermissionManager; \ + GURL forced_requesting_origin_; #define GetCanonicalOrigin virtual GetCanonicalOrigin #include "src/components/permissions/permission_manager.h" diff --git a/chromium_src/components/permissions/permission_util.cc b/chromium_src/components/permissions/permission_util.cc index 594a760968bc1..303d572ba20a9 100644 --- a/chromium_src/components/permissions/permission_util.cc +++ b/chromium_src/components/permissions/permission_util.cc @@ -4,9 +4,37 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "components/permissions/permission_util.h" +#include "third_party/blink/public/common/permissions/permission_utils.h" #define PermissionUtil PermissionUtil_ChromiumImpl + +#define NUM \ + BRAVE_ADS: \ + return ContentSettingsType::BRAVE_ADS; \ + case PermissionType::BRAVE_COSMETIC_FILTERING: \ + return ContentSettingsType::BRAVE_COSMETIC_FILTERING; \ + case PermissionType::BRAVE_TRACKERS: \ + return ContentSettingsType::BRAVE_TRACKERS; \ + case PermissionType::BRAVE_HTTP_UPGRADABLE_RESOURCES: \ + return ContentSettingsType::BRAVE_HTTP_UPGRADABLE_RESOURCES; \ + case PermissionType::BRAVE_FINGERPRINTING_V2: \ + return ContentSettingsType::BRAVE_FINGERPRINTING_V2; \ + case PermissionType::BRAVE_SHIELDS: \ + return ContentSettingsType::BRAVE_SHIELDS; \ + case PermissionType::BRAVE_REFERRERS: \ + return ContentSettingsType::BRAVE_REFERRERS; \ + case PermissionType::BRAVE_COOKIES: \ + return ContentSettingsType::BRAVE_COOKIES; \ + case PermissionType::BRAVE_SPEEDREADER: \ + return ContentSettingsType::BRAVE_SPEEDREADER; \ + case PermissionType::BRAVE_ETHEREUM: \ + return ContentSettingsType::BRAVE_ETHEREUM; \ + case PermissionType::BRAVE_SOLANA: \ + return ContentSettingsType::BRAVE_SOLANA; \ + case PermissionType::NUM + #include "src/components/permissions/permission_util.cc" +#undef NUM #undef PermissionUtil namespace permissions { @@ -26,7 +54,7 @@ std::string PermissionUtil::GetPermissionString( // static bool PermissionUtil::GetPermissionType(ContentSettingsType type, - content::PermissionType* out) { + blink::PermissionType* out) { if (type == ContentSettingsType::BRAVE_ETHEREUM || type == ContentSettingsType::BRAVE_SOLANA) { *out = PermissionType::WINDOW_PLACEMENT; diff --git a/chromium_src/components/permissions/permission_util.h b/chromium_src/components/permissions/permission_util.h index 480893ba3ff89..039361b14b45d 100644 --- a/chromium_src/components/permissions/permission_util.h +++ b/chromium_src/components/permissions/permission_util.h @@ -16,7 +16,7 @@ class PermissionUtil : public PermissionUtil_ChromiumImpl { public: static std::string GetPermissionString(ContentSettingsType); static bool GetPermissionType(ContentSettingsType type, - content::PermissionType* out); + blink::PermissionType* out); static bool IsPermission(ContentSettingsType type); }; diff --git a/chromium_src/components/search_engines/brave_template_url_service_util_unittest.cc b/chromium_src/components/search_engines/brave_template_url_service_util_unittest.cc index c6aafeabb3777..503789dff9e3f 100644 --- a/chromium_src/components/search_engines/brave_template_url_service_util_unittest.cc +++ b/chromium_src/components/search_engines/brave_template_url_service_util_unittest.cc @@ -106,16 +106,18 @@ TEST_F(BraveTemplateURLServiceUtilTest, GetSearchProvidersUsingKeywordResult) { TemplateURL::OwnedTemplateURLVector template_urls; int new_resource_keyword_version = 0; + int new_resource_starter_pack_version = 0; prefs_.SetInteger(kCountryIDAtInstall, 'U' << 8 | 'S'); - GetSearchProvidersUsingKeywordResult(result, nullptr, &prefs_, &template_urls, - default_turl.get(), SearchTermsData(), - &new_resource_keyword_version, nullptr); + GetSearchProvidersUsingKeywordResult( + result, nullptr, &prefs_, &template_urls, default_turl.get(), + SearchTermsData(), &new_resource_keyword_version, + &new_resource_starter_pack_version, nullptr); // Verify count and order. - EXPECT_EQ(local_turls.size(), template_urls.size()); - TestDefaultOrder(template_urls, {":g", ":d", ":q", ":b", ":sp", ":ya", - "random1", "random2"}); + TestDefaultOrder(template_urls, + {":g", ":d", ":q", ":b", ":sp", ":ya", "random1", "random2", + "@bookmarks", "@history"}); } TEST_F(BraveTemplateURLServiceUtilTest, @@ -133,14 +135,16 @@ TEST_F(BraveTemplateURLServiceUtilTest, InitKeywordResult(&prefs_, local_turls)); TemplateURL::OwnedTemplateURLVector template_urls; int new_resource_keyword_version = 0; + int new_resource_starter_pack_version = 0; // Check Germany. prefs_.SetInteger(kCountryIDAtInstall, 'D' << 8 | 'E'); - GetSearchProvidersUsingKeywordResult(result, nullptr, &prefs_, &template_urls, - default_turl.get(), SearchTermsData(), - &new_resource_keyword_version, nullptr); + GetSearchProvidersUsingKeywordResult( + result, nullptr, &prefs_, &template_urls, default_turl.get(), + SearchTermsData(), &new_resource_keyword_version, + &new_resource_starter_pack_version, nullptr); // Verify count and order. - EXPECT_EQ(local_turls.size(), template_urls.size()); - TestDefaultOrder(template_urls, {":d", ":q", ":g", ":b", ":sp", ":ya"}); + TestDefaultOrder(template_urls, {":d", ":q", ":g", ":b", ":sp", ":ya", + "@bookmarks", "@history"}); } diff --git a/chromium_src/components/search_engines/template_url_starter_pack_data.cc b/chromium_src/components/search_engines/template_url_starter_pack_data.cc new file mode 100644 index 0000000000000..d8c0f6f660171 --- /dev/null +++ b/chromium_src/components/search_engines/template_url_starter_pack_data.cc @@ -0,0 +1,39 @@ +/* Copyright (c) 2022 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#include "components/search_engines/template_url_starter_pack_data.h" +#include "base/strings/strcat.h" +#include "base/strings/string_util.h" + +#define GetStarterPackEngines GetStarterPackEngines_ChromiumImpl + +#include "src/components/search_engines/template_url_starter_pack_data.cc" +#undef GetStarterPackEngines + +namespace { + +const char kChromeSchema[] = "chrome://"; +const char kBraveSchema[] = "brave://"; +} // namespace + +namespace TemplateURLStarterPackData { + +std::vector> GetStarterPackEngines() { + auto t_urls = GetStarterPackEngines_ChromiumImpl(); + + // It is necessary to correct urls for the brave schema + for (auto& t_url : t_urls) { + base::StringPiece url(t_url->url()); + if (base::StartsWith(url, kChromeSchema, + base::CompareCase::INSENSITIVE_ASCII)) { + t_url->SetURL(base::StrCat( + {kBraveSchema, url.substr(std::size(kChromeSchema) - 1)})); + } + } + + return t_urls; +} + +} // namespace TemplateURLStarterPackData diff --git a/chromium_src/components/search_engines/util.cc b/chromium_src/components/search_engines/util.cc index 63931e4d32466..e2f14cf9c82b5 100644 --- a/chromium_src/components/search_engines/util.cc +++ b/chromium_src/components/search_engines/util.cc @@ -16,11 +16,13 @@ void GetSearchProvidersUsingKeywordResult( TemplateURL* default_search_provider, const SearchTermsData& search_terms_data, int* new_resource_keyword_version, + int* new_resource_starter_pack_version, std::set* removed_keyword_guids) { // Call the original implementation to get template_urls. GetSearchProvidersUsingKeywordResult_ChromiumImpl( result, service, prefs, template_urls, default_search_provider, - search_terms_data, new_resource_keyword_version, removed_keyword_guids); + search_terms_data, new_resource_keyword_version, + new_resource_starter_pack_version, removed_keyword_guids); // Resort template_urls in the orider of prepopulated search engines. if (template_urls && !template_urls->empty()) { std::vector> prepopulated_urls = diff --git a/chromium_src/components/security_state/core/features.cc b/chromium_src/components/security_state/core/features.cc deleted file mode 100644 index 2aa60d0902062..0000000000000 --- a/chromium_src/components/security_state/core/features.cc +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright (c) 2021 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at https://mozilla.org/MPL/2.0/. */ - -#include "src/components/security_state/core/features.cc" - -#include "base/feature_override.h" - -namespace security_state { -namespace features { - -OVERRIDE_FEATURE_DEFAULT_STATES({{ - {kSafetyTipUI, base::FEATURE_ENABLED_BY_DEFAULT}, -}}); - -} // namespace features -} // namespace security_state diff --git a/chromium_src/components/shared_highlighting/core/common/shared_highlighting_features.cc b/chromium_src/components/shared_highlighting/core/common/shared_highlighting_features.cc index ad971d1b936df..426c847f7f0a8 100644 --- a/chromium_src/components/shared_highlighting/core/common/shared_highlighting_features.cc +++ b/chromium_src/components/shared_highlighting/core/common/shared_highlighting_features.cc @@ -11,7 +11,6 @@ namespace shared_highlighting { OVERRIDE_FEATURE_DEFAULT_STATES({{ {kSharedHighlightingAmp, base::FEATURE_DISABLED_BY_DEFAULT}, - {kSharedHighlightingV2, base::FEATURE_DISABLED_BY_DEFAULT}, }}); } // namespace shared_highlighting diff --git a/chromium_src/components/sync/base/model_type_unittest.cc b/chromium_src/components/sync/base/model_type_unittest.cc index 66ac4c9cc915e..9f6a119face2c 100644 --- a/chromium_src/components/sync/base/model_type_unittest.cc +++ b/chromium_src/components/sync/base/model_type_unittest.cc @@ -14,7 +14,7 @@ TEST_F(ModelTypeTest, EncryptableUserTypes) { // This test is supposed to fail when sync types are increased/decreased TEST_F(ModelTypeTest, ModelTypeCounts) { - EXPECT_EQ(static_cast(ModelTypeForHistograms::kMaxValue), 50); + EXPECT_EQ(static_cast(ModelTypeForHistograms::kMaxValue), 51); } } // namespace diff --git a/chromium_src/components/sync/driver/sync_session_durations_metrics_recorder.cc b/chromium_src/components/sync/driver/sync_session_durations_metrics_recorder.cc index ac1cf328eb597..1a76927034edd 100644 --- a/chromium_src/components/sync/driver/sync_session_durations_metrics_recorder.cc +++ b/chromium_src/components/sync/driver/sync_session_durations_metrics_recorder.cc @@ -35,4 +35,10 @@ void SyncSessionDurationsMetricsRecorder:: OnErrorStateOfRefreshTokenUpdatedForAccount( const CoreAccountInfo& account_info, const GoogleServiceAuthError& error) {} +bool SyncSessionDurationsMetricsRecorder::IsSignedIn() const { + return false; +} +bool SyncSessionDurationsMetricsRecorder::IsSyncing() const { + return false; +} } // namespace syncer diff --git a/chromium_src/components/sync_device_info/device_info_tracker.h b/chromium_src/components/sync_device_info/device_info_tracker.h index 8d0da832c97e5..698b9970ebdfe 100644 --- a/chromium_src/components/sync_device_info/device_info_tracker.h +++ b/chromium_src/components/sync_device_info/device_info_tracker.h @@ -6,6 +6,8 @@ #ifndef BRAVE_CHROMIUM_SRC_COMPONENTS_SYNC_DEVICE_INFO_DEVICE_INFO_TRACKER_H_ #define BRAVE_CHROMIUM_SRC_COMPONENTS_SYNC_DEVICE_INFO_DEVICE_INFO_TRACKER_H_ +#include "base/callback.h" + namespace syncer { class BraveDeviceInfo; diff --git a/chromium_src/components/update_client/update_checker.cc b/chromium_src/components/update_client/update_checker.cc index 1052717ae2b45..0158825ec1267 100644 --- a/chromium_src/components/update_client/update_checker.cc +++ b/chromium_src/components/update_client/update_checker.cc @@ -21,43 +21,55 @@ SequentialUpdateChecker::~SequentialUpdateChecker() { } void SequentialUpdateChecker::CheckForUpdates( - const std::string& session_id, - const std::vector& ids_checked, - const IdToComponentPtrMap& components, + scoped_refptr update_context, const base::flat_map& additional_attributes, UpdateCheckCallback update_check_callback) { - VLOG(3) << "> CheckForUpdates"; - DCHECK(thread_checker_.CalledOnValidThread()); - DCHECK(!ids_checked.empty()); - - for (const auto& app_id : ids_checked) { - VLOG(3) << "> * " << app_id; - remaining_ids_.push_back(app_id); - } + DCHECK(!update_context->components_to_check_for_updates.empty()); + VLOG(3) << "> CheckForUpdates"; - session_id_ = session_id; - components_ = &components; + update_context_ = std::move(update_context); additional_attributes_ = additional_attributes; update_check_callback_ = std::move(update_check_callback); - CheckNext(); + for (const auto& id : update_context_->components_to_check_for_updates) { + remaining_ids_.push_back(id); + } + CheckNext(); VLOG(3) << "< CheckForUpdates"; } void SequentialUpdateChecker::CheckNext() { VLOG(3) << "> CheckNext()"; DCHECK(!remaining_ids_.empty()); - std::string id = remaining_ids_.front(); + DCHECK(update_context_); + + const auto id = remaining_ids_.front(); remaining_ids_.pop_front(); - std::vector id_vector = {id}; + + scoped_refptr context = new UpdateContext( + update_context_->config, update_context_->is_foreground, + update_context_->is_install, {id}, + update_context_->crx_state_change_callback, + update_context_->notify_observers_callback, + // We don't pass a context callback here because UpdateChecker doesn't use + // it. This is instead done by UpdateEngine, which calls us. + base::DoNothing(), update_context_->persisted_data); + + auto& component = context->components[id]; + auto& crx_component = update_context_->components[id]->crx_component(); + component->set_crx_component(*crx_component); + component->set_previous_version(crx_component->version); + component->set_previous_fp(crx_component->fingerprint); + context->components_to_check_for_updates.push_back(id); update_checker_ = UpdateChecker::Create(config_, metadata_); update_checker_->CheckForUpdates( - session_id_, id_vector, *components_, additional_attributes_, + context, additional_attributes_, base::BindOnce(&SequentialUpdateChecker::UpdateResultAvailable, base::Unretained(this))); + VLOG(3) << "< CheckNext()"; } @@ -66,8 +78,8 @@ void SequentialUpdateChecker::UpdateResultAvailable( ErrorCategory error_category, int error, int retry_after_sec) { - VLOG(3) << "< UpdateResultAvailable(" << error << ")"; DCHECK(thread_checker_.CalledOnValidThread()); + VLOG(3) << "< UpdateResultAvailable(" << error << ")"; if (!error) { DCHECK(results); @@ -77,7 +89,7 @@ void SequentialUpdateChecker::UpdateResultAvailable( bool done = error || remaining_ids_.empty(); - if (done) + if (done) { base::ThreadTaskRunnerHandle::Get()->PostTask( FROM_HERE, base::BindOnce( @@ -85,8 +97,11 @@ void SequentialUpdateChecker::UpdateResultAvailable( error ? absl::nullopt : absl::make_optional(results_), error_category, error, retry_after_sec)); - else + + remaining_ids_.clear(); + } else { CheckNext(); + } VLOG(3) << "> UpdateResultAvailable(" << error << ")"; } diff --git a/chromium_src/components/update_client/update_checker.h b/chromium_src/components/update_client/update_checker.h index b41558cf0e6ab..a71254510a142 100644 --- a/chromium_src/components/update_client/update_checker.h +++ b/chromium_src/components/update_client/update_checker.h @@ -42,9 +42,7 @@ class SequentialUpdateChecker : public UpdateChecker { PersistedData* persistent); void CheckForUpdates( - const std::string& session_id, - const std::vector& ids_checked, - const IdToComponentPtrMap& components, + scoped_refptr update_context, const base::flat_map& additional_attributes, UpdateCheckCallback update_check_callback) override; @@ -68,14 +66,10 @@ class SequentialUpdateChecker : public UpdateChecker { const scoped_refptr config_; PersistedData* metadata_ = nullptr; - // Store the parameters to CheckForUpdates(...), so we can pass them multiple - // times to the original UpdateChecker implementation. - std::string session_id_; - // Needs to be a pointer because the values in IdToComponentPtrMap are of - // type std::unique_ptr, which we can't copy. Furthermore, it is okay to keep - // this pointer because IdToComponentPtrMap resides in in UpdateContext, which - // outlives this class. - const IdToComponentPtrMap* components_; + // This update conext instance is stored locally and then used to create + // individidual UpdateContext instances based on each application id. + scoped_refptr update_context_; + base::flat_map additional_attributes_; UpdateCheckCallback update_check_callback_; diff --git a/chromium_src/content/browser/permissions/permission_controller_impl.cc b/chromium_src/content/browser/permissions/permission_controller_impl.cc new file mode 100644 index 0000000000000..b958d53d7795b --- /dev/null +++ b/chromium_src/content/browser/permissions/permission_controller_impl.cc @@ -0,0 +1,25 @@ +/* Copyright (c) 2022 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#include "content/browser/permissions/permission_controller_impl.h" +#include "content/browser/permissions/permission_util.h" +#include "third_party/blink/public/common/permissions/permission_utils.h" + +#define NUM \ + BRAVE_ADS: \ + case PermissionType::BRAVE_COSMETIC_FILTERING: \ + case PermissionType::BRAVE_TRACKERS: \ + case PermissionType::BRAVE_HTTP_UPGRADABLE_RESOURCES: \ + case PermissionType::BRAVE_FINGERPRINTING_V2: \ + case PermissionType::BRAVE_SHIELDS: \ + case PermissionType::BRAVE_REFERRERS: \ + case PermissionType::BRAVE_COOKIES: \ + case PermissionType::BRAVE_SPEEDREADER: \ + case PermissionType::BRAVE_ETHEREUM: \ + case PermissionType::BRAVE_SOLANA: \ + case PermissionType::NUM + +#include "src/content/browser/permissions/permission_controller_impl.cc" +#undef NUM diff --git a/chromium_src/content/public/common/content_features.cc b/chromium_src/content/public/common/content_features.cc index 4f4bbb11f4baa..b4f9085fc4efc 100644 --- a/chromium_src/content/public/common/content_features.cc +++ b/chromium_src/content/public/common/content_features.cc @@ -12,6 +12,7 @@ namespace features { OVERRIDE_FEATURE_DEFAULT_STATES({{ {kDigitalGoodsApi, base::FEATURE_DISABLED_BY_DEFAULT}, + {kEarlyHintsPreloadForNavigation, base::FEATURE_DISABLED_BY_DEFAULT}, {kFedCm, base::FEATURE_DISABLED_BY_DEFAULT}, {kFirstPartySets, base::FEATURE_DISABLED_BY_DEFAULT}, {kIdleDetection, base::FEATURE_DISABLED_BY_DEFAULT}, diff --git a/chromium_src/content/shell/browser/shell_permission_manager.cc b/chromium_src/content/shell/browser/shell_permission_manager.cc new file mode 100644 index 0000000000000..e5dce1657cad9 --- /dev/null +++ b/chromium_src/content/shell/browser/shell_permission_manager.cc @@ -0,0 +1,24 @@ +/* Copyright (c) 2022 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#include "components/permissions/permission_util.h" +#include "third_party/blink/public/common/permissions/permission_utils.h" + +#define NUM \ + BRAVE_ADS: \ + case PermissionType::BRAVE_COSMETIC_FILTERING: \ + case PermissionType::BRAVE_TRACKERS: \ + case PermissionType::BRAVE_HTTP_UPGRADABLE_RESOURCES: \ + case PermissionType::BRAVE_FINGERPRINTING_V2: \ + case PermissionType::BRAVE_SHIELDS: \ + case PermissionType::BRAVE_REFERRERS: \ + case PermissionType::BRAVE_COOKIES: \ + case PermissionType::BRAVE_SPEEDREADER: \ + case PermissionType::BRAVE_ETHEREUM: \ + case PermissionType::BRAVE_SOLANA: \ + case PermissionType::NUM + +#include "src/content/shell/browser/shell_permission_manager.cc" +#undef NUM diff --git a/chromium_src/ios/chrome/browser/application_context_impl.mm b/chromium_src/ios/chrome/browser/application_context_impl.mm index 303bfa0b2fa13..8c0b13444ec07 100644 --- a/chromium_src/ios/chrome/browser/application_context_impl.mm +++ b/chromium_src/ios/chrome/browser/application_context_impl.mm @@ -12,7 +12,6 @@ #include "base/files/file_path.h" #include "base/memory/ptr_util.h" #include "base/path_service.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/time/default_clock.h" #include "base/time/default_tick_clock.h" @@ -44,7 +43,7 @@ #include "ios/chrome/browser/pref_names.h" #include "ios/chrome/browser/prefs/browser_prefs.h" #include "ios/chrome/browser/prefs/ios_chrome_pref_service_factory.h" -#import "ios/chrome/browser/safe_browsing/safe_browsing_service.h" +#import "ios/components/security_interstitials/safe_browsing/safe_browsing_service.h" #include "ios/public/provider/chrome/browser/app_distribution/app_distribution_api.h" #include "ios/public/provider/chrome/browser/signin/signin_sso_api.h" #include "mojo/public/cpp/bindings/pending_receiver.h" diff --git a/chromium_src/ios/chrome/browser/ios_chrome_field_trials.mm b/chromium_src/ios/chrome/browser/ios_chrome_field_trials.mm index d83f41e87d48b..3c230657f98c5 100644 --- a/chromium_src/ios/chrome/browser/ios_chrome_field_trials.mm +++ b/chromium_src/ios/chrome/browser/ios_chrome_field_trials.mm @@ -9,7 +9,6 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/path_service.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "components/metrics/persistent_histograms.h" #include "ios/chrome/browser/chrome_paths.h" @@ -27,8 +26,8 @@ void DeleteFileMetrics() { FROM_HERE, {base::MayBlock(), base::TaskPriority::BEST_EFFORT, base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN}, - base::BindOnce(base::GetDeletePathRecursivelyCallback(), - std::move(browser_metrics_upload_dir))); + GetDeletePathRecursivelyCallback( + std::move(browser_metrics_upload_dir))); } } diff --git a/chromium_src/ios/chrome/browser/metrics/ios_chrome_metrics_service_client.mm b/chromium_src/ios/chrome/browser/metrics/ios_chrome_metrics_service_client.mm index ff043173eee20..5a8ed2d6a97b1 100644 --- a/chromium_src/ios/chrome/browser/metrics/ios_chrome_metrics_service_client.mm +++ b/chromium_src/ios/chrome/browser/metrics/ios_chrome_metrics_service_client.mm @@ -17,7 +17,6 @@ #include "base/metrics/persistent_histogram_allocator.h" #include "base/path_service.h" #include "base/process/process_metrics.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "components/metrics/metrics_log_uploader.h" #include "components/metrics/metrics_provider.h" @@ -57,8 +56,8 @@ void DeleteFileMetrics() { FROM_HERE, {base::MayBlock(), base::TaskPriority::BEST_EFFORT, base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN}, - base::BindOnce(base::GetDeletePathRecursivelyCallback(), - std::move(browser_metrics_upload_dir))); + base::GetDeletePathRecursivelyCallback( + std::move(browser_metrics_upload_dir))); } } diff --git a/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc b/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc index fc6d4277632b0..885d293360504 100644 --- a/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc +++ b/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc @@ -13,8 +13,12 @@ namespace net { namespace transport_security_state { -bool ParseCertificatesFile(base::StringPiece certs_input, Pinsets* pinsets) { - base::StringPiece brave_certs = R"brave_certs(TestSPKI +bool ParseCertificatesFile(base::StringPiece certs_input, + Pinsets* pinsets, + base::Time* timestamp) { + base::StringPiece brave_certs = R"brave_certs(PinsListTimestamp +1649894400 +TestSPKI sha256/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= # =====BEGIN BRAVE ROOTS ASC===== @@ -351,7 +355,7 @@ tL4ndQavEi51mI38AjEAi/V3bNTIZargCyzuFJ0nN6T5U6VR5CmD1/iQMVtCnwr1 # =====END BRAVE ROOTS ASC===== )brave_certs"; - return ParseCertificatesFile_ChromiumImpl(brave_certs, pinsets); + return ParseCertificatesFile_ChromiumImpl(brave_certs, pinsets, timestamp); } bool ParseJSON(base::StringPiece json, diff --git a/chromium_src/third_party/blink/common/features.cc b/chromium_src/third_party/blink/common/features.cc index a2ff9fb08b248..2cc13e637515f 100644 --- a/chromium_src/third_party/blink/common/features.cc +++ b/chromium_src/third_party/blink/common/features.cc @@ -28,6 +28,7 @@ OVERRIDE_FEATURE_DEFAULT_STATES({{ {kParakeet, base::FEATURE_DISABLED_BY_DEFAULT}, {kPrerender2, base::FEATURE_DISABLED_BY_DEFAULT}, {kPrivacySandboxAdsAPIs, base::FEATURE_DISABLED_BY_DEFAULT}, + {kSharedStorageAPI, base::FEATURE_DISABLED_BY_DEFAULT}, {kSpeculationRulesPrefetchProxy, base::FEATURE_DISABLED_BY_DEFAULT}, {kTextFragmentAnchor, base::FEATURE_DISABLED_BY_DEFAULT}, }}); diff --git a/chromium_src/third_party/blink/public/common/permissions/permission_utils.h b/chromium_src/third_party/blink/public/common/permissions/permission_utils.h new file mode 100644 index 0000000000000..12ed209ccfb00 --- /dev/null +++ b/chromium_src/third_party/blink/public/common/permissions/permission_utils.h @@ -0,0 +1,28 @@ +/* Copyright (c) 2022 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#ifndef BRAVE_CHROMIUM_SRC_THIRD_PARTY_BLINK_PUBLIC_COMMON_PERMISSIONS_PERMISSION_UTILS_H_ +#define BRAVE_CHROMIUM_SRC_THIRD_PARTY_BLINK_PUBLIC_COMMON_PERMISSIONS_PERMISSION_UTILS_H_ + +// clang-format off +#define NUM \ + BRAVE_ADS, \ + BRAVE_COSMETIC_FILTERING, \ + BRAVE_TRACKERS, \ + BRAVE_HTTP_UPGRADABLE_RESOURCES, \ + BRAVE_FINGERPRINTING_V2, \ + BRAVE_SHIELDS, \ + BRAVE_REFERRERS, \ + BRAVE_COOKIES, \ + BRAVE_SPEEDREADER, \ + BRAVE_ETHEREUM, \ + BRAVE_SOLANA, \ + NUM +// clang-format on + +#include "src/third_party/blink/public/common/permissions/permission_utils.h" +#undef NUM + +#endif // BRAVE_CHROMIUM_SRC_THIRD_PARTY_BLINK_PUBLIC_COMMON_PERMISSIONS_PERMISSION_UTILS_H_ diff --git a/chromium_src/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc b/chromium_src/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc index 0a7ad77418554..abd877726941f 100644 --- a/chromium_src/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc +++ b/chromium_src/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc @@ -26,7 +26,7 @@ String ResourceFetcher::GetContextCacheIdentifier() const { if (!base::FeatureList::IsEnabled(features::kPartitionBlinkMemoryCache)) { return MemoryCache::DefaultCacheIdentifier(); } - if (!properties_->IsMainFrame()) { + if (!properties_->IsOutermostMainFrame()) { if (auto cache_identifier = Context().GetCacheIdentifierIfCrossSiteSubframe()) { return cache_identifier; diff --git a/components/assist_ranker/ranker_model_loader_impl_unittest.cc b/components/assist_ranker/ranker_model_loader_impl_unittest.cc index 703df57f012b6..de70c502d0998 100644 --- a/components/assist_ranker/ranker_model_loader_impl_unittest.cc +++ b/components/assist_ranker/ranker_model_loader_impl_unittest.cc @@ -12,7 +12,6 @@ #include "base/files/file_util.h" #include "base/memory/ref_counted.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" diff --git a/components/autofill_payments_strings.grdp b/components/autofill_payments_strings.grdp index 5ce1a9f23ce38..cdf46c27fed8c 100644 --- a/components/autofill_payments_strings.grdp +++ b/components/autofill_payments_strings.grdp @@ -106,6 +106,9 @@ Save your card and billing info to your Brave sync chain for secure and faster checkouts + + Save your card and billing info to your Brave sync chain ^1user@gmail.com for secure and faster checkouts + diff --git a/components/autofill_strings.grdp b/components/autofill_strings.grdp index f6d1d5ae1c9ab..42013af675f75 100644 --- a/components/autofill_strings.grdp +++ b/components/autofill_strings.grdp @@ -141,17 +141,33 @@ Manage... - - Manage addresses... - + + + Manage addresses... + - - Manage payment methods... - + + Manage payment methods... + - - Manage passwords... - + + Manage passwords... + + + + + + Manage Addresses... + + + + Manage Payment Methods... + + + + Manage Passwords... + + Scan new card diff --git a/components/binance/browser/binance_service.cc b/components/binance/browser/binance_service.cc index 3de36064e2479..75fb56ae64969 100644 --- a/components/binance/browser/binance_service.cc +++ b/components/binance/browser/binance_service.cc @@ -15,7 +15,6 @@ #include "base/files/file_enumerator.h" #include "base/files/file_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/time/time.h" diff --git a/components/brave_ads/browser/component_updater/resource_component.cc b/components/brave_ads/browser/component_updater/resource_component.cc index 93b79d7002a4e..dfdb8fe06523b 100644 --- a/components/brave_ads/browser/component_updater/resource_component.cc +++ b/components/brave_ads/browser/component_updater/resource_component.cc @@ -12,7 +12,7 @@ #include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" +#include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "brave/components/brave_ads/browser/component_updater/component_util.h" #include "brave/components/l10n/common/locale_util.h" diff --git a/components/brave_perf_predictor/browser/named_third_party_registry.cc b/components/brave_perf_predictor/browser/named_third_party_registry.cc index 4dd74d4dc0049..7f454f1a90465 100644 --- a/components/brave_perf_predictor/browser/named_third_party_registry.cc +++ b/components/brave_perf_predictor/browser/named_third_party_registry.cc @@ -14,7 +14,7 @@ #include "base/metrics/histogram_macros.h" #include "base/strings/string_piece.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" +#include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/values.h" #include "brave/components/brave_perf_predictor/browser/bandwidth_linreg_parameters.h" diff --git a/components/brave_perf_predictor/browser/perf_predictor_page_metrics_observer.cc b/components/brave_perf_predictor/browser/perf_predictor_page_metrics_observer.cc index d8cdc8f0718b5..93db705282e14 100644 --- a/components/brave_perf_predictor/browser/perf_predictor_page_metrics_observer.cc +++ b/components/brave_perf_predictor/browser/perf_predictor_page_metrics_observer.cc @@ -73,4 +73,14 @@ void PerfPredictorPageMetricsObserver::OnLoadEventStart( } } +page_load_metrics::PageLoadMetricsObserver::ObservePolicy +PerfPredictorPageMetricsObserver::OnFencedFramesStart( + content::NavigationHandle* navigation_handle, + const GURL& currently_committed_url) { + // Observe all MIME types. We still only use actual data usage, so strange + // cases (e.g., data:// URLs) will still record the right amount of data + // usage. + return CONTINUE_OBSERVING; +} + } // namespace brave_perf_predictor diff --git a/components/brave_perf_predictor/browser/perf_predictor_page_metrics_observer.h b/components/brave_perf_predictor/browser/perf_predictor_page_metrics_observer.h index 01ea9ac57a3c4..94c52e330fea9 100644 --- a/components/brave_perf_predictor/browser/perf_predictor_page_metrics_observer.h +++ b/components/brave_perf_predictor/browser/perf_predictor_page_metrics_observer.h @@ -51,6 +51,10 @@ class PerfPredictorPageMetricsObserver ObservePolicy ShouldObserveMimeType( const std::string& mime_type) const override; + ObservePolicy OnFencedFramesStart( + content::NavigationHandle* navigation_handle, + const GURL& currently_committed_url) override; + int64_t navigation_id_ = 0; // The browser context this navigation is operating in. diff --git a/components/brave_perf_predictor/browser/perf_predictor_tab_helper_browsertest.cc b/components/brave_perf_predictor/browser/perf_predictor_tab_helper_browsertest.cc index be18323f629f9..7cfecfd3f9a70 100644 --- a/components/brave_perf_predictor/browser/perf_predictor_tab_helper_browsertest.cc +++ b/components/brave_perf_predictor/browser/perf_predictor_tab_helper_browsertest.cc @@ -4,7 +4,6 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "base/path_service.h" -#include "base/task/post_task.h" #include "base/test/thread_test_helper.h" #include "brave/browser/brave_browser_process.h" #include "brave/common/brave_paths.h" diff --git a/components/brave_referrals/browser/brave_referrals_service.cc b/components/brave_referrals/browser/brave_referrals_service.cc index 197046ea22261..86e974c4d0d0c 100644 --- a/components/brave_referrals/browser/brave_referrals_service.cc +++ b/components/brave_referrals/browser/brave_referrals_service.cc @@ -20,7 +20,6 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/values.h" #include "brave/common/network_constants.h" @@ -429,14 +428,14 @@ void BraveReferralsService::SetFirstRunTime( void BraveReferralsService::PerformFinalizationChecks() { // Delete the promo code preference, if appropriate. - base::PostTask( - FROM_HERE, {content::BrowserThread::UI}, + content::GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(&BraveReferralsService::MaybeDeletePromoCodePref, weak_factory_.GetWeakPtr())); // Check for referral finalization, if appropriate. - base::PostTask( - FROM_HERE, {content::BrowserThread::UI}, + content::GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(&BraveReferralsService::MaybeCheckForReferralFinalization, weak_factory_.GetWeakPtr())); } diff --git a/components/brave_rewards/browser/diagnostic_log.cc b/components/brave_rewards/browser/diagnostic_log.cc index 869bf0817ebb7..7efaad26e0931 100644 --- a/components/brave_rewards/browser/diagnostic_log.cc +++ b/components/brave_rewards/browser/diagnostic_log.cc @@ -12,7 +12,6 @@ #include "base/i18n/time_formatting.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" namespace { diff --git a/components/brave_rewards/browser/net/network_delegate_helper.cc b/components/brave_rewards/browser/net/network_delegate_helper.cc index dbec11931807c..5993e2767dd7a 100644 --- a/components/brave_rewards/browser/net/network_delegate_helper.cc +++ b/components/brave_rewards/browser/net/network_delegate_helper.cc @@ -8,7 +8,6 @@ #include #include -#include "base/task/post_task.h" #include "brave/components/brave_rewards/browser/rewards_service.h" #include "brave/browser/brave_rewards/rewards_service_factory.h" #include "chrome/browser/profiles/profile.h" diff --git a/components/brave_rewards/browser/rewards_protocol_handler.cc b/components/brave_rewards/browser/rewards_protocol_handler.cc index abe930150a6d5..8e08004bb813e 100644 --- a/components/brave_rewards/browser/rewards_protocol_handler.cc +++ b/components/brave_rewards/browser/rewards_protocol_handler.cc @@ -8,15 +8,14 @@ #include #include +#include "base/strings/escape.h" #include "base/strings/strcat.h" #include "base/strings/string_piece_forward.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "bat/ledger/buildflags.h" #include "brave/components/brave_rewards/common/url_constants.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" -#include "net/base/escape.h" namespace { @@ -29,10 +28,7 @@ GURL TranslateUrl(const GURL& url) { std::string query; if (url.has_query()) { - query = base::StrCat({ - "?", - net::EscapeExternalHandlerValue(url.query()) - }); + query = base::StrCat({"?", base::EscapeExternalHandlerValue(url.query())}); } base::ReplaceFirstSubstringAfterOffset(&path, 0, "/", ""); @@ -105,8 +101,8 @@ void HandleRewardsProtocol(const GURL& url, ui::PageTransition page_transition, bool has_user_gesture) { DCHECK(url.SchemeIs(kRewardsScheme)); - base::PostTask( - FROM_HERE, {content::BrowserThread::UI}, + content::GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(&LoadRewardsURL, url, std::move(web_contents_getter), page_transition, has_user_gesture)); } diff --git a/components/brave_rewards/browser/rewards_service_impl.cc b/components/brave_rewards/browser/rewards_service_impl.cc index 78ab04204ef44..7623767aa0b6c 100644 --- a/components/brave_rewards/browser/rewards_service_impl.cc +++ b/components/brave_rewards/browser/rewards_service_impl.cc @@ -25,12 +25,12 @@ #include "base/json/json_string_value_serializer.h" #include "base/json/json_writer.h" #include "base/logging.h" +#include "base/strings/escape.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" @@ -72,7 +72,6 @@ #include "content/public/browser/service_process_host.h" #include "content/public/browser/storage_partition.h" #include "content/public/browser/url_data_source.h" -#include "net/base/escape.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "net/base/url_util.h" #include "net/http/http_status_code.h" @@ -819,7 +818,7 @@ void RewardsServiceImpl::RestorePublishers() { } std::string RewardsServiceImpl::URIEncode(const std::string& value) { - return net::EscapeQueryParamValue(value, false); + return base::EscapeQueryParamValue(value, false); } void RewardsServiceImpl::Shutdown() { diff --git a/components/brave_shields/browser/ad_block_regional_service_manager.cc b/components/brave_shields/browser/ad_block_regional_service_manager.cc index e3801664e49a7..3fae91c27c244 100644 --- a/components/brave_shields/browser/ad_block_regional_service_manager.cc +++ b/components/brave_shields/browser/ad_block_regional_service_manager.cc @@ -11,7 +11,6 @@ #include "base/feature_list.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/values.h" #include "brave/components/adblock_rust_ffi/src/wrapper.h" #include "brave/components/brave_shields/browser/ad_block_engine.h" @@ -248,8 +247,8 @@ void AdBlockRegionalServiceManager::EnableFilterList(const std::string& uuid, // Update preferences to reflect enabled/disabled state of specified // filter list - base::PostTask( - FROM_HERE, {content::BrowserThread::UI}, + content::GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(&AdBlockRegionalServiceManager::UpdateFilterListPrefs, weak_factory_.GetWeakPtr(), uuid, enabled)); } diff --git a/components/brave_shields/browser/ad_block_subscription_download_manager.cc b/components/brave_shields/browser/ad_block_subscription_download_manager.cc index b93d536548c60..c7606b6b4ad90 100644 --- a/components/brave_shields/browser/ad_block_subscription_download_manager.cc +++ b/components/brave_shields/browser/ad_block_subscription_download_manager.cc @@ -12,7 +12,7 @@ #include "base/files/file_util.h" #include "base/guid.h" #include "base/metrics/histogram_functions.h" -#include "base/task/post_task.h" +#include "base/task/task_runner_util.h" #include "brave/components/brave_shields/browser/ad_block_service_helper.h" #include "brave/components/brave_shields/browser/ad_block_subscription_service_manager.h" #include "brave/components/brave_shields/common/brave_shield_constants.h" diff --git a/components/brave_shields/browser/ad_block_subscription_service_manager.cc b/components/brave_shields/browser/ad_block_subscription_service_manager.cc index ffac382df70cd..104a22401fbba 100644 --- a/components/brave_shields/browser/ad_block_subscription_service_manager.cc +++ b/components/brave_shields/browser/ad_block_subscription_service_manager.cc @@ -16,7 +16,6 @@ #include "base/json/json_value_converter.h" #include "base/json/values_util.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/time/time.h" #include "base/values.h" diff --git a/components/brave_shields/browser/brave_shields_p3a_unittest.cc b/components/brave_shields/browser/brave_shields_p3a_unittest.cc index 79d71bcd58ba4..7f59b76cb8c45 100644 --- a/components/brave_shields/browser/brave_shields_p3a_unittest.cc +++ b/components/brave_shields/browser/brave_shields_p3a_unittest.cc @@ -12,6 +12,7 @@ #include "chrome/test/base/testing_profile.h" #include "content/public/test/browser_task_environment.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" namespace brave_shields { diff --git a/components/brave_shields/browser/brave_shields_util_unittest.cc b/components/brave_shields/browser/brave_shields_util_unittest.cc index fee818fea64b9..51a6b2e097565 100644 --- a/components/brave_shields/browser/brave_shields_util_unittest.cc +++ b/components/brave_shields/browser/brave_shields_util_unittest.cc @@ -17,6 +17,7 @@ #include "content/public/test/browser_task_environment.h" #include "net/base/features.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" using brave_shields::ControlType; using brave_shields::ControlTypeFromString; diff --git a/components/brave_shields/browser/domain_block_navigation_throttle.cc b/components/brave_shields/browser/domain_block_navigation_throttle.cc index 124d3e05fa7df..e51b739152be0 100644 --- a/components/brave_shields/browser/domain_block_navigation_throttle.cc +++ b/components/brave_shields/browser/domain_block_navigation_throttle.cc @@ -11,7 +11,7 @@ #include "base/bind.h" #include "base/feature_list.h" #include "base/metrics/histogram_macros.h" -#include "base/task/post_task.h" +#include "base/task/task_runner_util.h" #include "base/threading/thread_task_runner_handle.h" #include "brave/components/brave_shields/browser/ad_block_service.h" #include "brave/components/brave_shields/browser/domain_block_controller_client.h" diff --git a/components/brave_shields/browser/https_everywhere_service_browsertest.cc b/components/brave_shields/browser/https_everywhere_service_browsertest.cc index 3da1ad9ff24ae..0be535b692b16 100644 --- a/components/brave_shields/browser/https_everywhere_service_browsertest.cc +++ b/components/brave_shields/browser/https_everywhere_service_browsertest.cc @@ -4,7 +4,6 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "base/path_service.h" -#include "base/task/post_task.h" #include "base/test/thread_test_helper.h" #include "brave/browser/brave_browser_process.h" #include "brave/browser/brave_shields/https_everywhere_component_installer.h" diff --git a/components/brave_sync/BUILD.gn b/components/brave_sync/BUILD.gn index 7c280159d8a23..3d6bda614ddf9 100644 --- a/components/brave_sync/BUILD.gn +++ b/components/brave_sync/BUILD.gn @@ -57,6 +57,10 @@ static_library("network_time_helper") { "//base", "//components/network_time", ] + + if (is_ios) { + deps += [ "//ios/web/public" ] + } } source_set("prefs") { diff --git a/components/brave_sync/DEPS b/components/brave_sync/DEPS index 30e21a70f02aa..55518564224f6 100644 --- a/components/brave_sync/DEPS +++ b/components/brave_sync/DEPS @@ -1,4 +1,5 @@ include_rules = [ "+content/public/browser", "+third_party/boringssl", + "+ios/web/public", ] diff --git a/components/brave_sync/network_time_helper.cc b/components/brave_sync/network_time_helper.cc index 3f7aba6d90b7c..9cc317752e355 100644 --- a/components/brave_sync/network_time_helper.cc +++ b/components/brave_sync/network_time_helper.cc @@ -8,10 +8,21 @@ #include #include "base/sequence_checker.h" -#include "base/task/post_task.h" #include "components/network_time/network_time_tracker.h" + +#if defined(OS_IOS) +#include "ios/web/public/thread/web_task_traits.h" +#include "ios/web/public/thread/web_thread.h" +#else #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" +#endif // defined(OS_IOS) + +#if defined(OS_IOS) +using web::GetUIThreadTaskRunner; +#else +using content::GetUIThreadTaskRunner; +#endif // defined(OS_IOS) namespace brave_sync { @@ -34,8 +45,8 @@ void NetworkTimeHelper::GetNetworkTime(GetNetworkTimeCallback cb) { std::move(cb).Run(network_time_for_test_); return; } - base::PostTask(FROM_HERE, {content::BrowserThread::UI}, - base::BindOnce(&NetworkTimeHelper::GetNetworkTimeOnUIThread, + GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(&NetworkTimeHelper::GetNetworkTimeOnUIThread, weak_ptr_factory_.GetWeakPtr(), std::move(cb))); } diff --git a/components/brave_today/browser/feed_parsing.cc b/components/brave_today/browser/feed_parsing.cc index ee6bc3a7a153e..8dcc264198f7c 100644 --- a/components/brave_today/browser/feed_parsing.cc +++ b/components/brave_today/browser/feed_parsing.cc @@ -95,16 +95,16 @@ bool ParseFeedItem(const base::Value& feed_item_raw, return false; } item->data = std::move(metadata); - feed_item->get()->set_promoted_article(std::move(item)); + *feed_item = mojom::FeedItem::NewPromotedArticle(std::move(item)); } else if (content_type == "product") { auto item = mojom::Deal::New(); item->offers_category = *feed_item_raw.FindStringKey("offers_category"); item->data = std::move(metadata); - feed_item->get()->set_deal(std::move(item)); + *feed_item = mojom::FeedItem::NewDeal(std::move(item)); } else if (content_type == "article") { auto item = mojom::Article::New(); item->data = std::move(metadata); - feed_item->get()->set_article(std::move(item)); + *feed_item = mojom::FeedItem::NewArticle(std::move(item)); } else { // Do not error if unknown content_type is discovered, it could // be a future use. @@ -130,8 +130,7 @@ bool ParseFeedItems(const std::string& json, return false; } for (const base::Value& feed_item_raw : records_v->GetList()) { - auto item = mojom::FeedItem::New(); - std::string item_hash; + mojom::FeedItemPtr item; if (ParseFeedItem(feed_item_raw, &item)) { feed_items->push_back(std::move(item)); } diff --git a/components/brave_wallet/browser/BUILD.gn b/components/brave_wallet/browser/BUILD.gn index 90f8e0d51a6a3..2e003e81dafaa 100644 --- a/components/brave_wallet/browser/BUILD.gn +++ b/components/brave_wallet/browser/BUILD.gn @@ -165,7 +165,9 @@ if (!is_ios) { deps = [ ":utils", "//base", + "//brave/components/brave_wallet/common:mojom", "//components/permissions:permissions_common", + "//third_party/blink/public/common", "//third_party/re2", "//url", ] diff --git a/components/brave_wallet/browser/DEPS b/components/brave_wallet/browser/DEPS index cf629d70f8b96..cbca9f1035718 100644 --- a/components/brave_wallet/browser/DEPS +++ b/components/brave_wallet/browser/DEPS @@ -1,6 +1,7 @@ include_rules = [ "+services/data_decoder/public/cpp", "+services/network/public/cpp", + "+third_party/blink/public/common", "+third_party/boringssl", "+third_party/re2", "+brave/common/brave_services_key.h", diff --git a/components/brave_wallet/browser/asset_ratio_service.cc b/components/brave_wallet/browser/asset_ratio_service.cc index d05ea905db463..45783b6b88558 100644 --- a/components/brave_wallet/browser/asset_ratio_service.cc +++ b/components/brave_wallet/browser/asset_ratio_service.cc @@ -13,7 +13,6 @@ #include "base/strings/stringprintf.h" #include "brave/common/brave_services_key.h" #include "brave/components/brave_wallet/browser/brave_wallet_constants.h" -#include "net/base/escape.h" #include "net/base/load_flags.h" #include "services/network/public/cpp/shared_url_loader_factory.h" #include "services/network/public/cpp/simple_url_loader.h" diff --git a/components/brave_wallet/browser/brave_wallet_utils.cc b/components/brave_wallet/browser/brave_wallet_utils.cc index 308141ee2dab3..d6a101bd7510d 100644 --- a/components/brave_wallet/browser/brave_wallet_utils.cc +++ b/components/brave_wallet/browser/brave_wallet_utils.cc @@ -1184,16 +1184,4 @@ std::string GetWeb3ClientVersion() { "BraveWallet/v%s", version_info::GetBraveChromiumVersionNumber().c_str()); } -absl::optional CoinTypeToContentSettingsType( - mojom::CoinType coin_type) { - switch (coin_type) { - case mojom::CoinType::ETH: - return ContentSettingsType::BRAVE_ETHEREUM; - case mojom::CoinType::SOL: - return ContentSettingsType::BRAVE_SOLANA; - default: - return absl::nullopt; - } -} - } // namespace brave_wallet diff --git a/components/brave_wallet/browser/brave_wallet_utils.h b/components/brave_wallet/browser/brave_wallet_utils.h index 37ef0e5a02111..097bb4b821732 100644 --- a/components/brave_wallet/browser/brave_wallet_utils.h +++ b/components/brave_wallet/browser/brave_wallet_utils.h @@ -147,9 +147,6 @@ std::string eTLDPlusOne(const url::Origin& origin); mojom::OriginInfoPtr MakeOriginInfo(const url::Origin& origin); -absl::optional CoinTypeToContentSettingsType( - mojom::CoinType coin_type); - } // namespace brave_wallet #endif // BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_BRAVE_WALLET_UTILS_H_ diff --git a/components/brave_wallet/browser/permission_utils.cc b/components/brave_wallet/browser/permission_utils.cc index 1b554edad1dbc..83f3891279cbb 100644 --- a/components/brave_wallet/browser/permission_utils.cc +++ b/components/brave_wallet/browser/permission_utils.cc @@ -203,4 +203,16 @@ GURL GetConnectWithSiteWebUIURL(const GURL& webui_base_url, return webui_base_url.ReplaceComponents(replacements); } +absl::optional CoinTypeToPermissionType( + mojom::CoinType coin_type) { + switch (coin_type) { + case mojom::CoinType::ETH: + return blink::PermissionType::BRAVE_ETHEREUM; + case mojom::CoinType::SOL: + return blink::PermissionType::BRAVE_SOLANA; + default: + return absl::nullopt; + } +} + } // namespace brave_wallet diff --git a/components/brave_wallet/browser/permission_utils.h b/components/brave_wallet/browser/permission_utils.h index bf144ff6737d4..ad66ca528e7aa 100644 --- a/components/brave_wallet/browser/permission_utils.h +++ b/components/brave_wallet/browser/permission_utils.h @@ -10,7 +10,9 @@ #include #include +#include "brave/components/brave_wallet/common/brave_wallet.mojom.h" #include "components/permissions/request_type.h" +#include "third_party/blink/public/common/permissions/permission_utils.h" class GURL; namespace url { @@ -76,6 +78,9 @@ GURL GetConnectWithSiteWebUIURL(const GURL& webui_base_url, const std::vector& accounts, const url::Origin& origin); +absl::optional CoinTypeToPermissionType( + mojom::CoinType coin_type); + } // namespace brave_wallet #endif // BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_PERMISSION_UTILS_H_ diff --git a/components/brave_wallet/browser/swap_service.cc b/components/brave_wallet/browser/swap_service.cc index 7db7a257febe2..830e6be7d1a7f 100644 --- a/components/brave_wallet/browser/swap_service.cc +++ b/components/brave_wallet/browser/swap_service.cc @@ -11,7 +11,6 @@ #include "brave/components/brave_wallet/browser/brave_wallet_constants.h" #include "brave/components/brave_wallet/browser/json_rpc_service.h" #include "brave/components/brave_wallet/browser/swap_response_parser.h" -#include "net/base/escape.h" #include "net/base/load_flags.h" #include "net/base/url_util.h" #include "services/network/public/cpp/shared_url_loader_factory.h" diff --git a/components/brave_webtorrent/browser/content_browser_client_helper.h b/components/brave_webtorrent/browser/content_browser_client_helper.h index d1a9d0beab98f..43f4071b8bf53 100644 --- a/components/brave_webtorrent/browser/content_browser_client_helper.h +++ b/components/brave_webtorrent/browser/content_browser_client_helper.h @@ -9,9 +9,9 @@ #include #include +#include "base/strings/escape.h" #include "base/strings/strcat.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "brave/common/url_constants.h" #include "brave/components/brave_webtorrent/browser/webtorrent_util.h" #include "chrome/browser/external_protocol/external_protocol_handler.h" @@ -23,7 +23,6 @@ #include "extensions/browser/extension_registry.h" #include "extensions/common/constants.h" #include "extensions/common/extension_set.h" -#include "net/base/escape.h" namespace webtorrent { @@ -34,15 +33,15 @@ static GURL TranslateMagnetURL(const GURL& url) { "/extension/brave_webtorrent.html?%s"})); std::string translatedSpec(extension_page_url.spec()); base::ReplaceFirstSubstringAfterOffset( - &translatedSpec, 0, "%s", - net::EscapeQueryParamValue(url.spec(), true)); + &translatedSpec, 0, "%s", base::EscapeQueryParamValue(url.spec(), true)); return GURL(translatedSpec); } static GURL TranslateTorrentUIURLReversed(const GURL& url) { - GURL translatedURL(net::UnescapeURLComponent( - url.query(), net::UnescapeRule::URL_SPECIAL_CHARS_EXCEPT_PATH_SEPARATORS | - net::UnescapeRule::PATH_SEPARATORS)); + GURL translatedURL(base::UnescapeURLComponent( + url.query(), + base::UnescapeRule::URL_SPECIAL_CHARS_EXCEPT_PATH_SEPARATORS | + base::UnescapeRule::PATH_SEPARATORS)); GURL::Replacements replacements; replacements.SetRefStr(url.ref_piece()); return translatedURL.ReplaceComponents(replacements); @@ -123,8 +122,8 @@ static void HandleMagnetProtocol( const absl::optional& initiating_origin, content::WeakDocumentPtr initiator_document) { DCHECK(url.SchemeIs(kMagnetScheme)); - base::PostTask( - FROM_HERE, {content::BrowserThread::UI}, + content::GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(&LoadOrLaunchMagnetURL, url, web_contents_getter, page_transition, has_user_gesture, is_in_fenced_frame_tree, initiating_origin, std::move(initiator_document))); diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/browser_ui/site_settings/android/BUILD.gn index 2f3c2ebbf3d51..241ec670aae0b 100644 --- a/components/browser_ui/site_settings/android/BUILD.gn +++ b/components/browser_ui/site_settings/android/BUILD.gn @@ -18,6 +18,7 @@ android_library("java") { deps = [ ":java_resources", "//base:base_java", + "//build/android:build_java", "//components/browser_ui/settings/android:java", "//components/browser_ui/site_settings/android:java", "//components/browser_ui/widget/android:java", diff --git a/components/commerce_strings.grdp b/components/commerce_strings.grdp index d9eb84597a77a..c9f38c9eb0b1a 100644 --- a/components/commerce_strings.grdp +++ b/components/commerce_strings.grdp @@ -24,5 +24,14 @@ Done + + Yes, I'm in + + + Get discounts on your carts & when you shop online + + + Let Brave find personalized discounts on your carts and on online stores you visit. When available, discounts will automatically show up on your carts and on sites. + diff --git a/components/components_strings.grd b/components/components_strings.grd index bd3b230065cdb..a88ed12c26ac1 100644 --- a/components/components_strings.grd +++ b/components/components_strings.grd @@ -332,6 +332,7 @@ + diff --git a/components/content_settings/core/browser/brave_content_settings_pref_provider.cc b/components/content_settings/core/browser/brave_content_settings_pref_provider.cc index b00e81a1befca..e7cb62b72c6d5 100644 --- a/components/content_settings/core/browser/brave_content_settings_pref_provider.cc +++ b/components/content_settings/core/browser/brave_content_settings_pref_provider.cc @@ -12,7 +12,6 @@ #include "base/no_destructor.h" #include "base/strings/strcat.h" #include "base/strings/string_number_conversions.h" -#include "base/task/post_task.h" #include "brave/common/network_constants.h" #include "brave/common/pref_names.h" #include "brave/components/brave_shields/common/brave_shield_constants.h" @@ -593,12 +592,11 @@ void BravePrefProvider::UpdateCookieRules(ContentSettingsType content_type, if (initialized_ && (content_type == ContentSettingsType::BRAVE_COOKIES || content_type == ContentSettingsType::BRAVE_SHIELDS)) { // PostTask here to avoid content settings autolock DCHECK - base::PostTask( - FROM_HERE, - {content::BrowserThread::UI, base::TaskPriority::USER_VISIBLE}, - base::BindOnce(&BravePrefProvider::NotifyChanges, - weak_factory_.GetWeakPtr(), - std::move(brave_cookie_updates), incognito)); + content::GetUIThreadTaskRunner({base::TaskPriority::USER_VISIBLE}) + ->PostTask(FROM_HERE, + base::BindOnce(&BravePrefProvider::NotifyChanges, + weak_factory_.GetWeakPtr(), + std::move(brave_cookie_updates), incognito)); } } diff --git a/components/crypto_dot_com/browser/crypto_dot_com_service.cc b/components/crypto_dot_com/browser/crypto_dot_com_service.cc index dcfa7b9bd4450..8e61bc501ff16 100644 --- a/components/crypto_dot_com/browser/crypto_dot_com_service.cc +++ b/components/crypto_dot_com/browser/crypto_dot_com_service.cc @@ -14,7 +14,6 @@ #include "base/files/file_enumerator.h" #include "base/files/file_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/time/time.h" diff --git a/components/ftx/browser/ftx_service.cc b/components/ftx/browser/ftx_service.cc index 82b34104c44e4..879a81731a829 100644 --- a/components/ftx/browser/ftx_service.cc +++ b/components/ftx/browser/ftx_service.cc @@ -10,8 +10,8 @@ #include "base/base64.h" #include "base/json/json_writer.h" +#include "base/strings/escape.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "brave/components/ftx/browser/buildflags/buildflags.h" @@ -23,7 +23,6 @@ #include "components/user_prefs/user_prefs.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/storage_partition.h" -#include "net/base/escape.h" #include "net/base/load_flags.h" #include "net/base/url_util.h" #include "services/network/public/cpp/resource_request.h" @@ -70,7 +69,7 @@ void BuildFormEncoding(const std::string& key, std::string* out) { if (!out->empty()) out->append("&"); - out->append(key + "=" + net::EscapeUrlEncodedData(value, true)); + out->append(key + "=" + base::EscapeUrlEncodedData(value, true)); } } // namespace @@ -195,10 +194,11 @@ std::string FTXService::GetOAuthClientUrl() { // This particular FTX Url has a strange format. It is parameterized as if // it has a query param, except the params are the last path segment. auto state = ntp_widget_utils::GetCryptoRandomString(false); - std::string path = std::string(oauth_path) + "/response_type=code" + - "&client_id=" + net::EscapeQueryParamValue(client_id_, true) + - "&state=" + net::EscapeQueryParamValue(state, true) + - "&redirect_uri=" + net::EscapeQueryParamValue(oauth_callback, true); + std::string path = + std::string(oauth_path) + "/response_type=code" + + "&client_id=" + base::EscapeQueryParamValue(client_id_, true) + + "&state=" + base::EscapeQueryParamValue(state, true) + + "&redirect_uri=" + base::EscapeQueryParamValue(oauth_callback, true); GURL url = GetOAuthURL(path); return url.spec(); } diff --git a/components/gemini/browser/gemini_service.cc b/components/gemini/browser/gemini_service.cc index 4ec50c5915fee..3179c0518eea9 100644 --- a/components/gemini/browser/gemini_service.cc +++ b/components/gemini/browser/gemini_service.cc @@ -17,7 +17,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/time/time.h" diff --git a/components/greaselion/browser/greaselion_download_service.cc b/components/greaselion/browser/greaselion_download_service.cc index 2fff4316cf41e..4ef4a786c0b85 100644 --- a/components/greaselion/browser/greaselion_download_service.cc +++ b/components/greaselion/browser/greaselion_download_service.cc @@ -17,7 +17,6 @@ #include "base/logging.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/threading/sequenced_task_runner_handle.h" diff --git a/components/greaselion/browser/greaselion_service_impl.cc b/components/greaselion/browser/greaselion_service_impl.cc index 8083b8c3e64ce..7b7eb17dc87d4 100644 --- a/components/greaselion/browser/greaselion_service_impl.cc +++ b/components/greaselion/browser/greaselion_service_impl.cc @@ -23,7 +23,6 @@ #include "base/one_shot_event.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/values.h" #include "base/version.h" diff --git a/components/history_clusters_strings.grdp b/components/history_clusters_strings.grdp index 455ca012df817..1f0d5f80b2045 100644 --- a/components/history_clusters_strings.grdp +++ b/components/history_clusters_strings.grdp @@ -8,7 +8,7 @@ Turn on Journeys - + Journeys @@ -44,4 +44,7 @@ Show more + + Search your Journeys + diff --git a/components/ipfs/brave_ipfs_client_updater.cc b/components/ipfs/brave_ipfs_client_updater.cc index 5b3fe99f0d9b3..1bf5ff85e4e13 100644 --- a/components/ipfs/brave_ipfs_client_updater.cc +++ b/components/ipfs/brave_ipfs_client_updater.cc @@ -9,7 +9,6 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/logging.h" -#include "base/task/post_task.h" #include "base/task/task_runner.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" diff --git a/components/ipfs/import/ipfs_import_worker_base.cc b/components/ipfs/import/ipfs_import_worker_base.cc index 672a49744359c..c085152367d3c 100644 --- a/components/ipfs/import/ipfs_import_worker_base.cc +++ b/components/ipfs/import/ipfs_import_worker_base.cc @@ -14,7 +14,6 @@ #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/time/time.h" diff --git a/components/ipfs/import/ipfs_link_import_worker.cc b/components/ipfs/import/ipfs_link_import_worker.cc index c7f8fc92cc19b..f314f72a007ea 100644 --- a/components/ipfs/import/ipfs_link_import_worker.cc +++ b/components/ipfs/import/ipfs_link_import_worker.cc @@ -7,7 +7,6 @@ #include -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "brave/components/ipfs/ipfs_network_utils.h" @@ -91,7 +90,7 @@ void IpfsLinkImportWorker::RemoveDownloadedFile() { if (!temp_file_path_.empty()) { base::ThreadPool::PostTask( FROM_HERE, {base::TaskPriority::BEST_EFFORT, base::MayBlock()}, - base::BindOnce(base::GetDeleteFileCallback(), temp_file_path_)); + base::GetDeleteFileCallback(temp_file_path_)); temp_file_path_ = base::FilePath(); } } diff --git a/components/ipfs/ipfs_network_utils.cc b/components/ipfs/ipfs_network_utils.cc index d28287c453eb3..2bbf76886c04f 100644 --- a/components/ipfs/ipfs_network_utils.cc +++ b/components/ipfs/ipfs_network_utils.cc @@ -15,12 +15,12 @@ #include "base/files/file_enumerator.h" #include "base/files/file_util.h" #include "base/guid.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "brave/components/ipfs/blob_context_getter_factory.h" #include "brave/components/ipfs/buildflags/buildflags.h" #include "brave/components/ipfs/ipfs_constants.h" #include "content/public/browser/browser_task_traits.h" +#include "content/public/browser/browser_thread.h" #include "net/base/mime_util.h" #include "services/network/public/cpp/resource_request.h" #include "services/network/public/cpp/simple_url_loader.h" @@ -263,8 +263,8 @@ void CreateRequestForFile( content_type += " boundary="; content_type += mime_boundary; - base::PostTaskAndReplyWithResult( - FROM_HERE, {base::MayBlock(), content::BrowserThread::IO}, + content::GetIOThreadTaskRunner({})->PostTaskAndReplyWithResult( + FROM_HERE, base::BindOnce(&CreateResourceRequest, std::move(blob_builder_callback), content_type, blob_context_getter_factory), std::move(request_callback)); @@ -300,8 +300,8 @@ void CreateRequestForFileList( content_type += " boundary="; content_type += mime_boundary; - base::PostTaskAndReplyWithResult( - FROM_HERE, {base::MayBlock(), content::BrowserThread::IO}, + content::GetIOThreadTaskRunner({})->PostTaskAndReplyWithResult( + FROM_HERE, base::BindOnce(&CreateResourceRequest, std::move(blob_builder_callback), content_type, blob_context_getter_factory), std::move(request_callback)); @@ -329,8 +329,8 @@ void CreateRequestForText(const std::string& text, content_type += " boundary="; content_type += mime_boundary; - base::PostTaskAndReplyWithResult( - FROM_HERE, {base::MayBlock(), content::BrowserThread::IO}, + content::GetIOThreadTaskRunner({})->PostTaskAndReplyWithResult( + FROM_HERE, base::BindOnce(&CreateResourceRequest, std::move(blob_builder_callback), content_type, context_factory), std::move(request_callback)); diff --git a/components/ipfs/ipfs_service.cc b/components/ipfs/ipfs_service.cc index 374e023b0136b..e27c8f755c1d6 100644 --- a/components/ipfs/ipfs_service.cc +++ b/components/ipfs/ipfs_service.cc @@ -16,7 +16,6 @@ #include "base/strings/strcat.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "brave/components/ipfs/blob_context_getter_factory.h" diff --git a/components/ipfs/keys/ipns_keys_manager.cc b/components/ipfs/keys/ipns_keys_manager.cc index 37d74304f7050..afca257b1c1f0 100644 --- a/components/ipfs/keys/ipns_keys_manager.cc +++ b/components/ipfs/keys/ipns_keys_manager.cc @@ -10,7 +10,6 @@ #include #include "base/rand_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "brave/components/ipfs/blob_context_getter_factory.h" #include "brave/components/ipfs/ipfs_constants.h" diff --git a/components/ntp_background_images/browser/ntp_background_images_service.cc b/components/ntp_background_images/browser/ntp_background_images_service.cc index 9d58a60db7213..2502124d68bd2 100644 --- a/components/ntp_background_images/browser/ntp_background_images_service.cc +++ b/components/ntp_background_images/browser/ntp_background_images_service.cc @@ -15,7 +15,7 @@ #include "base/json/json_reader.h" #include "base/path_service.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" +#include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "brave/components/brave_component_updater/browser/brave_on_demand_updater.h" #include "brave/components/brave_referrals/browser/brave_referrals_service.h" diff --git a/components/ntp_background_images/browser/ntp_background_images_source.cc b/components/ntp_background_images/browser/ntp_background_images_source.cc index 5ab57d9d66287..2c653de565d4a 100644 --- a/components/ntp_background_images/browser/ntp_background_images_source.cc +++ b/components/ntp_background_images/browser/ntp_background_images_source.cc @@ -13,7 +13,6 @@ #include "base/files/file_util.h" #include "base/memory/ref_counted_memory.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "brave/components/ntp_background_images/browser/ntp_background_images_data.h" #include "brave/components/ntp_background_images/browser/ntp_background_images_service.h" diff --git a/components/ntp_background_images/browser/ntp_custom_images_source.cc b/components/ntp_background_images/browser/ntp_custom_images_source.cc index 2bfdec8de9828..160980b314a56 100644 --- a/components/ntp_background_images/browser/ntp_custom_images_source.cc +++ b/components/ntp_background_images/browser/ntp_custom_images_source.cc @@ -13,7 +13,6 @@ #include "base/files/file_util.h" #include "base/memory/ref_counted_memory.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "brave/components/ntp_background_images/browser/ntp_custom_background_images_service.h" #include "brave/components/ntp_background_images/browser/url_constants.h" diff --git a/components/ntp_background_images/browser/ntp_sponsored_images_source.cc b/components/ntp_background_images/browser/ntp_sponsored_images_source.cc index 91602d9929d19..6e0440dcc0bcf 100644 --- a/components/ntp_background_images/browser/ntp_sponsored_images_source.cc +++ b/components/ntp_background_images/browser/ntp_sponsored_images_source.cc @@ -13,7 +13,6 @@ #include "base/files/file_util.h" #include "base/memory/ref_counted_memory.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "brave/components/ntp_background_images/browser/ntp_background_images_service.h" #include "brave/components/ntp_background_images/browser/ntp_sponsored_images_data.h" diff --git a/components/p3a/brave_p3a_service.cc b/components/p3a/brave_p3a_service.cc index 4291685c916a9..42d56e535d9dd 100644 --- a/components/p3a/brave_p3a_service.cc +++ b/components/p3a/brave_p3a_service.cc @@ -21,7 +21,6 @@ #include "base/rand_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece_forward.h" -#include "base/task/post_task.h" #include "base/trace_event/trace_event.h" #include "brave/components/brave_prochlo/prochlo_message.pb.h" #include "brave/components/brave_referrals/common/pref_names.h" @@ -327,11 +326,9 @@ void BraveP3AService::OnHistogramChanged(const char* histogram_name, // Shortcut for the special values, see |kSuspendedMetricValue| // description for details. if (IsSuspendedMetric(histogram_name, sample)) { - base::PostTask(FROM_HERE, {content::BrowserThread::UI}, - base::BindOnce(&BraveP3AService::OnHistogramChangedOnUI, - this, - histogram_name, - kSuspendedMetricValue, + content::GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(&BraveP3AService::OnHistogramChangedOnUI, + this, histogram_name, kSuspendedMetricValue, kSuspendedMetricBucket)); return; } @@ -361,8 +358,8 @@ void BraveP3AService::OnHistogramChanged(const char* histogram_name, bucket = DirectEncodingProtocol::Perturb(bucket_count, bucket); } - base::PostTask(FROM_HERE, {content::BrowserThread::UI}, - base::BindOnce(&BraveP3AService::OnHistogramChangedOnUI, this, + content::GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(&BraveP3AService::OnHistogramChangedOnUI, this, histogram_name, sample, bucket)); } diff --git a/components/page_info_strings.grdp b/components/page_info_strings.grdp index 08d4de10c4d81..e3942582a6d1f 100644 --- a/components/page_info_strings.grdp +++ b/components/page_info_strings.grdp @@ -699,7 +699,12 @@ From $1Wikipedia - + + More about this page + + + Show more information about this page + History diff --git a/components/password_manager_strings.grdp b/components/password_manager_strings.grdp index 38daf3409731f..a78150c9ef52f 100644 --- a/components/password_manager_strings.grdp +++ b/components/password_manager_strings.grdp @@ -14,9 +14,6 @@ Change automatically - - Change it myself - Change your password @@ -51,7 +48,7 @@ The password you just used was found in a data breach. Brave Password Manager recommends changing this password now. - The password you just used was found in a data breach. To secure your accounts, Brave Password Manager recommends changing it now and then checking your saved passwords. + The password you just used was found in a data breach. To secure your accounts, Brave Password Manager recommends changing it now and checking your saved passwords. The password you just used was found in a data breach. To secure your accounts, Password Manager recommends checking your saved passwords. diff --git a/components/permissions/brave_permission_manager.cc b/components/permissions/brave_permission_manager.cc index a9217d618e9be..7653d830dd2c4 100644 --- a/components/permissions/brave_permission_manager.cc +++ b/components/permissions/brave_permission_manager.cc @@ -7,6 +7,7 @@ #include +#include "base/auto_reset.h" #include "components/permissions/permission_context_base.h" #include "content/public/browser/browser_thread.h" #include "url/origin.h" @@ -31,17 +32,35 @@ GURL BravePermissionManager::GetCanonicalOrigin( embedding_origin); } -void BravePermissionManager::ResetPermissionViaContentSetting( - ContentSettingsType type, +void BravePermissionManager::RequestPermissionsForOrigin( + const std::vector& permissions, + content::RenderFrameHost* render_frame_host, const GURL& requesting_origin, - const GURL& embedding_origin) { + bool user_gesture, + base::OnceCallback&)> + callback) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); - PermissionContextBase* context = GetPermissionContext(type); - if (!context) - return; - context->ResetPermission( - GetCanonicalOrigin(type, requesting_origin, embedding_origin), - url::Origin::Create(embedding_origin).GetURL()); + base::AutoReset auto_reset_requesting_origin(&forced_requesting_origin_, + requesting_origin); + return RequestPermissionsFromCurrentDocument( + permissions, render_frame_host, user_gesture, std::move(callback)); +} + +blink::mojom::PermissionStatus +BravePermissionManager::GetPermissionStatusForOrigin( + blink::PermissionType permission, + content::RenderFrameHost* render_frame_host, + const GURL& requesting_origin) { + DCHECK_CURRENTLY_ON(content::BrowserThread::UI); + base::AutoReset auto_reset_requesting_origin(&forced_requesting_origin_, + requesting_origin); + return GetPermissionStatusForCurrentDocument(permission, render_frame_host); +} +void BravePermissionManager::ResetPermission(blink::PermissionType permission, + const GURL& requesting_origin, + const GURL& embedding_origin) { + PermissionManager::ResetPermission(permission, requesting_origin, + embedding_origin); } } // namespace permissions diff --git a/components/permissions/brave_permission_manager.h b/components/permissions/brave_permission_manager.h index 17e8048940bb8..72e8cded16090 100644 --- a/components/permissions/brave_permission_manager.h +++ b/components/permissions/brave_permission_manager.h @@ -6,6 +6,8 @@ #ifndef BRAVE_COMPONENTS_PERMISSIONS_BRAVE_PERMISSION_MANAGER_H_ #define BRAVE_COMPONENTS_PERMISSIONS_BRAVE_PERMISSION_MANAGER_H_ +#include + #include "components/permissions/permission_manager.h" namespace permissions { @@ -23,9 +25,25 @@ class BravePermissionManager : public PermissionManager { const GURL& requesting_origin, const GURL& embedding_origin) const override; - void ResetPermissionViaContentSetting(ContentSettingsType type, - const GURL& requesting_origin, - const GURL& embedding_origin); + void RequestPermissionsForOrigin( + const std::vector& permissions, + content::RenderFrameHost* render_frame_host, + const GURL& requesting_origin, + bool user_gesture, + base::OnceCallback< + void(const std::vector&)> callback); + + blink::mojom::PermissionStatus GetPermissionStatusForOrigin( + blink::PermissionType permission, + content::RenderFrameHost* render_frame_host, + const GURL& requesting_origin); + + void ResetPermission(blink::PermissionType permission, + const GURL& requesting_origin, + const GURL& embedding_origin) override; + + using PermissionManager::GetPermissionStatus; + using PermissionManager::ResetPermission; }; } // namespace permissions diff --git a/components/permissions/contexts/DEPS b/components/permissions/contexts/DEPS index 23ec9f6d18b8b..bdc626bb936e8 100644 --- a/components/permissions/contexts/DEPS +++ b/components/permissions/contexts/DEPS @@ -1,3 +1,4 @@ include_rules = [ + "+third_party/blink/public/common", "+third_party/blink/public/mojom", ] diff --git a/components/permissions/contexts/brave_wallet_permission_context.cc b/components/permissions/contexts/brave_wallet_permission_context.cc index 89b4f36cb6ab7..e66400d674d6e 100644 --- a/components/permissions/contexts/brave_wallet_permission_context.cc +++ b/components/permissions/contexts/brave_wallet_permission_context.cc @@ -153,12 +153,13 @@ bool BraveWalletPermissionContext::HasRequestsInProgress( // static void BraveWalletPermissionContext::RequestPermissions( - ContentSettingsType content_settings_type, + blink::PermissionType permission, content::RenderFrameHost* rfh, const std::vector& addresses, - base::OnceCallback&)> callback) { + base::OnceCallback&)> + callback) { if (!rfh) { - std::move(callback).Run(std::vector()); + std::move(callback).Run(std::vector()); return; } @@ -166,15 +167,16 @@ void BraveWalletPermissionContext::RequestPermissions( // Fail the request came from 3p origin. if (web_contents->GetMainFrame()->GetLastCommittedOrigin() != rfh->GetLastCommittedOrigin()) { - std::move(callback).Run(std::vector()); + std::move(callback).Run(std::vector()); return; } - permissions::PermissionManager* permission_manager = + auto* permission_manager = static_cast( permissions::PermissionsClient::Get()->GetPermissionManager( - web_contents->GetBrowserContext()); + web_contents->GetBrowserContext())); + if (!permission_manager) { - std::move(callback).Run(std::vector()); + std::move(callback).Run(std::vector()); return; } @@ -188,20 +190,19 @@ void BraveWalletPermissionContext::RequestPermissions( url::Origin origin; if (!brave_wallet::GetConcatOriginFromWalletAddresses( rfh->GetLastCommittedOrigin(), addresses, &origin)) { - std::move(callback).Run(std::vector()); + std::move(callback).Run(std::vector()); return; } - std::vector types(addresses.size(), - content_settings_type); - permission_manager->RequestPermissions(types, rfh, origin.GetURL(), - rfh->HasTransientUserActivation(), - std::move(callback)); + std::vector types(addresses.size(), permission); + permission_manager->RequestPermissionsForOrigin( + types, rfh, origin.GetURL(), rfh->HasTransientUserActivation(), + std::move(callback)); } // static void BraveWalletPermissionContext::GetAllowedAccounts( - ContentSettingsType content_settings_type, + blink::PermissionType permission, content::RenderFrameHost* rfh, const std::vector& addresses, base::OnceCallback&)> callback) { @@ -224,14 +225,17 @@ void BraveWalletPermissionContext::GetAllowedAccounts( return; } - permissions::PermissionManager* permission_manager = + auto* permission_manager = static_cast( permissions::PermissionsClient::Get()->GetPermissionManager( - web_contents->GetBrowserContext()); + web_contents->GetBrowserContext())); if (!permission_manager) { std::move(callback).Run(false, std::vector()); return; } + const ContentSettingsType content_settings_type = + PermissionUtil::PermissionTypeToContentSettingSafe(permission); + std::vector allowed_accounts; url::Origin origin = url::Origin::Create(rfh->GetLastCommittedURL()); for (const auto& address : addresses) { @@ -240,9 +244,9 @@ void BraveWalletPermissionContext::GetAllowedAccounts( ContentSettingsTypeToRequestType(content_settings_type), origin, address, &sub_request_origin); if (success) { - PermissionResult result = permission_manager->GetPermissionStatusForFrame( - content_settings_type, rfh, sub_request_origin.GetURL()); - if (result.content_setting == CONTENT_SETTING_ALLOW) { + auto status = permission_manager->GetPermissionStatusForOrigin( + permission, rfh, sub_request_origin.GetURL()); + if (status == blink::mojom::PermissionStatus::GRANTED) { allowed_accounts.push_back(address); } } @@ -253,18 +257,20 @@ void BraveWalletPermissionContext::GetAllowedAccounts( // static bool BraveWalletPermissionContext::AddPermission( - ContentSettingsType content_settings_type, + blink::PermissionType permission, content::BrowserContext* context, const url::Origin& origin, const std::string& account) { bool has_permission; - if (!HasPermission(content_settings_type, context, origin, account, - &has_permission)) + if (!HasPermission(permission, context, origin, account, &has_permission)) return false; if (has_permission) return true; + const ContentSettingsType content_settings_type = + PermissionUtil::PermissionTypeToContentSettingSafe(permission); + url::Origin origin_wallet_address; if (!brave_wallet::GetSubRequestOrigin( ContentSettingsTypeToRequestType(content_settings_type), origin, @@ -282,7 +288,7 @@ bool BraveWalletPermissionContext::AddPermission( // static bool BraveWalletPermissionContext::HasPermission( - ContentSettingsType content_settings_type, + blink::PermissionType permission, content::BrowserContext* context, const url::Origin& origin, const std::string& account, @@ -294,6 +300,9 @@ bool BraveWalletPermissionContext::HasPermission( if (!permission_manager) return false; + const ContentSettingsType content_settings_type = + PermissionUtil::PermissionTypeToContentSettingSafe(permission); + url::Origin origin_wallet_address; if (!brave_wallet::GetSubRequestOrigin( ContentSettingsTypeToRequestType(content_settings_type), origin, @@ -301,18 +310,17 @@ bool BraveWalletPermissionContext::HasPermission( return false; } - permissions::PermissionResult result = - permission_manager->GetPermissionStatus(content_settings_type, - origin_wallet_address.GetURL(), - origin_wallet_address.GetURL()); + auto status = permission_manager->GetPermissionStatus( + permission, origin_wallet_address.GetURL(), + origin_wallet_address.GetURL()); - *has_permission = result.content_setting == CONTENT_SETTING_ALLOW; + *has_permission = status == blink::mojom::PermissionStatus::GRANTED; return true; } // static bool BraveWalletPermissionContext::ResetPermission( - ContentSettingsType content_settings_type, + blink::PermissionType permission, content::BrowserContext* context, const url::Origin& origin, const std::string& account) { @@ -321,6 +329,9 @@ bool BraveWalletPermissionContext::ResetPermission( if (!permission_manager) return false; + const ContentSettingsType content_settings_type = + PermissionUtil::PermissionTypeToContentSettingSafe(permission); + url::Origin origin_wallet_address; if (!brave_wallet::GetSubRequestOrigin( ContentSettingsTypeToRequestType(content_settings_type), origin, @@ -328,17 +339,20 @@ bool BraveWalletPermissionContext::ResetPermission( return false; } - permission_manager->ResetPermissionViaContentSetting( - content_settings_type, origin_wallet_address.GetURL(), - origin_wallet_address.GetURL()); + permission_manager->ResetPermission(permission, + origin_wallet_address.GetURL(), + origin_wallet_address.GetURL()); return true; } // static std::vector BraveWalletPermissionContext::GetWebSitesWithPermission( - ContentSettingsType content_settings_type, + blink::PermissionType permission, content::BrowserContext* context) { + const ContentSettingsType content_settings_type = + PermissionUtil::PermissionTypeToContentSettingSafe(permission); + HostContentSettingsMap* map = PermissionsClient::Get()->GetSettingsMap(context); ContentSettingsForOneType settings; @@ -357,7 +371,7 @@ BraveWalletPermissionContext::GetWebSitesWithPermission( // static bool BraveWalletPermissionContext::ResetWebSitePermission( - ContentSettingsType content_settings_type, + blink::PermissionType permission, content::BrowserContext* context, const std::string& formed_website) { auto* permission_manager = static_cast( @@ -366,8 +380,7 @@ bool BraveWalletPermissionContext::ResetWebSitePermission( if (!permission_manager || !url.is_valid()) return false; - permission_manager->ResetPermissionViaContentSetting(content_settings_type, - url, url); + permission_manager->ResetPermission(permission, url, url); return true; } diff --git a/components/permissions/contexts/brave_wallet_permission_context.h b/components/permissions/contexts/brave_wallet_permission_context.h index d18192dae6676..d7a3de2cf7b3f 100644 --- a/components/permissions/contexts/brave_wallet_permission_context.h +++ b/components/permissions/contexts/brave_wallet_permission_context.h @@ -14,6 +14,7 @@ #include "components/permissions/permission_context_base.h" #include "components/permissions/permission_request_id.h" #include "components/permissions/request_type.h" +#include "third_party/blink/public/common/permissions/permission_utils.h" #include "url/origin.h" class GURL; @@ -51,10 +52,11 @@ class BraveWalletPermissionContext : public PermissionContextBase { BrowserPermissionCallback callback) override; static void RequestPermissions( - ContentSettingsType content_settings_type, + blink::PermissionType permission, content::RenderFrameHost* rfh, const std::vector& addresses, - base::OnceCallback&)> callback); + base::OnceCallback< + void(const std::vector&)> callback); static bool HasRequestsInProgress(content::RenderFrameHost* rfh, permissions::RequestType request_type); @@ -63,29 +65,29 @@ class BraveWalletPermissionContext : public PermissionContextBase { static void Cancel(content::WebContents* web_contents); static void GetAllowedAccounts( - ContentSettingsType content_settings_type, + blink::PermissionType permission, content::RenderFrameHost* rfh, const std::vector& addresses, base::OnceCallback&)> callback); - static bool AddPermission(ContentSettingsType content_settings_type, + static bool AddPermission(blink::PermissionType permission, content::BrowserContext* context, const url::Origin& origin, const std::string& account); - static bool HasPermission(ContentSettingsType content_settings_type, + static bool HasPermission(blink::PermissionType permission, content::BrowserContext* context, const url::Origin& origin, const std::string& account, bool* has_permission); - static bool ResetPermission(ContentSettingsType content_settings_type, + static bool ResetPermission(blink::PermissionType permission, content::BrowserContext* context, const url::Origin& origin, const std::string& account); static std::vector GetWebSitesWithPermission( - ContentSettingsType content_settings_type, + blink::PermissionType permission, content::BrowserContext* context); - static bool ResetWebSitePermission(ContentSettingsType content_settings_type, + static bool ResetWebSitePermission(blink::PermissionType permission, content::BrowserContext* context, const std::string& formed_website); diff --git a/components/search_engines/brave_prepopulated_engines.cc b/components/search_engines/brave_prepopulated_engines.cc index 48e8f739ac195..7a7b12b19dd45 100644 --- a/components/search_engines/brave_prepopulated_engines.cc +++ b/components/search_engines/brave_prepopulated_engines.cc @@ -60,6 +60,7 @@ PrepopulatedEngine ModifyEngineParams(const PrepopulatedEngine& engine, engine.alternate_urls_size, engine.type, engine.preconnect_to_search_url, + engine.prefetch_likely_navigations, id > 0 ? id : engine.id}; } @@ -85,6 +86,7 @@ const PrepopulatedEngine duckduckgo = { 0, SEARCH_ENGINE_DUCKDUCKGO, NULL, + NULL, PREPOPULATED_ENGINE_ID_DUCKDUCKGO, }; @@ -127,6 +129,7 @@ const PrepopulatedEngine duckduckgo_lite = { 0, SEARCH_ENGINE_DUCKDUCKGO, NULL, + NULL, PREPOPULATED_ENGINE_ID_DUCKDUCKGO_LITE, }; #endif @@ -166,6 +169,7 @@ const PrepopulatedEngine qwant = { 0, SEARCH_ENGINE_QWANT, NULL, + NULL, PREPOPULATED_ENGINE_ID_QWANT, }; @@ -191,6 +195,7 @@ const PrepopulatedEngine startpage = { 0, SEARCH_ENGINE_OTHER, NULL, + NULL, PREPOPULATED_ENGINE_ID_STARTPAGE, }; @@ -235,6 +240,7 @@ const PrepopulatedEngine brave_search = { 0, SEARCH_ENGINE_OTHER, NULL, + NULL, PREPOPULATED_ENGINE_ID_BRAVE, }; diff --git a/components/site_settings_strings.grdp b/components/site_settings_strings.grdp index 808dcb389b940..e384d17f6542a 100644 --- a/components/site_settings_strings.grdp +++ b/components/site_settings_strings.grdp @@ -149,6 +149,12 @@ + + Third-party sign-in + + + third-party sign-in + File editing diff --git a/components/skus/browser/rs/cxx/BUILD.gn b/components/skus/browser/rs/cxx/BUILD.gn index ad2774c112591..723323a401e7a 100644 --- a/components/skus/browser/rs/cxx/BUILD.gn +++ b/components/skus/browser/rs/cxx/BUILD.gn @@ -24,9 +24,14 @@ rust_cxx("cxx") { } source_set("shim") { - visibility = [ ":*", "//brave/components/skus/browser" ] + visibility = [ + ":*", + "//brave/components/skus/browser", + ] sources = [ "src/shim.h" ] + public_deps = [ "//third_party/abseil-cpp:absl" ] + deps = [ "//base", "//brave/build/rust:cxx_cppdeps", diff --git a/components/skus/browser/skus_service_impl.cc b/components/skus/browser/skus_service_impl.cc index 18dbb62848500..8fc138fca0be6 100644 --- a/components/skus/browser/skus_service_impl.cc +++ b/components/skus/browser/skus_service_impl.cc @@ -8,7 +8,6 @@ #include #include "base/json/json_reader.h" -#include "base/task/post_task.h" #include "base/threading/sequenced_task_runner_handle.h" #include "brave/components/skus/browser/pref_names.h" #include "brave/components/skus/browser/rs/cxx/src/lib.rs.h" diff --git a/components/speedreader/speedreader_rewriter_service.cc b/components/speedreader/speedreader_rewriter_service.cc index 1576ad65186ed..96db2e8a191d1 100644 --- a/components/speedreader/speedreader_rewriter_service.cc +++ b/components/speedreader/speedreader_rewriter_service.cc @@ -14,7 +14,6 @@ #include "base/files/file_util.h" #include "base/logging.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "brave/components/speedreader/features.h" #include "brave/components/speedreader/rust/ffi/speedreader.h" diff --git a/components/sync/driver/brave_sync_service_impl.cc b/components/sync/driver/brave_sync_service_impl.cc index 6bad7b4cb1568..52b1c519d025c 100644 --- a/components/sync/driver/brave_sync_service_impl.cc +++ b/components/sync/driver/brave_sync_service_impl.cc @@ -143,11 +143,9 @@ void BraveSyncServiceImpl::ResumeDeviceObserver() { } void BraveSyncServiceImpl::OnEngineInitialized( - const WeakHandle& debug_info_listener, bool success, bool is_first_time_sync_configure) { - SyncServiceImpl::OnEngineInitialized(debug_info_listener, success, - is_first_time_sync_configure); + SyncServiceImpl::OnEngineInitialized(success, is_first_time_sync_configure); if (!IsEngineInitialized()) { return; } diff --git a/components/sync/driver/brave_sync_service_impl.h b/components/sync/driver/brave_sync_service_impl.h index f295d562addd8..5bfef0fae6d91 100644 --- a/components/sync/driver/brave_sync_service_impl.h +++ b/components/sync/driver/brave_sync_service_impl.h @@ -34,10 +34,8 @@ class BraveSyncServiceImpl : public SyncServiceImpl { void StopAndClear() override; // SyncEngineHost override. - void OnEngineInitialized( - const WeakHandle& debug_info_listener, - bool success, - bool is_first_time_sync_configure) override; + void OnEngineInitialized(bool success, + bool is_first_time_sync_configure) override; std::string GetOrCreateSyncCode(); bool SetSyncCode(const std::string& sync_code); diff --git a/components/sync/driver/brave_sync_service_impl_unittest.cc b/components/sync/driver/brave_sync_service_impl_unittest.cc index fdd5c354b7d9a..9902840aae763 100644 --- a/components/sync/driver/brave_sync_service_impl_unittest.cc +++ b/components/sync/driver/brave_sync_service_impl_unittest.cc @@ -263,8 +263,7 @@ TEST_F(BraveSyncServiceImplTest, ForcedSetDecryptionPassphrase) { EXPECT_TRUE( brave_sync_service_impl()->GetUserSettings()->IsPassphraseRequired()); - brave_sync_service_impl()->OnEngineInitialized( - WeakHandle(), true, false); + brave_sync_service_impl()->OnEngineInitialized(true, false); EXPECT_FALSE( brave_sync_service_impl()->GetUserSettings()->IsPassphraseRequired()); diff --git a/components/tor/brave_tor_client_updater.cc b/components/tor/brave_tor_client_updater.cc index 6a35dafc2960a..b2b1e38a1896b 100644 --- a/components/tor/brave_tor_client_updater.cc +++ b/components/tor/brave_tor_client_updater.cc @@ -14,7 +14,6 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/logging.h" -#include "base/task/post_task.h" #include "base/task/task_runner.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" diff --git a/components/tor/tor_control.cc b/components/tor/tor_control.cc index 87985d6b313e6..abf1f14aed97a 100644 --- a/components/tor/tor_control.cc +++ b/components/tor/tor_control.cc @@ -8,7 +8,6 @@ #include "base/callback_helpers.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_traits.h" #include "base/threading/sequenced_task_runner_handle.h" diff --git a/components/tor/tor_file_watcher.cc b/components/tor/tor_file_watcher.cc index 353de2de4888c..e7892b0144a21 100644 --- a/components/tor/tor_file_watcher.cc +++ b/components/tor/tor_file_watcher.cc @@ -12,7 +12,6 @@ #include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/time/time.h" diff --git a/components/tor/tor_profile_service_impl.cc b/components/tor/tor_profile_service_impl.cc index 8483505ccb7b8..66bb04f5ef702 100644 --- a/components/tor/tor_profile_service_impl.cc +++ b/components/tor/tor_profile_service_impl.cc @@ -10,7 +10,7 @@ #include #include "base/bind.h" -#include "base/task/post_task.h" +#include "base/task/thread_pool.h" #include "brave/components/tor/pref_names.h" #include "brave/components/tor/tor_constants.h" #include "brave/net/proxy_resolution/proxy_config_service_tor.h" @@ -83,9 +83,8 @@ class TorProxyLookupClient : public network::mojom::ProxyLookupClient { mojo::PendingRemote GetProxyLookupClient() { mojo::PendingRemote pending_remote = - receiver_.BindNewPipeAndPassRemote(base::CreateSingleThreadTaskRunner( - {content::BrowserThread::UI, - content::BrowserTaskType::kPreconnect})); + receiver_.BindNewPipeAndPassRemote(content::GetUIThreadTaskRunner( + {content::BrowserTaskType::kPreconnect})); receiver_.set_disconnect_handler(base::BindOnce( &TorProxyLookupClient::OnProxyLookupComplete, base::Unretained(this), net::ERR_ABORTED, absl::nullopt)); diff --git a/components/translate_strings.grdp b/components/translate_strings.grdp index a09e88f03e69f..966aa2712ba1e 100644 --- a/components/translate_strings.grdp +++ b/components/translate_strings.grdp @@ -53,12 +53,6 @@ Try again - - Always translate pages in $1French - - - Never translate pages in $1French - @@ -102,14 +96,23 @@ Cancel - + Translate page? - + Page translated - - %1$sFrench to %2$sEnglish + + $1French to $2English + + + Undo + + + Always translate pages in $1French + + + Never translate pages in $1French diff --git a/components/user_education_strings.grdp b/components/user_education_strings.grdp new file mode 100644 index 0000000000000..46486550d9d8a --- /dev/null +++ b/components/user_education_strings.grdp @@ -0,0 +1,40 @@ + + + + + Close tutorial + + + Close help bubble + + + + Got It + + + Remind Me Later + + + Show Me How + + + + + Got it + + + Remind me later + + + Show me how + + + + + Restart tutorial + + + Close + + + diff --git a/components/version_ui_strings.grdp b/components/version_ui_strings.grdp index d8fa3d5fe8dc9..9df1fd484d337 100644 --- a/components/version_ui_strings.grdp +++ b/components/version_ui_strings.grdp @@ -65,7 +65,7 @@ No such file or directory - Variations + Active Variations Command-line variations diff --git a/ios/browser/api/ads/brave_ads.mm b/ios/browser/api/ads/brave_ads.mm index ada78e92136e3..6aae3ec15e10a 100644 --- a/ios/browser/api/ads/brave_ads.mm +++ b/ios/browser/api/ads/brave_ads.mm @@ -13,7 +13,6 @@ #include "base/containers/flat_map.h" #include "base/logging.h" #include "base/strings/sys_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" diff --git a/ios/browser/api/bookmarks/brave_bookmarks_api.mm b/ios/browser/api/bookmarks/brave_bookmarks_api.mm index 13ee1e6478691..7425f364f69a3 100644 --- a/ios/browser/api/bookmarks/brave_bookmarks_api.mm +++ b/ios/browser/api/bookmarks/brave_bookmarks_api.mm @@ -10,7 +10,6 @@ #include "base/containers/stack.h" #include "base/guid.h" #include "base/strings/sys_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "brave/ios/browser/api/bookmarks/bookmark_model_listener_ios.h" @@ -644,7 +643,7 @@ - (void)searchWithQuery:(NSString*)query completion(nodes); }; - base::PostTask( + base::ThreadPool::PostTask( FROM_HERE, {web::WebThread::UI}, base::BindOnce(search_with_query, query, maxCount, completion)); } diff --git a/ios/browser/api/bookmarks/exporter/bookmark_html_writer.cc b/ios/browser/api/bookmarks/exporter/bookmark_html_writer.cc index c3cc7fca0aa9f..a82fb525d3f6e 100644 --- a/ios/browser/api/bookmarks/exporter/bookmark_html_writer.cc +++ b/ios/browser/api/bookmarks/exporter/bookmark_html_writer.cc @@ -21,10 +21,10 @@ #include "base/files/file_path.h" #include "base/location.h" #include "base/logging.h" +#include "base/strings/escape.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/supports_user_data.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/time/time.h" #include "base/values.h" @@ -38,7 +38,6 @@ #include "ios/chrome/browser/browser_state/chrome_browser_state.h" #include "ios/chrome/browser/browser_state/chrome_browser_state_manager.h" #include "ios/chrome/browser/favicon/favicon_service_factory.h" -#include "net/base/escape.h" #include "ui/base/l10n/l10n_util.h" using bookmarks::BookmarkCodec; @@ -290,7 +289,7 @@ class Writer : public base::RefCountedThreadSafe { break; case CONTENT: - utf8_string = net::EscapeForHTML(text); + utf8_string = base::EscapeForHTML(text); break; default: diff --git a/ios/browser/api/bookmarks/exporter/brave_bookmarks_exporter.mm b/ios/browser/api/bookmarks/exporter/brave_bookmarks_exporter.mm index de9bcdc4b5c66..4c27ab4f9adba 100644 --- a/ios/browser/api/bookmarks/exporter/brave_bookmarks_exporter.mm +++ b/ios/browser/api/bookmarks/exporter/brave_bookmarks_exporter.mm @@ -18,7 +18,6 @@ #include "base/mac/foundation_util.h" #include "base/path_service.h" #include "base/strings/sys_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/values.h" @@ -118,8 +117,9 @@ - (void)exportToFile:(NSString*)filePath }; __weak BraveBookmarksExporter* weakSelf = self; - base::PostTask(FROM_HERE, {web::WebThread::UI}, - base::BindOnce(start_export, weakSelf, filePath, listener)); + base::ThreadPool::PostTask( + FROM_HERE, {web::WebThread::UI}, + base::BindOnce(start_export, weakSelf, filePath, listener)); } - (void)exportToFile:(NSString*)filePath diff --git a/ios/browser/api/bookmarks/importer/bookmark_html_reader.cc b/ios/browser/api/bookmarks/importer/bookmark_html_reader.cc index 85a537ba76386..3497422d5231f 100644 --- a/ios/browser/api/bookmarks/importer/bookmark_html_reader.cc +++ b/ios/browser/api/bookmarks/importer/bookmark_html_reader.cc @@ -11,6 +11,7 @@ #include "base/callback.h" #include "base/files/file_util.h" #include "base/i18n/icu_string_conversions.h" +#include "base/strings/escape.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" @@ -21,7 +22,6 @@ #include "components/search_engines/search_terms_data.h" #include "components/search_engines/template_url.h" #include "net/base/data_url.h" -#include "net/base/escape.h" #include "url/gurl.h" #include "url/url_constants.h" @@ -339,7 +339,7 @@ bool ParseFolderNameFromLine(const std::string& lineDt, base::CodepageToUTF16(line.substr(tag_end, end - tag_end), charset.c_str(), base::OnStringConversionError::SKIP, folder_name); - *folder_name = net::UnescapeForHTML(*folder_name); + *folder_name = base::UnescapeForHTML(*folder_name); std::string attribute_list = line.substr(std::size(kFolderOpen), tag_end - std::size(kFolderOpen) - 1); @@ -409,14 +409,14 @@ bool ParseBookmarkFromLine(const std::string& lineDt, // Title base::CodepageToUTF16(line.substr(tag_end, end - tag_end), charset.c_str(), base::OnStringConversionError::SKIP, title); - *title = net::UnescapeForHTML(*title); + *title = base::UnescapeForHTML(*title); // URL if (GetAttribute(attribute_list, kHrefAttribute, &value)) { std::u16string url16; base::CodepageToUTF16(value, charset.c_str(), base::OnStringConversionError::SKIP, &url16); - url16 = net::UnescapeForHTML(url16); + url16 = base::UnescapeForHTML(url16); *url = GURL(url16); } @@ -429,7 +429,7 @@ bool ParseBookmarkFromLine(const std::string& lineDt, if (GetAttribute(attribute_list, kShortcutURLAttribute, &value)) { base::CodepageToUTF16(value, charset.c_str(), base::OnStringConversionError::SKIP, shortcut); - *shortcut = net::UnescapeForHTML(*shortcut); + *shortcut = base::UnescapeForHTML(*shortcut); } // Add date @@ -445,7 +445,7 @@ bool ParseBookmarkFromLine(const std::string& lineDt, if (GetAttribute(attribute_list, kPostDataAttribute, &value)) { base::CodepageToUTF16(value, charset.c_str(), base::OnStringConversionError::SKIP, post_data); - *post_data = net::UnescapeForHTML(*post_data); + *post_data = base::UnescapeForHTML(*post_data); } return true; @@ -480,7 +480,7 @@ bool ParseMinimumBookmarkFromLine(const std::string& lineDt, // Title base::CodepageToUTF16(line.substr(tag_end, end - tag_end), charset.c_str(), base::OnStringConversionError::SKIP, title); - *title = net::UnescapeForHTML(*title); + *title = base::UnescapeForHTML(*title); // URL std::string value; @@ -490,7 +490,7 @@ bool ParseMinimumBookmarkFromLine(const std::string& lineDt, std::u16string url16; base::CodepageToUTF16(value, charset.c_str(), base::OnStringConversionError::SKIP, &url16); - url16 = net::UnescapeForHTML(url16); + url16 = base::UnescapeForHTML(url16); *url = GURL(url16); } else { diff --git a/ios/browser/api/bookmarks/importer/brave_bookmarks_importer.mm b/ios/browser/api/bookmarks/importer/brave_bookmarks_importer.mm index d787d78b007fb..ffc32f39b19b8 100644 --- a/ios/browser/api/bookmarks/importer/brave_bookmarks_importer.mm +++ b/ios/browser/api/bookmarks/importer/brave_bookmarks_importer.mm @@ -16,7 +16,6 @@ #include "base/path_service.h" #include "base/stl_util.h" #include "base/strings/sys_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "brave/ios/browser/api/bookmarks/importer/bookmark_html_reader.h" @@ -149,9 +148,10 @@ - (void)importFromFile:(NSString*)filePath }; // Import into the Profile/ChromeBrowserState on the main-thread. - base::PostTask(FROM_HERE, {web::WebThread::UI}, - base::BindOnce(complete_import, std::move(bookmarks), - top_level_folder_name, listener)); + base::ThreadPool::PostTask( + FROM_HERE, {web::WebThread::UI}, + base::BindOnce(complete_import, std::move(bookmarks), + top_level_folder_name, listener)); } else { listener(BraveBookmarksImporterStateCompleted, [importer convertToIOSImportedBookmarks:bookmarks]); @@ -197,9 +197,9 @@ - (void)importFromArray:(NSArray*)bookmarks // Import into the Profile/ChromeBrowserState on the main-thread. __weak BraveBookmarksImporter* weakSelf = self; - base::PostTask(FROM_HERE, {web::WebThread::UI}, - base::BindOnce(start_import, weakSelf, bookmarks, - top_level_folder_name, listener)); + base::ThreadPool::PostTask(FROM_HERE, {web::WebThread::UI}, + base::BindOnce(start_import, weakSelf, bookmarks, + top_level_folder_name, listener)); } // MARK: - Private diff --git a/ios/browser/api/certificate/brave_certificate.mm b/ios/browser/api/certificate/brave_certificate.mm index feed0e040bce2..9deea2f6d1b9e 100644 --- a/ios/browser/api/certificate/brave_certificate.mm +++ b/ios/browser/api/certificate/brave_certificate.mm @@ -92,16 +92,26 @@ - (void)parseCertificate { std::string serial_number_string = extended_cert_->tbs().serial_number.AsString(); + net::der::BitString subject_unique_id; + if (extended_cert_->tbs().subject_unique_id) { + subject_unique_id = extended_cert_->tbs().subject_unique_id.value(); + } + + net::der::BitString issuer_unique_id; + if (extended_cert_->tbs().issuer_unique_id) { + issuer_unique_id = extended_cert_->tbs().issuer_unique_id.value(); + } + _isRootCertificate = [self is_root_certificate]; _isCertificateAuthority = [self is_certificate_authority]; _isSelfSigned = [self is_self_signed]; _isSelfIssued = [self is_self_issued]; _subjectName = [[BraveCertificateRDNSequence alloc] initWithBERName:extended_cert_->tbs().subject_tlv - uniqueId:extended_cert_->tbs().subject_unique_id]; + uniqueId:subject_unique_id]; _issuerName = [[BraveCertificateRDNSequence alloc] initWithBERName:extended_cert_->tbs().issuer_tlv - uniqueId:extended_cert_->tbs().issuer_unique_id]; + uniqueId:issuer_unique_id]; _serialNumber = base::SysUTF8ToNSString(base::HexEncode( serial_number_string.data(), serial_number_string.size())); _version = static_cast(extended_cert_->tbs().version) + diff --git a/ios/browser/api/ledger/brave_ledger.mm b/ios/browser/api/ledger/brave_ledger.mm index 8e44490afa767..4f2ef0da54da9 100644 --- a/ios/browser/api/ledger/brave_ledger.mm +++ b/ios/browser/api/ledger/brave_ledger.mm @@ -11,7 +11,6 @@ #include "base/ios/ios_util.h" #include "base/logging.h" #include "base/strings/sys_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" diff --git a/ios/browser/api/sync/BUILD.gn b/ios/browser/api/sync/BUILD.gn index 2eab27feffe79..f2dad33c610aa 100644 --- a/ios/browser/api/sync/BUILD.gn +++ b/ios/browser/api/sync/BUILD.gn @@ -35,6 +35,7 @@ source_set("sync") { "//ios/web/public/thread", "//ios/web/public/webui", "//ios/web/web_state", + "//ios/web/web_state:web_state_impl_header", "//ios/web/webui", "//ui/base", ] diff --git a/ios/browser/api/url/url_formatter.h b/ios/browser/api/url/url_formatter.h index 65ad94cfaed43..28cf4b08db067 100644 --- a/ios/browser/api/url/url_formatter.h +++ b/ios/browser/api/url/url_formatter.h @@ -10,8 +10,8 @@ NS_ASSUME_NONNULL_BEGIN -typedef NSInteger BraveURLSchemeDisplay NS_TYPED_ENUM - NS_SWIFT_NAME(URLFormatter.SchemeDisplay); +typedef NSInteger BraveURLSchemeDisplay + NS_TYPED_ENUM NS_SWIFT_NAME(URLFormatter.SchemeDisplay); OBJC_EXPORT BraveURLSchemeDisplay const BraveURLSchemeDisplayShow; OBJC_EXPORT BraveURLSchemeDisplay const BraveURLSchemeDisplayOmitHttpAndHttps; diff --git a/ios/browser/api/url/url_spoof_checker.h b/ios/browser/api/url/url_spoof_checker.h index d60707c8bf4db..4b3e46ba9f83e 100644 --- a/ios/browser/api/url/url_spoof_checker.h +++ b/ios/browser/api/url/url_spoof_checker.h @@ -13,15 +13,15 @@ NS_ASSUME_NONNULL_BEGIN /// The |SkeletonType| and |TopDomainEntry| are mirrored in trie_entry.h. These /// are used to insert and read nodes from the Trie. /// The type of skeleton in the trie node. -typedef NSInteger BraveSpoofCheckerSkeletonType NS_TYPED_ENUM - NS_SWIFT_NAME(URLSpoofChecker.SkeletonType); +typedef NSInteger BraveSpoofCheckerSkeletonType + NS_TYPED_ENUM NS_SWIFT_NAME(URLSpoofChecker.SkeletonType); OBJC_EXPORT BraveSpoofCheckerSkeletonType const BraveSpoofCheckerSkeletonTypeFull; OBJC_EXPORT BraveSpoofCheckerSkeletonType const BraveSpoofCheckerSkeletonTypeSeparatorsRemoved; -typedef NSInteger BraveSpoofCheckerLookalikeURLMatchType NS_TYPED_ENUM - NS_SWIFT_NAME(URLSpoofChecker.LookalikeURLMatchType); +typedef NSInteger BraveSpoofCheckerLookalikeURLMatchType + NS_TYPED_ENUM NS_SWIFT_NAME(URLSpoofChecker.LookalikeURLMatchType); OBJC_EXPORT BraveSpoofCheckerLookalikeURLMatchType const BraveSpoofCheckerLookalikeURLMatchTypeNone; diff --git a/ios/browser/brave_web_main_parts.mm b/ios/browser/brave_web_main_parts.mm index 8eaa39586c0b9..064e773d471f2 100644 --- a/ios/browser/brave_web_main_parts.mm +++ b/ios/browser/brave_web_main_parts.mm @@ -7,7 +7,6 @@ #include "base/metrics/user_metrics.h" #include "base/path_service.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "brave/ios/browser/browser_state/brave_browser_state_keyed_service_factories.h" diff --git a/ios/browser/providers/BUILD.gn b/ios/browser/providers/BUILD.gn index 346e6cbcba8fb..da035ce590310 100644 --- a/ios/browser/providers/BUILD.gn +++ b/ios/browser/providers/BUILD.gn @@ -15,6 +15,7 @@ group("brave_providers") { "//ios/chrome/browser/providers/app_distribution:chromium_app_distribution", "//ios/chrome/browser/providers/app_utils:chromium_app_utils", "//ios/chrome/browser/providers/branded_images:chromium_branded_images", + "//ios/chrome/browser/providers/context_menu:chromium_context_menu", "//ios/chrome/browser/providers/discover_feed:chromium_discover_feed", "//ios/chrome/browser/providers/lens:chromium_lens", "//ios/chrome/browser/providers/mailto_handler:chromium_mailto_handler", diff --git a/package.json b/package.json index 161a130c2b14a..6c772b269b4ab 100644 --- a/package.json +++ b/package.json @@ -255,7 +255,7 @@ "projects": { "chrome": { "dir": "src", - "tag": "102.0.5005.125", + "tag": "103.0.5060.42", "repository": { "url": "https://github.com/chromium/chromium" } diff --git a/patches/base-BUILD.gn.patch b/patches/base-BUILD.gn.patch index 0f98ed80bae26..170513cd6e102 100644 --- a/patches/base-BUILD.gn.patch +++ b/patches/base-BUILD.gn.patch @@ -1,10 +1,10 @@ diff --git a/base/BUILD.gn b/base/BUILD.gn -index 32d8f8db42fa945f832ebc59633dc3ee13a99ba2..78dbd2d50eb316e7562666f3076fccdce307432f 100644 +index 3f4eb14a38603bc4f6512a03ac8ea0f58b1b260b..1e49b48d669d63e735756da9b60853474ddd9d4c 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn -@@ -4144,6 +4144,7 @@ if (is_android) { - "android/java/src/org/chromium/base/task/TaskTraits.java", - "android/java/src/org/chromium/base/task/TaskTraitsExtensionDescriptor.java", +@@ -4176,6 +4176,7 @@ if (is_android) { + "android/java/src/org/chromium/base/time/Timer.java", + "android/java/src/org/chromium/base/time/UptimeTimer.java", ] + sources += brave_java_base_sources diff --git a/patches/base-threading-thread_restrictions.h.patch b/patches/base-threading-thread_restrictions.h.patch index 7df0701a9d85a..b4bdb7e644a06 100644 --- a/patches/base-threading-thread_restrictions.h.patch +++ b/patches/base-threading-thread_restrictions.h.patch @@ -1,8 +1,8 @@ diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h -index 5f1deb141679a60e25f837bbdf471b8e38dc21db..ceaa075306e37213e820ef607e3669f63f8533e6 100644 +index 114677b5163b847d736912e2139db55f36ca1219..c12a18c870e4de1907cba573d2fb4e4447940b0c 100644 --- a/base/threading/thread_restrictions.h +++ b/base/threading/thread_restrictions.h -@@ -546,6 +546,7 @@ class BASE_EXPORT ScopedAllowBaseSyncPrimitives { +@@ -554,6 +554,7 @@ class BASE_EXPORT ScopedAllowBaseSyncPrimitives { ScopedAllowBaseSyncPrimitives& operator=( const ScopedAllowBaseSyncPrimitives&) = delete; diff --git a/patches/base-trace_event-builtin_categories.h.patch b/patches/base-trace_event-builtin_categories.h.patch index 3a24330ee0be7..7742078749cc3 100644 --- a/patches/base-trace_event-builtin_categories.h.patch +++ b/patches/base-trace_event-builtin_categories.h.patch @@ -1,8 +1,8 @@ diff --git a/base/trace_event/builtin_categories.h b/base/trace_event/builtin_categories.h -index 0736e7021761e6019e1b52448d21ffdb73b964fc..40b31f4fddd4350afb088f19cf9412903188a694 100644 +index a1a93418b0b0d56f92647aa1087bb4485c354201..77e8b0773c597d38dd885d9bdcc78af077f7294c 100644 --- a/base/trace_event/builtin_categories.h +++ b/base/trace_event/builtin_categories.h -@@ -177,6 +177,7 @@ +@@ -178,6 +178,7 @@ X("WebCore") \ X("webrtc") \ X("xr") \ diff --git a/patches/build-config-android-config.gni.patch b/patches/build-config-android-config.gni.patch index e70d5bc6c2e2c..c3f9695b7f3bc 100644 --- a/patches/build-config-android-config.gni.patch +++ b/patches/build-config-android-config.gni.patch @@ -1,5 +1,5 @@ diff --git a/build/config/android/config.gni b/build/config/android/config.gni -index 56e2c642190f02d3f64949ed5e1e2a48a0ab56d9..d1465cbb76937e7ec35d29ff2ba7d85d8745d84f 100644 +index 0c19c020290c96dbe3874cbea07d022bdeebaf9e..322b0eb2c5d11cffd10e61d4b85f0b425f6930c5 100644 --- a/build/config/android/config.gni +++ b/build/config/android/config.gni @@ -8,6 +8,7 @@ diff --git a/patches/build-config-android-rules.gni.patch b/patches/build-config-android-rules.gni.patch index 286615d59992f..be3c5e2b34ab1 100644 --- a/patches/build-config-android-rules.gni.patch +++ b/patches/build-config-android-rules.gni.patch @@ -1,5 +1,5 @@ diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni -index 0ca23f5814e62ff89425515ace593963afd2f65d..d84c92137f0813ff765e47e0b957b9921852b87a 100644 +index e2cf9099f6ab05b08117d323e54fb641f32ed055..17e6b2fa5970d2b74294a7c7fa581b459ce4af47 100644 --- a/build/config/android/rules.gni +++ b/build/config/android/rules.gni @@ -500,6 +500,7 @@ if (enable_java_templates) { diff --git a/patches/build-config-compiler-BUILD.gn.patch b/patches/build-config-compiler-BUILD.gn.patch index 679164fef5800..fc379f9c7ba73 100644 --- a/patches/build-config-compiler-BUILD.gn.patch +++ b/patches/build-config-compiler-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index d40843b44f9ee81f026bf52e3f39c9475fe87ac3..c5400b845bb92482893cee5388b910185cca8286 100644 +index f378b9560d1534fa83eec1601e68396afa2e704f..3dac3c667427f13ff2234fa51d250338ebb278d3 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -1679,6 +1679,7 @@ config("chromium_code") { +@@ -1675,6 +1675,7 @@ config("chromium_code") { ] } } diff --git a/patches/chrome-BUILD.gn.patch b/patches/chrome-BUILD.gn.patch index 95aa36a315329..a2dba74971afd 100644 --- a/patches/chrome-BUILD.gn.patch +++ b/patches/chrome-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn -index 7203dde2f96d5e8ed44443e21a2257166b6e6f36..8833d83da71d57d08bd0738d2f7b72206a950260 100644 +index 925e275532a5fa91b55f575f2e8d86403f5d17d8..aaedf7f832ca716037a18584ceb3464371dc37a7 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn -@@ -170,6 +170,7 @@ if (!is_android && !is_mac) { +@@ -174,6 +174,7 @@ if (!is_android && !is_mac) { "common/crash_keys.cc", "common/crash_keys.h", ] @@ -10,7 +10,7 @@ index 7203dde2f96d5e8ed44443e21a2257166b6e6f36..8833d83da71d57d08bd0738d2f7b7220 deps += [ ":chrome_dll", -@@ -456,11 +457,12 @@ if (is_win) { +@@ -463,11 +464,12 @@ if (is_win) { args += [ "--privileged_helper_id=$privileged_helper_name" ] } } @@ -24,7 +24,7 @@ index 7203dde2f96d5e8ed44443e21a2257166b6e6f36..8833d83da71d57d08bd0738d2f7b7220 extra_substitutions = [ "CHROMIUM_BUNDLE_ID=$chrome_mac_bundle_id", "CHROMIUM_SHORT_NAME=$chrome_product_short_name", -@@ -480,6 +482,7 @@ if (is_win) { +@@ -487,6 +489,7 @@ if (is_win) { "//chrome/common:buildflags", "//chrome/common:version_header", ] @@ -32,7 +32,7 @@ index 7203dde2f96d5e8ed44443e21a2257166b6e6f36..8833d83da71d57d08bd0738d2f7b7220 if (enable_stripping) { # At link time, preserve the global symbols specified in the .exports -@@ -556,7 +559,7 @@ if (is_win) { +@@ -563,7 +566,7 @@ if (is_win) { args = [ "-b", @@ -41,7 +41,7 @@ index 7203dde2f96d5e8ed44443e21a2257166b6e6f36..8833d83da71d57d08bd0738d2f7b7220 "-v", chrome_version_full, "-g", -@@ -630,6 +633,7 @@ if (is_win) { +@@ -637,6 +640,7 @@ if (is_win) { # this dependency directly copies the file into the framework's # resources directory. public_deps += [ ":chrome_framework_widevine_signature" ] @@ -49,7 +49,7 @@ index 7203dde2f96d5e8ed44443e21a2257166b6e6f36..8833d83da71d57d08bd0738d2f7b7220 } } -@@ -673,9 +677,11 @@ if (is_win) { +@@ -680,9 +684,11 @@ if (is_win) { "--scm=0", ] } @@ -61,7 +61,7 @@ index 7203dde2f96d5e8ed44443e21a2257166b6e6f36..8833d83da71d57d08bd0738d2f7b7220 if (is_chrome_branded) { # These entitlements are bound to the official Google Chrome signing # certificate and will not necessarily work in any other build. -@@ -700,6 +706,7 @@ if (is_win) { +@@ -707,6 +713,7 @@ if (is_win) { info_plist_target = invoker.info_plist_target } else { info_plist_target = ":chrome_helper_plist" @@ -69,7 +69,7 @@ index 7203dde2f96d5e8ed44443e21a2257166b6e6f36..8833d83da71d57d08bd0738d2f7b7220 } extra_substitutions = [ -@@ -1187,6 +1194,7 @@ if (is_win) { +@@ -1194,6 +1201,7 @@ if (is_win) { chrome_dylib_version, "-Wl,-order_file," + rebase_path("app/framework.order", root_build_dir), ] @@ -77,7 +77,7 @@ index 7203dde2f96d5e8ed44443e21a2257166b6e6f36..8833d83da71d57d08bd0738d2f7b7220 if (!is_component_build) { # Specify a sensible install_name for static builds. The library is -@@ -1365,6 +1373,7 @@ if (is_win) { +@@ -1372,6 +1380,7 @@ if (is_win) { group("dependencies") { public_deps = [ @@ -85,7 +85,7 @@ index 7203dde2f96d5e8ed44443e21a2257166b6e6f36..8833d83da71d57d08bd0738d2f7b7220 "//build:branding_buildflags", "//build:chromeos_buildflags", "//chrome/browser", -@@ -1435,7 +1444,7 @@ group("dependencies") { +@@ -1442,7 +1451,7 @@ group("dependencies") { if (is_win) { process_version_rc_template("chrome_exe_version") { @@ -94,7 +94,7 @@ index 7203dde2f96d5e8ed44443e21a2257166b6e6f36..8833d83da71d57d08bd0738d2f7b7220 output = "$target_gen_dir/chrome_exe_version.rc" } -@@ -1489,6 +1498,7 @@ group("resources") { +@@ -1496,6 +1505,7 @@ group("resources") { "//chrome/browser:resources", "//chrome/common:resources", "//chrome/renderer:resources", diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index d4dec99fcc7ec..fc921f4d5669f 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,12 +1,12 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index 6c2850a7ebf262f6dc48904d9638125806561b24..e93b1ed0d1ab4fa01abb729308755f48e8c77cb9 100644 +index 486af5c4bf400ffc63a9cbba6f9e3cc8a211d81d..7cfbe9fc91f7f98cbf867bf9e47722029aab0c19 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ - MAJOR=102 + MAJOR=103 -MINOR=0 --BUILD=5005 --PATCH=125 +-BUILD=5060 +-PATCH=42 +MINOR=1 +BUILD=40 +PATCH=99 diff --git a/patches/chrome-android-BUILD.gn.patch b/patches/chrome-android-BUILD.gn.patch index 0b756347dbe1c..b50eb0803ca48 100644 --- a/patches/chrome-android-BUILD.gn.patch +++ b/patches/chrome-android-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn -index 42f3f8c0f1d2c189f4f47eca9c7737c735497b71..83873987cfa774d1acc215b29f2f8c6030d2b806 100644 +index 7cc19e7c68c597c8835aa07d8c889693f9a26167..be55b35fd9c271b418acada4d5118b7574ebc869 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -269,6 +269,7 @@ android_resources("chrome_app_java_resources") { +@@ -270,6 +271,7 @@ android_resources("chrome_app_java_resources") { "//third_party/androidx:androidx_gridlayout_gridlayout_java", "//third_party/androidx:androidx_preference_preference_java", ] @@ -10,7 +10,7 @@ index 42f3f8c0f1d2c189f4f47eca9c7737c735497b71..83873987cfa774d1acc215b29f2f8c60 } if (enable_vr) { -@@ -648,6 +649,7 @@ android_library("chrome_java") { +@@ -651,6 +653,7 @@ android_library("chrome_java") { ] deps += feed_deps @@ -18,7 +18,7 @@ index 42f3f8c0f1d2c189f4f47eca9c7737c735497b71..83873987cfa774d1acc215b29f2f8c60 srcjar_deps = [ ":autofill_verification_status_generated_enum", -@@ -676,6 +678,7 @@ android_library("chrome_java") { +@@ -678,6 +681,7 @@ android_library("chrome_java") { "//components/offline_pages/core:offline_page_model_enums_java", "//net:effective_connection_type_java", ] @@ -26,7 +26,7 @@ index 42f3f8c0f1d2c189f4f47eca9c7737c735497b71..83873987cfa774d1acc215b29f2f8c60 # From java_sources.gni. sources = chrome_java_sources + [ app_hooks_impl ] -@@ -797,6 +800,7 @@ java_group("chrome_all_java") { +@@ -809,6 +813,7 @@ java_group("chrome_all_java") { "//chrome/android/features/tab_ui:module_desc_java", ] } @@ -34,7 +34,7 @@ index 42f3f8c0f1d2c189f4f47eca9c7737c735497b71..83873987cfa774d1acc215b29f2f8c60 } # This is a list of all base module jni headers. New features should add their -@@ -845,6 +849,7 @@ group("jni_headers") { +@@ -857,6 +862,7 @@ group("jni_headers") { "//components/ukm/android:jni_headers", "//components/webauthn/android:jni_headers", ] @@ -42,7 +42,7 @@ index 42f3f8c0f1d2c189f4f47eca9c7737c735497b71..83873987cfa774d1acc215b29f2f8c60 } action_with_pydeps("chrome_android_java_google_api_keys_srcjar") { -@@ -2229,6 +2234,7 @@ if (current_toolchain == default_toolchain) { +@@ -2265,6 +2272,7 @@ if (current_toolchain == default_toolchain) { ":${_variant}_locale_pak_assets", ":${_variant}_paks", ] @@ -50,7 +50,7 @@ index 42f3f8c0f1d2c189f4f47eca9c7737c735497b71..83873987cfa774d1acc215b29f2f8c60 if (_is_monochrome) { deps += [ "//android_webview:locale_pak_assets" ] if (webview_includes_weblayer && !_is_bundle_module) { -@@ -2487,6 +2493,7 @@ template("chrome_public_apk_or_module_tmpl") { +@@ -2524,6 +2532,7 @@ template("chrome_public_apk_or_module_tmpl") { load_library_from_apk = chromium_linker_supported version_name = chrome_version_name @@ -58,7 +58,7 @@ index 42f3f8c0f1d2c189f4f47eca9c7737c735497b71..83873987cfa774d1acc215b29f2f8c60 } } -@@ -2626,6 +2633,7 @@ android_library("base_module_java") { +@@ -2667,6 +2676,7 @@ android_library("base_module_java") { "//components/payments/content/android:service_java", "//third_party/androidx:androidx_browser_browser_java", ] @@ -66,7 +66,7 @@ index 42f3f8c0f1d2c189f4f47eca9c7737c735497b71..83873987cfa774d1acc215b29f2f8c60 # More deps for DFMs. if (dfmify_dev_ui) { -@@ -2776,6 +2784,7 @@ template("monochrome_public_apk_or_module_tmpl") { +@@ -2817,6 +2827,7 @@ template("monochrome_public_apk_or_module_tmpl") { deps += [ "//weblayer/browser/java:upstream_java" ] } } diff --git a/patches/chrome-android-chrome_java_sources.gni.patch b/patches/chrome-android-chrome_java_sources.gni.patch index 24e2c8273dcef..0d8b2b1a8378a 100644 --- a/patches/chrome-android-chrome_java_sources.gni.patch +++ b/patches/chrome-android-chrome_java_sources.gni.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni -index d9c173d124155b84030a6b87fdd24c8fde6cdffb..063d6f4d92c215efa5b1f60b139c4e6bbaafbcfc 100644 +index 29c681ee981e25de97dfd3be046918189e4b803a..fac6b106d92fc87199f54673c7eec0e50444f0f5 100644 --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -1240,3 +1240,4 @@ chrome_java_sources = [ +@@ -1219,3 +1219,4 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/webauth/authenticator/CableAuthenticatorUSBActivity.java", "java/src/org/chromium/chrome/browser/webshare/ShareServiceImplementationFactory.java", ] diff --git a/patches/chrome-android-chrome_public_apk_tmpl.gni.patch b/patches/chrome-android-chrome_public_apk_tmpl.gni.patch index bb2af2e25256f..d1ceec19e449f 100644 --- a/patches/chrome-android-chrome_public_apk_tmpl.gni.patch +++ b/patches/chrome-android-chrome_public_apk_tmpl.gni.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni -index 266fd80a0eacc528180783941c40c3d1d9353ed1..d6cc631003efdd0481c62dd991bb39f8784f7f46 100644 +index 6fb71709dd398673f7950c0d33b39565bbd83ffe..6d5affe1eaac2cd8e27a9179ba25661bed0bb386 100644 --- a/chrome/android/chrome_public_apk_tmpl.gni +++ b/chrome/android/chrome_public_apk_tmpl.gni @@ -181,6 +181,7 @@ template("chrome_public_common_apk_or_module_tmpl") { diff --git a/patches/chrome-android-java-AndroidManifest.xml.patch b/patches/chrome-android-java-AndroidManifest.xml.patch index f9f21abda6299..43b9937d67822 100644 --- a/patches/chrome-android-java-AndroidManifest.xml.patch +++ b/patches/chrome-android-java-AndroidManifest.xml.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml -index b31d14a673bb536c55ca146a3ad0100f6814e13f..2df2b5599914355fdbae3997ca7a5f0d4eca03e5 100644 +index 8cf03aa889ddfc934eaf3221fcce73d16cb68a1e..dcfc01a9a3c6da7173f6412c1ad9a6a0a211b93b 100644 --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml @@ -26,6 +26,7 @@ by a child template that "extends" this file. @@ -41,7 +41,7 @@ index b31d14a673bb536c55ca146a3ad0100f6814e13f..2df2b5599914355fdbae3997ca7a5f0d -@@ -78,7 +87,9 @@ by a child template that "extends" this file. +@@ -79,7 +88,9 @@ by a child template that "extends" this file. @@ -52,7 +52,7 @@ index b31d14a673bb536c55ca146a3ad0100f6814e13f..2df2b5599914355fdbae3997ca7a5f0d -@@ -123,7 +134,9 @@ by a child template that "extends" this file. +@@ -124,7 +135,9 @@ by a child template that "extends" this file. @@ -63,7 +63,7 @@ index b31d14a673bb536c55ca146a3ad0100f6814e13f..2df2b5599914355fdbae3997ca7a5f0d {% block extra_uses_permissions %} {% endblock %} -@@ -170,6 +183,7 @@ by a child template that "extends" this file. +@@ -171,6 +184,7 @@ by a child template that "extends" this file. @@ -79,7 +79,7 @@ index b31d14a673bb536c55ca146a3ad0100f6814e13f..2df2b5599914355fdbae3997ca7a5f0d -@@ -1239,6 +1254,7 @@ by a child template that "extends" this file. +@@ -1211,6 +1226,7 @@ by a child template that "extends" this file. android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize" > @@ -87,7 +87,7 @@ index b31d14a673bb536c55ca146a3ad0100f6814e13f..2df2b5599914355fdbae3997ca7a5f0d {% block extra_application_definitions %} {% endblock %} {% endmacro %} -@@ -1317,6 +1333,7 @@ by a child template that "extends" this file. +@@ -1289,6 +1305,7 @@ by a child template that "extends" this file. diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-AppHooks.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-AppHooks.java.patch index fd8572b0c22c8..777a7bf85626e 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-AppHooks.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-AppHooks.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java -index 9670f5b1aa017cc4969afa753c1909e2ce24bccb..9624bea5328cfb9318f91d583b780e1b02125fa3 100644 +index 5e249423119b442b46a212ae5e44f6d39ea10784..2c4d3e44bcd366dcfafdd2a382f7585a59680810 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java @@ -73,7 +73,7 @@ public abstract class AppHooks { diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-app-ChromeActivity.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-app-ChromeActivity.java.patch index 1f284991f5d06..94ee43c2701c4 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-app-ChromeActivity.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-app-ChromeActivity.java.patch @@ -1,9 +1,9 @@ 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 -index 3c22e311441108a18c653520e8af97218dd1767d..acb4b6c32030c3629660127a1e77d2d0d3dea385 100644 +index e7d8cd3b263da83ce129e231e60bc1b0a6581e82..f0870711de3e9505cd9bf55fd73c58e3924dd67c 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java -@@ -402,7 +402,7 @@ public abstract class ChromeActivity - private SubscriptionsManager mSubscriptionsManager; +@@ -403,7 +403,7 @@ public abstract class ChromeActivity + private Callback mSelectionPopupBackPressInitCallback; protected ChromeActivity() { - mIntentHandler = new IntentHandler(this, createIntentHandlerDelegate()); diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPageLayout.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPageLayout.java.patch index 3ca2764af6552..095bd012b4dda 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPageLayout.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPageLayout.java.patch @@ -1,9 +1,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java -index b9a36e2105e508fa149d8761ea767d986af2afd5..1fe592aed29eb50f0add82915299142bd12e177e 100644 +index afc1590d894d69294c3d4641cdf894722d67e412..70033739cc73c88a36d9bbc8b1f8777eeb6d72d5 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java -@@ -375,6 +375,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer - /* observer = */ this, offlinePageBridge); +@@ -338,6 +338,7 @@ public class NewTabPageLayout extends LinearLayout implements VrModeObserver { + assert mMvTilesContainerLayout != null; int maxRows = 2; + maxRows = QueryTileSection.getMaxRowsForMostVisitedTiles(getContext()); diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-PrivacySettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-PrivacySettings.java.patch index b9a5ac9fef863..273c51004f8f5 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-PrivacySettings.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-PrivacySettings.java.patch @@ -1,5 +1,5 @@ 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 -index 5b4d0dd6f6451394feb299d3f9fe88bf064d1c38..00cb6373311d0c6da7d4a10c89773cb72c1f81bb 100644 +index ea4b2becf283a757b3bbabf07b84e768d7ebe525..b0d5bae925aacaaa0bbe7b7f4f1de88de80ed922 100644 --- 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 @@ -52,7 +52,7 @@ import org.chromium.ui.text.SpanApplier; @@ -11,7 +11,7 @@ index 5b4d0dd6f6451394feb299d3f9fe88bf064d1c38..00cb6373311d0c6da7d4a10c89773cb7 private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment"; private static final String PREF_PRELOAD_PAGES = "preload_pages"; private static final String PREF_HTTPS_FIRST_MODE = "https_first_mode"; -@@ -273,6 +273,7 @@ public class PrivacySettings +@@ -268,6 +268,7 @@ public class PrivacySettings @Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { menu.clear(); @@ -19,7 +19,7 @@ index 5b4d0dd6f6451394feb299d3f9fe88bf064d1c38..00cb6373311d0c6da7d4a10c89773cb7 MenuItem help = menu.add(Menu.NONE, R.id.menu_id_targeted_help, Menu.NONE, R.string.menu_help); help.setIcon(VectorDrawableCompat.create( -@@ -287,7 +288,7 @@ public class PrivacySettings +@@ -282,7 +283,7 @@ public class PrivacySettings null); return true; } diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-suggestions-tile-TileGridLayout.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-suggestions-tile-MostVisitedTilesGridLayout.java.patch similarity index 53% rename from patches/chrome-android-java-src-org-chromium-chrome-browser-suggestions-tile-TileGridLayout.java.patch rename to patches/chrome-android-java-src-org-chromium-chrome-browser-suggestions-tile-MostVisitedTilesGridLayout.java.patch index d8291e5235bd8..27ba724179daa 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-suggestions-tile-TileGridLayout.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-suggestions-tile-MostVisitedTilesGridLayout.java.patch @@ -1,8 +1,8 @@ -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/tile/TileGridLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/suggestions/tile/TileGridLayout.java -index 71ee0a73800d7764d79ce01b6958d9baf54eae26..162d8c3657aaf3e956072ee636b1a1ee530b1485 100644 ---- a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/tile/TileGridLayout.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/suggestions/tile/TileGridLayout.java -@@ -159,7 +159,7 @@ public class TileGridLayout extends FrameLayout { +diff --git a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/tile/MostVisitedTilesGridLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/suggestions/tile/MostVisitedTilesGridLayout.java +index 1ce04af004b8c6689413cd5c5ab8940a074b69de..b781914dbd4a309c7ee065ba45bdde4bec9cae4d 100644 +--- a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/tile/MostVisitedTilesGridLayout.java ++++ b/chrome/android/java/src/org/chromium/chrome/browser/suggestions/tile/MostVisitedTilesGridLayout.java +@@ -160,7 +160,7 @@ public class MostVisitedTilesGridLayout extends FrameLayout { } } diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch index 0b7c755f1bf42..ba21bcdb0ba2d 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java -index 5764d2416e5298368b1b7537c0c8e1214afb1a7a..98e07e449a6cf6146624af54e15963552b667111 100644 +index c208195d6a9ab924387e4976621c62cbeabc16f7..f7948aa364d8bb7d9eb569fb43828deb1ff04b12 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java @@ -24,7 +24,7 @@ import androidx.appcompat.app.AppCompatActivity; @@ -11,7 +11,7 @@ index 5764d2416e5298368b1b7537c0c8e1214afb1a7a..98e07e449a6cf6146624af54e1596355 import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceFragmentCompat; -@@ -373,7 +373,7 @@ public class ManageSyncSettings extends PreferenceFragmentCompat +@@ -377,7 +377,7 @@ public class ManageSyncSettings extends PreferenceFragmentCompat IdentityServicesProvider.get() .getIdentityManager(Profile.getLastUsedRegularProfile()) .getPrimaryAccountInfo(ConsentLevel.SYNC)); diff --git a/patches/chrome-android-java_sources.gni.patch b/patches/chrome-android-java_sources.gni.patch index 146c4b13b2bbf..270bc3feaff97 100644 --- a/patches/chrome-android-java_sources.gni.patch +++ b/patches/chrome-android-java_sources.gni.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni -index 25bf6a7bd4c724bd3a66ca479c264368b9e59980..7fd76de7a509f16457c9e79cbd4f902c3ca5ebe9 100644 +index 1b97166a1f8211dff97597199bc54f50b6ff7b30..ca6b4311569b04470faa2b3d2f66248b2d67f024 100644 --- a/chrome/android/java_sources.gni +++ b/chrome/android/java_sources.gni @@ -26,6 +26,7 @@ import("//components/omnibox/browser/test_java_sources.gni") diff --git a/patches/chrome-app-BUILD.gn.patch b/patches/chrome-app-BUILD.gn.patch index e2d187f77693e..6a6ce3fb16fd6 100644 --- a/patches/chrome-app-BUILD.gn.patch +++ b/patches/chrome-app-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/app/BUILD.gn b/chrome/app/BUILD.gn -index 4f77c336e47560af639218ed2a3ddc3cf48e515d..5cd83deb6077fd404f10ffa72ca9629d0a61dafe 100644 +index d1dac81e8e91178ddddfbfb21616b18459948b86..288623021068b9602ab75c9b0a52e52122f214e6 100644 --- a/chrome/app/BUILD.gn +++ b/chrome/app/BUILD.gn -@@ -102,6 +102,8 @@ grit("generated_resources") { +@@ -100,6 +100,8 @@ grit("generated_resources") { if (is_android) { outputs += android_generated_java_resources } @@ -11,7 +11,7 @@ index 4f77c336e47560af639218ed2a3ddc3cf48e515d..5cd83deb6077fd404f10ffa72ca9629d } if (is_android) { -@@ -137,7 +139,7 @@ grit("google_chrome_strings") { +@@ -135,7 +137,7 @@ grit("google_chrome_strings") { } grit("chromium_strings") { diff --git a/patches/chrome-browser-BUILD.gn.patch b/patches/chrome-browser-BUILD.gn.patch index 34d43537fa1f9..ef9da9fc95b0d 100644 --- a/patches/chrome-browser-BUILD.gn.patch +++ b/patches/chrome-browser-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index af2fd82cbc458b396107a161d9c3dd31077e57a7..3c2a06773f36c19106a2141d528a937e44a4e722 100644 +index 631420eb56152a3de776c0abdb6836ca992f6602..3ed76cdbcff87c337997f9bc07d75142704e5127 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2594,6 +2594,7 @@ static_library("browser") { +@@ -2626,6 +2626,7 @@ static_library("browser") { "performance_monitor/metric_evaluator_helper_posix.h", ] } diff --git a/patches/chrome-browser-about_flags.cc.patch b/patches/chrome-browser-about_flags.cc.patch index 01a355a276976..ccefa155698c1 100644 --- a/patches/chrome-browser-about_flags.cc.patch +++ b/patches/chrome-browser-about_flags.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc -index 4e330d33700299175dc5b7605ad527bdca9e41fa..a4c603db19000c49ef1578e16cb48d9d720d1179 100644 +index bee1d114bf9a05c29f2143539368e619f86244c7..bdcf0870714e555f7770e331dcb30f4d9f6e536b 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -3110,6 +3110,7 @@ const FeatureEntry::FeatureVariation kDesktopSharePreviewVariations[] = { +@@ -3132,6 +3132,7 @@ const FeatureEntry::FeatureVariation kDesktopSharePreviewVariations[] = { // // When adding a new choice, add it to the end of the list. const FeatureEntry kFeatureEntries[] = { diff --git a/patches/chrome-browser-browser_process_impl.h.patch b/patches/chrome-browser-browser_process_impl.h.patch index 0e8c89296d9e2..46ecc5a9efb6f 100644 --- a/patches/chrome-browser-browser_process_impl.h.patch +++ b/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 8fd6e51b8f078acc2de2d29c2277bab2e617ea17..46212415aaa9f07b5bf47bfd542c21d73addccc6 100644 +index a3eabe6f0ef595cc254f9a609682de3036539740..a73a8541ad547ddda47923c437fa0a557225107c 100644 --- a/chrome/browser/browser_process_impl.h +++ b/chrome/browser/browser_process_impl.h -@@ -223,6 +223,7 @@ class BrowserProcessImpl : public BrowserProcess, +@@ -215,6 +215,7 @@ class BrowserProcessImpl : public BrowserProcess, static void RegisterPrefs(PrefRegistrySimple* registry); private: diff --git a/patches/chrome-browser-browsing_data-chrome_browsing_data_remover_delegate_factory.cc.patch b/patches/chrome-browser-browsing_data-chrome_browsing_data_remover_delegate_factory.cc.patch index 8c39f48b816de..344a33aed4a2e 100644 --- a/patches/chrome-browser-browsing_data-chrome_browsing_data_remover_delegate_factory.cc.patch +++ b/patches/chrome-browser-browsing_data-chrome_browsing_data_remover_delegate_factory.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_factory.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_factory.cc -index 2d495133dad1735f149a2ebfb56bbaaf134b5c75..4dd7c8ae83f79cd06989164d35de9a0ca4ceadae 100644 +index a1c4ba52c2abfffa4a3e0958b1e08cbe15f498ee..f7ccc411f616121634b0d5494c043bd968303415 100644 --- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_factory.cc +++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_factory.cc -@@ -100,5 +100,5 @@ ChromeBrowsingDataRemoverDelegateFactory::GetBrowserContextToUse( +@@ -98,5 +98,5 @@ ChromeBrowsingDataRemoverDelegateFactory::GetBrowserContextToUse( KeyedService* ChromeBrowsingDataRemoverDelegateFactory::BuildServiceInstanceFor( content::BrowserContext* context) const { diff --git a/patches/chrome-browser-content_settings-page_specific_content_settings_delegate.cc.patch b/patches/chrome-browser-content_settings-page_specific_content_settings_delegate.cc.patch index e70f6f89b1fd1..441e0ed66a162 100644 --- a/patches/chrome-browser-content_settings-page_specific_content_settings_delegate.cc.patch +++ b/patches/chrome-browser-content_settings-page_specific_content_settings_delegate.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/content_settings/page_specific_content_settings_delegate.cc b/chrome/browser/content_settings/page_specific_content_settings_delegate.cc -index 7bcec606c0650341973d14331da907317e5cfdbb..debd74e22842f2619b695d86f6376d43297e92b8 100644 +index 69fe2883908d1a8ef7672c7c451aeb74a0bcbf06..0d3ed12a0f1bb6f5a6f5621f4bd615b45cde2672 100644 --- a/chrome/browser/content_settings/page_specific_content_settings_delegate.cc +++ b/chrome/browser/content_settings/page_specific_content_settings_delegate.cc @@ -121,6 +121,7 @@ void GetGuestViewDefaultContentSettingRules( diff --git a/patches/chrome-browser-download-download_item_model.h.patch b/patches/chrome-browser-download-download_item_model.h.patch index 43328f06d623d..488a585a0fe15 100644 --- a/patches/chrome-browser-download-download_item_model.h.patch +++ b/patches/chrome-browser-download-download_item_model.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/download/download_item_model.h b/chrome/browser/download/download_item_model.h -index 5ebc4371aad622e4e26c74968569877428052c56..a45ef658a2641b6b73085fd53dfd949e973e6d43 100644 +index 2f84c442a1b886da37b7d1523c3f1ae412c8efe6..b419e77ce6d27272a6b72b5319db1025db564406 100644 --- a/chrome/browser/download/download_item_model.h +++ b/chrome/browser/download/download_item_model.h -@@ -124,6 +124,7 @@ class DownloadItemModel : public DownloadUIModel, +@@ -123,6 +123,7 @@ class DownloadItemModel : public DownloadUIModel, void OnDownloadDestroyed(download::DownloadItem* download) override; private: diff --git a/patches/chrome-browser-extensions-BUILD.gn.patch b/patches/chrome-browser-extensions-BUILD.gn.patch index 01044cbcaf5f2..fdd74063c76d0 100644 --- a/patches/chrome-browser-extensions-BUILD.gn.patch +++ b/patches/chrome-browser-extensions-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn -index 3d7882c13ff59436f9490d3ac549e6e5d496f7bc..da658054307341e018fb86eda9662d00dba4d071 100644 +index a2c9b2c07951f4061dbd2e8bdddedd52a64db070..5e3b2a5994d0490a1be857d013713e9aed6d3488 100644 --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn -@@ -1340,6 +1340,7 @@ static_library("extensions") { +@@ -1319,6 +1319,7 @@ static_library("extensions") { } else { sources += [ "api/braille_display_private/braille_controller_stub.cc" ] } diff --git a/patches/chrome-browser-extensions-api-developer_private-extension_info_generator.cc.patch b/patches/chrome-browser-extensions-api-developer_private-extension_info_generator.cc.patch index 1386aa631f6c3..2c87afbe8a716 100644 --- a/patches/chrome-browser-extensions-api-developer_private-extension_info_generator.cc.patch +++ b/patches/chrome-browser-extensions-api-developer_private-extension_info_generator.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/extensions/api/developer_private/extension_info_generator.cc b/chrome/browser/extensions/api/developer_private/extension_info_generator.cc -index 0c0058a63a98634d80af45aee681950a36e7cfdb..686c9d48e414dd3655dc1f667ee9babc7fa8fd6d 100644 +index ec7ce69a263b63af2eedefae9e86a69252c4a236..7edcba5f4b301d8c477825374706615836aa3aa7 100644 --- a/chrome/browser/extensions/api/developer_private/extension_info_generator.cc +++ b/chrome/browser/extensions/api/developer_private/extension_info_generator.cc @@ -622,6 +622,7 @@ void ExtensionInfoGenerator::CreateExtensionInfoHelper( diff --git a/patches/chrome-browser-extensions-component_loader.h.patch b/patches/chrome-browser-extensions-component_loader.h.patch index fa9bda86abb8e..1a2b72464e1ed 100644 --- a/patches/chrome-browser-extensions-component_loader.h.patch +++ b/patches/chrome-browser-extensions-component_loader.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/extensions/component_loader.h b/chrome/browser/extensions/component_loader.h -index 5089843bbc37e89b09e400f864c2a0d60cf3198a..a4c405d0090302d6e91bfe2bf50b8109c45cc31a 100644 +index 0ba2893b96e73d5d67ef2e97801f6de8457f3be7..c824d51b04e3c5b0b6e3974f2b953e84bd758407 100644 --- a/chrome/browser/extensions/component_loader.h +++ b/chrome/browser/extensions/component_loader.h @@ -85,7 +85,7 @@ class ComponentLoader { diff --git a/patches/chrome-browser-extensions-extension_tab_util.cc.patch b/patches/chrome-browser-extensions-extension_tab_util.cc.patch index e46cade6bd468..9b4fa470796d2 100644 --- a/patches/chrome-browser-extensions-extension_tab_util.cc.patch +++ b/patches/chrome-browser-extensions-extension_tab_util.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/extensions/extension_tab_util.cc b/chrome/browser/extensions/extension_tab_util.cc -index 253ea5174c65841acb3106ad6e36dbce357c8fb4..568e9a248d18dd8ae14a1ffb663a2cc849324f56 100644 +index e5ad4ae1c6ece3b5e88034221fee25a9555682cb..3b2dcc537f4061e6f632c59c1a505448bb169439 100644 --- a/chrome/browser/extensions/extension_tab_util.cc +++ b/chrome/browser/extensions/extension_tab_util.cc -@@ -813,6 +813,7 @@ bool ExtensionTabUtil::IsKillURL(const GURL& url) { +@@ -814,6 +814,7 @@ bool ExtensionTabUtil::IsKillURL(const GURL& url) { }; if (!url.SchemeIs(content::kChromeUIScheme)) diff --git a/patches/chrome-browser-external_protocol-external_protocol_handler.cc.patch b/patches/chrome-browser-external_protocol-external_protocol_handler.cc.patch index fc55dfa45a219..1020dd14c12d4 100644 --- a/patches/chrome-browser-external_protocol-external_protocol_handler.cc.patch +++ b/patches/chrome-browser-external_protocol-external_protocol_handler.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/external_protocol/external_protocol_handler.cc b/chrome/browser/external_protocol/external_protocol_handler.cc -index 5fbcc287d8711db6ec5e7d10f92775d3d64c9923..2ce02da37f0e4322dd21f65f3ede4a7fa51373af 100644 +index 380a73e06eb8014a0b8a732d32fa0b0882710955..066443349793e4543b0f0b814dbe1135d2c62f9e 100644 --- a/chrome/browser/external_protocol/external_protocol_handler.cc +++ b/chrome/browser/external_protocol/external_protocol_handler.cc @@ -332,7 +332,7 @@ ExternalProtocolHandler::BlockState ExternalProtocolHandler::GetBlockState( diff --git a/patches/chrome-browser-first_run-upgrade_util_win.cc.patch b/patches/chrome-browser-first_run-upgrade_util_win.cc.patch index 9d9fcebe15319..40bfb6a9d177f 100644 --- a/patches/chrome-browser-first_run-upgrade_util_win.cc.patch +++ b/patches/chrome-browser-first_run-upgrade_util_win.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/first_run/upgrade_util_win.cc b/chrome/browser/first_run/upgrade_util_win.cc -index 563d5e13d148cda826d245c4b21fb8041ef9ff66..52ea94801c4dc8a70231655d7087ef1bf19f8821 100644 +index 3837a74d7dc225cd626ad9260c94c67ac5e82065..9cd05dd357e77dd85986339cbd7cca64eee7ca3a 100644 --- a/chrome/browser/first_run/upgrade_util_win.cc +++ b/chrome/browser/first_run/upgrade_util_win.cc -@@ -43,7 +43,7 @@ +@@ -44,7 +44,7 @@ #include "components/prefs/pref_service.h" #include "ui/base/ui_base_switches.h" @@ -11,7 +11,7 @@ index 563d5e13d148cda826d245c4b21fb8041ef9ff66..52ea94801c4dc8a70231655d7087ef1b #include "google_update/google_update_idl.h" #endif -@@ -57,7 +57,7 @@ bool GetNewerChromeFile(base::FilePath* path) { +@@ -58,7 +58,7 @@ bool GetNewerChromeFile(base::FilePath* path) { } bool InvokeGoogleUpdateForRename() { diff --git a/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch b/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch index fdb230bb0cd69..a4494beba86d6 100644 --- a/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch +++ b/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 52db6c80d153707894dd1fa05b63f5b867b73166..fa756ee86ddd1d2bf70204c1b573ef2074f0305b 100644 +index aaf50c149b8afd4edb8aa2004dc41c60cb372f4b..2a2a1861010ce13c85dde1886ab5f3ec8dc12be0 100644 --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -375,6 +375,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -384,6 +384,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { }; const base::Feature* FindFeatureExposedToJava(const std::string& feature_name) { diff --git a/patches/chrome-browser-global_keyboard_shortcuts_mac.mm.patch b/patches/chrome-browser-global_keyboard_shortcuts_mac.mm.patch index 450862752a672..956678a75a573 100644 --- a/patches/chrome-browser-global_keyboard_shortcuts_mac.mm.patch +++ b/patches/chrome-browser-global_keyboard_shortcuts_mac.mm.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/global_keyboard_shortcuts_mac.mm b/chrome/browser/global_keyboard_shortcuts_mac.mm -index b4c85b92468ec43747b72fdeaf2bf4068534bd47..0253843194f8e443e46a37a61d428dead35afdbd 100644 +index c766aadf8d462733636874d383c588a7f88bf9f0..8002baaa150199e26f11cb0702df920cecd90cb5 100644 --- a/chrome/browser/global_keyboard_shortcuts_mac.mm +++ b/chrome/browser/global_keyboard_shortcuts_mac.mm -@@ -180,6 +180,7 @@ const std::vector& GetShortcutsNotPresentInMainMenu() { +@@ -180,6 +180,7 @@ CommandForKeyEventResult ShortcutCommand(int cmd) { {true, false, false, true, kVK_DownArrow, IDC_FOCUS_NEXT_PANE}, {true, false, false, true, kVK_UpArrow, IDC_FOCUS_PREVIOUS_PANE}, {true, true, false, true, kVK_ANSI_A, IDC_FOCUS_INACTIVE_POPUP_FOR_ACCESSIBILITY}, diff --git a/patches/chrome-browser-net-proxy_config_monitor.cc.patch b/patches/chrome-browser-net-proxy_config_monitor.cc.patch index 2d26429cb83d6..a7d669952fb49 100644 --- a/patches/chrome-browser-net-proxy_config_monitor.cc.patch +++ b/patches/chrome-browser-net-proxy_config_monitor.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/net/proxy_config_monitor.cc b/chrome/browser/net/proxy_config_monitor.cc -index 88fad9811069e7851363c8068f9702a9019669cc..72e1e184f5e9ab923cc02e44cf99e002e9bf24d6 100644 +index d05a82a9c369a42cddebb1af1546a5ba6ae59c9f..84e56f7c24138ec3b509026320232c6e6590f99e 100644 --- a/chrome/browser/net/proxy_config_monitor.cc +++ b/chrome/browser/net/proxy_config_monitor.cc -@@ -51,6 +51,7 @@ ProxyConfigMonitor::ProxyConfigMonitor(Profile* profile) { +@@ -52,6 +52,7 @@ ProxyConfigMonitor::ProxyConfigMonitor(Profile* profile) { profile->GetPrefs(), g_browser_process->local_state()); } diff --git a/patches/chrome-browser-notifications-BUILD.gn.patch b/patches/chrome-browser-notifications-BUILD.gn.patch index c19e1ca860ed1..cef6c2dad6d4e 100644 --- a/patches/chrome-browser-notifications-BUILD.gn.patch +++ b/patches/chrome-browser-notifications-BUILD.gn.patch @@ -1,9 +1,9 @@ diff --git a/chrome/browser/notifications/BUILD.gn b/chrome/browser/notifications/BUILD.gn -index ffbd09aa91717a52fe38a98c973cbccdf87090d1..76937fa87d3b52d5f06776b295430d260aa3b888 100644 +index 984d7e48ed6cd342c40fe5c05203df06b48fa114..e5c7f6a4cedf55534db23d3593a62ad113430080 100644 --- a/chrome/browser/notifications/BUILD.gn +++ b/chrome/browser/notifications/BUILD.gn -@@ -81,6 +81,7 @@ if (is_android) { - "//third_party/androidx:androidx_annotation_annotation_java", +@@ -82,6 +82,7 @@ if (is_android) { + "//third_party/androidx:androidx_core_core_java", "//ui/android:ui_no_recycler_view_java", ] + deps += [ "//brave/browser/notifications/android:brave_java", ] diff --git a/patches/chrome-browser-notifications-android-java-src-org-chromium-chrome-browser-notifications-channels-ChromeChannelDefinitions.java.patch b/patches/chrome-browser-notifications-android-java-src-org-chromium-chrome-browser-notifications-channels-ChromeChannelDefinitions.java.patch index db4ce5f08d87d..0c0d06fb49ae2 100644 --- a/patches/chrome-browser-notifications-android-java-src-org-chromium-chrome-browser-notifications-channels-ChromeChannelDefinitions.java.patch +++ b/patches/chrome-browser-notifications-android-java-src-org-chromium-chrome-browser-notifications-channels-ChromeChannelDefinitions.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/channels/ChromeChannelDefinitions.java b/chrome/browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/channels/ChromeChannelDefinitions.java -index 81c39210ba410b8261047cee432615b268226999..daa2d5eee812440af49b78e282310ebe6a45d7bb 100644 +index 1f23fd163661ca2f9169498f482642022ba53ee1..f2dc25d5b7f66fefeefd22e0aa0075e9a1f3bd9d 100644 --- a/chrome/browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/channels/ChromeChannelDefinitions.java +++ b/chrome/browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/channels/ChromeChannelDefinitions.java @@ -36,6 +36,7 @@ import java.util.Set; @@ -18,8 +18,8 @@ index 81c39210ba410b8261047cee432615b268226999..daa2d5eee812440af49b78e282310ebe ChannelId.MEDIA_PLAYBACK, ChannelId.SCREEN_CAPTURE, ChannelId.CONTENT_SUGGESTIONS, ChannelId.WEBAPP_ACTIONS, ChannelId.SITES, ChannelId.SHARING, ChannelId.UPDATES, ChannelId.COMPLETED_DOWNLOADS, ChannelId.PERMISSION_REQUESTS, -@@ -101,7 +103,7 @@ public class ChromeChannelDefinitions extends ChannelDefinitions { - String CHROME_TIPS = "chrome_tips"; +@@ -102,7 +104,7 @@ public class ChromeChannelDefinitions extends ChannelDefinitions { + String BLUETOOTH = "bluetooth"; } - @StringDef({ChannelGroupId.GENERAL, ChannelGroupId.SITES}) @@ -27,7 +27,7 @@ index 81c39210ba410b8261047cee432615b268226999..daa2d5eee812440af49b78e282310ebe @Retention(RetentionPolicy.SOURCE) public @interface ChannelGroupId { String SITES = "sites"; -@@ -130,6 +132,7 @@ public class ChromeChannelDefinitions extends ChannelDefinitions { +@@ -131,6 +133,7 @@ public class ChromeChannelDefinitions extends ChannelDefinitions { Map map = new HashMap<>(); Set startup = new HashSet<>(); @@ -35,7 +35,7 @@ index 81c39210ba410b8261047cee432615b268226999..daa2d5eee812440af49b78e282310ebe map.put(ChannelId.BROWSER, PredefinedChannel.create(ChannelId.BROWSER, R.string.notification_category_browser, -@@ -266,6 +269,7 @@ public class ChromeChannelDefinitions extends ChannelDefinitions { +@@ -274,6 +277,7 @@ public class ChromeChannelDefinitions extends ChannelDefinitions { static final Map MAP; static { Map map = new HashMap<>(); diff --git a/patches/chrome-browser-plugins-plugins_resource_service.cc.patch b/patches/chrome-browser-plugins-plugins_resource_service.cc.patch deleted file mode 100644 index d4e25c353edec..0000000000000 --- a/patches/chrome-browser-plugins-plugins_resource_service.cc.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/chrome/browser/plugins/plugins_resource_service.cc b/chrome/browser/plugins/plugins_resource_service.cc -index 0fa75bfa622479b2b9e0f93a11b2641e0bda9629..3a8547d66bd608c6b4b34d85579c821118b03e5a 100644 ---- a/chrome/browser/plugins/plugins_resource_service.cc -+++ b/chrome/browser/plugins/plugins_resource_service.cc -@@ -54,7 +54,7 @@ const int kStartResourceFetchDelayMs = 60 * 1000; - const int kCacheUpdateDelayMs = 24 * 60 * 60 * 1000; - - const char kPluginsServerUrl[] = -- "https://www.gstatic.com/chrome/config/plugins_3/"; -+ "https://static1.brave.com/chrome/config/plugins_3/"; - - GURL GetPluginsServerURL() { - std::string filename; diff --git a/patches/chrome-browser-prefs-browser_prefs.cc.patch b/patches/chrome-browser-prefs-browser_prefs.cc.patch index 079960cf57ac6..04bf8db3ca285 100644 --- a/patches/chrome-browser-prefs-browser_prefs.cc.patch +++ b/patches/chrome-browser-prefs-browser_prefs.cc.patch @@ -1,17 +1,17 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc -index 1a660729062c09f3a3152db76e4a87b76e7ff039..727c13fd582b04bf53592b44f82e6107e62bb4e8 100644 +index d6c5b0148dec90ebf4ab3be55cbc29262174d10e..369a1455ad3276b5677bd60a7f428d7f131094a2 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -1204,6 +1204,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -1190,6 +1190,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { registry->RegisterBooleanPref( policy::policy_prefs::kSetTimeoutWithout1MsClampEnabled, false); + brave::RegisterLocalStatePrefs(registry); - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + #if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) screen_ai::RegisterLocalStatePrefs(registry); -@@ -1539,6 +1540,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, - true); +@@ -1528,6 +1529,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, + #endif RegisterProfilePrefsForMigration(registry); + brave::RegisterProfilePrefs(registry); diff --git a/patches/chrome-browser-profile_resetter-reset_report_uploader.cc.patch b/patches/chrome-browser-profile_resetter-reset_report_uploader.cc.patch index db27e7d92ecb9..ccb9d529a9e21 100644 --- a/patches/chrome-browser-profile_resetter-reset_report_uploader.cc.patch +++ b/patches/chrome-browser-profile_resetter-reset_report_uploader.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/profile_resetter/reset_report_uploader.cc b/chrome/browser/profile_resetter/reset_report_uploader.cc -index ea847b6875bae8ec8e73522dac9e83dfe09eab25..a6aa6a2971a9c6dc8a597d9980ca634a29c9b3c4 100644 +index a28016ddb65a9419f64b315e62854d5144142e79..862c3270de67149a1491028d04f44864825b2fc8 100644 --- a/chrome/browser/profile_resetter/reset_report_uploader.cc +++ b/chrome/browser/profile_resetter/reset_report_uploader.cc @@ -49,6 +49,7 @@ void ResetReportUploader::DispatchReport( diff --git a/patches/chrome-browser-profiles-profile_impl.cc.patch b/patches/chrome-browser-profiles-profile_impl.cc.patch index 6fe176fcc52a6..afe69fddf9f7a 100644 --- a/patches/chrome-browser-profiles-profile_impl.cc.patch +++ b/patches/chrome-browser-profiles-profile_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc -index bf169b652ef30e1199d4ea15e59900a8eea7768f..1dd6c46232649bebb774203575e52e879d63cbf5 100644 +index 2e1d353a1e34b11438d7b77a8915aab9b07a1d17..8f67e440be09e9490d94243ecf455d2ed2ad5a8a 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc -@@ -363,7 +363,7 @@ std::unique_ptr Profile::CreateProfile(const base::FilePath& path, +@@ -358,7 +358,7 @@ std::unique_ptr Profile::CreateProfile(const base::FilePath& path, NOTREACHED(); } diff --git a/patches/chrome-browser-profiles-profile_impl.h.patch b/patches/chrome-browser-profiles-profile_impl.h.patch index 16222e85e40ce..312091ba00eac 100644 --- a/patches/chrome-browser-profiles-profile_impl.h.patch +++ b/patches/chrome-browser-profiles-profile_impl.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/profiles/profile_impl.h b/chrome/browser/profiles/profile_impl.h -index 5a6ea18c6fd98b2b89861259c844740e8cc1a6c5..4e14ad1d73f36a8c006ab007616a436cef077dd7 100644 +index 7db7fd820a931f0d3560c83c53ab5990ccf860cc..842114594c200ad92029c24c51ee9555b0901b6c 100644 --- a/chrome/browser/profiles/profile_impl.h +++ b/chrome/browser/profiles/profile_impl.h -@@ -157,6 +157,7 @@ class ProfileImpl : public Profile { +@@ -155,6 +155,7 @@ class ProfileImpl : public Profile { void OnLogin() override; void InitChromeOSPreferences() override; #endif // BUILDFLAG(IS_CHROMEOS_ASH) diff --git a/patches/chrome-browser-profiles-profile_shortcut_manager_win.cc.patch b/patches/chrome-browser-profiles-profile_shortcut_manager_win.cc.patch index c5a91fb09a770..dcda7a110522f 100644 --- a/patches/chrome-browser-profiles-profile_shortcut_manager_win.cc.patch +++ b/patches/chrome-browser-profiles-profile_shortcut_manager_win.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/profiles/profile_shortcut_manager_win.cc b/chrome/browser/profiles/profile_shortcut_manager_win.cc -index 793a00805adb260b71821576aa53d72787e9bc06..b312eb2c5c27c432162dac724ed71b1c992b2b03 100644 +index 11f19c48fe5e46fb07c3987aa92f1318ab47e1a2..2fdb2e8e4d4c18dff0ce420f94e1ebe5afc5129a 100644 --- a/chrome/browser/profiles/profile_shortcut_manager_win.cc +++ b/chrome/browser/profiles/profile_shortcut_manager_win.cc -@@ -835,7 +835,7 @@ bool ProfileShortcutManager::IsFeatureEnabled() { +@@ -859,7 +859,7 @@ bool ProfileShortcutManager::IsFeatureEnabled() { // static std::unique_ptr ProfileShortcutManager::Create( ProfileManager* manager) { diff --git a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch index 3936a9ac20f40..50481b7860232 100644 --- a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch +++ b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc -index e6efbf1e457ae92f7f2ffacb23b4dc5ba718ed47..634b75e5e01906a44cba8ccd0e807719daf510c1 100644 +index fdad390f46a98c3d9ea5ce9b3e3d616d0fcc0459..c0851e605336fdb615371bf905d4c8f1d6912cb7 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc @@ -1843,6 +1843,7 @@ void RenderViewContextMenu::AppendSearchProvider() { diff --git a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch index b62b763b6a011..0e9aa86a9ea71 100644 --- a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch +++ b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.h b/chrome/browser/renderer_context_menu/render_view_context_menu.h -index 37e11f2cd6742c5b342f4180fa5c6011aba369d5..9feb684e4c4756f15dbf9567d268689f64fd0561 100644 +index f993ef1e145ddb08a5873555c9c2b2d4f7fe8b0a..327b59758944a765d6b9bd37fb15644af53e482f 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.h +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.h @@ -149,6 +149,7 @@ class RenderViewContextMenu diff --git a/patches/chrome-browser-resources-bookmarks-BUILD.gn.patch b/patches/chrome-browser-resources-bookmarks-BUILD.gn.patch index ef54f8b6254d4..4cb212d003f29 100644 --- a/patches/chrome-browser-resources-bookmarks-BUILD.gn.patch +++ b/patches/chrome-browser-resources-bookmarks-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/bookmarks/BUILD.gn b/chrome/browser/resources/bookmarks/BUILD.gn -index 1e13b5171c6ad90d77330dbb293d3ff58ef0d916..a47be402d1cd4077357afe09018ad68677a3e7d9 100644 +index 227ce792eccdbbde61964306df4c0897accc4cc7..5e63b744aa6ca1a3744d2bbc671f45a8d385f589 100644 --- a/chrome/browser/resources/bookmarks/BUILD.gn +++ b/chrome/browser/resources/bookmarks/BUILD.gn @@ -50,6 +50,7 @@ generate_grd("build_grd") { diff --git a/patches/chrome-browser-resources-bookmarks-command_manager.ts.patch b/patches/chrome-browser-resources-bookmarks-command_manager.ts.patch index 651923178b086..f7f531925e9b4 100644 --- a/patches/chrome-browser-resources-bookmarks-command_manager.ts.patch +++ b/patches/chrome-browser-resources-bookmarks-command_manager.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/bookmarks/command_manager.ts b/chrome/browser/resources/bookmarks/command_manager.ts -index c52fce66001c4e77274c66bbabd262e2e73e97a9..eed0aaa1f1e93e81c812382b9c7851a74e8b9a28 100644 +index 04ad6214da5d8afe5f920f21b29e5f36242e638c..dd0d01c8a686707ed2fc8ab63948c14f65939500 100644 --- a/chrome/browser/resources/bookmarks/command_manager.ts +++ b/chrome/browser/resources/bookmarks/command_manager.ts @@ -428,7 +428,7 @@ export class BookmarksCommandManagerElement extends diff --git a/patches/chrome-browser-resources-extensions-BUILD.gn.patch b/patches/chrome-browser-resources-extensions-BUILD.gn.patch index 43c90084d699e..068951741f9e1 100644 --- a/patches/chrome-browser-resources-extensions-BUILD.gn.patch +++ b/patches/chrome-browser-resources-extensions-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/extensions/BUILD.gn b/chrome/browser/resources/extensions/BUILD.gn -index ed35295923a7bfb16c015bdadc0fd36776fd2240..7f77ef086708d8693f711df189c6b5c5bd081cdf 100644 +index 4480c50562cf497c02cbd725f029be2d2ae034b7..b373e6273bd1444f235645fbffeaff9d79a6326a 100644 --- a/chrome/browser/resources/extensions/BUILD.gn +++ b/chrome/browser/resources/extensions/BUILD.gn -@@ -50,6 +50,7 @@ generate_grd("build_grd") { +@@ -51,6 +51,7 @@ generate_grd("build_grd") { deps = [ ":build_ts" ] manifest_files = [ "$target_gen_dir/tsconfig.manifest" ] } @@ -10,7 +10,7 @@ index ed35295923a7bfb16c015bdadc0fd36776fd2240..7f77ef086708d8693f711df189c6b5c5 } preprocess_if_expr("preprocess") { -@@ -121,4 +122,5 @@ ts_library("build_ts") { +@@ -128,4 +129,5 @@ ts_library("build_ts") { ":preprocess", ":preprocess_generated", ] diff --git a/patches/chrome-browser-resources-extensions-item_list.ts.patch b/patches/chrome-browser-resources-extensions-item_list.ts.patch index 2a7f5b07a29ac..c8335335ff649 100644 --- a/patches/chrome-browser-resources-extensions-item_list.ts.patch +++ b/patches/chrome-browser-resources-extensions-item_list.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/extensions/item_list.ts b/chrome/browser/resources/extensions/item_list.ts -index da86db23349e3dc4368da9946689df4b46db9e28..63e8228ddddc3636a8ce0bf11d247cad90e6de86 100644 +index c02caf2bbc1940b8be008ad1bd098f15314313b8..024f66113e4bd0e14136e4645ce53125b7c6c077 100644 --- a/chrome/browser/resources/extensions/item_list.ts +++ b/chrome/browser/resources/extensions/item_list.ts @@ -13,6 +13,7 @@ import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bu diff --git a/patches/chrome-browser-resources-history-BUILD.gn.patch b/patches/chrome-browser-resources-history-BUILD.gn.patch index dc563b811be5d..31918bfc401f9 100644 --- a/patches/chrome-browser-resources-history-BUILD.gn.patch +++ b/patches/chrome-browser-resources-history-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/history/BUILD.gn b/chrome/browser/resources/history/BUILD.gn -index a5d96f0ffbbddf634c9c32d5e2018556af575794..591eaf1ac6fff2782fea146f01d2d329bf7caf62 100644 +index 8f693f4e111333a5948d4d3faaae69a9e774af9f..1e3a850fdd15fa92f8aa5ce27d7287083014a564 100644 --- a/chrome/browser/resources/history/BUILD.gn +++ b/chrome/browser/resources/history/BUILD.gn @@ -65,6 +65,7 @@ generate_grd("build_grd") { @@ -10,11 +10,9 @@ index a5d96f0ffbbddf634c9c32d5e2018556af575794..591eaf1ac6fff2782fea146f01d2d329 } preprocess_if_expr("preprocess") { -@@ -129,6 +130,7 @@ ts_library("build_ts") { +@@ -128,4 +129,5 @@ ts_library("build_ts") { ":preprocess", ":preprocess_generated", ] + in_files += brave_deps_chrome_browser_resources_history_in_files extra_deps += brave_deps_chrome_browser_resources_history_extra_deps } - - copy("copy_history_clusters_mojom") { diff --git a/patches/chrome-browser-resources-history-history.ts.patch b/patches/chrome-browser-resources-history-history.ts.patch index a195678e7e7cd..aa0e591c2a023 100644 --- a/patches/chrome-browser-resources-history-history.ts.patch +++ b/patches/chrome-browser-resources-history-history.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/history/history.ts b/chrome/browser/resources/history/history.ts -index bdada409b9e774b92350788186c6c2dfab40d023..31bff354c6d0ab4da248e3372637b5612b3d8692 100644 +index d14eb35c4e9f1a9be3762f7df2cd610b373cd1ba..018d26fcbb36e532e56acc1403a63d7bfbb6f41f 100644 --- a/chrome/browser/resources/history/history.ts +++ b/chrome/browser/resources/history/history.ts @@ -2,6 +2,8 @@ @@ -10,4 +10,4 @@ index bdada409b9e774b92350788186c6c2dfab40d023..31bff354c6d0ab4da248e3372637b561 +import './brave_overrides/index.js'; import './app.js'; - export {CrActionMenuElement} from 'chrome://resources/cr_elements/cr_action_menu/cr_action_menu.js'; + export {BrowserProxyImpl} from 'chrome://resources/cr_components/history_clusters/browser_proxy.js'; diff --git a/patches/chrome-browser-resources-settings-BUILD.gn.patch b/patches/chrome-browser-resources-settings-BUILD.gn.patch index 0d7fa9f11e0e7..22e9cdadd0276 100644 --- a/patches/chrome-browser-resources-settings-BUILD.gn.patch +++ b/patches/chrome-browser-resources-settings-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resources/settings/BUILD.gn -index d2a8621134f456b8b0c07b41639b35d8ce07d6ae..576f381bbfaa575ecb4fa49649062c95ff91012d 100644 +index 321252ecfe0534741342b7e46ed808952ce72ff6..05fda631c93e0f424ad11083777f144589b9d469 100644 --- a/chrome/browser/resources/settings/BUILD.gn +++ b/chrome/browser/resources/settings/BUILD.gn -@@ -122,6 +122,7 @@ generate_grd("build_grd") { +@@ -144,6 +144,7 @@ generate_grd("build_grd") { deps = [ ":build_ts" ] manifest_files = [ "$target_gen_dir/tsconfig.manifest" ] } @@ -10,7 +10,7 @@ index d2a8621134f456b8b0c07b41639b35d8ce07d6ae..576f381bbfaa575ecb4fa49649062c95 } preprocess_if_expr("preprocess") { -@@ -280,4 +281,6 @@ ts_library("build_ts") { +@@ -302,4 +303,6 @@ ts_library("build_ts") { ":preprocess", ":preprocess_generated", ] diff --git a/patches/chrome-browser-resources-settings-privacy_page-personalization_options.html.patch b/patches/chrome-browser-resources-settings-privacy_page-personalization_options.html.patch index a554fdaa27dcd..59d864296d013 100644 --- a/patches/chrome-browser-resources-settings-privacy_page-personalization_options.html.patch +++ b/patches/chrome-browser-resources-settings-privacy_page-personalization_options.html.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/privacy_page/personalization_options.html b/chrome/browser/resources/settings/privacy_page/personalization_options.html -index 9d35ae4a8be3f92fb0bd665eb08558bea65ba0c6..628d2aabcf87bccbd543c7184a27c2b068264761 100644 +index 9d35ae4a8be3f92fb0bd665eb08558bea65ba0c6..45dbd3294be447d1820b6701e552fb4ed27fed4b 100644 --- a/chrome/browser/resources/settings/privacy_page/personalization_options.html +++ b/chrome/browser/resources/settings/privacy_page/personalization_options.html @@ -13,6 +13,7 @@ @@ -18,26 +18,24 @@ index 9d35ae4a8be3f92fb0bd665eb08558bea65ba0c6..628d2aabcf87bccbd543c7184a27c2b0 + -+ - -+ + @@ -45,7 +43,7 @@ index 9d35ae4a8be3f92fb0bd665eb08558bea65ba0c6..628d2aabcf87bccbd543c7184a27c2b0 @@ -53,7 +51,7 @@ index 9d35ae4a8be3f92fb0bd665eb08558bea65ba0c6..628d2aabcf87bccbd543c7184a27c2b0 diff --git a/patches/chrome-browser-resources-settings-privacy_page-personalization_options.ts.patch b/patches/chrome-browser-resources-settings-privacy_page-personalization_options.ts.patch index ce7b5b7e00d92..46bd1736d0294 100644 --- a/patches/chrome-browser-resources-settings-privacy_page-personalization_options.ts.patch +++ b/patches/chrome-browser-resources-settings-privacy_page-personalization_options.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/privacy_page/personalization_options.ts b/chrome/browser/resources/settings/privacy_page/personalization_options.ts -index e6deebea7f7098e2e2a2233de789e6ec616ff3d6..500d6eb5c0a504b5407481598dba816fc505585f 100644 +index e6deebea7f7098e2e2a2233de789e6ec616ff3d6..55cf762b72f68c8a87675f8c950043c511343f0e 100644 --- a/chrome/browser/resources/settings/privacy_page/personalization_options.ts +++ b/chrome/browser/resources/settings/privacy_page/personalization_options.ts @@ -74,7 +74,7 @@ export class SettingsPersonalizationOptionsElement extends @@ -7,7 +7,7 @@ index e6deebea7f7098e2e2a2233de789e6ec616ff3d6..500d6eb5c0a504b5407481598dba816f syncStatus: Object, - // -+ // ++ // // TODO(dbeam): make a virtual.* pref namespace and set/get this normally // (but handled differently in C++). metricsReportingPref_: { @@ -16,7 +16,7 @@ index e6deebea7f7098e2e2a2233de789e6ec616ff3d6..500d6eb5c0a504b5407481598dba816f syncStatus: SyncStatus; - // -+ // ++ // private metricsReportingPref_: chrome.settingsPrivate.PrefObject; private showRestart_: boolean; // @@ -25,7 +25,7 @@ index e6deebea7f7098e2e2a2233de789e6ec616ff3d6..500d6eb5c0a504b5407481598dba816f super.ready(); - // -+ // ++ // const setMetricsReportingPref = (metricsReporting: MetricsReporting) => this.setMetricsReportingPref_(metricsReporting); this.addWebUIListener('metrics-reporting-change', setMetricsReportingPref); @@ -34,7 +34,7 @@ index e6deebea7f7098e2e2a2233de789e6ec616ff3d6..500d6eb5c0a504b5407481598dba816f // - // -+ // ++ // private onMetricsReportingChange_() { const enabled = this.$.metricsReportingControl.checked; this.browserProxy_.setMetricsReportingEnabled(enabled); diff --git a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch index 0b72c335f4d40..7287c5f599089 100644 --- a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch +++ b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html -index 05d8339f1b579b5f0dc7300052c654f9bc6a8ccf..9a13e4ad8a1cfa91f450fb9bd44eedeca1c54796 100644 +index 248f9d9a319e9d3b31f1d208b39569214d49c875..5b56f2f715e5f2769b00ab1ce0b4d68768e75496 100644 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html @@ -45,6 +45,7 @@ diff --git a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.ts.patch b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.ts.patch index f286996624413..98776c32c00fe 100644 --- a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.ts.patch +++ b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.ts b/chrome/browser/resources/settings/privacy_page/privacy_page.ts -index a849f644e2c7241067b2a774ad950e3ac4a19a91..a669dd94e03cc54401e66a55f07a525581648c97 100644 +index 3fadcedf7ee6609ba363d12717256782a46ed73f..a6566b221460d8f663cd9ca165eb723f03cc15a9 100644 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.ts +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.ts @@ -20,6 +20,7 @@ import '../site_settings/site_data_details_subpage.js'; diff --git a/patches/chrome-browser-resources-settings-privacy_page-privacy_page_browser_proxy.ts.patch b/patches/chrome-browser-resources-settings-privacy_page-privacy_page_browser_proxy.ts.patch index d65954c7b716a..7eb05a8d0f4c7 100644 --- a/patches/chrome-browser-resources-settings-privacy_page-privacy_page_browser_proxy.ts.patch +++ b/patches/chrome-browser-resources-settings-privacy_page-privacy_page_browser_proxy.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page_browser_proxy.ts b/chrome/browser/resources/settings/privacy_page/privacy_page_browser_proxy.ts -index 430e9efa0ec7b4842ef293f274d72b2d276612f9..80e9e6a989f0a57adde019a44c3a208c2fe3dfa3 100644 +index 430e9efa0ec7b4842ef293f274d72b2d276612f9..125fff5f4649c701cbd534866383d97ce70aed8e 100644 --- a/chrome/browser/resources/settings/privacy_page/privacy_page_browser_proxy.ts +++ b/chrome/browser/resources/settings/privacy_page/privacy_page_browser_proxy.ts @@ -46,7 +46,7 @@ export type SecureDnsSetting = { @@ -7,7 +7,7 @@ index 430e9efa0ec7b4842ef293f274d72b2d276612f9..80e9e6a989f0a57adde019a44c3a208c export interface PrivacyPageBrowserProxy { - // -+ // ++ // getMetricsReporting(): Promise; setMetricsReportingEnabled(enabled: boolean): void; @@ -16,7 +16,7 @@ index 430e9efa0ec7b4842ef293f274d72b2d276612f9..80e9e6a989f0a57adde019a44c3a208c export class PrivacyPageBrowserProxyImpl implements PrivacyPageBrowserProxy { - // -+ // ++ // getMetricsReporting() { return sendWithPromise('getMetricsReporting'); } diff --git a/patches/chrome-browser-resources-settings-route.ts.patch b/patches/chrome-browser-resources-settings-route.ts.patch index 25af2cf3da4d6..25a4800f853fa 100644 --- a/patches/chrome-browser-resources-settings-route.ts.patch +++ b/patches/chrome-browser-resources-settings-route.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resources/settings/route.ts -index 9479290e7974b2abff7729ee862fbbe5eb37745c..543f67045e3d765918382affe472702f2e775d62 100644 +index fdba8d4db78727a4b580f4770b8e2e66a66c2b99..9f02ed90916b9151f795bdf0454cd3e0a796f265 100644 --- a/chrome/browser/resources/settings/route.ts +++ b/chrome/browser/resources/settings/route.ts @@ -8,6 +8,7 @@ import {pageVisibility} from './page_visibility.js'; @@ -10,7 +10,7 @@ index 9479290e7974b2abff7729ee862fbbe5eb37745c..543f67045e3d765918382affe472702f /** * Add all of the child routes that originate from the privacy route, * regardless of whether the privacy section under basic or advanced. -@@ -218,6 +219,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes { +@@ -220,6 +221,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes { // } } diff --git a/patches/chrome-browser-resources-settings-settings.ts.patch b/patches/chrome-browser-resources-settings-settings.ts.patch index 399c46b57797e..44f855366d195 100644 --- a/patches/chrome-browser-resources-settings-settings.ts.patch +++ b/patches/chrome-browser-resources-settings-settings.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/settings.ts b/chrome/browser/resources/settings/settings.ts -index 63bc7a50925003445443e8acac4508fd0ce43b97..3612ac6d40ccf0c256a2dcbe7ce81631c389187a 100644 +index f972cd3fba9db81e2fc4b84379c4ff2365fb39c3..77e052651d86b29a11e9d4404a6229f2be64fbd6 100644 --- a/chrome/browser/resources/settings/settings.ts +++ b/chrome/browser/resources/settings/settings.ts @@ -2,6 +2,7 @@ diff --git a/patches/chrome-browser-resources-settings-settings_routes.ts.patch b/patches/chrome-browser-resources-settings-settings_routes.ts.patch index d58c540a3a6b4..fcf4c72b0fa5f 100644 --- a/patches/chrome-browser-resources-settings-settings_routes.ts.patch +++ b/patches/chrome-browser-resources-settings-settings_routes.ts.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/settings/settings_routes.ts b/chrome/browser/resources/settings/settings_routes.ts -index 44e70ccce23153728f57962e36dec6b5e8568891..f0ccc9d5fe5c15f55b176919a3b1d24642e3c287 100644 +index a990b440ad4382a3a19300fc950f41c8dcb18f17..345a93a47708eeb196407e2a9f6d252df2136c26 100644 --- a/chrome/browser/resources/settings/settings_routes.ts +++ b/chrome/browser/resources/settings/settings_routes.ts -@@ -88,4 +88,5 @@ export type SettingsRoutes = { +@@ -89,4 +89,5 @@ export type SettingsRoutes = { SYNC_ADVANCED: Route, SYSTEM: Route, TRIGGERED_RESET_DIALOG: Route, diff --git a/patches/chrome-browser-resources-settings-site_settings-category_default_setting.ts.patch b/patches/chrome-browser-resources-settings-site_settings-category_default_setting.ts.patch index 22015935514ec..46cc8793d4f15 100644 --- a/patches/chrome-browser-resources-settings-site_settings-category_default_setting.ts.patch +++ b/patches/chrome-browser-resources-settings-site_settings-category_default_setting.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/site_settings/category_default_setting.ts b/chrome/browser/resources/settings/site_settings/category_default_setting.ts -index b09a0b36761817607989fe63588550eb548027a4..2c66270f5b06432c2d29111ef07f4dd5a217b5af 100644 +index 3d6137647ab6f4584c29f81e7609505086b36297..9b8ed65a65fe3e47f0456c254454bf5345c537bd 100644 --- a/chrome/browser/resources/settings/site_settings/category_default_setting.ts +++ b/chrome/browser/resources/settings/site_settings/category_default_setting.ts @@ -184,6 +184,7 @@ export class CategoryDefaultSettingElement extends @@ -8,9 +8,9 @@ index b09a0b36761817607989fe63588550eb548027a4..2c66270f5b06432c2d29111ef07f4dd5 case ContentSettingsTypes.ADS: + case ContentSettingsTypes.AUTOPLAY: case ContentSettingsTypes.BACKGROUND_SYNC: + case ContentSettingsTypes.FEDERATED_IDENTITY_API: case ContentSettingsTypes.IMAGES: - case ContentSettingsTypes.JAVASCRIPT: -@@ -217,6 +218,7 @@ export class CategoryDefaultSettingElement extends +@@ -218,6 +219,7 @@ export class CategoryDefaultSettingElement extends case ContentSettingsTypes.USB_DEVICES: case ContentSettingsTypes.VR: case ContentSettingsTypes.WINDOW_PLACEMENT: diff --git a/patches/chrome-browser-resources-settings-site_settings-constants.ts.patch b/patches/chrome-browser-resources-settings-site_settings-constants.ts.patch index 633e188726cbd..b0e39d267b210 100644 --- a/patches/chrome-browser-resources-settings-site_settings-constants.ts.patch +++ b/patches/chrome-browser-resources-settings-site_settings-constants.ts.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/settings/site_settings/constants.ts b/chrome/browser/resources/settings/site_settings/constants.ts -index f0c43b2b42618f930e2269eb50ecdc81c096ad04..1369c2634942f7f7501b699f68f27f3a8f79a158 100644 +index a9dee83d2102f73f88f47700011e0213c870abdc..92b07227a61f8186644594182eaafcb82602fff6 100644 --- a/chrome/browser/resources/settings/site_settings/constants.ts +++ b/chrome/browser/resources/settings/site_settings/constants.ts -@@ -45,6 +45,7 @@ export enum ContentSettingsTypes { +@@ -46,6 +46,7 @@ export enum ContentSettingsTypes { // The following item is not in the C++ kContentSettingsTypeGroupNames, but it // is used everywhere where ContentSettingsTypes is used in JS. PDF_DOCUMENTS = 'pdfDocuments', diff --git a/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.ts.patch b/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.ts.patch index 78a3e47276d46..0242c416eec83 100644 --- a/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.ts.patch +++ b/patches/chrome-browser-resources-settings-site_settings_page-site_settings_page.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts -index 5edd5c2c941dbe50be15f20a0bbcad0e75de249f..73f5c38430fa5afacc92bb1eddc97dde70fe25a7 100644 +index 0a0189306e7a371f377ca3fa2d13c334c8935d6b..66bfd3ce67cf39d88d369d994a1bd2f5569373f9 100644 --- a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts +++ b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts @@ -8,6 +8,7 @@ diff --git a/patches/chrome-browser-resources-signin-profile_picker-profile_picker_main_view.ts.patch b/patches/chrome-browser-resources-signin-profile_picker-profile_picker_main_view.ts.patch index 28581128bb776..2c2a42c507c36 100644 --- a/patches/chrome-browser-resources-signin-profile_picker-profile_picker_main_view.ts.patch +++ b/patches/chrome-browser-resources-signin-profile_picker-profile_picker_main_view.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.ts b/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.ts -index 59ffdbc4f1695d9970d9e43e62b231ad58bbc79f..301da4950960229b27a8caeaeccb3d61a74504e1 100644 +index 014a4ff7b261f3e5e19025b24764fb2a0ee7c595..66fcdf0c083718b9dea307eda53818b15ed0c975 100644 --- a/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.ts +++ b/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.ts @@ -95,6 +95,7 @@ export class ProfilePickerMainViewElement extends diff --git a/patches/chrome-browser-sync-sync_service_factory.cc.patch b/patches/chrome-browser-sync-sync_service_factory.cc.patch index 99266d4da5b84..9ada81ef02614 100644 --- a/patches/chrome-browser-sync-sync_service_factory.cc.patch +++ b/patches/chrome-browser-sync-sync_service_factory.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/sync/sync_service_factory.cc b/chrome/browser/sync/sync_service_factory.cc -index b0b549e12f4f7c0ade8dd104048a4f4f77dc1273..ae12edaba89dabec18b4d38f0e78b6f73e00e171 100644 +index ac1fca31a1be7187808c9d1a4969c98a767c9cab..7c7e3623f92210449eae50fb76f5a122f928abf7 100644 --- a/chrome/browser/sync/sync_service_factory.cc +++ b/chrome/browser/sync/sync_service_factory.cc -@@ -161,7 +161,7 @@ std::unique_ptr BuildSyncService( +@@ -162,7 +162,7 @@ std::unique_ptr BuildSyncService( } auto sync_service = diff --git a/patches/chrome-browser-ui-BUILD.gn.patch b/patches/chrome-browser-ui-BUILD.gn.patch index 5814b42173483..8b1c9d13ce725 100644 --- a/patches/chrome-browser-ui-BUILD.gn.patch +++ b/patches/chrome-browser-ui-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn -index 3480cadf84faf1897ebf25414a6e5e2c45587cff..1bc69b4d501578e8dd5f84155ef198dc979f9d1f 100644 +index 19d419331ef0ed4ecfb743e03af7df8ec0aa95d3..babea0f6303137bdfe93b72105aacc6c22e9de89 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -658,6 +658,7 @@ static_library("ui") { +@@ -663,6 +663,7 @@ static_library("ui") { "//ui/webui", "//v8:v8_version", ] @@ -10,7 +10,7 @@ index 3480cadf84faf1897ebf25414a6e5e2c45587cff..1bc69b4d501578e8dd5f84155ef198dc # TODO(crbug/925153): Remove this circular dependency. allow_circular_includes_from = [ -@@ -3846,10 +3847,13 @@ static_library("ui") { +@@ -3848,10 +3849,13 @@ static_library("ui") { ] deps += [ "//google_update" ] } else { diff --git a/patches/chrome-browser-ui-android-appmenu-internal-BUILD.gn.patch b/patches/chrome-browser-ui-android-appmenu-internal-BUILD.gn.patch index 0d80815fa11b0..10bbdf4d87736 100644 --- a/patches/chrome-browser-ui-android-appmenu-internal-BUILD.gn.patch +++ b/patches/chrome-browser-ui-android-appmenu-internal-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/android/appmenu/internal/BUILD.gn b/chrome/browser/ui/android/appmenu/internal/BUILD.gn -index 7f178a0bb8adbd5e13bb35656526313aa716c70a..4b756e86dbe046169748ebb9cdaa005b18ba51a5 100644 +index 0eb54cd0a337207ecd50e8ba5fcd446bf02ccc12..562c76488e4e3388dabd4f7e11ee8ea13614ceef 100644 --- a/chrome/browser/ui/android/appmenu/internal/BUILD.gn +++ b/chrome/browser/ui/android/appmenu/internal/BUILD.gn @@ -21,6 +21,7 @@ android_library("java") { diff --git a/patches/chrome-browser-ui-android-appmenu-internal-java-src-org-chromium-chrome-browser-ui-appmenu-AppMenu.java.patch b/patches/chrome-browser-ui-android-appmenu-internal-java-src-org-chromium-chrome-browser-ui-appmenu-AppMenu.java.patch index 7a6a5d77ff3b9..2aac5464c1ab8 100644 --- a/patches/chrome-browser-ui-android-appmenu-internal-java-src-org-chromium-chrome-browser-ui-appmenu-AppMenu.java.patch +++ b/patches/chrome-browser-ui-android-appmenu-internal-java-src-org-chromium-chrome-browser-ui-appmenu-AppMenu.java.patch @@ -1,11 +1,11 @@ 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 -index d284e045a72b59938c67b9ef8e17bf03b3be78c1..98dff6365fa735f27a4a33861e73f89bb2930c6b 100644 +index 22eca15a5bc74f2f62d00bfe8ce085f86c28949d..c6800957f260e93a1da7f352c7b39d3218eaf67a 100644 --- 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 -@@ -220,6 +220,7 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler - mPopup.setOutsideTouchable(true); - - if (!isByPermanentButton) mPopup.setAnimationStyle(R.style.EndIconMenuAnim); +@@ -225,6 +225,7 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler + mPopup.setAnimationStyle( + isMenuIconAtStart ? R.style.StartIconMenuAnim : R.style.EndIconMenuAnim); + } + if (!isByPermanentButton) mPopup.setAnimationStyle(BraveAppMenu.getAnimationStyle()); // Turn off window animations for low end devices. diff --git a/patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch b/patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch index ae7c37a48af39..8fcf04f0f4ae0 100644 --- a/patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch +++ b/patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/android/toolbar/BUILD.gn b/chrome/browser/ui/android/toolbar/BUILD.gn -index d9fe7ba2585193d52106a7c501b2ab9b1a104b07..d61b9cb5235c6c5241c6ea200e6e56b5964d8e2a 100644 +index 2c3ce5f8d1002a6c25f76a5f4e4e107a337b41be..56cc2542cfe193bf14e45c328872a28bdac18dc1 100644 --- a/chrome/browser/ui/android/toolbar/BUILD.gn +++ b/chrome/browser/ui/android/toolbar/BUILD.gn -@@ -97,6 +97,7 @@ android_library("java") { +@@ -98,6 +98,7 @@ android_library("java") { "java/src/org/chromium/chrome/browser/toolbar/top/TopToolbarSceneLayer.java", "java/src/org/chromium/chrome/browser/toolbar/top/ViewShiftingActionBarDelegate.java", ] diff --git a/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch b/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch index a51ead2bcaf32..223c38e99b101 100644 --- a/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch +++ b/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java -index ec510f1ed886ea21a1ea28f48e31c3e35cac75ae..c0911dd50f42c84da5b612caac086580f4b5e31f 100644 +index deaabb2adebb846be31daee4b6c05593aed1d6b5..ccc3d9d48ba8e527936daf4b1c55183dabb2cbd1 100644 --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java @@ -426,6 +426,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC @@ -34,7 +34,7 @@ index ec510f1ed886ea21a1ea28f48e31c3e35cac75ae..c0911dd50f42c84da5b612caac086580 TraceEvent.begin("ToolbarPhone.updateLocationBarLayoutForExpansionAnimation"); FrameLayout.LayoutParams locationBarLayoutParams = mLocationBar.getPhoneCoordinator().getFrameLayoutParams(); -@@ -2155,6 +2159,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC +@@ -2148,6 +2152,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC } else { populateUrlClearExpansionAnimatorSet(animators); } diff --git a/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch b/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch index ad3323e5ffbce..ea506080c0a08 100644 --- a/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch +++ b/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java -index 8bc757f8ddb15eb8d191da7d5376d2186deb1d7b..41eb5daee0fe7cd956704447e8a8eeaa8393dcfb 100644 +index d45b30cfbdd3049ce23f6ee0ab2d055059cb1d59..65c6f4d7fb8fef66276894cf045faa79c8a351b0 100644 --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java -@@ -348,10 +348,12 @@ public class ToolbarTablet extends ToolbarLayout +@@ -347,10 +347,12 @@ public class ToolbarTablet mOfflineDownloader.downloadPage(getContext(), getToolbarDataProvider().getTab()); RecordUserAction.record("MobileToolbarDownloadPage"); } @@ -15,7 +15,7 @@ index 8bc757f8ddb15eb8d191da7d5376d2186deb1d7b..41eb5daee0fe7cd956704447e8a8eeaa String description = null; Context context = getContext(); Resources resources = context.getResources(); -@@ -427,6 +429,7 @@ public class ToolbarTablet extends ToolbarLayout +@@ -426,6 +428,7 @@ public class ToolbarTablet mLocationBar.getTabletCoordinator().getBackground().setTint(textBoxColor); mLocationBar.updateVisualsForState(); setToolbarHairlineColor(color); diff --git a/patches/chrome-browser-ui-browser.cc.patch b/patches/chrome-browser-ui-browser.cc.patch index 8cbc1b1e72341..dd8302561c7cd 100644 --- a/patches/chrome-browser-ui-browser.cc.patch +++ b/patches/chrome-browser-ui-browser.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc -index 7548e63c57dc8463cb59614122e32c574ae17437..fb0972c14a103e010e3fdc0b64a8f5a6810bb611 100644 +index fe7fafc5ee148c9e7c47fc1a3df870565ccbcdae..7d95960ac3fcac39df5a0eb01a8c9caf480989e1 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc -@@ -446,6 +446,7 @@ Browser* Browser::Create(const CreateParams& params) { +@@ -451,6 +451,7 @@ Browser* Browser::Create(const CreateParams& params) { // not possible, e.g. using the wrong profile or during shutdown. The caller // should handle this; see e.g. crbug.com/1141608 and crbug.com/1261628. CHECK_EQ(CreationStatus::kOk, GetCreationStatusForProfile(params.profile)); @@ -10,7 +10,7 @@ index 7548e63c57dc8463cb59614122e32c574ae17437..fb0972c14a103e010e3fdc0b64a8f5a6 return new Browser(params); } -@@ -456,7 +457,7 @@ Browser::Browser(const CreateParams& params) +@@ -461,7 +462,7 @@ Browser::Browser(const CreateParams& params) window_(nullptr), tab_strip_model_delegate_( std::make_unique(this)), diff --git a/patches/chrome-browser-ui-browser.h.patch b/patches/chrome-browser-ui-browser.h.patch deleted file mode 100644 index c43c57ea437b9..0000000000000 --- a/patches/chrome-browser-ui-browser.h.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h -index 5edda102ff59ccb30d2150a88e75e8fb65379fca..0e4efc0d13a9bcf33e09b195b54780193ae523ce 100644 ---- a/chrome/browser/ui/browser.h -+++ b/chrome/browser/ui/browser.h -@@ -718,6 +718,7 @@ class Browser : public TabStripModelObserver, - - StatusBubble* GetStatusBubbleForTesting(); - -+ BRAVE_BROWSER_H - private: - friend class BrowserTest; - friend class ExclusiveAccessTest; diff --git a/patches/chrome-browser-ui-browser_navigator.cc.patch b/patches/chrome-browser-ui-browser_navigator.cc.patch index 15504aade24a3..40e687f0e43e3 100644 --- a/patches/chrome-browser-ui-browser_navigator.cc.patch +++ b/patches/chrome-browser-ui-browser_navigator.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc -index a1680f4c54a575c9393aa494c9441b6e6bc3e87d..dd14a6837f98ce2b29d82ee9544b83c38ce31862 100644 +index fd72594b74be082fa83c7e5835a1e7129ff782ed..1a7988478ed539855f22ae811f2476ac18957c7c 100644 --- a/chrome/browser/ui/browser_navigator.cc +++ b/chrome/browser/ui/browser_navigator.cc -@@ -534,6 +534,7 @@ base::WeakPtr Navigate(NavigateParams* params) { +@@ -552,6 +552,7 @@ base::WeakPtr Navigate(NavigateParams* params) { // Block any navigation requests in locked fullscreen mode. return nullptr; } @@ -10,7 +10,7 @@ index a1680f4c54a575c9393aa494c9441b6e6bc3e87d..dd14a6837f98ce2b29d82ee9544b83c3 // Open System Apps in their standalone window if necessary. // TODO(crbug.com/1096345): Remove this code after we integrate with intent -@@ -825,6 +826,7 @@ base::WeakPtr Navigate(NavigateParams* params) { +@@ -839,6 +840,7 @@ base::WeakPtr Navigate(NavigateParams* params) { bool IsHostAllowedInIncognito(const GURL& url) { std::string scheme = url.scheme(); base::StringPiece host = url.host_piece(); diff --git a/patches/chrome-browser-ui-chrome_pages.cc.patch b/patches/chrome-browser-ui-chrome_pages.cc.patch index c14b0b3478a3e..d31b31b17b74d 100644 --- a/patches/chrome-browser-ui-chrome_pages.cc.patch +++ b/patches/chrome-browser-ui-chrome_pages.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc -index 903981316df0626134f28c78279b44e28d913bd6..1561bb6ccbf56508db819eba5b42cd62f0c07ca8 100644 +index c0dbfc9814c5e816b269f83c13d7d82797cff16a..97a777e2fa3ec8fb35b4793e4d0b4a4097242938 100644 --- a/chrome/browser/ui/chrome_pages.cc +++ b/chrome/browser/ui/chrome_pages.cc @@ -326,7 +326,7 @@ void ShowSlow(Browser* browser) { diff --git a/patches/chrome-browser-ui-cocoa-accelerators_cocoa.mm.patch b/patches/chrome-browser-ui-cocoa-accelerators_cocoa.mm.patch index 4d2c1a0363580..0ed9eb836938d 100644 --- a/patches/chrome-browser-ui-cocoa-accelerators_cocoa.mm.patch +++ b/patches/chrome-browser-ui-cocoa-accelerators_cocoa.mm.patch @@ -2,7 +2,7 @@ diff --git a/chrome/browser/ui/cocoa/accelerators_cocoa.mm b/chrome/browser/ui/c index c76c8571b836b3b7c32eecda158f75878b80b302..737a5864eb4f0c379221274bec03105190ef96d5 100644 --- a/chrome/browser/ui/cocoa/accelerators_cocoa.mm +++ b/chrome/browser/ui/cocoa/accelerators_cocoa.mm -@@ -40,6 +40,8 @@ const struct AcceleratorMapping { +@@ -40,6 +40,8 @@ ui::VKEY_N}, {IDC_NEW_TAB, ui::EF_COMMAND_DOWN, ui::VKEY_T}, {IDC_NEW_WINDOW, ui::EF_COMMAND_DOWN, ui::VKEY_N}, diff --git a/patches/chrome-browser-ui-cocoa-main_menu_builder.mm.patch b/patches/chrome-browser-ui-cocoa-main_menu_builder.mm.patch index bf24542bb3632..84ff179ad3a7a 100644 --- a/patches/chrome-browser-ui-cocoa-main_menu_builder.mm.patch +++ b/patches/chrome-browser-ui-cocoa-main_menu_builder.mm.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/cocoa/main_menu_builder.mm b/chrome/browser/ui/cocoa/main_menu_builder.mm -index 6697543d2620d1962ab249cf6bcb821d4c26c2ff..424f9f65a3712935efaee17b1879a5868965deb8 100644 +index 9b3d5ab43e17e301f3021257d68d6a6949f5f642..30f0871f06df6c69b5685f5273b6530e2b4327f2 100644 --- a/chrome/browser/ui/cocoa/main_menu_builder.mm +++ b/chrome/browser/ui/cocoa/main_menu_builder.mm -@@ -108,6 +108,7 @@ base::scoped_nsobject BuildFileMenu( +@@ -108,6 +108,7 @@ Item(IDS_NEW_INCOGNITO_WINDOW_MAC) .command_id(IDC_NEW_INCOGNITO_WINDOW) .remove_if(is_pwa), @@ -10,7 +10,7 @@ index 6697543d2620d1962ab249cf6bcb821d4c26c2ff..424f9f65a3712935efaee17b1879a586 Item(IDS_REOPEN_CLOSED_TABS_MAC) .command_id(IDC_RESTORE_TAB) .remove_if(is_pwa), -@@ -486,6 +487,7 @@ base::scoped_nsobject BuildHelpMenu( +@@ -486,6 +487,7 @@ #if BUILDFLAG(GOOGLE_CHROME_BRANDING) Item(IDS_FEEDBACK_MAC).command_id(IDC_FEEDBACK), #endif diff --git a/patches/chrome-browser-ui-dialogs-outdated_upgrade_bubble.cc.patch b/patches/chrome-browser-ui-dialogs-outdated_upgrade_bubble.cc.patch index b91a9151034f6..a64159338de86 100644 --- a/patches/chrome-browser-ui-dialogs-outdated_upgrade_bubble.cc.patch +++ b/patches/chrome-browser-ui-dialogs-outdated_upgrade_bubble.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc b/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc -index cad7eb15562d153e0eaa3f021a15f82bb6ccc3f0..295cae4547432a1b3432b27c53c7aeefbb36f125 100644 +index ed846b5561504e9759d2d015f9ea2d64c75079e7..aa31054665a2dc060939cb21983359649f0587af 100644 --- a/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc +++ b/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc @@ -42,6 +42,8 @@ constexpr int kNumIgnoredBuckets = 5; diff --git a/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch b/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch index f26ce6fb3b34e..0147b84f6b690 100644 --- a/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch +++ b/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc -index 5e36094865df680847aa80d3389568bf93c4af1b..45fe0639f77ef5dc59a6dfd4d5b1298b796194b5 100644 +index e408c0d6504590ea0182038daa1d27269892c169..d73d21c5cca4c541f22641e02afb1e774e6d88f5 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc -@@ -377,6 +377,7 @@ StartupBrowserCreatorImpl::DetermineURLsAndLaunch( +@@ -378,6 +378,7 @@ StartupBrowserCreatorImpl::DetermineURLsAndLaunch( #elif !BUILDFLAG(IS_CHROMEOS_ASH) welcome_enabled = welcome::IsEnabled(profile_) && welcome::HasModulesToShow(profile_); diff --git a/patches/chrome-browser-ui-tab_helpers.cc.patch b/patches/chrome-browser-ui-tab_helpers.cc.patch index 3d5f40f9d9b4e..ed8a12df750f8 100644 --- a/patches/chrome-browser-ui-tab_helpers.cc.patch +++ b/patches/chrome-browser-ui-tab_helpers.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc -index 4b12f532e19ecf81fadf1d94eda8f527aeaab57b..42fe93366438eb9be92d5eca302bd44c9514a528 100644 +index 04f4b69b72f7d0c29f546c7d0ac8d7d2ccc8823d..b40385cfb1b922876bd782889d930eee5a192ac2 100644 --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc -@@ -636,4 +636,5 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { +@@ -641,4 +641,5 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { // This is common code for all of us. PLEASE DO YOUR PART to keep it tidy and // organized. diff --git a/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch b/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch index 4b7d07b7a0a8d..bb09fed5c8a68 100644 --- a/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch +++ b/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch @@ -1,12 +1,12 @@ diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc -index 233e0a48c98a1be970c83b1df0d11c04696b584a..fbdfc2fd3bcc5613755bfb75e0f59be2b50f7fb9 100644 +index 2b7a0c04c0e4582a27e20d04dea1da416c16baee..beddda5b42cec3719d58aee88bad3afb40c281fe 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc -@@ -975,6 +975,7 @@ void BookmarkBarView::Layout() { +@@ -846,6 +846,7 @@ void BookmarkBarView::Layout() { x = next_x; } } + BRAVE_LAYOUT - // Only render the tab group separtor if there are groups and bookmarks - // visible. Must done after the bookmark buttons are rendered. + // Set the visibility of the tab group separator if there are groups and + // bookmarks. diff --git a/patches/chrome-browser-ui-views-bookmarks-bookmark_bubble_view.cc.patch b/patches/chrome-browser-ui-views-bookmarks-bookmark_bubble_view.cc.patch index 173fcad06cc74..9b6ac72ed8f25 100644 --- a/patches/chrome-browser-ui-views-bookmarks-bookmark_bubble_view.cc.patch +++ b/patches/chrome-browser-ui-views-bookmarks-bookmark_bubble_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc -index 223969a63b452b8ce228d64e5afba22feb4ac081..c92be32acb8335565027e3793d57be1ab7304607 100644 +index a139b33ce534ed5197a3913404a5ad34f4659d12..c3e96f523395f0e9a1c526e5d2378f09d51a19c5 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc -@@ -228,6 +228,7 @@ void BookmarkBubbleView::ShowBubble( +@@ -227,6 +227,7 @@ void BookmarkBubbleView::ShowBubble( auto bubble = std::make_unique( std::move(dialog_model), anchor_view, views::BubbleBorder::TOP_RIGHT); bookmark_bubble_ = bubble.get(); diff --git a/patches/chrome-browser-ui-views-extensions-extension_popup.cc.patch b/patches/chrome-browser-ui-views-extensions-extension_popup.cc.patch index ed25ab9392728..ce646e8c65c6b 100644 --- a/patches/chrome-browser-ui-views-extensions-extension_popup.cc.patch +++ b/patches/chrome-browser-ui-views-extensions-extension_popup.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/extensions/extension_popup.cc b/chrome/browser/ui/views/extensions/extension_popup.cc -index 273f903df336349cc639922f0b6acbfe957cae1b..58590fdc2d7318f52a7a5868683985b4901fc5c3 100644 +index 772d8d74e57bcf8acb17e12b3d90b5dfcfb494c1..a49a458d322400310d45ce55478b5a60bb8e2587 100644 --- a/chrome/browser/ui/views/extensions/extension_popup.cc +++ b/chrome/browser/ui/views/extensions/extension_popup.cc -@@ -106,7 +106,7 @@ gfx::Size ExtensionPopup::CalculatePreferredSize() const { +@@ -114,7 +114,7 @@ gfx::Size ExtensionPopup::CalculatePreferredSize() const { void ExtensionPopup::AddedToWidget() { BubbleDialogDelegateView::AddedToWidget(); diff --git a/patches/chrome-browser-ui-views-frame-browser_view.h.patch b/patches/chrome-browser-ui-views-frame-browser_view.h.patch deleted file mode 100644 index a961d2cd81233..0000000000000 --- a/patches/chrome-browser-ui-views-frame-browser_view.h.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h -index c380e63f2f7ac8304dda02dc0de871a87117a8d1..52d48d17199bb71b09b70dab12907ba1b9a862b8 100644 ---- a/chrome/browser/ui/views/frame/browser_view.h -+++ b/chrome/browser/ui/views/frame/browser_view.h -@@ -749,6 +749,7 @@ class BrowserView : public BrowserWindow, - const std::map& extra_data) override; - #endif - -+ BRAVE_BROWSER_VIEW_H - private: - // Do not friend BrowserViewLayout. Use the BrowserViewLayoutDelegate - // interface to keep these two classes decoupled and testable. diff --git a/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch b/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch index dacccc0c6addb..4d27e9e9a29eb 100644 --- a/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch +++ b/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc -index 1fd07f8e4dcda2e9f403b78f7460287e613345f0..2fa73ab52d49bbf15e9a0993ae0aab4c971e0116 100644 +index 8928c561b87e598275f67379f2527e0cc900b404..6fddb4676ce1c80cd9186ea7267035111f88b30f 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc -@@ -669,6 +669,7 @@ void LocationBarView::Layout() { +@@ -664,6 +664,7 @@ void LocationBarView::Layout() { } }; diff --git a/patches/chrome-browser-ui-views-location_bar-location_icon_view.cc.patch b/patches/chrome-browser-ui-views-location_bar-location_icon_view.cc.patch index 6d241bdccf31f..68f71d4d730ba 100644 --- a/patches/chrome-browser-ui-views-location_bar-location_icon_view.cc.patch +++ b/patches/chrome-browser-ui-views-location_bar-location_icon_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/location_bar/location_icon_view.cc b/chrome/browser/ui/views/location_bar/location_icon_view.cc -index a3cc4f7b28941e8b56cc8d9af09f0a80583fd4a1..b93b7b23085fa9682f559228689376e3983f1d3d 100644 +index 8f196b1f1231da9e78ceafd254eafd1d5059532f..8021989767c0005a2c14e4cfbc1438496ba56337 100644 --- a/chrome/browser/ui/views/location_bar/location_icon_view.cc +++ b/chrome/browser/ui/views/location_bar/location_icon_view.cc -@@ -149,6 +149,7 @@ bool LocationIconView::GetShowText() const { +@@ -139,6 +139,7 @@ bool LocationIconView::GetShowText() const { const auto* location_bar_model = delegate_->GetLocationBarModel(); const GURL& url = location_bar_model->GetURL(); if (url.SchemeIs(content::kChromeUIScheme) || diff --git a/patches/chrome-browser-ui-views-overlay-overlay_window_views.cc.patch b/patches/chrome-browser-ui-views-overlay-overlay_window_views.cc.patch index 6476f307da4b7..e6c421b64e9b4 100644 --- a/patches/chrome-browser-ui-views-overlay-overlay_window_views.cc.patch +++ b/patches/chrome-browser-ui-views-overlay-overlay_window_views.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/overlay/overlay_window_views.cc b/chrome/browser/ui/views/overlay/overlay_window_views.cc -index 850b34e3b40f7ff1848c66158976db079e0853bd..347dfd9ab4fd933fd27d55ffd9371b30d2fbb148 100644 +index 55b53039e4db6afa197fbb61c40d0a21095c5bf9..185acd998cb7d4a4733406456bd166e7e411d9dc 100644 --- a/chrome/browser/ui/views/overlay/overlay_window_views.cc +++ b/chrome/browser/ui/views/overlay/overlay_window_views.cc @@ -539,6 +539,7 @@ void OverlayWindowViews::UpdateMaxSize(const gfx::Rect& work_area) { diff --git a/patches/chrome-browser-ui-views-page_info-page_info_main_view.cc.patch b/patches/chrome-browser-ui-views-page_info-page_info_main_view.cc.patch index 1cb3143f7b066..891b005fa3d03 100644 --- a/patches/chrome-browser-ui-views-page_info-page_info_main_view.cc.patch +++ b/patches/chrome-browser-ui-views-page_info-page_info_main_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_main_view.cc b/chrome/browser/ui/views/page_info/page_info_main_view.cc -index 0641b5511129dee177ef75ef759b3638d62cd06d..5ae74532fabe1696d26637fa18425431a7b82c10 100644 +index 69b64c979094add398be0366cce574bb6d1dbe71..d2a12d3839c8d454e60a25c26d57ab184216df8b 100644 --- a/chrome/browser/ui/views/page_info/page_info_main_view.cc +++ b/chrome/browser/ui/views/page_info/page_info_main_view.cc -@@ -501,6 +501,7 @@ gfx::Size PageInfoMainView::CalculatePreferredSize() const { +@@ -509,6 +509,7 @@ gfx::Size PageInfoMainView::CalculatePreferredSize() const { if (site_settings_view_) { width = std::max(width, site_settings_view_->GetPreferredSize().width()); width = std::max(width, permissions_view_->GetPreferredSize().width()); diff --git a/patches/chrome-browser-ui-views-page_info-page_info_view_factory.cc.patch b/patches/chrome-browser-ui-views-page_info-page_info_view_factory.cc.patch index 93df800ddc2c9..a4ddc83e35519 100644 --- a/patches/chrome-browser-ui-views-page_info-page_info_view_factory.cc.patch +++ b/patches/chrome-browser-ui-views-page_info-page_info_view_factory.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_view_factory.cc b/chrome/browser/ui/views/page_info/page_info_view_factory.cc -index c6aefbb30b1ba96fbf247dd0d9922f9c01dc5092..0c4878000d7a61a4e2f8a6fd7a04156af15c0ab0 100644 +index 99ce641bb0201d28db22c0d2abc0026f5e838789..9ed7c17b62cb5b157609b65d5d3d1e9e487db162 100644 --- a/chrome/browser/ui/views/page_info/page_info_view_factory.cc +++ b/chrome/browser/ui/views/page_info/page_info_view_factory.cc @@ -223,6 +223,7 @@ const ui::ImageModel PageInfoViewFactory::GetPermissionIcon( diff --git a/patches/chrome-browser-ui-views-permission_bubble-permission_prompt_bubble_view.cc.patch b/patches/chrome-browser-ui-views-permission_bubble-permission_prompt_bubble_view.cc.patch index 47ec76f82e715..06af2a563738a 100644 --- a/patches/chrome-browser-ui-views-permission_bubble-permission_prompt_bubble_view.cc.patch +++ b/patches/chrome-browser-ui-views-permission_bubble-permission_prompt_bubble_view.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view.cc b/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view.cc -index e3da148c90f92e7d157cb6f040087c24f35378cb..98dd7599d2037d67769a0b38b68a4b6b1a4ffe43 100644 +index 04cc536ec001067a51b23000050dd709158ada7d..b184db3107c83020e2b4a30172b585badee58c39 100644 --- a/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view.cc +++ b/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view.cc @@ -140,6 +140,7 @@ PermissionPromptBubbleView::PermissionPromptBubbleView( diff --git a/patches/chrome-browser-ui-views-profiles-profile_menu_view.h.patch b/patches/chrome-browser-ui-views-profiles-profile_menu_view.h.patch index 08713ddf8a16e..d289302d52404 100644 --- a/patches/chrome-browser-ui-views-profiles-profile_menu_view.h.patch +++ b/patches/chrome-browser-ui-views-profiles-profile_menu_view.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/profiles/profile_menu_view.h b/chrome/browser/ui/views/profiles/profile_menu_view.h -index 2d2924ed918504a6c5038fe71dac658bedeaa4e2..660bc2a5b2e6d2daba80f0d70eff586cd1c31689 100644 +index 7981369bbd5c9d12fdefbdfa3d217f8d3bf041c0..31888bb9336df68e71d5717b1867fc0b62cac56c 100644 --- a/chrome/browser/ui/views/profiles/profile_menu_view.h +++ b/chrome/browser/ui/views/profiles/profile_menu_view.h @@ -46,6 +46,7 @@ class ProfileMenuView : public ProfileMenuViewBase { diff --git a/patches/chrome-browser-ui-views-profiles-profile_menu_view_base.h.patch b/patches/chrome-browser-ui-views-profiles-profile_menu_view_base.h.patch index 7ad8a054320a5..a074c3f71fbde 100644 --- a/patches/chrome-browser-ui-views-profiles-profile_menu_view_base.h.patch +++ b/patches/chrome-browser-ui-views-profiles-profile_menu_view_base.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/profiles/profile_menu_view_base.h b/chrome/browser/ui/views/profiles/profile_menu_view_base.h -index 745238a4edbe603f454c288a6b4385fceb690c89..828bbc40ac058e5dc4d696485a49910c803bc23e 100644 +index a7e54e38890f860873355d52126c42befe1a1e27..de18a1fe4db0ea529b3508bbc170967955c2a310 100644 --- a/chrome/browser/ui/views/profiles/profile_menu_view_base.h +++ b/chrome/browser/ui/views/profiles/profile_menu_view_base.h @@ -168,6 +168,7 @@ class ProfileMenuViewBase : public content::WebContentsDelegate, diff --git a/patches/chrome-browser-ui-views-send_tab_to_self-send_tab_to_self_bubble_view_impl.cc.patch b/patches/chrome-browser-ui-views-send_tab_to_self-send_tab_to_self_bubble_view_impl.cc.patch deleted file mode 100644 index 47399ad4cb534..0000000000000 --- a/patches/chrome-browser-ui-views-send_tab_to_self-send_tab_to_self_bubble_view_impl.cc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_bubble_view_impl.cc b/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_bubble_view_impl.cc -index 9b9b7959da3926360fa1a0e5dfd005f525b4ecfd..fb61eba55a30b01c0572232710550890a1501818 100644 ---- a/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_bubble_view_impl.cc -+++ b/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_bubble_view_impl.cc -@@ -138,6 +138,7 @@ void SendTabToSelfBubbleViewImpl::Init() { - CreateHintTextLabel(); - CreateDevicesScrollView(); - -+ BRAVE_SENT_TAB_TO_SELF_BUBBLE_VIEW_IMPL_INIT - AddChildView(std::make_unique()); - CreateManageDevicesLink(); - } diff --git a/patches/chrome-browser-ui-views-send_tab_to_self-send_tab_to_self_device_picker_bubble_view.cc.patch b/patches/chrome-browser-ui-views-send_tab_to_self-send_tab_to_self_device_picker_bubble_view.cc.patch new file mode 100644 index 0000000000000..9d1effeb57085 --- /dev/null +++ b/patches/chrome-browser-ui-views-send_tab_to_self-send_tab_to_self_device_picker_bubble_view.cc.patch @@ -0,0 +1,12 @@ +diff --git a/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_device_picker_bubble_view.cc b/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_device_picker_bubble_view.cc +index 7c4b7ee29b0ea87c0f6a540d13cc704550c316d7..7138aa8415a914e3b9c4d3ccff8713f3f4ae31c9 100644 +--- a/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_device_picker_bubble_view.cc ++++ b/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_device_picker_bubble_view.cc +@@ -140,6 +140,7 @@ void SendTabToSelfDevicePickerBubbleView::Init() { + CreateHintTextLabel(); + CreateDevicesScrollView(); + ++ BRAVE_SEND_TAB_TO_SELFDEVICE_PICKER_BUBBLE_VIEW_INIT + AddChildView(std::make_unique()); + CreateManageDevicesLink(); + } diff --git a/patches/chrome-browser-ui-views-tabs-new_tab_button.h.patch b/patches/chrome-browser-ui-views-tabs-new_tab_button.h.patch index 44528370fee5e..b462facb3156b 100644 --- a/patches/chrome-browser-ui-views-tabs-new_tab_button.h.patch +++ b/patches/chrome-browser-ui-views-tabs-new_tab_button.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/tabs/new_tab_button.h b/chrome/browser/ui/views/tabs/new_tab_button.h -index fb544dca5a3179efdec3773f64f333b8d5f849bf..215d9ac8c8b5eae82f47b687e7faf28703db124a 100644 +index f9c5f69e21e43a8bbe9c91a7c96336c5676e5f14..9fba22592fa324b5646299a7eb31b36aaed3c243 100644 --- a/chrome/browser/ui/views/tabs/new_tab_button.h +++ b/chrome/browser/ui/views/tabs/new_tab_button.h @@ -48,6 +48,7 @@ class NewTabButton : public views::ImageButton, diff --git a/patches/chrome-browser-ui-views-tabs-tab.cc.patch b/patches/chrome-browser-ui-views-tabs-tab.cc.patch index e323ba1e0feae..bfefc26436349 100644 --- a/patches/chrome-browser-ui-views-tabs-tab.cc.patch +++ b/patches/chrome-browser-ui-views-tabs-tab.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc -index e03a03546119162825661fcde9737fe2b8e316a9..2ac623f54401cad5b927875d701c1fabeb8408c8 100644 +index 7b4670597248635874b2b1650b1eae40fddb52e7..1888150f0ad27c60b19bc451c6a70eb7f78545e2 100644 --- a/chrome/browser/ui/views/tabs/tab.cc +++ b/chrome/browser/ui/views/tabs/tab.cc @@ -391,6 +391,7 @@ void Tab::Layout() { diff --git a/patches/chrome-browser-ui-views-tabs-tab_style_views.cc.patch b/patches/chrome-browser-ui-views-tabs-tab_style_views.cc.patch index 1d4d145a6ce2d..ffa79310c4413 100644 --- a/patches/chrome-browser-ui-views-tabs-tab_style_views.cc.patch +++ b/patches/chrome-browser-ui-views-tabs-tab_style_views.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/tabs/tab_style_views.cc b/chrome/browser/ui/views/tabs/tab_style_views.cc -index 1be54c5efa2f14fc71f90b051725b75bbd41f189..bf692089a8496102ddc093dd16fda37f2de4e235 100644 +index 4635a2fd158e16dbdd2f5ce6ac959026c49c6e0e..08ac6a898c0b949cc62fefcf28486267292ba13c 100644 --- a/chrome/browser/ui/views/tabs/tab_style_views.cc +++ b/chrome/browser/ui/views/tabs/tab_style_views.cc -@@ -73,6 +73,7 @@ class GM2TabStyle : public TabStyleViews { +@@ -74,6 +74,7 @@ class GM2TabStyle : public TabStyleViews { void HideHover(HideHoverStyle style) override; private: @@ -10,7 +10,7 @@ index 1be54c5efa2f14fc71f90b051725b75bbd41f189..bf692089a8496102ddc093dd16fda37f // Gets the bounds for the leading and trailing separators for a tab. SeparatorBounds GetSeparatorBounds(float scale) const; -@@ -287,6 +288,7 @@ SkPath GM2TabStyle::GetPath(PathType path_type, +@@ -288,6 +289,7 @@ SkPath GM2TabStyle::GetPath(PathType path_type, const ShapeModifier shape_modifier = GetShapeModifier(path_type); const bool extend_left_to_bottom = shape_modifier & kNoLowerLeftArc; const bool extend_right_to_bottom = shape_modifier & kNoLowerRightArc; @@ -18,7 +18,7 @@ index 1be54c5efa2f14fc71f90b051725b75bbd41f189..bf692089a8496102ddc093dd16fda37f SkPath path; -@@ -555,7 +557,7 @@ TabStyle::SeparatorBounds GM2TabStyle::GetSeparatorBounds(float scale) const { +@@ -565,7 +567,7 @@ TabStyle::SeparatorBounds GM2TabStyle::GetSeparatorBounds(float scale) const { separator_bounds.leading = gfx::RectF(aligned_bounds.x() + corner_radius, aligned_bounds.y() + @@ -27,7 +27,7 @@ index 1be54c5efa2f14fc71f90b051725b75bbd41f189..bf692089a8496102ddc093dd16fda37f separator_size.width(), separator_size.height()); separator_bounds.trailing = separator_bounds.leading; -@@ -925,12 +927,16 @@ void GM2TabStyle::PaintSeparators(gfx::Canvas* canvas) const { +@@ -935,12 +937,16 @@ void GM2TabStyle::PaintSeparators(gfx::Canvas* canvas) const { SK_AlphaOPAQUE)); }; diff --git a/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch b/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch index 7cf2e50480f2e..4fc77162c5001 100644 --- a/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch +++ b/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc -index 1ab19d8ef449316a4be072d3ed8f88a42a4e8eb6..eea63acd4417a93c084581f4a918a333e81c24fb 100644 +index b5ba130e6ed00e54d76884ff305d4d6566337781..f25270d2c0a2211373d5e79598990428a444a020 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc -@@ -302,6 +302,7 @@ void ToolbarView::Init() { +@@ -298,6 +298,7 @@ void ToolbarView::Init() { } std::unique_ptr side_panel_button; @@ -10,7 +10,7 @@ index 1ab19d8ef449316a4be072d3ed8f88a42a4e8eb6..eea63acd4417a93c084581f4a918a333 if (browser_view_->right_aligned_side_panel()) { side_panel_button = std::make_unique(browser_); } -@@ -370,6 +371,7 @@ void ToolbarView::Init() { +@@ -364,6 +365,7 @@ void ToolbarView::Init() { } else { // TODO(crbug.com/932818): Remove this once the // |kAutofillEnableToolbarStatusChip| is fully launched. diff --git a/patches/chrome-browser-ui-views-translate-translate_bubble_view.cc.patch b/patches/chrome-browser-ui-views-translate-translate_bubble_view.cc.patch index 8ad765bf48d9d..11488bb0d6f2c 100644 --- a/patches/chrome-browser-ui-views-translate-translate_bubble_view.cc.patch +++ b/patches/chrome-browser-ui-views-translate-translate_bubble_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/translate/translate_bubble_view.cc b/chrome/browser/ui/views/translate/translate_bubble_view.cc -index 324c084b2e4d7fb30b6a6a634133b40a58e6f32c..b7b0dcc66a8df2b141e4915058dd331621b2146a 100644 +index 2b8eb6870e37ca826b97e1707c3d3e8c7e55c1bb..650c42288ee9c81b68c0639b43ddf4763540d359 100644 --- a/chrome/browser/ui/views/translate/translate_bubble_view.cc +++ b/chrome/browser/ui/views/translate/translate_bubble_view.cc -@@ -198,7 +198,7 @@ views::Widget* TranslateBubbleView::ShowBubble( +@@ -197,7 +197,7 @@ views::Widget* TranslateBubbleView::ShowBubble( source_language, target_language)); std::unique_ptr model( new TranslateBubbleModelImpl(step, std::move(ui_delegate))); diff --git a/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch b/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch index 4ba4e8234af5e..1fb6140386556 100644 --- a/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch +++ b/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -index d29dc6e3fb26d542b0a9ccc1e8c1d455b5b8bb3a..898825514bdbc93e1cdbccad8866ad8c9bf96071 100644 +index 0963a28a1ff2f4ac97cbd248425d2b82199a974b..3f068cc77bc079502c7d1271fb07e31f41a8c2f0 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -1414,6 +1414,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL( +@@ -1398,6 +1398,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL( // static ChromeWebUIControllerFactory* ChromeWebUIControllerFactory::GetInstance() { diff --git a/patches/chrome-browser-ui-webui-downloads-downloads_ui.cc.patch b/patches/chrome-browser-ui-webui-downloads-downloads_ui.cc.patch index 5df216c26c1a9..a64ab42250d90 100644 --- a/patches/chrome-browser-ui-webui-downloads-downloads_ui.cc.patch +++ b/patches/chrome-browser-ui-webui-downloads-downloads_ui.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/webui/downloads/downloads_ui.cc b/chrome/browser/ui/webui/downloads/downloads_ui.cc -index b27caab8a94ca960cb47f5ece77079f936c0f2f6..e2f8b6dff5b794f95ceccd5fabf786cf22af8c77 100644 +index 02802dbc6165bb0da2e6739c93877eb0694303e2..3e103813daef49287fb030858ab3038d032ac214 100644 --- a/chrome/browser/ui/webui/downloads/downloads_ui.cc +++ b/chrome/browser/ui/webui/downloads/downloads_ui.cc @@ -59,6 +59,7 @@ namespace { diff --git a/patches/chrome-browser-ui-webui-settings-import_data_handler.cc.patch b/patches/chrome-browser-ui-webui-settings-import_data_handler.cc.patch index f86807b2b1e6d..31a9428d47e95 100644 --- a/patches/chrome-browser-ui-webui-settings-import_data_handler.cc.patch +++ b/patches/chrome-browser-ui-webui-settings-import_data_handler.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/webui/settings/import_data_handler.cc b/chrome/browser/ui/webui/settings/import_data_handler.cc -index a2d1ae566df6352f21c0a437ffd5e30ba7b1abdc..a5c818276daf6376184da4f7d5e78f0318db56fe 100644 +index 73ad5260441a8fec0482801847957c1d02e7ef5c..87fe3fd7f86251ddf6c7b9e186b9cfc80c5be58c 100644 --- a/chrome/browser/ui/webui/settings/import_data_handler.cc +++ b/chrome/browser/ui/webui/settings/import_data_handler.cc @@ -130,6 +130,7 @@ void ImportDataHandler::HandleImportData(const base::Value::List& args) { @@ -10,11 +10,11 @@ index a2d1ae566df6352f21c0a437ffd5e30ba7b1abdc..a5c818276daf6376184da4f7d5e78f03 const importer::SourceProfile& source_profile = importer_list_->GetSourceProfileAt(browser_index); -@@ -210,6 +211,7 @@ void ImportDataHandler::SendBrowserProfileData(const std::string& callback_id) { - browser_profile->SetBoolKey( - "autofillFormData", - (browser_services & importer::AUTOFILL_FORM_DATA) != 0); -+ BRAVE_SEND_BROWSER_PROFILE_DATA +@@ -208,6 +209,7 @@ void ImportDataHandler::SendBrowserProfileData(const std::string& callback_id) { + browser_profile.Set("autofillFormData", + (browser_services & importer::AUTOFILL_FORM_DATA) != 0); ++ BRAVE_SEND_BROWSER_PROFILE_DATA browser_profiles.Append(std::move(browser_profile)); } + diff --git a/patches/chrome-browser-ui-webui-settings-people_handler.cc.patch b/patches/chrome-browser-ui-webui-settings-people_handler.cc.patch index fef1f359c6286..c794819e41919 100644 --- a/patches/chrome-browser-ui-webui-settings-people_handler.cc.patch +++ b/patches/chrome-browser-ui-webui-settings-people_handler.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/settings/people_handler.cc b/chrome/browser/ui/webui/settings/people_handler.cc -index bcd5c878f887a620f9c8c161d478f95718d310d9..ce6541ea461458e15bb9646950a949a03b8fdd45 100644 +index ccc7957f49b30c87f03c88150bb3a64807ada716..63ab3ebf7ae49d1e7ceee2157a819499390b7553 100644 --- a/chrome/browser/ui/webui/settings/people_handler.cc +++ b/chrome/browser/ui/webui/settings/people_handler.cc -@@ -841,6 +841,7 @@ void PeopleHandler::OnStateChanged(syncer::SyncService* sync_service) { +@@ -876,6 +876,7 @@ void PeopleHandler::OnStateChanged(syncer::SyncService* sync_service) { void PeopleHandler::BeforeUnloadDialogCancelled() { // The before unload dialog is only shown during the first sync setup. @@ -10,7 +10,7 @@ index bcd5c878f887a620f9c8c161d478f95718d310d9..ce6541ea461458e15bb9646950a949a0 DCHECK(IdentityManagerFactory::GetForProfile(profile_)->HasPrimaryAccount( signin::ConsentLevel::kSync)); syncer::SyncService* service = GetSyncService(); -@@ -890,6 +891,7 @@ base::Value PeopleHandler::GetSyncStatusDictionary() const { +@@ -925,6 +926,7 @@ base::Value PeopleHandler::GetSyncStatusDictionary() const { service && !disallowed_by_policy && service->IsSetupInProgress() && !service->GetUserSettings()->IsFirstSetupComplete() && identity_manager->HasPrimaryAccount(signin::ConsentLevel::kSync)); @@ -18,7 +18,7 @@ index bcd5c878f887a620f9c8c161d478f95718d310d9..ce6541ea461458e15bb9646950a949a0 const SyncStatusLabels status_labels = GetSyncStatusLabels(profile_); // TODO(crbug.com/1027467): Consider unifying some of the fields below to -@@ -1056,6 +1058,7 @@ void PeopleHandler::MaybeMarkSyncConfiguring() { +@@ -1091,6 +1093,7 @@ void PeopleHandler::MaybeMarkSyncConfiguring() { } bool PeopleHandler::IsProfileAuthNeededOrHasErrors() { diff --git a/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch b/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch index 448ac72695286..3cdf70853383b 100644 --- a/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch +++ b/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -index 36054ef89f16f980c5ec0a6b8b9e859689e6d2e9..82ef8e97e97877002bb4b4d3c96fcd8502490f5d 100644 +index 9b395a777e1f4ab3093d2c4345401c81bcb1d4cc..3e9ec0e65d06074268dbbe52665c24c1bc53b7bb 100644 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -3092,6 +3092,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, +@@ -3114,6 +3114,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, policy_indicator::AddLocalizedStrings(html_source); AddSecurityKeysStrings(html_source); diff --git a/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch b/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch index 847a533c813ff..f3c496172d477 100644 --- a/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch +++ b/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/browser/ui/webui/settings/site_settings_helper.cc -index 211050f2e19ef477d925eea19d50e3fa5877e016..3777d36feaabee39c7944e9d0a78688cc24c82f7 100644 +index 57a5deb77ffa6ab7dc77faaa235f18c2250b9d7f..b7286720a49d384ce225a0ad3b989bf183398eef 100644 --- a/chrome/browser/ui/webui/settings/site_settings_helper.cc +++ b/chrome/browser/ui/webui/settings/site_settings_helper.cc -@@ -169,6 +169,7 @@ const ContentSettingsTypeNameEntry kContentSettingsTypeGroupNames[] = { +@@ -170,6 +170,7 @@ const ContentSettingsTypeNameEntry kContentSettingsTypeGroupNames[] = { {ContentSettingsType::AUTO_DARK_WEB_CONTENT, nullptr}, {ContentSettingsType::REQUEST_DESKTOP_SITE, nullptr}, {ContentSettingsType::GET_DISPLAY_MEDIA_SET_SELECT_ALL_SCREENS, nullptr}, @@ -10,7 +10,7 @@ index 211050f2e19ef477d925eea19d50e3fa5877e016..3777d36feaabee39c7944e9d0a78688c }; static_assert(std::size(kContentSettingsTypeGroupNames) == -@@ -393,6 +394,7 @@ bool HasRegisteredGroupName(ContentSettingsType type) { +@@ -394,6 +395,7 @@ bool HasRegisteredGroupName(ContentSettingsType type) { } ContentSettingsType ContentSettingsTypeFromGroupName(base::StringPiece name) { diff --git a/patches/chrome-browser-upgrade_detector-upgrade_detector_impl.cc.patch b/patches/chrome-browser-upgrade_detector-upgrade_detector_impl.cc.patch index 778546d09dc0f..34683142439e5 100644 --- a/patches/chrome-browser-upgrade_detector-upgrade_detector_impl.cc.patch +++ b/patches/chrome-browser-upgrade_detector-upgrade_detector_impl.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/upgrade_detector/upgrade_detector_impl.cc b/chrome/browser/upgrade_detector/upgrade_detector_impl.cc -index 8b9fec4c6f39c8451b1b5493012082632e116f8a..e2d99f5bf9545112544bfe7e1db73e1710c8247c 100644 +index 7fa7f6020b35fc89ed0826dcf56db5586b56d008..4eaa6504c1de5212b3ddf8b3f0460cfc28df0cb9 100644 --- a/chrome/browser/upgrade_detector/upgrade_detector_impl.cc +++ b/chrome/browser/upgrade_detector/upgrade_detector_impl.cc @@ -450,7 +450,6 @@ void UpgradeDetectorImpl::Init() { diff --git a/patches/chrome-browser-web_applications-os_integration-web_app_shortcut_mac.mm.patch b/patches/chrome-browser-web_applications-os_integration-web_app_shortcut_mac.mm.patch index 7dcef311f28d5..5a7a3a2cb2045 100644 --- a/patches/chrome-browser-web_applications-os_integration-web_app_shortcut_mac.mm.patch +++ b/patches/chrome-browser-web_applications-os_integration-web_app_shortcut_mac.mm.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/web_applications/os_integration/web_app_shortcut_mac.mm b/chrome/browser/web_applications/os_integration/web_app_shortcut_mac.mm -index 2b70c0acfd781f229f477c1f7a9144bd5e464c17..5ad5a440f243eb4d3d8a1421b1cd239dbb3b4b2b 100644 +index 6b4fc626d07ffdd97e0e36fb052043a8ef088476..917c53653b877cd5c3e349c4bb81c0552dbb9762 100644 --- a/chrome/browser/web_applications/os_integration/web_app_shortcut_mac.mm +++ b/chrome/browser/web_applications/os_integration/web_app_shortcut_mac.mm -@@ -793,6 +793,7 @@ base::FilePath GetChromeAppsFolder() { +@@ -793,6 +793,7 @@ bool AppShimLaunchDisabled() { if (path.empty()) return path; diff --git a/patches/chrome-common-BUILD.gn.patch b/patches/chrome-common-BUILD.gn.patch index 29bdfab9c203f..07e72676e6378 100644 --- a/patches/chrome-common-BUILD.gn.patch +++ b/patches/chrome-common-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn -index ae37955102c878ac4603a7397925d859ae48cda2..5bb4aa010336927597ce75b25301c3f537755bcd 100644 +index 3500082d77261e8707f2fd5a182a1c9d08b092e5..4188bb40d610bde702b6783f26f5ea74b3d5856c 100644 --- a/chrome/common/BUILD.gn +++ b/chrome/common/BUILD.gn -@@ -86,6 +86,7 @@ source_set("channel_info") { +@@ -88,6 +88,7 @@ source_set("channel_info") { } else if (is_fuchsia) { sources += [ "channel_info_fuchsia.cc" ] } @@ -10,7 +10,7 @@ index ae37955102c878ac4603a7397925d859ae48cda2..5bb4aa010336927597ce75b25301c3f5 } source_set("ini_parser") { -@@ -517,6 +518,7 @@ static_library("non_code_constants") { +@@ -524,6 +525,7 @@ static_library("non_code_constants") { "//printing/buildflags", "//ui/base:buildflags", ] diff --git a/patches/chrome-installer-linux-BUILD.gn.patch b/patches/chrome-installer-linux-BUILD.gn.patch index c01e3a106326c..c5ec70fba6f3f 100644 --- a/patches/chrome-installer-linux-BUILD.gn.patch +++ b/patches/chrome-installer-linux-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/installer/linux/BUILD.gn b/chrome/installer/linux/BUILD.gn -index 3f0414a3ee4011541275bf93662c5b889d2ae0c4..62226eb6bc4c4af0ce08e3d94a78b1424db167c1 100644 +index c0d81d6ffb9640ef96f895868345b38c514a2869..06c0e3839d90e07654d1f6bb56c4b612827c0a8e 100644 --- a/chrome/installer/linux/BUILD.gn +++ b/chrome/installer/linux/BUILD.gn -@@ -88,6 +88,7 @@ if (build_with_internal_optimization_guide) { +@@ -89,6 +89,7 @@ if (build_with_internal_optimization_guide) { [ "$root_out_dir/liboptimization_guide_internal.so" ] } @@ -10,7 +10,7 @@ index 3f0414a3ee4011541275bf93662c5b889d2ae0c4..62226eb6bc4c4af0ce08e3d94a78b142 packaging_files_binaries = packaging_files_executables + packaging_files_shlibs # TODO(mmoss) Any convenient way to get all the relevant build files? -@@ -176,6 +177,7 @@ action("merge_rpm_dependencies") { +@@ -183,6 +184,7 @@ action("merge_rpm_dependencies") { strip_binary("strip_chrome_binary") { binary_input = "$root_out_dir/chrome" deps = [ "//chrome" ] @@ -18,7 +18,7 @@ index 3f0414a3ee4011541275bf93662c5b889d2ae0c4..62226eb6bc4c4af0ce08e3d94a78b142 } strip_binary("strip_chrome_crashpad_handler") { -@@ -191,6 +193,7 @@ strip_binary("strip_chrome_management_service") { +@@ -198,6 +200,7 @@ strip_binary("strip_chrome_management_service") { strip_binary("strip_chrome_sandbox") { binary_input = "$root_out_dir/chrome_sandbox" deps = [ "//sandbox/linux:chrome_sandbox" ] @@ -26,7 +26,7 @@ index 3f0414a3ee4011541275bf93662c5b889d2ae0c4..62226eb6bc4c4af0ce08e3d94a78b142 } strip_binary("strip_libEGL_shlib") { -@@ -281,6 +284,7 @@ copy("common_packaging_files") { +@@ -295,6 +298,7 @@ copy("common_packaging_files") { } sources += [ "//buildtools/third_party/eu-strip/bin/eu-strip" ] @@ -34,7 +34,7 @@ index 3f0414a3ee4011541275bf93662c5b889d2ae0c4..62226eb6bc4c4af0ce08e3d94a78b142 outputs = [ "$root_out_dir/installer/common/{{source_file_part}}" ] } -@@ -381,6 +385,7 @@ group("installer_deps") { +@@ -395,6 +399,7 @@ group("installer_deps") { "//components/crash/core/app:chrome_crashpad_handler", "//sandbox/linux:chrome_sandbox", ] @@ -42,7 +42,7 @@ index 3f0414a3ee4011541275bf93662c5b889d2ae0c4..62226eb6bc4c4af0ce08e3d94a78b142 if (enable_nacl) { public_deps += [ ":strip_nacl_helper", -@@ -435,6 +440,9 @@ group("installer_deps") { +@@ -455,6 +460,9 @@ group("installer_deps") { template("linux_package") { assert(defined(invoker.channel)) channel = invoker.channel @@ -52,7 +52,7 @@ index 3f0414a3ee4011541275bf93662c5b889d2ae0c4..62226eb6bc4c4af0ce08e3d94a78b142 if (is_chrome_branded) { package = "google-chrome" -@@ -598,3 +606,6 @@ linux_package("beta") { +@@ -618,3 +626,6 @@ linux_package("beta") { linux_package("unstable") { channel = "unstable" } diff --git a/patches/chrome-installer-linux-common-installer.include.patch b/patches/chrome-installer-linux-common-installer.include.patch index e1ccc63989f81..e357c2a133541 100644 --- a/patches/chrome-installer-linux-common-installer.include.patch +++ b/patches/chrome-installer-linux-common-installer.include.patch @@ -1,5 +1,5 @@ diff --git a/chrome/installer/linux/common/installer.include b/chrome/installer/linux/common/installer.include -index 9f0f85bea5dbcd301e91625a8bddb163242fb1cd..0ed060cd1d4fb3725baf590774a1c5deaaddc817 100644 +index 6309df66f1f4b070a86e918e288de7d1beae7b41..a7d372ded336467083adb8c045d9a91142ef3d68 100644 --- a/chrome/installer/linux/common/installer.include +++ b/chrome/installer/linux/common/installer.include @@ -75,6 +75,7 @@ process_template() ( @@ -19,7 +19,7 @@ index 9f0f85bea5dbcd301e91625a8bddb163242fb1cd..0ed060cd1d4fb3725baf590774a1c5de # ICU data file; Necessary when the GN icu_use_data_file flag is true. install -m 644 "${OUTPUTDIR}/icudtl.dat" "${STAGEDIR}/${INSTALLDIR}/" -@@ -302,11 +305,13 @@ stage_install_common() { +@@ -309,11 +312,13 @@ stage_install_common() { # app icons local icon_regex=".*product_logo_[0-9]\+\." diff --git a/patches/chrome-installer-linux-debian-update_dist_package_versions.py.patch b/patches/chrome-installer-linux-debian-update_dist_package_versions.py.patch index b9ec7c6d9397d..32307dd16b681 100644 --- a/patches/chrome-installer-linux-debian-update_dist_package_versions.py.patch +++ b/patches/chrome-installer-linux-debian-update_dist_package_versions.py.patch @@ -1,5 +1,5 @@ diff --git a/chrome/installer/linux/debian/update_dist_package_versions.py b/chrome/installer/linux/debian/update_dist_package_versions.py -index 0c1aa908ee5a88bba9f279fbfb845def654e618b..1492dbae6417b7a3477f48215d40f8b3e8f5ffc0 100755 +index a5520e23f8ed7f3aa98850033d9fc9836778c41c..a8624574fdf1d798ac51f5225834f62cce57cb3c 100755 --- a/chrome/installer/linux/debian/update_dist_package_versions.py +++ b/chrome/installer/linux/debian/update_dist_package_versions.py @@ -42,6 +42,7 @@ PACKAGE_FILTER = set([ @@ -10,7 +10,7 @@ index 0c1aa908ee5a88bba9f279fbfb845def654e618b..1492dbae6417b7a3477f48215d40f8b3 "libcups2", "libdbus-1-3", "libdrm2", -@@ -71,6 +72,7 @@ PACKAGE_FILTER = set([ +@@ -72,6 +73,7 @@ PACKAGE_FILTER = set([ "libxshmfence1", "libxss1", "libxtst6", diff --git a/patches/chrome-installer-linux-rpm-update_package_provides.py.patch b/patches/chrome-installer-linux-rpm-update_package_provides.py.patch index 9f9fa4838e0f1..4f07c4dda4553 100644 --- a/patches/chrome-installer-linux-rpm-update_package_provides.py.patch +++ b/patches/chrome-installer-linux-rpm-update_package_provides.py.patch @@ -1,5 +1,5 @@ diff --git a/chrome/installer/linux/rpm/update_package_provides.py b/chrome/installer/linux/rpm/update_package_provides.py -index c09a7c1be57a3c45d0b5731297f60ac0b315d26a..2d6cf3d6e1fc9f5422eb14ee3b933c0f3bbbfeb7 100755 +index ccc28ea7f5bad77a7a20f77a0d19abc48227bd7f..09f3829a3647ee27592f9819effd2fa06268d689 100755 --- a/chrome/installer/linux/rpm/update_package_provides.py +++ b/chrome/installer/linux/rpm/update_package_provides.py @@ -33,6 +33,7 @@ LIBRARY_FILTER = set([ @@ -21,7 +21,7 @@ index c09a7c1be57a3c45d0b5731297f60ac0b315d26a..2d6cf3d6e1fc9f5422eb14ee3b933c0f "librt.so", "libsmime3.so", "libstdc++.so", -@@ -60,6 +64,7 @@ LIBRARY_FILTER = set([ +@@ -61,6 +65,7 @@ LIBRARY_FILTER = set([ "libxcb-dri3.so.0", "libxkbcommon.so.0", "libxshmfence.so.1", diff --git a/patches/chrome-installer-util-shell_util.cc.patch b/patches/chrome-installer-util-shell_util.cc.patch index 4b2a49be77cf2..0fdbd1c233d01 100644 --- a/patches/chrome-installer-util-shell_util.cc.patch +++ b/patches/chrome-installer-util-shell_util.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/installer/util/shell_util.cc b/chrome/installer/util/shell_util.cc -index d3bd7875eb554a2cd591c7b181d4e0c92f262017..775e12b8006ea34c493be59bdede22542453379f 100644 +index f19a3aba8b980010bac4c1052e28e4aea1364d5d..9ff8f79151e889e306582aae3505f739be52ff27 100644 --- a/chrome/installer/util/shell_util.cc +++ b/chrome/installer/util/shell_util.cc @@ -360,6 +360,7 @@ void GetChromeProgIdEntries( diff --git a/patches/chrome-renderer-BUILD.gn.patch b/patches/chrome-renderer-BUILD.gn.patch index f023e20df4c20..06d51753bf644 100644 --- a/patches/chrome-renderer-BUILD.gn.patch +++ b/patches/chrome-renderer-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn -index 4dc47fb91328aeae6ce283983690129cf30b1146..55f7444499dab2c30fc1cdfb242e1ccc09604ab5 100644 +index a32f28835170ce246edd52bd56f5d1fc66e60460..f53f07afb2f8a946bffaac3ac3135404077bc0a0 100644 --- a/chrome/renderer/BUILD.gn +++ b/chrome/renderer/BUILD.gn @@ -205,6 +205,7 @@ static_library("renderer") { diff --git a/patches/chrome-renderer-chrome_content_renderer_client.cc.patch b/patches/chrome-renderer-chrome_content_renderer_client.cc.patch index 7e4d5c066be73..2dc7bf6e60936 100644 --- a/patches/chrome-renderer-chrome_content_renderer_client.cc.patch +++ b/patches/chrome-renderer-chrome_content_renderer_client.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc -index abfb11349c9eeec7d3edf2e5ebc13d022e4eee88..cf5d10c957ed2675ac08dd09f287a331c1a1bfe3 100644 +index 06315cc8f3b9934336b0b17817070e7605100036..a6aa08d1d3d402437749838c9eaead95cf29bc23 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc -@@ -524,7 +524,7 @@ void ChromeContentRendererClient::RenderFrameCreated( +@@ -532,7 +532,7 @@ void ChromeContentRendererClient::RenderFrameCreated( ChromeExtensionsRendererClient::GetInstance()->extension_dispatcher()); #endif content_settings::ContentSettingsAgentImpl* content_settings = diff --git a/patches/chrome-renderer-chrome_content_renderer_client.h.patch b/patches/chrome-renderer-chrome_content_renderer_client.h.patch index acdc8c7eb8d15..6b290dc4f5139 100644 --- a/patches/chrome-renderer-chrome_content_renderer_client.h.patch +++ b/patches/chrome-renderer-chrome_content_renderer_client.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.h b/chrome/renderer/chrome_content_renderer_client.h -index 5230b8978b525a3111b49cbc723d2a7c5c8fd8d8..3302e1a69daa9d8eca08693d9182b815baaebbdb 100644 +index 64b54bc3b40f44dc4149ed1539d69122f4ea3afb..9e09805572e90a8e570d1b13dbfd0bae41998bca 100644 --- a/chrome/renderer/chrome_content_renderer_client.h +++ b/chrome/renderer/chrome_content_renderer_client.h -@@ -226,6 +226,7 @@ class ChromeContentRendererClient +@@ -228,6 +228,7 @@ class ChromeContentRendererClient #endif private: diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch index 02966a0459231..971994cdf9f55 100644 --- a/patches/chrome-test-BUILD.gn.patch +++ b/patches/chrome-test-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn -index 641f52eb7952858738a6623b480f767261e5d009..0d97ca76e95613c62a531da9828538bbff6ae199 100644 +index 96ac0c2f2ca1e6ddd8ba3a75fbda9354ebd3a60f..2900271a36e6f8d9e244bad77b1552613d53f8f3 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -306,6 +306,7 @@ static_library("test_support") { +@@ -308,6 +308,7 @@ static_library("test_support") { "//ui/gl", ] diff --git a/patches/chrome-tools-build-mac-BUILD.gn.patch b/patches/chrome-tools-build-mac-BUILD.gn.patch index a2a4197aeacbf..7b531c77f6638 100644 --- a/patches/chrome-tools-build-mac-BUILD.gn.patch +++ b/patches/chrome-tools-build-mac-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/tools/build/mac/BUILD.gn b/chrome/tools/build/mac/BUILD.gn -index cd080aee2da3ecdb86738a457d31c70305c83150..f3139fe1f223fdffa0f8a1183f86178988d4ad3b 100644 +index 4666937778bd0e25c90a47057080a5d98a697450..429bff98822e46c7a5ffcafebe2209b527d6ff47 100644 --- a/chrome/tools/build/mac/BUILD.gn +++ b/chrome/tools/build/mac/BUILD.gn -@@ -4,6 +4,7 @@ +@@ -17,6 +17,7 @@ if (current_toolchain != default_toolchain) { executable("infoplist_strings_util") { configs += [ "//build/config/compiler:wexit_time_destructors" ] diff --git a/patches/chrome-utility-BUILD.gn.patch b/patches/chrome-utility-BUILD.gn.patch index f92a6ec884ef7..0eca9f6338f08 100644 --- a/patches/chrome-utility-BUILD.gn.patch +++ b/patches/chrome-utility-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn -index dd4d0b1efff332b4879d3dd10667a07ca970fba1..4575e9011c6b51b1a50653e5731ed3f881001d47 100644 +index f59b1571624f6614e3002b3e326e9521c5c0d79a..9d745bbd539434b55d62123d5eae30d83c7f8025 100644 --- a/chrome/utility/BUILD.gn +++ b/chrome/utility/BUILD.gn -@@ -65,6 +65,8 @@ static_library("utility") { +@@ -69,6 +69,8 @@ static_library("utility") { "//ui/base:buildflags", ] diff --git a/patches/components-browser_ui-widget-android-java-res-values-dimens.xml.patch b/patches/components-browser_ui-widget-android-java-res-values-dimens.xml.patch index eea13ca1b3bf9..10fad44dce662 100644 --- a/patches/components-browser_ui-widget-android-java-res-values-dimens.xml.patch +++ b/patches/components-browser_ui-widget-android-java-res-values-dimens.xml.patch @@ -1,5 +1,5 @@ diff --git a/components/browser_ui/widget/android/java/res/values/dimens.xml b/components/browser_ui/widget/android/java/res/values/dimens.xml -index 3b74affb06d98b909965b47295bae44f2a5c7faf..a86df2ef600faf59c6ca057b70df7b67e36ab6d1 100644 +index 0160923de27e72f0c1dd9e821986d20b6d82dd76..51d67fb4246390d8c093d0971455f90201dd7fa7 100644 --- a/components/browser_ui/widget/android/java/res/values/dimens.xml +++ b/components/browser_ui/widget/android/java/res/values/dimens.xml @@ -74,7 +74,7 @@ diff --git a/patches/components-content_settings-core-browser-content_settings_default_provider.cc.patch b/patches/components-content_settings-core-browser-content_settings_default_provider.cc.patch index ef8fde7584c9e..fa56e191e5739 100644 --- a/patches/components-content_settings-core-browser-content_settings_default_provider.cc.patch +++ b/patches/components-content_settings-core-browser-content_settings_default_provider.cc.patch @@ -1,11 +1,11 @@ diff --git a/components/content_settings/core/browser/content_settings_default_provider.cc b/components/content_settings/core/browser/content_settings_default_provider.cc -index 1f6642baaf50f5cf1d3bd1f84a1fa9ce925599c1..9611f0899649ae2e3c7dc447b02c9a4e2b87cbec 100644 +index 3a0c37be57739955356c351265f9ec6f70b5b031..785b07dce63ac61e080a8e799b1295479db45eed 100644 --- a/components/content_settings/core/browser/content_settings_default_provider.cc +++ b/components/content_settings/core/browser/content_settings_default_provider.cc @@ -438,6 +438,7 @@ void DefaultProvider::DiscardOrMigrateObsoletePreferences() { } prefs_->ClearPref(kDeprecatedEnableDRM); - #endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_WIN) + #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) +BRAVE_DISCARD_OR_MIGRATE_OBSOLETE_PREFERENCES } diff --git a/patches/components-content_settings-core-common-content_settings.cc.patch b/patches/components-content_settings-core-common-content_settings.cc.patch index 40577cdf6c7fc..5de8293d48d05 100644 --- a/patches/components-content_settings-core-common-content_settings.cc.patch +++ b/patches/components-content_settings-core-common-content_settings.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc -index 3512b57674bfd8ba84fd809cdcd2f31ebfc6101d..ce4ca6961e5845bf922ffc97f67813fa907884a2 100644 +index d8f8cfd5622060a1a003bec37cc4f92b4850cd23..b4582bbdee6d262a3220eadb2dbaea9ba16facc4 100644 --- a/components/content_settings/core/common/content_settings.cc +++ b/components/content_settings/core/common/content_settings.cc @@ -103,6 +103,7 @@ constexpr HistogramValue kHistogramValue[] = { diff --git a/patches/components-content_settings-core-common-content_settings_types.h.patch b/patches/components-content_settings-core-common-content_settings_types.h.patch index 8c7daacf6332d..feaaaaee2520c 100644 --- a/patches/components-content_settings-core-common-content_settings_types.h.patch +++ b/patches/components-content_settings-core-common-content_settings_types.h.patch @@ -1,8 +1,8 @@ diff --git a/components/content_settings/core/common/content_settings_types.h b/components/content_settings/core/common/content_settings_types.h -index 03eeba359b37f44d4b5fde44ccee5daf281d91a4..1d630e23c263816abdf0b87787aed76b0c6e4f39 100644 +index ffa4d1c88631d4e2de85bc41d94ccd927c4fd288..ee5580e7cb01e5582045e97ea68f4f0cf8fd747b 100644 --- a/components/content_settings/core/common/content_settings_types.h +++ b/components/content_settings/core/common/content_settings_types.h -@@ -288,6 +288,7 @@ enum class ContentSettingsType : int32_t { +@@ -281,6 +281,7 @@ enum class ContentSettingsType : int32_t { // the browser FedCM API. FEDERATED_IDENTITY_API, diff --git a/patches/components-crash-core-app-breakpad_linux.cc.patch b/patches/components-crash-core-app-breakpad_linux.cc.patch index 0a35d2c6fe96b..27c8646612b78 100644 --- a/patches/components-crash-core-app-breakpad_linux.cc.patch +++ b/patches/components-crash-core-app-breakpad_linux.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/crash/core/app/breakpad_linux.cc b/components/crash/core/app/breakpad_linux.cc -index 823e49a234e3dd31bf6527c2e4efa96f3d23f1f2..0c1ca2d57dc686a7df1d841d5e73061d28af6ded 100644 +index 4ed2558351e37dde0eb35b6eb32f442346ff2490..1a2a82195298e376c4d3ba4dc560bf253cbf7ba4 100644 --- a/components/crash/core/app/breakpad_linux.cc +++ b/components/crash/core/app/breakpad_linux.cc -@@ -1460,7 +1460,7 @@ bool IsValidCrashReportId(const char* buf, size_t bytes_read, +@@ -1462,7 +1462,7 @@ bool IsValidCrashReportId(const char* buf, size_t bytes_read, return my_strcmp(buf, "_sys_cr_finished") == 0; #else for (size_t i = 0; i < bytes_read; ++i) { @@ -11,7 +11,7 @@ index 823e49a234e3dd31bf6527c2e4efa96f3d23f1f2..0c1ca2d57dc686a7df1d841d5e73061d return false; } return true; -@@ -1955,7 +1955,7 @@ void HandleCrashDump(const BreakpadInfo& info) { +@@ -1957,7 +1957,7 @@ void HandleCrashDump(const BreakpadInfo& info) { if (upload_child > 0) { IGNORE_RET(sys_close(fds[1])); // Close write end of pipe. diff --git a/patches/components-crx_file-crx_creator.cc.patch b/patches/components-crx_file-crx_creator.cc.patch index b86a8c9947f7f..839fc05334d0e 100644 --- a/patches/components-crx_file-crx_creator.cc.patch +++ b/patches/components-crx_file-crx_creator.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/crx_file/crx_creator.cc b/components/crx_file/crx_creator.cc -index e46697dcef79cf79a8055dfa8075dc61d1791a34..55f454734b4d389acb4185723e97855ea92749cc 100644 +index e56183cbc11021d15b74607bcbe85f79da3a97ee..efde0364be8f6c69379e48e28fd305f8555fe72a 100644 --- a/components/crx_file/crx_creator.cc +++ b/components/crx_file/crx_creator.cc @@ -67,7 +67,7 @@ CreatorResult SignArchiveAndCreateHeader(const base::FilePath& output_path, diff --git a/patches/components-crx_file-crx_verifier.cc.patch b/patches/components-crx_file-crx_verifier.cc.patch index 5b08f5488766d..758f933c58827 100644 --- a/patches/components-crx_file-crx_verifier.cc.patch +++ b/patches/components-crx_file-crx_verifier.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/crx_file/crx_verifier.cc b/components/crx_file/crx_verifier.cc -index c7b80d71373b702aeae32f1b3552c5a66950236c..a6dbaee64cee00edf10b4caf5df08bfac7f0120f 100644 +index 75a2c01c0229a91956e240164b7656115a5a7ebb..282e2611a5c2db57e2d81f44f62762231a758f47 100644 --- a/components/crx_file/crx_verifier.cc +++ b/components/crx_file/crx_verifier.cc @@ -181,6 +181,7 @@ VerifierResult VerifyCrx3( diff --git a/patches/components-download-internal-common-download_item_impl.cc.patch b/patches/components-download-internal-common-download_item_impl.cc.patch index 14d611867d761..3c9db3c1c5c7b 100644 --- a/patches/components-download-internal-common-download_item_impl.cc.patch +++ b/patches/components-download-internal-common-download_item_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/download/internal/common/download_item_impl.cc b/components/download/internal/common/download_item_impl.cc -index 3b3b5907abd936069ce499aa98fde0b1295c96ca..ecca287b5fd4d1e05ff35929097d665c501bd447 100644 +index 22b5c89ec8c7fb507ce3a2281ea20629bf5c0a60..8d3b692d509b0514a974df51473eeb7aa364f85a 100644 --- a/components/download/internal/common/download_item_impl.cc +++ b/components/download/internal/common/download_item_impl.cc -@@ -2036,8 +2036,8 @@ void DownloadItemImpl::OnDownloadCompleting() { +@@ -2016,8 +2016,8 @@ void DownloadItemImpl::OnDownloadCompleting() { base::Unretained(download_file_.get()), GetTargetFilePath(), delegate_->GetApplicationClientIdForFileScanning(), diff --git a/patches/components-external_intents-android-BUILD.gn.patch b/patches/components-external_intents-android-BUILD.gn.patch index 78e114f9f4602..bc9d667e787ae 100644 --- a/patches/components-external_intents-android-BUILD.gn.patch +++ b/patches/components-external_intents-android-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/external_intents/android/BUILD.gn b/components/external_intents/android/BUILD.gn -index 44c58770bcda86deda5e0115b27faf9ba860a337..1d200154d5f4db50c82164fc5479538821987625 100644 +index 054e7ab45846eb43d506b285b1286b40ac89abac..c81c2b6a104f3a6725e51edc51866b2fc1a48968 100644 --- a/components/external_intents/android/BUILD.gn +++ b/components/external_intents/android/BUILD.gn -@@ -64,6 +64,7 @@ static_library("android") { +@@ -58,6 +58,7 @@ static_library("android") { "//components/navigation_interception", "//content/public/browser", ] diff --git a/patches/components-history-core-browser-history_types.h.patch b/patches/components-history-core-browser-history_types.h.patch index a612b7b6ab226..0c46d9117fbcf 100644 --- a/patches/components-history-core-browser-history_types.h.patch +++ b/patches/components-history-core-browser-history_types.h.patch @@ -1,8 +1,8 @@ diff --git a/components/history/core/browser/history_types.h b/components/history/core/browser/history_types.h -index d66ec7ff97590eb853419527fb95b1b539d5d5d9..66254684753f08cf0a6bf64545b42cbdbd175e13 100644 +index d0b35c3b813b0e6d35b06bd986aadcc13ae1e5ae..63b701a1dd9aed4c43347832c84e1a37c124dc30 100644 --- a/components/history/core/browser/history_types.h +++ b/components/history/core/browser/history_types.h -@@ -48,6 +48,8 @@ enum VisitSource { +@@ -49,6 +49,8 @@ enum VisitSource { SOURCE_FIREFOX_IMPORTED = 3, SOURCE_IE_IMPORTED = 4, SOURCE_SAFARI_IMPORTED = 5, diff --git a/patches/components-omnibox-browser-BUILD.gn.patch b/patches/components-omnibox-browser-BUILD.gn.patch index e1501bf6426c2..1d6ce8dd5854c 100644 --- a/patches/components-omnibox-browser-BUILD.gn.patch +++ b/patches/components-omnibox-browser-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/omnibox/browser/BUILD.gn b/components/omnibox/browser/BUILD.gn -index ef53d5d4600ddea4da858dd1f675cd2479ac6dd8..bfba203c47440ffff751fbe477a08be6698dee33 100644 +index 4fc0ee7cfcbc41aef90987ec06688fc21c2fbc4b..0351db3fa770c1773fcff1d367bf9e55db9d9ade 100644 --- a/components/omnibox/browser/BUILD.gn +++ b/components/omnibox/browser/BUILD.gn -@@ -288,6 +288,7 @@ static_library("browser") { +@@ -284,6 +284,7 @@ static_library("browser") { "//ui/base", "//ui/gfx", ] diff --git a/patches/components-omnibox-browser-autocomplete_controller.cc.patch b/patches/components-omnibox-browser-autocomplete_controller.cc.patch index 62bbbfb0682bb..280b18133af88 100644 --- a/patches/components-omnibox-browser-autocomplete_controller.cc.patch +++ b/patches/components-omnibox-browser-autocomplete_controller.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/omnibox/browser/autocomplete_controller.cc -index b939925eab7309c1e10c650383a109ed805d1321..7b7a6e7488f1ecd12939f8fc63516d933aefa7df 100644 +index ff15bdf15bea85017a929dce305c275e6c82ccc6..d9f2d679f9c62a3c63b86a6778d05b59dd8a0d5f 100644 --- a/components/omnibox/browser/autocomplete_controller.cc +++ b/components/omnibox/browser/autocomplete_controller.cc @@ -305,6 +305,7 @@ AutocompleteController::AutocompleteController( diff --git a/patches/components-omnibox-browser-omnibox_edit_model.cc.patch b/patches/components-omnibox-browser-omnibox_edit_model.cc.patch index a825f6f73ce2f..8644605afe6c4 100644 --- a/patches/components-omnibox-browser-omnibox_edit_model.cc.patch +++ b/patches/components-omnibox-browser-omnibox_edit_model.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/omnibox/browser/omnibox_edit_model.cc b/components/omnibox/browser/omnibox_edit_model.cc -index 6b5a56d2d7cc7eee191a2c137c3d2e7070e82adb..1df5830ef7d5c9dc12cb2ab7854a4eaec0ce157c 100644 +index 2dbe7c947c0a09899f2288fdbc68ce85681715cd..3d660062b26f6413855c2a8a48eab2667f7c49c0 100644 --- a/components/omnibox/browser/omnibox_edit_model.cc +++ b/components/omnibox/browser/omnibox_edit_model.cc @@ -420,6 +420,7 @@ void OmniboxEditModel::AdjustTextForCopy(int sel_min, diff --git a/patches/components-os_crypt-keychain_password_mac.mm.patch b/patches/components-os_crypt-keychain_password_mac.mm.patch index c44a923763767..e39c294f905f6 100644 --- a/patches/components-os_crypt-keychain_password_mac.mm.patch +++ b/patches/components-os_crypt-keychain_password_mac.mm.patch @@ -2,7 +2,7 @@ diff --git a/components/os_crypt/keychain_password_mac.mm b/components/os_crypt/ index 5589310e2e1f41a6a97e77bb57a7a71cd09a18be..af1be3edb2b6135bf93c5fdd42781a92a32ddb9a 100644 --- a/components/os_crypt/keychain_password_mac.mm +++ b/components/os_crypt/keychain_password_mac.mm -@@ -64,12 +64,14 @@ std::string AddRandomPasswordToKeychain(const AppleKeychain& keychain, +@@ -64,12 +64,14 @@ // static KeychainPassword::KeychainNameType& KeychainPassword::GetServiceName() { diff --git a/patches/components-os_crypt-os_crypt_win.cc.patch b/patches/components-os_crypt-os_crypt_win.cc.patch index 6dc306c36c28f..c06bd2ab3d9e3 100644 --- a/patches/components-os_crypt-os_crypt_win.cc.patch +++ b/patches/components-os_crypt-os_crypt_win.cc.patch @@ -1,17 +1,17 @@ diff --git a/components/os_crypt/os_crypt_win.cc b/components/os_crypt/os_crypt_win.cc -index 91f2c6d4f79cf233770abbbcaaedbdd246ee044e..84b8a28a8f18a074ce02bdbdc9821693f22d854d 100644 +index 305a8caa4eb45de6782e39e32e175d9d409b2fbf..c6d21eeaa204771274e39eb04975b732c4463181 100644 --- a/components/os_crypt/os_crypt_win.cc +++ b/components/os_crypt/os_crypt_win.cc -@@ -177,6 +177,7 @@ bool OSCryptImpl::DecryptString16(const std::string& ciphertext, - // static +@@ -146,6 +146,7 @@ bool OSCryptImpl::DecryptString16(const std::string& ciphertext, + bool OSCryptImpl::EncryptString(const std::string& plaintext, std::string* ciphertext) { + if (IsEncryptionDisabled(plaintext, ciphertext)) { return true; } - if (g_use_legacy) + if (use_legacy_) return EncryptStringWithDPAPI(plaintext, ciphertext); -@@ -203,6 +204,7 @@ bool OSCryptImpl::EncryptString(const std::string& plaintext, - // static +@@ -171,6 +172,7 @@ bool OSCryptImpl::EncryptString(const std::string& plaintext, + bool OSCryptImpl::DecryptString(const std::string& ciphertext, std::string* plaintext) { + if (IsEncryptionDisabled(ciphertext, plaintext)) { return true; } diff --git a/patches/components-page_info-page_info.cc.patch b/patches/components-page_info-page_info.cc.patch index d6b6769ed770f..fa4645d7232d6 100644 --- a/patches/components-page_info-page_info.cc.patch +++ b/patches/components-page_info-page_info.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.cc -index 42ef7f15dadfb2dd2e90f30efcacc20f7504261f..5ccf0eb2f1656c724b2075df8276fa24bafcfbcd 100644 +index 2e90fda000b28ab5bb8168a6908c49b0d4b6f629..b7362820ca9fb05766935364083b57300705001c 100644 --- a/components/page_info/page_info.cc +++ b/components/page_info/page_info.cc -@@ -997,6 +997,7 @@ void PageInfo::PresentSitePermissions() { +@@ -1082,6 +1082,7 @@ void PageInfo::PresentSitePermissions() { } } diff --git a/patches/components-password_manager-core-browser-login_database.cc.patch b/patches/components-password_manager-core-browser-login_database.cc.patch index 1e4068140e1de..66a00331cb04e 100644 --- a/patches/components-password_manager-core-browser-login_database.cc.patch +++ b/patches/components-password_manager-core-browser-login_database.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/password_manager/core/browser/login_database.cc b/components/password_manager/core/browser/login_database.cc -index b35556cf271f48c8db9ae2409f94dc3026d0aeac..e4e3acfa36aca126b09a5b0339cffd63a2711c68 100644 +index e4c7983629d5ca05a9192b38023e2ca79ac8335a..573118ad12f9b4c49b8e7d8083c1cc70e50ea398 100644 --- a/components/password_manager/core/browser/login_database.cc +++ b/components/password_manager/core/browser/login_database.cc -@@ -1849,6 +1849,7 @@ FormRetrievalResult LoginDatabase::StatementToForms( +@@ -1847,6 +1847,7 @@ FormRetrievalResult LoginDatabase::StatementToForms( EncryptionResult result = InitPasswordFormFromStatement( *statement, /*decrypt_and_fill_password_value=*/true, &primary_key, new_form.get()); diff --git a/patches/components-permissions-BUILD.gn.patch b/patches/components-permissions-BUILD.gn.patch index f222065e4a052..fe62c36f7e4da 100644 --- a/patches/components-permissions-BUILD.gn.patch +++ b/patches/components-permissions-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/components/permissions/BUILD.gn b/components/permissions/BUILD.gn -index 1347f0fb4b9d35641fa499025265cb319def05fd..b97970ef680e4389a4ebbe19022ae2ff098c544e 100644 +index de6148861210eb2f77284debea7503a351a2c240..ddd730d7f4f794635b1d3c19b88aba4708116e77 100644 --- a/components/permissions/BUILD.gn +++ b/components/permissions/BUILD.gn @@ -135,6 +135,7 @@ source_set("permissions") { diff --git a/patches/components-permissions-android-BUILD.gn.patch b/patches/components-permissions-android-BUILD.gn.patch index 9cc47c1ca23d4..becb3bd95f624 100644 --- a/patches/components-permissions-android-BUILD.gn.patch +++ b/patches/components-permissions-android-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/components/permissions/android/BUILD.gn b/components/permissions/android/BUILD.gn -index f82ec33a70565306444f334bcdf65133431f55a2..1b5a4e2473ddee7efb4e64ab82809a710e7e81ab 100644 +index a0711ec39bf5607cf4ae85d6db34a034c5828e6d..c5a02bb39e3dde969346b5b73c1c8527c24ccc9c 100644 --- a/components/permissions/android/BUILD.gn +++ b/components/permissions/android/BUILD.gn @@ -115,6 +115,7 @@ android_library("java") { diff --git a/patches/components-permissions-android-permission_dialog_delegate.cc.patch b/patches/components-permissions-android-permission_prompt-permission_dialog_delegate.cc.patch similarity index 56% rename from patches/components-permissions-android-permission_dialog_delegate.cc.patch rename to patches/components-permissions-android-permission_prompt-permission_dialog_delegate.cc.patch index 1aff202ac688f..cf5e99aaf252f 100644 --- a/patches/components-permissions-android-permission_dialog_delegate.cc.patch +++ b/patches/components-permissions-android-permission_prompt-permission_dialog_delegate.cc.patch @@ -1,7 +1,7 @@ -diff --git a/components/permissions/android/permission_dialog_delegate.cc b/components/permissions/android/permission_dialog_delegate.cc -index c76378df51a497a9cc53015893e33fa2ae19f1d4..214402321ed8b9f57963832578e636fafee51c9b 100644 ---- a/components/permissions/android/permission_dialog_delegate.cc -+++ b/components/permissions/android/permission_dialog_delegate.cc +diff --git a/components/permissions/android/permission_prompt/permission_dialog_delegate.cc b/components/permissions/android/permission_prompt/permission_dialog_delegate.cc +index a39e62bf9e4345bb402f4da342bee552eb6c45e4..93c21c96553c3bc42e4e7e68cc38e938df70b6ee 100644 +--- a/components/permissions/android/permission_prompt/permission_dialog_delegate.cc ++++ b/components/permissions/android/permission_prompt/permission_dialog_delegate.cc @@ -95,12 +95,14 @@ PermissionDialogDelegate* PermissionDialogDelegate::CreateForTesting( void PermissionDialogDelegate::Accept(JNIEnv* env, const JavaParamRef& obj) { diff --git a/patches/components-permissions-permission_manager.cc.patch b/patches/components-permissions-permission_manager.cc.patch new file mode 100644 index 0000000000000..ae2443b3796e8 --- /dev/null +++ b/patches/components-permissions-permission_manager.cc.patch @@ -0,0 +1,20 @@ +diff --git a/components/permissions/permission_manager.cc b/components/permissions/permission_manager.cc +index 698d7a5daf3dabff32fabd74660273294fce1563..b17829597a65171bc5f2aaaf98a1b29427cb1531 100644 +--- a/components/permissions/permission_manager.cc ++++ b/components/permissions/permission_manager.cc +@@ -396,6 +396,7 @@ void PermissionManager::RequestPermissionsFromCurrentDocument( + + const PermissionRequestID request_id(render_frame_host, request_local_id); + const GURL requesting_origin = ++ BRAVE_FORCED_REQUESTING_ORIGIN + PermissionUtil::GetLastCommittedOriginAsURL(render_frame_host); + const GURL embedding_origin = + GetEmbeddingOrigin(render_frame_host, requesting_origin); +@@ -456,6 +457,7 @@ PermissionStatus PermissionManager::GetPermissionStatusForCurrentDocument( + PermissionUtil::PermissionTypeToContentSetting(permission); + + const GURL requesting_origin = ++ BRAVE_FORCED_REQUESTING_ORIGIN + PermissionUtil::GetLastCommittedOriginAsURL(render_frame_host); + const GURL embedding_origin = + GetEmbeddingOrigin(render_frame_host, requesting_origin); diff --git a/patches/components-permissions-permission_uma_util.cc.patch b/patches/components-permissions-permission_uma_util.cc.patch index e05ef796d8fd8..1f9c778796123 100644 --- a/patches/components-permissions-permission_uma_util.cc.patch +++ b/patches/components-permissions-permission_uma_util.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/permissions/permission_uma_util.cc b/components/permissions/permission_uma_util.cc -index 5b3b205c765b132d169eab88a34e06bd0c88ba6a..141ab38e6780103ad63c7fddd1826b03895f588f 100644 +index 1b503d0249b7b2fe85c186b4343d361c186847b7..4f8663ab3691254f362036b1c4c519ad9287689f 100644 --- a/components/permissions/permission_uma_util.cc +++ b/components/permissions/permission_uma_util.cc -@@ -111,6 +111,7 @@ RequestTypeForUma GetUmaValueForRequestType(RequestType request_type) { +@@ -110,6 +110,7 @@ RequestTypeForUma GetUmaValueForRequestType(RequestType request_type) { case RequestType::kWindowPlacement: return RequestTypeForUma::PERMISSION_WINDOW_PLACEMENT; #endif diff --git a/patches/components-search_engines-BUILD.gn.patch b/patches/components-search_engines-BUILD.gn.patch index f3903d21d1420..aeffd48a6b533 100644 --- a/patches/components-search_engines-BUILD.gn.patch +++ b/patches/components-search_engines-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/search_engines/BUILD.gn b/components/search_engines/BUILD.gn -index dbfbd7eeb271a94b50572c01dd9531a1ed9047ac..2afa2d056228c19ce24cdc0af36cf0e04b1f64d2 100644 +index df37adb56831f2cf9197fb16beca399405cf10c5..aebcd82a96c5cc49d0d80465386704c10bbe7bbf 100644 --- a/components/search_engines/BUILD.gn +++ b/components/search_engines/BUILD.gn -@@ -203,6 +203,7 @@ json_to_struct("prepopulated_engines") { +@@ -202,6 +202,7 @@ json_to_struct("prepopulated_engines") { schema_file = "prepopulated_engines_schema.json" namespace = "TemplateURLPrepopulateData" deps = [ ":search_engine_type" ] diff --git a/patches/components-search_engines-default_search_manager.cc.patch b/patches/components-search_engines-default_search_manager.cc.patch index 2059dd4e64c65..f63672eae14fd 100644 --- a/patches/components-search_engines-default_search_manager.cc.patch +++ b/patches/components-search_engines-default_search_manager.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/search_engines/default_search_manager.cc b/components/search_engines/default_search_manager.cc -index 77b9c311ede676c1abd49e32f3774eaff5756da6..76c97efb4e9ad451ba0675d7ad6e92d4e2e8c075 100644 +index aeb8330f6034eb416a064e633264dba836360c78..9f3aec404531d4f5c169f8e4b7d5ed2cc86f9827 100644 --- a/components/search_engines/default_search_manager.cc +++ b/components/search_engines/default_search_manager.cc -@@ -307,6 +307,7 @@ void DefaultSearchManager::LoadDefaultSearchEngineFromPrefs() { +@@ -309,6 +309,7 @@ void DefaultSearchManager::LoadDefaultSearchEngineFromPrefs() { // Check if default search preference is overriden by extension. if (pref->IsExtensionControlled()) { extension_default_search_ = std::move(turl_data); diff --git a/patches/components-search_engines-prepopulated_engines.json.patch b/patches/components-search_engines-prepopulated_engines.json.patch index 968767713ef3f..873636bf43312 100644 --- a/patches/components-search_engines-prepopulated_engines.json.patch +++ b/patches/components-search_engines-prepopulated_engines.json.patch @@ -1,5 +1,5 @@ diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json -index 13572d43554c1c7b3f2ad110366cbdb4955b7b18..0be7f9600fe9b8b60675568bf841bec99468e215 100644 +index 765fe245ba192843486bfd677adc18255095036a..a54ffc9601a6980e79a207ad8629bea151641d1b 100644 --- a/components/search_engines/prepopulated_engines.json +++ b/components/search_engines/prepopulated_engines.json @@ -91,17 +91,6 @@ @@ -20,7 +20,7 @@ index 13572d43554c1c7b3f2ad110366cbdb4955b7b18..0be7f9600fe9b8b60675568bf841bec9 "ecosia": { "name": "Ecosia", "keyword": "ecosia.org", -@@ -167,16 +156,6 @@ +@@ -168,16 +157,6 @@ "id": 102 }, diff --git a/patches/components-signin-internal-identity_manager-BUILD.gn.patch b/patches/components-signin-internal-identity_manager-BUILD.gn.patch index 2316720a074e0..1848d37567942 100644 --- a/patches/components-signin-internal-identity_manager-BUILD.gn.patch +++ b/patches/components-signin-internal-identity_manager-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/signin/internal/identity_manager/BUILD.gn b/components/signin/internal/identity_manager/BUILD.gn -index 5a0f4c49dccd643ec8e17edc7df21cd8a587e2ec..82d996736950dfab3a28c3addfab0ec1872c1837 100644 +index 011ec1fa83cd9fcdab5a8d014e2e314dd7b72149..ee39353ffa20023bd23ca800ed796ffae9b11e7a 100644 --- a/components/signin/internal/identity_manager/BUILD.gn +++ b/components/signin/internal/identity_manager/BUILD.gn -@@ -134,6 +134,7 @@ source_set("identity_manager") { +@@ -133,6 +133,7 @@ source_set("identity_manager") { "device_accounts_synchronizer_impl.h", ] } diff --git a/patches/components-sync-driver-sync_service_impl.h.patch b/patches/components-sync-driver-sync_service_impl.h.patch index 87797137df612..3cd52ee8fbeec 100644 --- a/patches/components-sync-driver-sync_service_impl.h.patch +++ b/patches/components-sync-driver-sync_service_impl.h.patch @@ -1,8 +1,8 @@ diff --git a/components/sync/driver/sync_service_impl.h b/components/sync/driver/sync_service_impl.h -index 4bdf92404a88bda2319c7c7b571cd03a05ae6e74..e48c407188cc0a15735b2c4bfeae87aafacb16e6 100644 +index f45bf677f419bc2735b6942afb1d7d04ec189530..4aced8f1696adce6cbcceb172d42007bfb6c2b4b 100644 --- a/components/sync/driver/sync_service_impl.h +++ b/components/sync/driver/sync_service_impl.h -@@ -248,6 +248,7 @@ class SyncServiceImpl : public SyncService, +@@ -245,6 +245,7 @@ class SyncServiceImpl : public SyncService, SyncClient* GetSyncClientForTest(); diff --git a/patches/components-sync-engine-BUILD.gn.patch b/patches/components-sync-engine-BUILD.gn.patch index b7501a8877c20..04a7b1999676b 100644 --- a/patches/components-sync-engine-BUILD.gn.patch +++ b/patches/components-sync-engine-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/sync/engine/BUILD.gn b/components/sync/engine/BUILD.gn -index e9fcf08e35b870ffea89fd95e0afb9ffb928df23..69a411aa53257bfbe68a6ba1c629adb789120ae8 100644 +index e000e2ef4699031fcf89554c1ac84406d3d86724..3a952e4137c937a85dfbfcd8b66307d9ea9c7c02 100644 --- a/components/sync/engine/BUILD.gn +++ b/components/sync/engine/BUILD.gn -@@ -158,6 +158,7 @@ static_library("engine") { +@@ -156,6 +156,7 @@ static_library("engine") { "traffic_logger.h", "update_handler.h", ] diff --git a/patches/components-sync-engine-syncer_proto_util.cc.patch b/patches/components-sync-engine-syncer_proto_util.cc.patch index 19306538d3d1e..53da6526863ac 100644 --- a/patches/components-sync-engine-syncer_proto_util.cc.patch +++ b/patches/components-sync-engine-syncer_proto_util.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/sync/engine/syncer_proto_util.cc b/components/sync/engine/syncer_proto_util.cc -index 54924516f822122338345e65992c35e71de849d0..bfdb3cb7aeee6aa3ce7b147d3bb3d6a4cc1a8899 100644 +index b7f9309e25b97e6ce7ee7ea7884197bef6fc9cc5..21965e0bab0a6830e8d887a992154dc2a77771cf 100644 --- a/components/sync/engine/syncer_proto_util.cc +++ b/components/sync/engine/syncer_proto_util.cc -@@ -442,6 +442,7 @@ SyncerError SyncerProtoUtil::PostClientToServerMessage( +@@ -411,6 +411,7 @@ SyncerError SyncerProtoUtil::PostClientToServerMessage( SyncProtocolError sync_protocol_error = GetProtocolErrorFromResponse(*response, cycle->context()); diff --git a/patches/components-sync-protocol-proto_visitors.h.patch b/patches/components-sync-protocol-proto_visitors.h.patch index 0c98bc5daaa53..2ca000de69559 100644 --- a/patches/components-sync-protocol-proto_visitors.h.patch +++ b/patches/components-sync-protocol-proto_visitors.h.patch @@ -1,8 +1,8 @@ diff --git a/components/sync/protocol/proto_visitors.h b/components/sync/protocol/proto_visitors.h -index 2c2042b32dc824aa3157c3a269ef927b1763cc1c..86b87196061ae4e34e0d3602d94554985ba23730 100644 +index 55784eba3d383888f8db7a22f9d4034b9db82a78..37eea0b70c820ae221d5d5b2e99cb263930ef9c2 100644 --- a/components/sync/protocol/proto_visitors.h +++ b/components/sync/protocol/proto_visitors.h -@@ -398,6 +398,7 @@ VISIT_PROTO_FIELDS(const sync_pb::DeviceInfoSpecifics& proto) { +@@ -400,6 +400,7 @@ VISIT_PROTO_FIELDS(const sync_pb::DeviceInfoSpecifics& proto) { VISIT(manufacturer); VISIT(last_updated_timestamp); VISIT(feature_fields); @@ -10,7 +10,7 @@ index 2c2042b32dc824aa3157c3a269ef927b1763cc1c..86b87196061ae4e34e0d3602d9455498 VISIT(sharing_fields); VISIT(invalidation_fields); VISIT(paask_fields); -@@ -410,6 +411,7 @@ VISIT_PROTO_FIELDS(const sync_pb::FeatureSpecificFields& proto) { +@@ -412,6 +413,7 @@ VISIT_PROTO_FIELDS(const sync_pb::FeatureSpecificFields& proto) { VISIT(send_tab_to_self_receiving_enabled); } diff --git a/patches/components-sync-protocol-protocol_sources.gni.patch b/patches/components-sync-protocol-protocol_sources.gni.patch index 9313a37cd16a5..960573c6c1955 100644 --- a/patches/components-sync-protocol-protocol_sources.gni.patch +++ b/patches/components-sync-protocol-protocol_sources.gni.patch @@ -1,8 +1,8 @@ diff --git a/components/sync/protocol/protocol_sources.gni b/components/sync/protocol/protocol_sources.gni -index 000d0ff8cf2ce42a2f2daf177ca03681b75c4bba..4584c7d0351dc254228eb9edd87f7932bb9982ac 100644 +index d73f98f2fd650a1f9bbab26aa7bec0163ac081c0..f28978ad8d0b9f80d1acdd9afeb0445611a264da 100644 --- a/components/sync/protocol/protocol_sources.gni +++ b/components/sync/protocol/protocol_sources.gni -@@ -72,3 +72,4 @@ sync_protocol_sources = [ +@@ -73,3 +73,4 @@ sync_protocol_sources = [ "wifi_configuration_specifics.proto", "workspace_desk_specifics.proto", ] diff --git a/patches/components-sync_device_info-device_info.h.patch b/patches/components-sync_device_info-device_info.h.patch index 04e82342bdff6..8bccd3e862447 100644 --- a/patches/components-sync_device_info-device_info.h.patch +++ b/patches/components-sync_device_info-device_info.h.patch @@ -1,8 +1,8 @@ diff --git a/components/sync_device_info/device_info.h b/components/sync_device_info/device_info.h -index 0c856c39529b10ec04e793882e781de0321aafca..492f394cdba10bba3ebe1a452d1376d17f347143 100644 +index fd022044bbaf62a7e8fb0bc6c7fb962b905fabec..6da157aa779e9d16791a363298d18cf7c738dde3 100644 --- a/components/sync_device_info/device_info.h +++ b/components/sync_device_info/device_info.h -@@ -116,6 +116,7 @@ class DeviceInfo { +@@ -115,6 +115,7 @@ class DeviceInfo { DeviceInfo(const DeviceInfo&) = delete; DeviceInfo& operator=(const DeviceInfo&) = delete; diff --git a/patches/content-browser-browser_main_runner_impl.cc.patch b/patches/content-browser-browser_main_runner_impl.cc.patch index f57b790682799..7fe44eef4c788 100644 --- a/patches/content-browser-browser_main_runner_impl.cc.patch +++ b/patches/content-browser-browser_main_runner_impl.cc.patch @@ -1,5 +1,5 @@ diff --git a/content/browser/browser_main_runner_impl.cc b/content/browser/browser_main_runner_impl.cc -index a312dca606c27ab3c41deaee6cfef2cc82658266..8832a66982886036dcb115bb509ffb4b05b841dd 100644 +index 4d0be5f7989ec76c41766d81e818b62b65d251fb..034f6c2e41978907025ce40b517c3dfc076e3551 100644 --- a/content/browser/browser_main_runner_impl.cc +++ b/content/browser/browser_main_runner_impl.cc @@ -18,6 +18,7 @@ diff --git a/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch b/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch index a4edb3be4119a..153a76e6afbc8 100644 --- a/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch +++ b/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/browser/renderer_host/navigation_controller_impl.cc b/content/browser/renderer_host/navigation_controller_impl.cc -index fb073041fbc53a73db6e67ca9db2a3824b2d963e..6f2d8bd8caf0e411700771f08c9f907f796ea5ea 100644 +index 7801a15624fec05e6191909192d7163592e4fa9a..c62e31a4d78ef88158178be09a2bfc8c360837cc 100644 --- a/content/browser/renderer_host/navigation_controller_impl.cc +++ b/content/browser/renderer_host/navigation_controller_impl.cc -@@ -3358,16 +3358,17 @@ base::WeakPtr NavigationControllerImpl::NavigateWithoutEntry( +@@ -3370,16 +3370,17 @@ base::WeakPtr NavigationControllerImpl::NavigateWithoutEntry( // Note: we intentionally leave the pending entry in place for renderer debug // URLs, unlike the cases below where we clear it if the navigation doesn't // proceed. diff --git a/patches/content-browser-renderer_host-navigation_request.cc.patch b/patches/content-browser-renderer_host-navigation_request.cc.patch index 9377f3c9b2487..b642d2fefce7f 100644 --- a/patches/content-browser-renderer_host-navigation_request.cc.patch +++ b/patches/content-browser-renderer_host-navigation_request.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc -index 6291945b8640e3b4b68cb20656a5d837b2aa8e5e..1e19ad47426a5429a257df6fefbf826e72824f28 100644 +index 2081607afe3c1023096c4e149bf501bd83dc71be..81f32be6243ed92358a3f969eb5c10caa8e085c9 100644 --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -2696,6 +2696,7 @@ void NavigationRequest::OnRequestRedirected( +@@ -2723,6 +2723,7 @@ void NavigationRequest::OnRequestRedirected( common_params_->url = redirect_info.new_url; common_params_->method = redirect_info.new_method; common_params_->referrer->url = GURL(redirect_info.new_referrer); @@ -10,7 +10,7 @@ index 6291945b8640e3b4b68cb20656a5d837b2aa8e5e..1e19ad47426a5429a257df6fefbf826e common_params_->referrer = Referrer::SanitizeForRequest( common_params_->url, *common_params_->referrer); -@@ -4038,6 +4039,7 @@ void NavigationRequest::OnStartChecksComplete( +@@ -4092,6 +4093,7 @@ void NavigationRequest::OnStartChecksComplete( headers.MergeFrom(TakeModifiedRequestHeaders()); begin_params_->headers = headers.ToString(); diff --git a/patches/content-browser-webui-web_ui_impl.cc.patch b/patches/content-browser-webui-web_ui_impl.cc.patch index f5db82bdbda73..f7094c17821c2 100644 --- a/patches/content-browser-webui-web_ui_impl.cc.patch +++ b/patches/content-browser-webui-web_ui_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/browser/webui/web_ui_impl.cc b/content/browser/webui/web_ui_impl.cc -index 9ac421a35b339e66d90d35a9e793c83440b3be53..4783ed1c358358fe5235178a65dd14a4a4f344aa 100644 +index 22f5308776edadbfae131d924a4282e646265c4c..6e5fb1730d0f73b734998b8df389e53db4d26f42 100644 --- a/content/browser/webui/web_ui_impl.cc +++ b/content/browser/webui/web_ui_impl.cc -@@ -74,6 +74,7 @@ WebUIImpl::WebUIImpl(WebContentsImpl* contents, RenderFrameHostImpl* frame_host) +@@ -75,6 +75,7 @@ WebUIImpl::WebUIImpl(WebContentsImpl* contents, RenderFrameHostImpl* frame_host) RenderFrameHostImpl::LifecycleStateImpl::kActive || frame_host->lifecycle_state() == RenderFrameHostImpl::LifecycleStateImpl::kSpeculative); diff --git a/patches/content-common-user_agent.cc.patch b/patches/content-common-user_agent.cc.patch index f1998dd036620..92cd85e0778af 100644 --- a/patches/content-common-user_agent.cc.patch +++ b/patches/content-common-user_agent.cc.patch @@ -1,5 +1,5 @@ diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc -index 4d6a3c4e2303762403b3076c10d349c81f7e0520..0ccf3ba0201af1e5c6ce0e173b48610f6f073891 100644 +index bc2f280dfcc3a2a603f8abd68274cf620e00839b..3ebe3d424c9ddcb456a92833c47cf5f4ec9e6062 100644 --- a/content/common/user_agent.cc +++ b/content/common/user_agent.cc @@ -330,6 +330,7 @@ std::string GetAndroidOSInfo( diff --git a/patches/content-public-browser-content_browser_client.h.patch b/patches/content-public-browser-content_browser_client.h.patch index 8cf6b0353552b..ecfe9c1686a8f 100644 --- a/patches/content-public-browser-content_browser_client.h.patch +++ b/patches/content-public-browser-content_browser_client.h.patch @@ -1,8 +1,8 @@ diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h -index ae3dda4b9b40bb0d4c1a10eaedda9270d3543a8b..119ebabeb12de4d15a75ba5de93207c512bd6f9b 100644 +index d2c0f46e1a413829172013ea48aa572bf3e62610..9ff90838133ed1c362e43428e294ad6cbd19de88 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h -@@ -1971,6 +1971,7 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -1989,6 +1989,7 @@ class CONTENT_EXPORT ContentBrowserClient { virtual ui::AXMode GetAXModeForBrowserContext( BrowserContext* browser_context); diff --git a/patches/content-renderer-render_frame_impl.cc.patch b/patches/content-renderer-render_frame_impl.cc.patch index d83d334cc026c..e2e2d96af68a0 100644 --- a/patches/content-renderer-render_frame_impl.cc.patch +++ b/patches/content-renderer-render_frame_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index f217de19126feeeafee01b2be31ced936696ce20..e6e19c28b441035f74281f202a6b0f4998fcace8 100644 +index 3a03de6175413929c4e5ad9bd8ae7cb990f0bf77..614a3a74af619041dabc15b9293f66c6283ba7fa 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -4550,6 +4550,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const { +@@ -4569,6 +4569,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const { // Temporarily return early and fix properly as part of // https://crbug.com/426555. if (web_view->MainFrame()->IsWebRemoteFrame()) diff --git a/patches/content-renderer-render_thread_impl.cc.patch b/patches/content-renderer-render_thread_impl.cc.patch index d56afb87a2306..a72f692d75be5 100644 --- a/patches/content-renderer-render_thread_impl.cc.patch +++ b/patches/content-renderer-render_thread_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc -index 15bada83dc4bc3fda72600e6325917faeba4e60f..80c798c6fd4e433e993c3ff9edaea418b64786bb 100644 +index f81f1104399a42009f7705585716579d4c17ad03..5e4611b672bdc99dd316f0430684ac903cef0c73 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc -@@ -985,6 +985,7 @@ void RenderThreadImpl::InitializeRenderer( +@@ -986,6 +986,7 @@ void RenderThreadImpl::InitializeRenderer( } void RenderThreadImpl::RegisterSchemes() { diff --git a/patches/extensions-browser-api-web_request-web_request_api.cc.patch b/patches/extensions-browser-api-web_request-web_request_api.cc.patch index 7f3ecf6d33357..ec8d4a7070537 100644 --- a/patches/extensions-browser-api-web_request-web_request_api.cc.patch +++ b/patches/extensions-browser-api-web_request-web_request_api.cc.patch @@ -1,8 +1,8 @@ diff --git a/extensions/browser/api/web_request/web_request_api.cc b/extensions/browser/api/web_request/web_request_api.cc -index b418cbd88e8de727a8a9bfd0974341506ccaaf39..4aef32b13edcb358b9fa53afab485501289430b3 100644 +index c2c9a707175f783078982051fbbe85132af722b7..54b749549865aa2ab54da353567bf2f8a28699f0 100644 --- a/extensions/browser/api/web_request/web_request_api.cc +++ b/extensions/browser/api/web_request/web_request_api.cc -@@ -1371,6 +1371,9 @@ ExtensionWebRequestEventRouter::OnAuthRequired( +@@ -1367,6 +1367,9 @@ ExtensionWebRequestEventRouter::OnAuthRequired( const net::AuthChallengeInfo& auth_info, AuthCallback callback, net::AuthCredentials* credentials) { diff --git a/patches/extensions-browser-extension_event_histogram_value.h.patch b/patches/extensions-browser-extension_event_histogram_value.h.patch index 206ab5f07f5df..dd0cbc9e904f6 100644 --- a/patches/extensions-browser-extension_event_histogram_value.h.patch +++ b/patches/extensions-browser-extension_event_histogram_value.h.patch @@ -1,5 +1,5 @@ diff --git a/extensions/browser/extension_event_histogram_value.h b/extensions/browser/extension_event_histogram_value.h -index b9e19bf8c83fede8f0255d91a3582d34f82d75ad..866f3b6a7c86560602f2612a5dd8db5ed513f12f 100644 +index 7e2bc5aa5bd4b1b2438ec5ff13d787216b9de187..e33f638adf88edcc091b15d798afa05973484fe9 100644 --- a/extensions/browser/extension_event_histogram_value.h +++ b/extensions/browser/extension_event_histogram_value.h @@ -513,6 +513,20 @@ enum HistogramValue { diff --git a/patches/extensions-common-api-_api_features.json.patch b/patches/extensions-common-api-_api_features.json.patch index 792e7cfbbe9fe..8749694cae477 100644 --- a/patches/extensions-common-api-_api_features.json.patch +++ b/patches/extensions-common-api-_api_features.json.patch @@ -1,8 +1,8 @@ diff --git a/extensions/common/api/_api_features.json b/extensions/common/api/_api_features.json -index 93675096b7755cf81c5fc5f6f71912ccd71e5ca5..673f170788c6f60e91c456f00c77ca62f0994c5b 100644 +index 7048d7b063737a44741f48141b0dc8d6add48e3c..1b1022a64d110d3536b41c7223df0e942ed9d978 100644 --- a/extensions/common/api/_api_features.json +++ b/extensions/common/api/_api_features.json -@@ -558,6 +558,7 @@ +@@ -562,6 +562,7 @@ "matches": [ "chrome://password-change/*", "chrome://file-manager/*" diff --git a/patches/ios-chrome-browser-BUILD.gn.patch b/patches/ios-chrome-browser-BUILD.gn.patch index af3a581cc664c..c8daf91df7d53 100644 --- a/patches/ios-chrome-browser-BUILD.gn.patch +++ b/patches/ios-chrome-browser-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/ios/chrome/browser/BUILD.gn b/ios/chrome/browser/BUILD.gn -index e711fa5698fb1f64f7449942f99c7e901d5a9dda..bc1a70ad141d5b7ae8f361a97e852889bc9aa1e8 100644 +index 2d805833397abbdd8c34defd49d90a867173dcd9..2f4c123c07f00820eecdc2fe00b6cc43174bb5a7 100644 --- a/ios/chrome/browser/BUILD.gn +++ b/ios/chrome/browser/BUILD.gn @@ -130,6 +130,7 @@ source_set("browser") { diff --git a/patches/ios-chrome-browser-prefs-browser_prefs.mm.patch b/patches/ios-chrome-browser-prefs-browser_prefs.mm.patch index 16f08c73b717d..77a4b44cb6f18 100644 --- a/patches/ios-chrome-browser-prefs-browser_prefs.mm.patch +++ b/patches/ios-chrome-browser-prefs-browser_prefs.mm.patch @@ -1,20 +1,19 @@ diff --git a/ios/chrome/browser/prefs/browser_prefs.mm b/ios/chrome/browser/prefs/browser_prefs.mm -index 47b7a1fbeaada1e44c2c63f8c7d20186d9d2a851..75f306f0e6e54668a794a39a4fae7bdce9274443 100644 +index 8b79f294f61fe640235f886d69e58e477b893cb4..c1cf25d5a0a50f52be5a146a08c08740eae0c340 100644 --- a/ios/chrome/browser/prefs/browser_prefs.mm +++ b/ios/chrome/browser/prefs/browser_prefs.mm -@@ -212,6 +212,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) { - registry->RegisterIntegerPref(kSigninBottomSheetShownCount, 0); - +@@ -220,6 +220,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) { registry->RegisterIntegerPref(kFRETrialGroupPrefName, 0); + + registry->RegisterIntegerPref(kTrialGroupV3PrefName, 0); + BRAVE_REGISTER_LOCAL_STATE_PREFS } void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) { -@@ -325,6 +326,8 @@ void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) { - registry->RegisterBooleanPref(kSigninAllowedByPolicy, true); - - registry->RegisterBooleanPref(kShowReadingListInBookmarkBar, true); -+ +@@ -342,6 +343,7 @@ void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) { + // already shown. + registry->RegisterBooleanPref( + policy::policy_prefs::kUserPolicyNotificationWasShown, false); + BRAVE_REGISTER_BROWSER_STATE_PREFS } diff --git a/patches/ios-chrome-browser-sync-sync_service_factory.mm.patch b/patches/ios-chrome-browser-sync-sync_service_factory.mm.patch index 5636e05cc8188..393de5328374f 100644 --- a/patches/ios-chrome-browser-sync-sync_service_factory.mm.patch +++ b/patches/ios-chrome-browser-sync-sync_service_factory.mm.patch @@ -2,7 +2,7 @@ diff --git a/ios/chrome/browser/sync/sync_service_factory.mm b/ios/chrome/browse index 4be5148aec4fdea8404a4ed0976a4980e70f01d5..49cf2f6fe2be7af0208458eae8ae46bd5d90923d 100644 --- a/ios/chrome/browser/sync/sync_service_factory.mm +++ b/ios/chrome/browser/sync/sync_service_factory.mm -@@ -155,7 +155,7 @@ std::unique_ptr SyncServiceFactory::BuildServiceInstanceFor( +@@ -155,7 +155,7 @@ policy_connector ? policy_connector->GetPolicyService() : nullptr; auto sync_service = diff --git a/patches/mojo-public-tools-bindings-checks-mojom_attributes_check.py.patch b/patches/mojo-public-tools-bindings-checks-mojom_attributes_check.py.patch new file mode 100644 index 0000000000000..1dc418207c686 --- /dev/null +++ b/patches/mojo-public-tools-bindings-checks-mojom_attributes_check.py.patch @@ -0,0 +1,12 @@ +diff --git a/mojo/public/tools/bindings/checks/mojom_attributes_check.py b/mojo/public/tools/bindings/checks/mojom_attributes_check.py +index fd15dfd7f7cad25559d9796e08cf1a6e9573d1b7..a18a1cccffffe5352056157ccbd9bb30c4a4a61e 100644 +--- a/mojo/public/tools/bindings/checks/mojom_attributes_check.py ++++ b/mojo/public/tools/bindings/checks/mojom_attributes_check.py +@@ -7,6 +7,7 @@ import mojom.generate.check as check + import mojom.generate.module as module + + _COMMON_ATTRIBUTES = { ++ 'BraveAdd', 'BraveExtend', + 'EnableIf', + 'EnableIfNot', + } diff --git a/patches/net-BUILD.gn.patch b/patches/net-BUILD.gn.patch index e7d6e976f5021..438e597d33cf3 100644 --- a/patches/net-BUILD.gn.patch +++ b/patches/net-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/net/BUILD.gn b/net/BUILD.gn -index 5302673ba18bc5d6a4c0a6c856d72582d0ac14eb..001958a1b0c8464b42a9e99141e993b48e41462c 100644 +index c2905c5fd3234d862699b89a4ea8a76c58f9379d..a69e7ac11578d84851acb7e881a58513423cabf2 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn -@@ -1133,6 +1133,7 @@ component("net") { +@@ -1127,6 +1127,7 @@ component("net") { "reporting/reporting_uploader.h", ] } diff --git a/patches/net-cookies-canonical_cookie.cc.patch b/patches/net-cookies-canonical_cookie.cc.patch index 0390f5b067dfb..f34d2ffb0550d 100644 --- a/patches/net-cookies-canonical_cookie.cc.patch +++ b/patches/net-cookies-canonical_cookie.cc.patch @@ -1,12 +1,12 @@ diff --git a/net/cookies/canonical_cookie.cc b/net/cookies/canonical_cookie.cc -index 053f760ed76dfa5f5ed21a672ee24d9e34f301ed..5b056c63d0371c8fb6684c7c6c3bd70a722a5c1f 100644 +index 0a80584b8d510a709387d8564777f582d569776d..e4806edb42ea0987b7513d97c1a3e58d47773868 100644 --- a/net/cookies/canonical_cookie.cc +++ b/net/cookies/canonical_cookie.cc -@@ -603,6 +603,7 @@ std::unique_ptr CanonicalCookie::Create( +@@ -628,6 +628,7 @@ std::unique_ptr CanonicalCookie::Create( // Get the port, this will get a default value if a port isn't provided. int source_port = ValidateAndAdjustSourcePort(url.EffectiveIntPort()); + BRAVE_CREATE std::unique_ptr cc = base::WrapUnique(new CanonicalCookie( parsed_cookie.Name(), parsed_cookie.Value(), cookie_domain, cookie_path, - creation_time, cookie_expires, creation_time, parsed_cookie.IsSecure(), + creation_time, cookie_expires, creation_time, diff --git a/patches/net-http-transport_security_state.cc.patch b/patches/net-http-transport_security_state.cc.patch index 9d565bdfae4e3..8535fae2eea74 100644 --- a/patches/net-http-transport_security_state.cc.patch +++ b/patches/net-http-transport_security_state.cc.patch @@ -1,9 +1,9 @@ diff --git a/net/http/transport_security_state.cc b/net/http/transport_security_state.cc -index 340b2e49df29ac57b2f827836bdcd3a4c63da279..6e014a9e54fdfcaef7ce32f0f03f2420ed1dbf94 100644 +index f920d2925b2a5c8dc8043f8ef2dd967ddc3da7a6..5862e493c07ace8f843bd71dfa1d7733907930a1 100644 --- a/net/http/transport_security_state.cc +++ b/net/http/transport_security_state.cc -@@ -417,6 +417,7 @@ TransportSecurityState::TransportSecurityState( - BUILDFLAG(IS_IOS) +@@ -416,6 +416,7 @@ TransportSecurityState::TransportSecurityState( + #if !BUILDFLAG(GOOGLE_CHROME_BRANDING) || BUILDFLAG(IS_IOS) enable_static_pins_ = false; enable_static_expect_ct_ = false; + BRAVE_ENABLE_STATIC_PINS diff --git a/patches/net-socket-socks5_client_socket.cc.patch b/patches/net-socket-socks5_client_socket.cc.patch index c0d96bf145602..6d01890ab5c63 100644 --- a/patches/net-socket-socks5_client_socket.cc.patch +++ b/patches/net-socket-socks5_client_socket.cc.patch @@ -1,8 +1,8 @@ diff --git a/net/socket/socks5_client_socket.cc b/net/socket/socks5_client_socket.cc -index eeee9a39b321043327e4e931486de424be42f4e9..a59ac2bd456a02ab5612b2be0eacf0c6d2f35394 100644 +index dce6510138ad0418fcc00f1362537a69f1812732..819abf6ea9edd37689efb80a68bc05cd8dae6001 100644 --- a/net/socket/socks5_client_socket.cc +++ b/net/socket/socks5_client_socket.cc -@@ -238,6 +238,9 @@ int SOCKS5ClientSocket::DoLoop(int last_io_result) { +@@ -234,6 +234,9 @@ int SOCKS5ClientSocket::DoLoop(int last_io_result) { net_log_.EndEventWithNetErrorCode(NetLogEventType::SOCKS5_GREET_READ, rv); break; @@ -12,7 +12,7 @@ index eeee9a39b321043327e4e931486de424be42f4e9..a59ac2bd456a02ab5612b2be0eacf0c6 case STATE_HANDSHAKE_WRITE: DCHECK_EQ(OK, rv); net_log_.BeginEvent(NetLogEventType::SOCKS5_HANDSHAKE_WRITE); -@@ -267,8 +270,6 @@ int SOCKS5ClientSocket::DoLoop(int last_io_result) { +@@ -263,8 +266,6 @@ int SOCKS5ClientSocket::DoLoop(int last_io_result) { return rv; } @@ -21,7 +21,7 @@ index eeee9a39b321043327e4e931486de424be42f4e9..a59ac2bd456a02ab5612b2be0eacf0c6 int SOCKS5ClientSocket::DoGreetWrite() { // Since we only have 1 byte to send the hostname length in, if the // URL has a hostname longer than 255 characters we can't send it. -@@ -278,8 +279,12 @@ int SOCKS5ClientSocket::DoGreetWrite() { +@@ -274,8 +275,12 @@ int SOCKS5ClientSocket::DoGreetWrite() { } if (buffer_.empty()) { @@ -36,7 +36,7 @@ index eeee9a39b321043327e4e931486de424be42f4e9..a59ac2bd456a02ab5612b2be0eacf0c6 bytes_sent_ = 0; } -@@ -338,14 +343,14 @@ int SOCKS5ClientSocket::DoGreetReadComplete(int result) { +@@ -334,14 +339,14 @@ int SOCKS5ClientSocket::DoGreetReadComplete(int result) { "version", buffer_[0]); return ERR_SOCKS_CONNECTION_FAILED; } diff --git a/patches/net-socket-socks5_client_socket.h.patch b/patches/net-socket-socks5_client_socket.h.patch index 469bf667bd7d0..12a976c3e8f79 100644 --- a/patches/net-socket-socks5_client_socket.h.patch +++ b/patches/net-socket-socks5_client_socket.h.patch @@ -1,8 +1,8 @@ diff --git a/net/socket/socks5_client_socket.h b/net/socket/socks5_client_socket.h -index 6043d96d29860724abfaecd79a75050e61bb6fcc..8068ff62765d8609bd2a9b4972a348b6224c37ec 100644 +index 41b58b614f9a8407227a1c7be90d0ae9b7d99eda..37824bdb5d2ccb34c082895766dfc34c7d69b1e0 100644 --- a/net/socket/socks5_client_socket.h +++ b/net/socket/socks5_client_socket.h -@@ -79,11 +79,14 @@ class NET_EXPORT_PRIVATE SOCKS5ClientSocket : public StreamSocket { +@@ -76,11 +76,14 @@ class NET_EXPORT_PRIVATE SOCKS5ClientSocket : public StreamSocket { int GetLocalAddress(IPEndPoint* address) const override; private: @@ -17,7 +17,7 @@ index 6043d96d29860724abfaecd79a75050e61bb6fcc..8068ff62765d8609bd2a9b4972a348b6 STATE_HANDSHAKE_WRITE, STATE_HANDSHAKE_WRITE_COMPLETE, STATE_HANDSHAKE_READ, -@@ -118,6 +121,13 @@ class NET_EXPORT_PRIVATE SOCKS5ClientSocket : public StreamSocket { +@@ -115,6 +118,13 @@ class NET_EXPORT_PRIVATE SOCKS5ClientSocket : public StreamSocket { int DoGreetReadComplete(int result); int DoGreetWrite(); int DoGreetWriteComplete(int result); diff --git a/patches/sandbox-policy-win-sandbox_win.cc.patch b/patches/sandbox-policy-win-sandbox_win.cc.patch index 176caba8ce49e..dd079b6f93e1a 100644 --- a/patches/sandbox-policy-win-sandbox_win.cc.patch +++ b/patches/sandbox-policy-win-sandbox_win.cc.patch @@ -1,8 +1,8 @@ diff --git a/sandbox/policy/win/sandbox_win.cc b/sandbox/policy/win/sandbox_win.cc -index e4e7cfe65b87ef3bc6b88073dc384a50fd8256ea..80689c92a9e16ffb1b8042df169c60a1398b7cda 100644 +index 7eaf2e4187b5cd8d3271cedbb8a4c1392e9be6a9..1177900f668c030ecf0b7fc2140470329ce8fe94 100644 --- a/sandbox/policy/win/sandbox_win.cc +++ b/sandbox/policy/win/sandbox_win.cc -@@ -749,6 +749,7 @@ ResultCode LaunchWithoutSandbox( +@@ -744,6 +744,7 @@ ResultCode LaunchWithoutSandbox( base::Process* process) { base::LaunchOptions options; options.handles_to_inherit = handles_to_inherit; diff --git a/patches/services-network-cookie_manager.cc.patch b/patches/services-network-cookie_manager.cc.patch index 08272866bb5df..e87fe87a41b1f 100644 --- a/patches/services-network-cookie_manager.cc.patch +++ b/patches/services-network-cookie_manager.cc.patch @@ -1,5 +1,5 @@ diff --git a/services/network/cookie_manager.cc b/services/network/cookie_manager.cc -index c47a0482919499b10771178cf03f0382824882fa..5a97e6dc061de63794877730fa4e80278634ab62 100644 +index 07c1fb882adc8cf133956047b081d2209eab26cf..a33d0e876db936c7ce75cefc3ddd5d28f3e3040a 100644 --- a/services/network/cookie_manager.cc +++ b/services/network/cookie_manager.cc @@ -435,6 +435,7 @@ CookieDeletionInfo DeletionFilterToInfo(mojom::CookieDeletionFilterPtr filter) { diff --git a/patches/services-network-public-cpp-cors-cors.cc.patch b/patches/services-network-public-cpp-cors-cors.cc.patch index f52b77d8700cf..8eb7af26ce86a 100644 --- a/patches/services-network-public-cpp-cors-cors.cc.patch +++ b/patches/services-network-public-cpp-cors-cors.cc.patch @@ -1,5 +1,5 @@ diff --git a/services/network/public/cpp/cors/cors.cc b/services/network/public/cpp/cors/cors.cc -index 9b1aa044977dc1759ccbc9627d2a1d21c735e9a2..279fa99eb92da4d1b3f73e2c5bad1f6e10d47aa5 100644 +index 4a0b703fdb498831421649d3bc0509a85969d7d6..0c2d9b644463cb1b36f279f039a2c81555df7b99 100644 --- a/services/network/public/cpp/cors/cors.cc +++ b/services/network/public/cpp/cors/cors.cc @@ -344,6 +344,7 @@ bool IsCorsSafelistedHeader(const std::string& name, const std::string& value) { diff --git a/patches/third_party-blink-common-client_hints-client_hints.cc.patch b/patches/third_party-blink-common-client_hints-client_hints.cc.patch index 63dd5b7e5b8db..f8b418d0a37d8 100644 --- a/patches/third_party-blink-common-client_hints-client_hints.cc.patch +++ b/patches/third_party-blink-common-client_hints-client_hints.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/common/client_hints/client_hints.cc b/third_party/blink/common/client_hints/client_hints.cc -index 373c3d9be3c0a2d887b9aa8b5770b19d4fddba69..249a50f33526eca8a6ec52578529db12af23ab52 100644 +index fb72470144d8c9c9ba9aa518b04feee6d4c8cf59..559bf3068daa4fdc7405066c2a427686ef2363f8 100644 --- a/third_party/blink/common/client_hints/client_hints.cc +++ b/third_party/blink/common/client_hints/client_hints.cc -@@ -118,6 +118,7 @@ const size_t kWebEffectiveConnectionTypeMappingCount = +@@ -116,6 +116,7 @@ const size_t kWebEffectiveConnectionTypeMappingCount = std::size(kWebEffectiveConnectionTypeMapping); bool IsClientHintSentByDefault(network::mojom::WebClientHintsType type) { diff --git a/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch b/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch index 5da48e0c7ee52..a79c28db5b377 100644 --- a/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch +++ b/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/bindings/generated_in_modules.gni b/third_party/blink/renderer/bindings/generated_in_modules.gni -index adab0a530cb7662dc30c11f68dbd94de3d8d26a6..aaf4defe379a77bca564f3fb78928c1e082d52a1 100644 +index 1346279c307dd5130d546e9646674aaace11e3f1..310b34a103cd046284dfea2480900af8c428054c 100644 --- a/third_party/blink/renderer/bindings/generated_in_modules.gni +++ b/third_party/blink/renderer/bindings/generated_in_modules.gni -@@ -2520,6 +2520,7 @@ generated_interface_sources_in_modules = [ +@@ -2528,6 +2528,7 @@ generated_interface_sources_in_modules = [ "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_webgl_layer.cc", "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_webgl_layer.h", ] diff --git a/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch b/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch index 6d2c1de17a3b7..46efbdf1ed99b 100644 --- a/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch +++ b/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/bindings/idl_in_modules.gni b/third_party/blink/renderer/bindings/idl_in_modules.gni -index 53c758a813bd3f08ea11e0f1e77acdad83745eb8..34d43c16f555be92bb20dd4477e327a2f521dcfb 100644 +index 29c5f99681c3444c339636993cb8f6d9ff21221a..f502545433f7726f469858b31dde44777dc2f956 100644 --- a/third_party/blink/renderer/bindings/idl_in_modules.gni +++ b/third_party/blink/renderer/bindings/idl_in_modules.gni -@@ -1154,6 +1154,7 @@ static_idl_files_in_modules = get_path_info( +@@ -1155,6 +1155,7 @@ static_idl_files_in_modules = get_path_info( "//third_party/blink/renderer/modules/xr/xr_webgl_layer_init.idl", ], "abspath") diff --git a/patches/third_party-blink-renderer-core-BUILD.gn.patch b/patches/third_party-blink-renderer-core-BUILD.gn.patch index 803d79b123c7d..1a8cdf9b2e866 100644 --- a/patches/third_party-blink-renderer-core-BUILD.gn.patch +++ b/patches/third_party-blink-renderer-core-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/core/BUILD.gn b/third_party/blink/renderer/core/BUILD.gn -index 502a79562151468d8015bccda85dfd161de8c3f6..1fb07294fc3c6f7f4efc4b580fd178a93aec6bf4 100644 +index 86cdee743ad844a6986b28d4dcb43f9d6a3f0ec7..cfaf24b8cde4a959a8f7cf6ea7e2c3e315a4fa11 100644 --- a/third_party/blink/renderer/core/BUILD.gn +++ b/third_party/blink/renderer/core/BUILD.gn -@@ -359,6 +359,7 @@ component("core") { +@@ -361,6 +361,7 @@ component("core") { "Carbon.framework", ] } diff --git a/patches/third_party-blink-renderer-core-frame-dom_window.h.patch b/patches/third_party-blink-renderer-core-frame-dom_window.h.patch index 7c345b514a92b..45e5a8dce443a 100644 --- a/patches/third_party-blink-renderer-core-frame-dom_window.h.patch +++ b/patches/third_party-blink-renderer-core-frame-dom_window.h.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/core/frame/dom_window.h b/third_party/blink/renderer/core/frame/dom_window.h -index 6cf28c350dcf89ac212afba54dff261959848c31..7ef0dfd55ecff6e813355f5694b043752b7ffe5a 100644 +index 682a6b417827c5c40a832b923a9763a5f752f264..d48b931abefcc3572786ef8ac5bfc6d56e80662a 100644 --- a/third_party/blink/renderer/core/frame/dom_window.h +++ b/third_party/blink/renderer/core/frame/dom_window.h @@ -181,6 +181,7 @@ class CORE_EXPORT DOMWindow : public EventTargetWithInlineData { diff --git a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch index 882383eaa4d61..4394a3f6bc300 100644 --- a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch +++ b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc -index 6f283284216f8984fcb5f9be9112a20ea2f147b2..6b0358cfa1586818dfd4fd37bfd8729694688dda 100644 +index c4f111c6f2259225101f019cc80fc6a0393ce29f..7b60203ec733b1fa19143fbcd1896761902413a1 100644 --- a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc +++ b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc @@ -1006,6 +1006,7 @@ String HTMLCanvasElement::ToDataURLInternal( diff --git a/patches/third_party-blink-renderer-modules-BUILD.gn.patch b/patches/third_party-blink-renderer-modules-BUILD.gn.patch index 40ecb9688c857..97b29249007be 100644 --- a/patches/third_party-blink-renderer-modules-BUILD.gn.patch +++ b/patches/third_party-blink-renderer-modules-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/modules/BUILD.gn b/third_party/blink/renderer/modules/BUILD.gn -index 818e3e38fe4aad272d51122d829b7677bf5bc074..c5cf3a20fdf63ab09c780615cb8af2457a226abe 100644 +index 8a7265117d41b257099e027a05af7012a60351bf..828039774e2addb428f8427d3a778c0a0428da89 100644 --- a/third_party/blink/renderer/modules/BUILD.gn +++ b/third_party/blink/renderer/modules/BUILD.gn @@ -15,6 +15,7 @@ if (is_android) { diff --git a/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.cc.patch b/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.cc.patch index 01a121cb97057..1a34689f0ba92 100644 --- a/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.cc.patch +++ b/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.cc.patch @@ -1,8 +1,8 @@ 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 -index 59416d0a53c08cb7be7412086c7f3249873294d6..c591002f680d7d2f70fff001778d3540564c372c 100644 +index 5f1e9e2180912313c02c46a42fe2e6d07c11e561..e3a9d34d5b81428dbb545f2e347ee2410fe4db2b 100644 --- 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 -@@ -910,6 +910,7 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) { +@@ -913,6 +913,7 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) { if (!canvas()->GetDocument().GetFrame()) return MakeGarbageCollected(); diff --git a/patches/third_party-blink-renderer-modules-mediastream-media_devices.cc.patch b/patches/third_party-blink-renderer-modules-mediastream-media_devices.cc.patch index 393a8df24c3f8..4a97f92c739ee 100644 --- a/patches/third_party-blink-renderer-modules-mediastream-media_devices.cc.patch +++ b/patches/third_party-blink-renderer-modules-mediastream-media_devices.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/modules/mediastream/media_devices.cc b/third_party/blink/renderer/modules/mediastream/media_devices.cc -index 3d25ca464c23cf835bdbc7347bbac62485374097..3f9ab46563490ca2736957e786b3cc65ab122f68 100644 +index a48737fffe26a72bcc482b0ef5358bd5fe5ce55d..ee75497ac23fafb981e2d425a07febf033855e4b 100644 --- a/third_party/blink/renderer/modules/mediastream/media_devices.cc +++ b/third_party/blink/renderer/modules/mediastream/media_devices.cc @@ -669,6 +669,8 @@ void MediaDevices::DevicesEnumerated( diff --git a/patches/third_party-blink-renderer-modules-webgl-webgl2_rendering_context_base.cc.patch b/patches/third_party-blink-renderer-modules-webgl-webgl2_rendering_context_base.cc.patch index 03576ffc91284..86aa25d44a0b6 100644 --- a/patches/third_party-blink-renderer-modules-webgl-webgl2_rendering_context_base.cc.patch +++ b/patches/third_party-blink-renderer-modules-webgl-webgl2_rendering_context_base.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc b/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc -index 3824be8a73a8ee7dac1da9d306ee1a53368d28fb..7b654a9eeabb252251b924908073d5971c00e9ab 100644 +index 354c476ad8a04bd613235241bb1825409d1a4d38..8c014c87fb4a4854b5249d6e0cdee661b0277cd9 100644 --- a/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc +++ b/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc -@@ -5305,6 +5305,7 @@ ScriptValue WebGL2RenderingContextBase::getParameter(ScriptState* script_state, +@@ -5304,6 +5304,7 @@ ScriptValue WebGL2RenderingContextBase::getParameter(ScriptState* script_state, GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -10,7 +10,7 @@ index 3824be8a73a8ee7dac1da9d306ee1a53368d28fb..7b654a9eeabb252251b924908073d597 switch (pname) { case GL_SHADING_LANGUAGE_VERSION: { return WebGLAny( -@@ -5848,6 +5849,7 @@ ScriptValue WebGL2RenderingContextBase::getFramebufferAttachmentParameter( +@@ -5847,6 +5848,7 @@ ScriptValue WebGL2RenderingContextBase::getFramebufferAttachmentParameter( if (isContextLost() || !ValidateGetFramebufferAttachmentParameterFunc( kFunctionName, target, attachment)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -18,7 +18,7 @@ index 3824be8a73a8ee7dac1da9d306ee1a53368d28fb..7b654a9eeabb252251b924908073d597 WebGLFramebuffer* framebuffer_binding = GetFramebufferBinding(target); DCHECK(!framebuffer_binding || framebuffer_binding->Object()); -@@ -6060,6 +6062,7 @@ ScriptValue WebGL2RenderingContextBase::getTexParameter( +@@ -6059,6 +6061,7 @@ ScriptValue WebGL2RenderingContextBase::getTexParameter( GLenum pname) { if (isContextLost() || !ValidateTextureBinding("getTexParameter", target)) return ScriptValue::CreateNull(script_state->GetIsolate()); diff --git a/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch b/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch index 661d3d9879949..8f0e4e1f63b6d 100644 --- a/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch +++ b/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -index 396b2983f403b0684f952a5fbd2d0abf947328f0..e5f627ebf264462457a02dad45814cf64d819671 100644 +index e285aa5ed086129c760cebd586a39b6a149922f7..271bf1f1bc66f4d5f314cc5bd1facf0e9805b830 100644 --- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc +++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -3032,6 +3032,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveAttrib( +@@ -3033,6 +3033,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveAttrib( GLuint index) { if (!ValidateWebGLProgramOrShader("getActiveAttrib", program)) return nullptr; @@ -10,7 +10,7 @@ index 396b2983f403b0684f952a5fbd2d0abf947328f0..e5f627ebf264462457a02dad45814cf6 GLuint program_id = ObjectNonZero(program); GLint max_name_length = -1; ContextGL()->GetProgramiv(program_id, GL_ACTIVE_ATTRIBUTE_MAX_LENGTH, -@@ -3063,6 +3064,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveUniform( +@@ -3064,6 +3065,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveUniform( GLuint index) { if (!ValidateWebGLProgramOrShader("getActiveUniform", program)) return nullptr; @@ -18,7 +18,7 @@ index 396b2983f403b0684f952a5fbd2d0abf947328f0..e5f627ebf264462457a02dad45814cf6 GLuint program_id = ObjectNonZero(program); GLint max_name_length = -1; ContextGL()->GetProgramiv(program_id, GL_ACTIVE_UNIFORM_MAX_LENGTH, -@@ -3093,6 +3095,7 @@ absl::optional>> +@@ -3094,6 +3096,7 @@ absl::optional>> WebGLRenderingContextBase::getAttachedShaders(WebGLProgram* program) { if (!ValidateWebGLProgramOrShader("getAttachedShaders", program)) return absl::nullopt; @@ -26,7 +26,7 @@ index 396b2983f403b0684f952a5fbd2d0abf947328f0..e5f627ebf264462457a02dad45814cf6 HeapVector> shader_objects; for (GLenum shaderType : {GL_VERTEX_SHADER, GL_FRAGMENT_SHADER}) { -@@ -3107,6 +3110,7 @@ GLint WebGLRenderingContextBase::getAttribLocation(WebGLProgram* program, +@@ -3108,6 +3111,7 @@ GLint WebGLRenderingContextBase::getAttribLocation(WebGLProgram* program, const String& name) { if (!ValidateWebGLProgramOrShader("getAttribLocation", program)) return -1; @@ -34,7 +34,7 @@ index 396b2983f403b0684f952a5fbd2d0abf947328f0..e5f627ebf264462457a02dad45814cf6 if (!ValidateLocationLength("getAttribLocation", name)) return -1; if (!ValidateString("getAttribLocation", name)) -@@ -3140,6 +3144,7 @@ ScriptValue WebGLRenderingContextBase::getBufferParameter( +@@ -3141,6 +3145,7 @@ ScriptValue WebGLRenderingContextBase::getBufferParameter( GLenum pname) { if (isContextLost() || !ValidateBufferTarget("getBufferParameter", target)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -42,7 +42,7 @@ index 396b2983f403b0684f952a5fbd2d0abf947328f0..e5f627ebf264462457a02dad45814cf6 switch (pname) { case GL_BUFFER_USAGE: { -@@ -3286,6 +3291,7 @@ ScriptValue WebGLRenderingContextBase::getFramebufferAttachmentParameter( +@@ -3287,6 +3292,7 @@ ScriptValue WebGLRenderingContextBase::getFramebufferAttachmentParameter( target, attachment)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -50,7 +50,7 @@ index 396b2983f403b0684f952a5fbd2d0abf947328f0..e5f627ebf264462457a02dad45814cf6 if (!framebuffer_binding_ || !framebuffer_binding_->Object()) { SynthesizeGLError(GL_INVALID_OPERATION, "getFramebufferAttachmentParameter", "no framebuffer bound"); -@@ -3686,6 +3692,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, +@@ -3687,6 +3693,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, "invalid parameter name, OES_standard_derivatives not enabled"); return ScriptValue::CreateNull(script_state->GetIsolate()); case WebGLDebugRendererInfo::kUnmaskedRendererWebgl: @@ -58,7 +58,7 @@ index 396b2983f403b0684f952a5fbd2d0abf947328f0..e5f627ebf264462457a02dad45814cf6 if (ExtensionEnabled(kWebGLDebugRendererInfoName)) { if (IdentifiabilityStudySettings::Get()->ShouldSampleType( blink::IdentifiableSurface::Type::kWebGLParameter)) { -@@ -3701,6 +3708,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, +@@ -3702,6 +3709,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, "invalid parameter name, WEBGL_debug_renderer_info not enabled"); return ScriptValue::CreateNull(script_state->GetIsolate()); case WebGLDebugRendererInfo::kUnmaskedVendorWebgl: @@ -66,7 +66,7 @@ index 396b2983f403b0684f952a5fbd2d0abf947328f0..e5f627ebf264462457a02dad45814cf6 if (ExtensionEnabled(kWebGLDebugRendererInfoName)) { if (IdentifiabilityStudySettings::Get()->ShouldSampleType( blink::IdentifiableSurface::Type::kWebGLParameter)) { -@@ -3793,6 +3801,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( +@@ -3794,6 +3802,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( // intended to prevent applications from entering an infinite polling loop. if (isContextLost() && pname == GL_COMPLETION_STATUS_KHR) return WebGLAny(script_state, true); @@ -74,7 +74,7 @@ index 396b2983f403b0684f952a5fbd2d0abf947328f0..e5f627ebf264462457a02dad45814cf6 if (!ValidateWebGLProgramOrShader("getProgramParamter", program)) { return ScriptValue::CreateNull(script_state->GetIsolate()); } -@@ -3848,6 +3857,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( +@@ -3849,6 +3858,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( String WebGLRenderingContextBase::getProgramInfoLog(WebGLProgram* program) { if (!ValidateWebGLProgramOrShader("getProgramInfoLog", program)) return String(); @@ -82,7 +82,7 @@ index 396b2983f403b0684f952a5fbd2d0abf947328f0..e5f627ebf264462457a02dad45814cf6 GLStringQuery query(ContextGL()); return query.Run(ObjectNonZero(program)); } -@@ -3858,6 +3868,7 @@ ScriptValue WebGLRenderingContextBase::getRenderbufferParameter( +@@ -3859,6 +3869,7 @@ ScriptValue WebGLRenderingContextBase::getRenderbufferParameter( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -90,7 +90,7 @@ index 396b2983f403b0684f952a5fbd2d0abf947328f0..e5f627ebf264462457a02dad45814cf6 if (target != GL_RENDERBUFFER) { SynthesizeGLError(GL_INVALID_ENUM, "getRenderbufferParameter", "invalid target"); -@@ -3909,6 +3920,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( +@@ -3910,6 +3921,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( // intended to prevent applications from entering an infinite polling loop. if (isContextLost() && pname == GL_COMPLETION_STATUS_KHR) return WebGLAny(script_state, true); @@ -98,7 +98,7 @@ index 396b2983f403b0684f952a5fbd2d0abf947328f0..e5f627ebf264462457a02dad45814cf6 if (!ValidateWebGLProgramOrShader("getShaderParameter", shader)) { return ScriptValue::CreateNull(script_state->GetIsolate()); } -@@ -3940,6 +3952,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( +@@ -3941,6 +3953,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( String WebGLRenderingContextBase::getShaderInfoLog(WebGLShader* shader) { if (!ValidateWebGLProgramOrShader("getShaderInfoLog", shader)) return String(); @@ -106,7 +106,7 @@ index 396b2983f403b0684f952a5fbd2d0abf947328f0..e5f627ebf264462457a02dad45814cf6 GLStringQuery query(ContextGL()); return query.Run(ObjectNonZero(shader)); } -@@ -3970,6 +3983,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( +@@ -3971,6 +3984,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( GLint precision = 0; ContextGL()->GetShaderPrecisionFormat(shader_type, precision_type, range, &precision); @@ -114,7 +114,7 @@ index 396b2983f403b0684f952a5fbd2d0abf947328f0..e5f627ebf264462457a02dad45814cf6 auto* result = MakeGarbageCollected( range[0], range[1], precision); if (IdentifiabilityStudySettings::Get()->ShouldSampleType( -@@ -3982,6 +3996,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( +@@ -3983,6 +3997,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( String WebGLRenderingContextBase::getShaderSource(WebGLShader* shader) { if (!ValidateWebGLProgramOrShader("getShaderSource", shader)) return String(); @@ -122,7 +122,7 @@ index 396b2983f403b0684f952a5fbd2d0abf947328f0..e5f627ebf264462457a02dad45814cf6 return EnsureNotNull(shader->Source()); } -@@ -4011,6 +4026,7 @@ ScriptValue WebGLRenderingContextBase::getTexParameter( +@@ -4012,6 +4027,7 @@ ScriptValue WebGLRenderingContextBase::getTexParameter( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -130,7 +130,7 @@ index 396b2983f403b0684f952a5fbd2d0abf947328f0..e5f627ebf264462457a02dad45814cf6 if (!ValidateTextureBinding("getTexParameter", target)) return ScriptValue::CreateNull(script_state->GetIsolate()); switch (pname) { -@@ -4045,6 +4061,7 @@ ScriptValue WebGLRenderingContextBase::getUniform( +@@ -4046,6 +4062,7 @@ ScriptValue WebGLRenderingContextBase::getUniform( const WebGLUniformLocation* uniform_location) { if (!ValidateWebGLProgramOrShader("getUniform", program)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -138,7 +138,7 @@ index 396b2983f403b0684f952a5fbd2d0abf947328f0..e5f627ebf264462457a02dad45814cf6 DCHECK(uniform_location); if (uniform_location->Program() != program) { SynthesizeGLError(GL_INVALID_OPERATION, "getUniform", -@@ -4304,6 +4321,7 @@ WebGLUniformLocation* WebGLRenderingContextBase::getUniformLocation( +@@ -4305,6 +4322,7 @@ WebGLUniformLocation* WebGLRenderingContextBase::getUniformLocation( const String& name) { if (!ValidateWebGLProgramOrShader("getUniformLocation", program)) return nullptr; @@ -146,7 +146,7 @@ index 396b2983f403b0684f952a5fbd2d0abf947328f0..e5f627ebf264462457a02dad45814cf6 if (!ValidateLocationLength("getUniformLocation", name)) return nullptr; if (!ValidateString("getUniformLocation", name)) -@@ -4328,6 +4346,7 @@ ScriptValue WebGLRenderingContextBase::getVertexAttrib( +@@ -4329,6 +4347,7 @@ ScriptValue WebGLRenderingContextBase::getVertexAttrib( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -154,7 +154,7 @@ index 396b2983f403b0684f952a5fbd2d0abf947328f0..e5f627ebf264462457a02dad45814cf6 if (index >= max_vertex_attribs_) { SynthesizeGLError(GL_INVALID_VALUE, "getVertexAttrib", "index out of range"); -@@ -4405,6 +4424,7 @@ int64_t WebGLRenderingContextBase::getVertexAttribOffset(GLuint index, +@@ -4406,6 +4425,7 @@ int64_t WebGLRenderingContextBase::getVertexAttribOffset(GLuint index, GLenum pname) { if (isContextLost()) return 0; @@ -162,7 +162,7 @@ index 396b2983f403b0684f952a5fbd2d0abf947328f0..e5f627ebf264462457a02dad45814cf6 GLvoid* result = nullptr; // NOTE: If pname is ever a value that returns more than 1 element // this will corrupt memory. -@@ -4752,6 +4772,7 @@ void WebGLRenderingContextBase::ReadPixelsHelper(GLint x, +@@ -4753,6 +4773,7 @@ void WebGLRenderingContextBase::ReadPixelsHelper(GLint x, int64_t offset) { if (isContextLost()) return; diff --git a/patches/tools-gritsettings-resource_ids.spec.patch b/patches/tools-gritsettings-resource_ids.spec.patch index ad081ec606cfa..1c7bdbc14e96f 100644 --- a/patches/tools-gritsettings-resource_ids.spec.patch +++ b/patches/tools-gritsettings-resource_ids.spec.patch @@ -1,5 +1,5 @@ diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec -index 6a91282809a76ca60dd1b329c683705b127eb22a..90686384bbef18be9fef1ba58778791058bc35b4 100644 +index 31f80388a143f9f4be213808a789c03cdfdb54ce..e1f663d0f43759cb399f93ebd8683fe6cef943ac 100644 --- a/tools/gritsettings/resource_ids.spec +++ b/tools/gritsettings/resource_ids.spec @@ -41,6 +41,9 @@ @@ -12,7 +12,7 @@ index 6a91282809a76ca60dd1b329c683705b127eb22a..90686384bbef18be9fef1ba587787910 "chrome/app/google_chrome_strings.grd": { "messages": [400], }, -@@ -181,7 +184,7 @@ +@@ -185,7 +188,7 @@ "includes": [1600], }, "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/history/history_resources.grd": { @@ -20,8 +20,8 @@ index 6a91282809a76ca60dd1b329c683705b127eb22a..90686384bbef18be9fef1ba587787910 + "META": {"sizes": {"includes": [44]}}, "includes": [1620], }, - "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/image_editor/resources.grd": { -@@ -617,6 +620,9 @@ + "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/identity_internals/resources.grd": { +@@ -629,6 +632,9 @@ "components/components_chromium_strings.grd": { "messages": [3520], }, diff --git a/patches/tools-licenses.py.patch b/patches/tools-licenses.py.patch index 57895d424977b..5c6506c449a47 100644 --- a/patches/tools-licenses.py.patch +++ b/patches/tools-licenses.py.patch @@ -1,5 +1,5 @@ diff --git a/tools/licenses.py b/tools/licenses.py -index b083d3509433aa97aa85c59a4269def5ef5a5359..018830f339721d590b9b7cc3bd71312d3ace59d8 100755 +index a58dbf44370baabbfa2986c734c96a210cc16f1d..2fd1e05c1bd2e1c4cebab5140029e9885a57ccd0 100755 --- a/tools/licenses.py +++ b/tools/licenses.py @@ -35,6 +35,7 @@ else: @@ -10,15 +10,15 @@ index b083d3509433aa97aa85c59a4269def5ef5a5359..018830f339721d590b9b7cc3bd71312d # Paths from the root of the tree to directories to skip. -@@ -341,6 +342,7 @@ SPECIAL_CASES = { - "/third_party/swiftshader/third_party/SPIRV-Tools/LICENSE", +@@ -348,6 +349,7 @@ SPECIAL_CASES = { + "/third_party/swiftshader/third_party/SPIRV-Headers/LICENSE", }, } +(PRUNE_DIRS, ADDITIONAL_PATHS) = AddBraveCredits(PRUNE_PATHS, SPECIAL_CASES, PRUNE_DIRS, ADDITIONAL_PATHS) # Special value for 'License File' field used to indicate that the license file # should not be used in about:credits. -@@ -534,7 +536,8 @@ def FindThirdPartyDirs(prune_paths, root, extra_third_party_dirs=None): +@@ -541,7 +543,8 @@ def FindThirdPartyDirs(prune_paths, root, extra_third_party_dirs=None): if skip in dirs: dirs.remove(skip) @@ -28,7 +28,7 @@ index b083d3509433aa97aa85c59a4269def5ef5a5359..018830f339721d590b9b7cc3bd71312d # Add all subdirectories that are not marked for skipping. for dir in dirs: dirpath = os.path.join(path, dir) -@@ -738,7 +741,8 @@ def GenerateCredits(file_template_file, +@@ -745,7 +748,8 @@ def GenerateCredits(file_template_file, for path in third_party_dirs: try: metadata = ParseDir(path, _REPOSITORY_ROOT) diff --git a/patches/tools-metrics-histograms-metadata-histogram_suffixes_list.xml.patch b/patches/tools-metrics-histograms-metadata-histogram_suffixes_list.xml.patch index 28dee0ce3df3d..01dbbde39c2c5 100644 --- a/patches/tools-metrics-histograms-metadata-histogram_suffixes_list.xml.patch +++ b/patches/tools-metrics-histograms-metadata-histogram_suffixes_list.xml.patch @@ -1,8 +1,8 @@ diff --git a/tools/metrics/histograms/metadata/histogram_suffixes_list.xml b/tools/metrics/histograms/metadata/histogram_suffixes_list.xml -index 5c8d1e257334db0dd841c19a7b8486b88bfaaf62..aae8d51fe2a8e711bdfaee9282946744dd0735f8 100644 +index ba9fbf3f3e7a7723435400b5d1db6e98b83a707b..356455e1a4f752e8f13295cb1c2ab35fe9195bb4 100644 --- a/tools/metrics/histograms/metadata/histogram_suffixes_list.xml +++ b/tools/metrics/histograms/metadata/histogram_suffixes_list.xml -@@ -7326,6 +7326,7 @@ chromium-metrics-reviews@google.com. +@@ -7322,6 +7322,7 @@ chromium-metrics-reviews@google.com. diff --git a/patches/ui-accessibility-platform-ax_platform_node_cocoa.mm.patch b/patches/ui-accessibility-platform-ax_platform_node_cocoa.mm.patch index c13ecadd672aa..71e9390e67e5b 100644 --- a/patches/ui-accessibility-platform-ax_platform_node_cocoa.mm.patch +++ b/patches/ui-accessibility-platform-ax_platform_node_cocoa.mm.patch @@ -1,8 +1,8 @@ diff --git a/ui/accessibility/platform/ax_platform_node_cocoa.mm b/ui/accessibility/platform/ax_platform_node_cocoa.mm -index e36eedc550ec25052b5d574c0137ee634ef4260b..ece5397ce7fd37c29e59dfffd78a3e87aa64389f 100644 +index d6fae03d927d6e533bf971b72e460a0f2cf6547b..fe5f16bb8a2adbc45e56e8280807f346e22d1035 100644 --- a/ui/accessibility/platform/ax_platform_node_cocoa.mm +++ b/ui/accessibility/platform/ax_platform_node_cocoa.mm -@@ -1985,6 +1985,7 @@ bool IsAXSetter(SEL selector) { +@@ -2072,6 +2072,7 @@ - (NSAttributedString*)accessibilityAttributedStringForRange:(NSRange)range { if (!_node) return nil; diff --git a/patches/ui-base-BUILD.gn.patch b/patches/ui-base-BUILD.gn.patch index b9742659734fd..196eca11786b1 100644 --- a/patches/ui-base-BUILD.gn.patch +++ b/patches/ui-base-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn -index 028a97becd88fb12481b1de0395c7c81857d3af3..430d2ba424cb01b7f58b6bf4623d0dd22d5aaa93 100644 +index 271d6a410530a9c2c01ada1c8a34f4a6c4b5125e..b58fcfdaf33896825a9a36f7136ac7bca8411e79 100644 --- a/ui/base/BUILD.gn +++ b/ui/base/BUILD.gn -@@ -469,6 +469,7 @@ component("base") { +@@ -489,6 +489,7 @@ component("base") { "//ui/strings", "//url", ] diff --git a/patches/ui-webui-resources-cr_elements-shared_style_css.html.patch b/patches/ui-webui-resources-cr_elements-shared_style_css.html.patch index ce45d5f11e6f5..a905b6e6df0a0 100644 --- a/patches/ui-webui-resources-cr_elements-shared_style_css.html.patch +++ b/patches/ui-webui-resources-cr_elements-shared_style_css.html.patch @@ -1,5 +1,5 @@ diff --git a/ui/webui/resources/cr_elements/shared_style_css.html b/ui/webui/resources/cr_elements/shared_style_css.html -index c0976a8a5650eaaa28c8ffbc24a9f07a84c2eab7..2a63df83f5c0b40f410f0364c15dc7967cfa9198 100644 +index eda419ea6d73d44418c70d4c4bbc2d55ae7a6d40..5cd40a2c6bcb57612a9fc2ab1ce71a05d124463d 100644 --- a/ui/webui/resources/cr_elements/shared_style_css.html +++ b/ui/webui/resources/cr_elements/shared_style_css.html @@ -3,12 +3,13 @@ diff --git a/renderer/brave_content_renderer_client.cc b/renderer/brave_content_renderer_client.cc index fa77b33eaa175..7778df91dbb09 100644 --- a/renderer/brave_content_renderer_client.cc +++ b/renderer/brave_content_renderer_client.cc @@ -43,6 +43,8 @@ void BraveContentRendererClient:: "FileSystemAccessAPIExperimental", false); } blink::WebRuntimeFeatures::EnableFeatureFromString("Serial", false); + blink::WebRuntimeFeatures::EnableFeatureFromString( + "SpeculationRulesPrefetchProxy", false); } BraveContentRendererClient::~BraveContentRendererClient() = default; diff --git a/resources/BUILD.gn b/resources/BUILD.gn index 7a1a6238b6523..37ea118a6583a 100644 --- a/resources/BUILD.gn +++ b/resources/BUILD.gn @@ -19,6 +19,7 @@ action("brave_resource_ids") { "--add-header", "--depfile", rebase_path(depfile, root_build_dir), + "--input", _rebased_input, ] @@ -27,6 +28,7 @@ action("brave_resource_ids") { [ "update_resource_ids", "--analyze-inputs", + "--input", _rebased_input, ], "list lines") diff --git a/vendor/bat-native-ads/src/bat/ads/database.cc b/vendor/bat-native-ads/src/bat/ads/database.cc index fb19d212a36c1..eb20f1003969e 100644 --- a/vendor/bat-native-ads/src/bat/ads/database.cc +++ b/vendor/bat-native-ads/src/bat/ads/database.cc @@ -26,32 +26,32 @@ void Bind(sql::Statement* statement, const mojom::DBCommandBinding& binding) { DCHECK(statement); switch (binding.value->which()) { - case mojom::DBValue::Tag::STRING_VALUE: { + case mojom::DBValue::Tag::kStringValue: { statement->BindString(binding.index, binding.value->get_string_value()); return; } - case mojom::DBValue::Tag::INT_VALUE: { + case mojom::DBValue::Tag::kIntValue: { statement->BindInt(binding.index, binding.value->get_int_value()); return; } - case mojom::DBValue::Tag::INT64_VALUE: { + case mojom::DBValue::Tag::kInt64Value: { statement->BindInt64(binding.index, binding.value->get_int64_value()); return; } - case mojom::DBValue::Tag::DOUBLE_VALUE: { + case mojom::DBValue::Tag::kDoubleValue: { statement->BindDouble(binding.index, binding.value->get_double_value()); return; } - case mojom::DBValue::Tag::BOOL_VALUE: { + case mojom::DBValue::Tag::kBoolValue: { statement->BindBool(binding.index, binding.value->get_bool_value()); return; } - case mojom::DBValue::Tag::NULL_VALUE: { + case mojom::DBValue::Tag::kNullValue: { statement->BindNull(binding.index); return; } @@ -68,30 +68,30 @@ mojom::DBRecordPtr CreateRecord( int column = 0; for (const auto& binding : bindings) { - mojom::DBValuePtr value = mojom::DBValue::New(); + mojom::DBValuePtr value; switch (binding) { case mojom::DBCommand::RecordBindingType::STRING_TYPE: { - value->set_string_value(statement->ColumnString(column)); + value = mojom::DBValue::NewStringValue(statement->ColumnString(column)); break; } case mojom::DBCommand::RecordBindingType::INT_TYPE: { - value->set_int_value(statement->ColumnInt(column)); + value = mojom::DBValue::NewIntValue(statement->ColumnInt(column)); break; } case mojom::DBCommand::RecordBindingType::INT64_TYPE: { - value->set_int64_value(statement->ColumnInt64(column)); + value = mojom::DBValue::NewInt64Value(statement->ColumnInt64(column)); break; } case mojom::DBCommand::RecordBindingType::DOUBLE_TYPE: { - value->set_double_value(statement->ColumnDouble(column)); + value = mojom::DBValue::NewDoubleValue(statement->ColumnDouble(column)); break; } case mojom::DBCommand::RecordBindingType::BOOL_TYPE: { - value->set_bool_value(statement->ColumnBool(column)); + value = mojom::DBValue::NewBoolValue(statement->ColumnBool(column)); break; } } @@ -212,13 +212,8 @@ mojom::DBCommandResponse::Status Database::Initialize( table_version = meta_table_.GetVersionNumber(); } - mojom::DBValuePtr value = mojom::DBValue::New(); - value->set_int_value(table_version); - - mojom::DBCommandResultPtr result = mojom::DBCommandResult::New(); - result->set_value(std::move(value)); - - command_response->result = std::move(result); + command_response->result = mojom::DBCommandResult::NewValue( + mojom::DBValue::NewIntValue(table_version)); return mojom::DBCommandResponse::Status::RESPONSE_OK; } @@ -284,10 +279,8 @@ mojom::DBCommandResponse::Status Database::Read( Bind(&statement, *binding.get()); } - mojom::DBCommandResultPtr result = mojom::DBCommandResult::New(); - result->set_records(std::vector()); - - command_response->result = std::move(result); + command_response->result = + mojom::DBCommandResult::NewRecords(std::vector()); while (statement.Step()) { command_response->result->get_records().push_back( diff --git a/vendor/bat-native-ads/src/bat/ads/internal/base/database_statement_util.cc b/vendor/bat-native-ads/src/bat/ads/internal/base/database_statement_util.cc index e7099d1e987a6..f4c97f1f1c915 100644 --- a/vendor/bat-native-ads/src/bat/ads/internal/base/database_statement_util.cc +++ b/vendor/bat-native-ads/src/bat/ads/internal/base/database_statement_util.cc @@ -43,8 +43,7 @@ void BindNull(mojom::DBCommand* command, const int_fast16_t index) { mojom::DBCommandBindingPtr binding = mojom::DBCommandBinding::New(); binding->index = index; - binding->value = mojom::DBValue::New(); - binding->value->set_null_value(0); + binding->value = mojom::DBValue::NewNullValue(0); command->bindings.push_back(std::move(binding)); } @@ -54,8 +53,7 @@ void BindInt(mojom::DBCommand* command, const int index, const int32_t value) { mojom::DBCommandBindingPtr binding = mojom::DBCommandBinding::New(); binding->index = index; - binding->value = mojom::DBValue::New(); - binding->value->set_int_value(value); + binding->value = mojom::DBValue::NewIntValue(value); command->bindings.push_back(std::move(binding)); } @@ -67,8 +65,7 @@ void BindInt64(mojom::DBCommand* command, mojom::DBCommandBindingPtr binding = mojom::DBCommandBinding::New(); binding->index = index; - binding->value = mojom::DBValue::New(); - binding->value->set_int64_value(value); + binding->value = mojom::DBValue::NewInt64Value(value); command->bindings.push_back(std::move(binding)); } @@ -80,8 +77,7 @@ void BindDouble(mojom::DBCommand* command, mojom::DBCommandBindingPtr binding = mojom::DBCommandBinding::New(); binding->index = index; - binding->value = mojom::DBValue::New(); - binding->value->set_double_value(value); + binding->value = mojom::DBValue::NewDoubleValue(value); command->bindings.push_back(std::move(binding)); } @@ -91,8 +87,7 @@ void BindBool(mojom::DBCommand* command, const int index, const bool value) { mojom::DBCommandBindingPtr binding = mojom::DBCommandBinding::New(); binding->index = index; - binding->value = mojom::DBValue::New(); - binding->value->set_bool_value(value); + binding->value = mojom::DBValue::NewBoolValue(value); command->bindings.push_back(std::move(binding)); } @@ -104,8 +99,7 @@ void BindString(mojom::DBCommand* command, mojom::DBCommandBindingPtr binding = mojom::DBCommandBinding::New(); binding->index = index; - binding->value = mojom::DBValue::New(); - binding->value->set_string_value(value); + binding->value = mojom::DBValue::NewStringValue(value); command->bindings.push_back(std::move(binding)); } @@ -113,7 +107,7 @@ void BindString(mojom::DBCommand* command, int ColumnInt(mojom::DBRecord* record, const size_t index) { DCHECK(record); DCHECK_LT(index, record->fields.size()); - DCHECK_EQ(mojom::DBValue::Tag::INT_VALUE, record->fields.at(index)->which()); + DCHECK_EQ(mojom::DBValue::Tag::kIntValue, record->fields.at(index)->which()); return record->fields.at(index)->get_int_value(); } @@ -121,7 +115,7 @@ int ColumnInt(mojom::DBRecord* record, const size_t index) { int64_t ColumnInt64(mojom::DBRecord* record, const size_t index) { DCHECK(record); DCHECK_LT(index, record->fields.size()); - DCHECK_EQ(mojom::DBValue::Tag::INT64_VALUE, + DCHECK_EQ(mojom::DBValue::Tag::kInt64Value, record->fields.at(index)->which()); return record->fields.at(index)->get_int64_value(); @@ -130,7 +124,7 @@ int64_t ColumnInt64(mojom::DBRecord* record, const size_t index) { double ColumnDouble(mojom::DBRecord* record, const size_t index) { DCHECK(record); DCHECK_LT(index, record->fields.size()); - DCHECK_EQ(mojom::DBValue::Tag::DOUBLE_VALUE, + DCHECK_EQ(mojom::DBValue::Tag::kDoubleValue, record->fields.at(index)->which()); return record->fields.at(index)->get_double_value(); @@ -139,7 +133,7 @@ double ColumnDouble(mojom::DBRecord* record, const size_t index) { bool ColumnBool(mojom::DBRecord* record, const size_t index) { DCHECK(record); DCHECK_LT(index, record->fields.size()); - DCHECK_EQ(mojom::DBValue::Tag::BOOL_VALUE, record->fields.at(index)->which()); + DCHECK_EQ(mojom::DBValue::Tag::kBoolValue, record->fields.at(index)->which()); return record->fields.at(index)->get_bool_value(); } @@ -147,7 +141,7 @@ bool ColumnBool(mojom::DBRecord* record, const size_t index) { std::string ColumnString(mojom::DBRecord* record, const size_t index) { DCHECK(record); DCHECK_LT(index, record->fields.size()); - DCHECK_EQ(mojom::DBValue::Tag::STRING_VALUE, + DCHECK_EQ(mojom::DBValue::Tag::kStringValue, record->fields.at(index)->which()); return record->fields.at(index)->get_string_value(); diff --git a/vendor/bat-native-ads/src/bat/ads/internal/database/database_initialize.cc b/vendor/bat-native-ads/src/bat/ads/internal/database/database_initialize.cc index 8a69d47fc6a72..017cf30ec5611 100644 --- a/vendor/bat-native-ads/src/bat/ads/internal/database/database_initialize.cc +++ b/vendor/bat-native-ads/src/bat/ads/internal/database/database_initialize.cc @@ -48,7 +48,7 @@ void Initialize::OnCreateOrOpen(mojom::DBCommandResponsePtr response, } if (!response->result || response->result->get_value()->which() != - mojom::DBValue::Tag::INT_VALUE) { + mojom::DBValue::Tag::kIntValue) { last_message_ = "Invalid response result type"; callback(/* success */ false); return; diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/core/test_ledger_client.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/core/test_ledger_client.cc index 36913cc2ce1af..75e17a5dfad98 100644 --- a/vendor/bat-native-ledger/src/bat/ledger/internal/core/test_ledger_client.cc +++ b/vendor/bat-native-ledger/src/bat/ledger/internal/core/test_ledger_client.cc @@ -12,9 +12,9 @@ #include "base/callback_helpers.h" #include "base/logging.h" #include "base/path_service.h" +#include "base/strings/escape.h" #include "base/strings/string_number_conversions.h" #include "base/threading/sequenced_task_runner_handle.h" -#include "net/base/escape.h" #include "net/http/http_status_code.h" namespace ledger { @@ -117,7 +117,7 @@ void TestLedgerClient::FetchFavIcon(const std::string& url, } std::string TestLedgerClient::URIEncode(const std::string& value) { - return net::EscapeQueryParamValue(value, false); + return base::EscapeQueryParamValue(value, false); } void TestLedgerClient::LoadURL(mojom::UrlRequestPtr request, diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/database/database_initialize.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/database/database_initialize.cc index 9580fde03bf89..854c692c28ae5 100644 --- a/vendor/bat-native-ledger/src/bat/ledger/internal/database/database_initialize.cc +++ b/vendor/bat-native-ledger/src/bat/ledger/internal/database/database_initialize.cc @@ -59,9 +59,7 @@ void DatabaseInitialize::OnInitialize( return; } - if (!response->result || - response->result->get_value()->which() != - type::DBValue::Tag::INT_VALUE) { + if (!response->result || !response->result->get_value()->is_int_value()) { BLOG(0, "DB init failed"); callback(type::Result::DATABASE_INIT_FAILED); return; diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/database/database_util.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/database/database_util.cc index 8846996d3310c..0e8bc74be7231 100644 --- a/vendor/bat-native-ledger/src/bat/ledger/internal/database/database_util.cc +++ b/vendor/bat-native-ledger/src/bat/ledger/internal/database/database_util.cc @@ -28,8 +28,7 @@ void BindNull( auto binding = type::DBCommandBinding::New(); binding->index = index; - binding->value = type::DBValue::New(); - binding->value->set_null_value(0); + binding->value = type::DBValue::NewNullValue(0); command->bindings.push_back(std::move(binding)); } @@ -43,8 +42,7 @@ void BindInt( auto binding = type::DBCommandBinding::New(); binding->index = index; - binding->value = type::DBValue::New(); - binding->value->set_int_value(value); + binding->value = type::DBValue::NewIntValue(value); command->bindings.push_back(std::move(binding)); } @@ -58,8 +56,7 @@ void BindInt64( auto binding = type::DBCommandBinding::New(); binding->index = index; - binding->value = type::DBValue::New(); - binding->value->set_int64_value(value); + binding->value = type::DBValue::NewInt64Value(value); command->bindings.push_back(std::move(binding)); } @@ -73,8 +70,7 @@ void BindDouble( auto binding = type::DBCommandBinding::New(); binding->index = index; - binding->value = type::DBValue::New(); - binding->value->set_double_value(value); + binding->value = type::DBValue::NewDoubleValue(value); command->bindings.push_back(std::move(binding)); } @@ -88,8 +84,7 @@ void BindBool( auto binding = type::DBCommandBinding::New(); binding->index = index; - binding->value = type::DBValue::New(); - binding->value->set_bool_value(value); + binding->value = type::DBValue::NewBoolValue(value); command->bindings.push_back(std::move(binding)); } @@ -103,8 +98,7 @@ void BindString( auto binding = type::DBCommandBinding::New(); binding->index = index; - binding->value = type::DBValue::New(); - binding->value->set_string_value(value); + binding->value = type::DBValue::NewStringValue(value); command->bindings.push_back(std::move(binding)); } @@ -133,7 +127,7 @@ int GetIntColumn(type::DBRecord* record, const int index) { return 0; } - if (record->fields.at(index)->which() != type::DBValue::Tag::INT_VALUE) { + if (!record->fields.at(index)->is_int_value()) { DCHECK(false); return 0; } @@ -146,7 +140,7 @@ int64_t GetInt64Column(type::DBRecord* record, const int index) { return 0; } - if (record->fields.at(index)->which() != type::DBValue::Tag::INT64_VALUE) { + if (!record->fields.at(index)->is_int64_value()) { DCHECK(false); return 0; } @@ -159,7 +153,7 @@ double GetDoubleColumn(type::DBRecord* record, const int index) { return 0.0; } - if (record->fields.at(index)->which() != type::DBValue::Tag::DOUBLE_VALUE) { + if (!record->fields.at(index)->is_double_value()) { DCHECK(false); return 0.0; } @@ -172,7 +166,7 @@ bool GetBoolColumn(type::DBRecord* record, const int index) { return false; } - if (record->fields.at(index)->which() != type::DBValue::Tag::BOOL_VALUE) { + if (!record->fields.at(index)->is_bool_value()) { DCHECK(false); return false; } @@ -185,7 +179,7 @@ std::string GetStringColumn(type::DBRecord* record, const int index) { return ""; } - if (record->fields.at(index)->which() != type::DBValue::Tag::STRING_VALUE) { + if (!record->fields.at(index)->is_string_value()) { DCHECK(false); return ""; } diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/ledger_database_impl.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/ledger_database_impl.cc index 24a36d3b64db8..53736290f0dd6 100644 --- a/vendor/bat-native-ledger/src/bat/ledger/internal/ledger_database_impl.cc +++ b/vendor/bat-native-ledger/src/bat/ledger/internal/ledger_database_impl.cc @@ -24,27 +24,27 @@ void HandleBinding(sql::Statement* statement, } switch (binding.value->which()) { - case mojom::DBValue::Tag::STRING_VALUE: { + case mojom::DBValue::Tag::kStringValue: { statement->BindString(binding.index, binding.value->get_string_value()); return; } - case mojom::DBValue::Tag::INT_VALUE: { + case mojom::DBValue::Tag::kIntValue: { statement->BindInt(binding.index, binding.value->get_int_value()); return; } - case mojom::DBValue::Tag::INT64_VALUE: { + case mojom::DBValue::Tag::kInt64Value: { statement->BindInt64(binding.index, binding.value->get_int64_value()); return; } - case mojom::DBValue::Tag::DOUBLE_VALUE: { + case mojom::DBValue::Tag::kDoubleValue: { statement->BindDouble(binding.index, binding.value->get_double_value()); return; } - case mojom::DBValue::Tag::BOOL_VALUE: { + case mojom::DBValue::Tag::kBoolValue: { statement->BindBool(binding.index, binding.value->get_bool_value()); return; } - case mojom::DBValue::Tag::NULL_VALUE: { + case mojom::DBValue::Tag::kNullValue: { statement->BindNull(binding.index); return; } @@ -65,26 +65,26 @@ mojom::DBRecordPtr CreateRecord( } for (const auto& binding : bindings) { - auto value = mojom::DBValue::New(); + mojom::DBValuePtr value; switch (binding) { case mojom::DBCommand::RecordBindingType::STRING_TYPE: { - value->set_string_value(statement->ColumnString(column)); + value = mojom::DBValue::NewStringValue(statement->ColumnString(column)); break; } case mojom::DBCommand::RecordBindingType::INT_TYPE: { - value->set_int_value(statement->ColumnInt(column)); + value = mojom::DBValue::NewIntValue(statement->ColumnInt(column)); break; } case mojom::DBCommand::RecordBindingType::INT64_TYPE: { - value->set_int64_value(statement->ColumnInt64(column)); + value = mojom::DBValue::NewInt64Value(statement->ColumnInt64(column)); break; } case mojom::DBCommand::RecordBindingType::DOUBLE_TYPE: { - value->set_double_value(statement->ColumnDouble(column)); + value = mojom::DBValue::NewDoubleValue(statement->ColumnDouble(column)); break; } case mojom::DBCommand::RecordBindingType::BOOL_TYPE: { - value->set_bool_value(statement->ColumnBool(column)); + value = mojom::DBValue::NewBoolValue(statement->ColumnBool(column)); break; } default: { @@ -235,10 +235,8 @@ mojom::DBCommandResponse::Status LedgerDatabaseImpl::Initialize( table_version = meta_table_.GetVersionNumber(); } - auto value = mojom::DBValue::New(); - value->set_int_value(table_version); - auto result = mojom::DBCommandResult::New(); - result->set_value(std::move(value)); + auto result = mojom::DBCommandResult::NewValue( + mojom::DBValue::NewIntValue(table_version)); command_response->result = std::move(result); return mojom::DBCommandResponse::Status::RESPONSE_OK; @@ -306,9 +304,8 @@ mojom::DBCommandResponse::Status LedgerDatabaseImpl::Read( HandleBinding(&statement, *binding.get()); } - auto result = mojom::DBCommandResult::New(); - result->set_records(std::vector()); - command_response->result = std::move(result); + command_response->result = + mojom::DBCommandResult::NewRecords(std::vector()); while (statement.Step()) { command_response->result->get_records().push_back( CreateRecord(&statement, command->record_bindings));