0ct0pu5/bromite
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rebase to 98.0.4758.101

Browse source
This commit is contained in:
Carmelo Messina 2022-02-18 15:48:16 +01:00
parent 2f1108f7dd
commit 390bfc488c
No known key found for this signature in database
GPG key ID: 968894BE688289FD
14 changed files with 46 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/patches/Add-AllowUserCertificates-flag.patch
View file

@ -18,7 +18,7 @@ Subject: Add AllowUserCertificates flag
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
--- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
@@ -229,6 +229,7 @@ import org.chromium.content_public.browser.ScreenOrientationProvider;
@@ -230,6 +230,7 @@ import org.chromium.content_public.browser.ScreenOrientationProvider;
import org.chromium.content_public.browser.SelectionPopupController;
import org.chromium.content_public.browser.WebContents;
import org.chromium.content_public.common.ContentSwitches;

6
build/patches/Add-an-always-incognito-mode.patch
View file

@ -147,7 +147,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
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
--- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
@@ -101,6 +101,7 @@ import org.chromium.chrome.browser.contextualsearch.ContextualSearchFieldTrial;
@@ -102,6 +102,7 @@ import org.chromium.chrome.browser.contextualsearch.ContextualSearchFieldTrial;
import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager;
import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager.ContextualSearchTabPromotionDelegate;
import org.chromium.chrome.browser.dependency_injection.ChromeActivityCommonsModule;
@ -155,7 +155,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
import org.chromium.chrome.browser.dependency_injection.ChromeActivityComponent;
import org.chromium.chrome.browser.dependency_injection.ModuleFactoryOverrides;
import org.chromium.chrome.browser.device.DeviceClassManager;
@@ -1949,6 +1950,9 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
@@ -1952,6 +1953,9 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
throw new IllegalStateException(
"Attempting to access TabCreator before initialization");
}
@ -432,7 +432,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
/**
* A {@link RootUiCoordinator} variant that controls tabbed-mode specific UI.
@@ -493,11 +495,12 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
@@ -489,11 +491,12 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
// TODO(twellington): Supply TabModelSelector as well and move initialization earlier.
if (DeviceFormFactor.isNonMultiDisplayContextOnTablet(mActivity)) {

2
build/patches/Add-exit-menu-item.patch
View file

@ -86,7 +86,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
import org.chromium.chrome.browser.ChromeActivitySessionTracker;
import org.chromium.chrome.browser.ChromeApplicationImpl;
import org.chromium.chrome.browser.ChromeKeyboardVisibilityDelegate;
@@ -2385,6 +2386,11 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
@@ -2388,6 +2389,11 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
return true;
}

4
build/patches/Add-menu-item-to-bookmark-all-tabs.patch
View file

@ -208,7 +208,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java
@@ -623,6 +623,7 @@ public class BookmarkUtils {
@@ -628,6 +628,7 @@ public class BookmarkUtils {
List<BookmarkId> topLevelFolders = new ArrayList<>();
BookmarkId desktopNodeId = bookmarkModel.getDesktopFolderId();
BookmarkId mobileNodeId = bookmarkModel.getMobileFolderId();
@ -216,7 +216,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
BookmarkId othersNodeId = bookmarkModel.getOtherFolderId();
List<BookmarkId> specialFoldersIds =
@@ -648,6 +649,9 @@ public class BookmarkUtils {
@@ -653,6 +654,9 @@ public class BookmarkUtils {
if (bookmarkModel.isFolderVisible(mobileNodeId)) {
topLevelFolders.add(mobileNodeId);
}

2
build/patches/Add-menu-item-to-view-source.patch
View file

@ -53,7 +53,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
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
--- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
@@ -2555,6 +2555,11 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
@@ -2558,6 +2558,11 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
return true;
}

4
build/patches/Disable-all-promo-dialogs.patch
View file

@ -9,7 +9,7 @@ Subject: Disable all promo dialogs
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
@@ -855,7 +855,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
@@ -851,7 +851,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
* displayed.
*/
private boolean triggerPromo(boolean intentWithEffect) {
@ -18,7 +18,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
if (CommandLine.getInstance().hasSwitch(ChromeSwitches.DISABLE_STARTUP_PROMOS)) {
return false;
}
@@ -890,8 +890,8 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
@@ -886,8 +886,8 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
preferenceManager.writeBoolean(
ChromePreferenceKeys.PROMOS_SKIPPED_ON_FIRST_START, true);
}

2
build/patches/Do-not-compile-QR-code-sharing.patch
View file

@ -19,7 +19,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
import org.chromium.chrome.browser.share.scroll_capture.ScrollCaptureManager;
import org.chromium.chrome.browser.tab.AccessibilityVisibilityHandler;
import org.chromium.chrome.browser.tab.AutofillSessionLifetimeController;
@@ -428,10 +427,6 @@ public class RootUiCoordinator
@@ -423,10 +422,6 @@ public class RootUiCoordinator
}
public void onAttachFragment(Fragment fragment) {

10
build/patches/Move-toptoolbar-to-bottom.patch
View file

@ -1065,7 +1065,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
/**
* Contains logic for managing the toolbar visual component. This class manages the interactions
* with the rest of the application to ensure the toolbar is always visually up to date.
@@ -593,7 +596,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
@@ -592,7 +595,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
};
// clang-format off
LocationBarCoordinator locationBarCoordinator = new LocationBarCoordinator(
@ -1074,7 +1074,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
PrivacyPreferencesManagerImpl.getInstance(), mLocationBarModel,
mActionModeController.getActionModeCallback(),
new WindowDelegate(mActivity.getWindow()), windowAndroid, mActivityTabProvider,
@@ -835,11 +838,13 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
@@ -834,11 +837,13 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
// the height won't be measured by the background image.
if (mControlContainer.getBackground() == null) {
setControlContainerTopMargin(getToolbarExtraYOffset());
@ -1088,7 +1088,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
mControlContainer.removeOnLayoutChangeListener(mLayoutChangeListener);
mLayoutChangeListener = null;
}
@@ -1227,13 +1232,25 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
@@ -1224,13 +1229,25 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
return mLocationBar.getOmniboxStub().isUrlBarFocused();
}
@ -1116,7 +1116,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
mScrimCoordinator, mOmniboxFocusStateSupplier, mBottomSheetController,
mActivityLifecycleDispatcher, mIsWarmOnResumeSupplier, mTabModelSelector,
mTabContentManager, mCompositorViewHolder,
@@ -1242,8 +1259,9 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
@@ -1239,8 +1256,9 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
mBottomControlsCoordinatorSupplier.set(
new BottomControlsCoordinator(mActivity, mWindowAndroid, mLayoutManager,
mCompositorViewHolder.getResourceManager(), mBrowserControlsSizer,
@ -1128,7 +1128,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
}
/**
@@ -1976,6 +1994,15 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
@@ -1973,6 +1991,15 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
private void setControlContainerTopMargin(int margin) {
final ViewGroup.MarginLayoutParams layoutParams =
((ViewGroup.MarginLayoutParams) mControlContainer.getLayoutParams());

8
build/patches/Remove-blocklisted-URLs-upon-bookmark-creation.patch
View file

@ -9,7 +9,7 @@ Subject: Remove blocklisted URLs upon bookmark creation
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
--- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
@@ -140,6 +140,8 @@ import org.chromium.chrome.browser.night_mode.SystemNightModeMonitor;
@@ -141,6 +141,8 @@ import org.chromium.chrome.browser.night_mode.SystemNightModeMonitor;
import org.chromium.chrome.browser.night_mode.WebContentsDarkModeController;
import org.chromium.chrome.browser.night_mode.WebContentsDarkModeMessageController;
import org.chromium.chrome.browser.ntp.NewTabPageUma;
@ -18,7 +18,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
import org.chromium.chrome.browser.offlinepages.OfflinePageUtils;
import org.chromium.chrome.browser.offlinepages.indicator.OfflineIndicatorController;
import org.chromium.chrome.browser.omaha.UpdateMenuItemHelper;
@@ -244,6 +246,8 @@ import org.chromium.ui.widget.Toast;
@@ -245,6 +247,8 @@ import org.chromium.ui.widget.Toast;
import org.chromium.url.GURL;
import org.chromium.webapk.lib.client.WebApkNavigationClient;
@ -27,7 +27,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
import java.util.ArrayList;
import java.util.List;
import java.util.function.Consumer;
@@ -293,6 +297,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
@@ -294,6 +298,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
private UmaSessionStats mUmaSessionStats;
private ContextReporter mContextReporter;
@ -47,7 +47,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
onDestroyInternal();
if (mDidAddPolicyChangeListener) {
@@ -1832,6 +1842,13 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
@@ -1835,6 +1845,13 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
// Defense in depth against the UI being erroneously enabled.
BookmarkBridge bridge = mBookmarkBridgeSupplier.get();

2
build/patches/Remove-help-menu-item.patch
View file

@ -39,7 +39,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcu
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
--- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
@@ -2398,16 +2398,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
@@ -2401,16 +2401,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
final Tab currentTab = getActivityTab();

44
build/patches/Remove-signin-and-data-saver-integrations.patch
View file

@ -650,7 +650,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
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
--- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
@@ -108,7 +108,6 @@ import org.chromium.chrome.browser.download.DownloadUtils;
@@ -109,7 +109,6 @@ import org.chromium.chrome.browser.download.DownloadUtils;
import org.chromium.chrome.browser.download.items.OfflineContentAggregatorNotificationBridgeUiFactory;
import org.chromium.chrome.browser.feature_engagement.TrackerFactory;
import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncherImpl;
@ -658,7 +658,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
import org.chromium.chrome.browser.flags.ActivityType;
import org.chromium.chrome.browser.flags.CachedFeatureFlags;
import org.chromium.chrome.browser.flags.ChromeFeatureList;
@@ -157,7 +156,6 @@ import org.chromium.chrome.browser.share.ShareDelegateSupplier;
@@ -158,7 +157,6 @@ import org.chromium.chrome.browser.share.ShareDelegateSupplier;
import org.chromium.chrome.browser.share.ShareRegistrationCoordinator;
import org.chromium.chrome.browser.subscriptions.CommerceSubscriptionsServiceFactory;
import org.chromium.chrome.browser.subscriptions.SubscriptionsManager;
@ -666,7 +666,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
import org.chromium.chrome.browser.tab.AccessibilityVisibilityHandler;
import org.chromium.chrome.browser.tab.RequestDesktopUtils;
import org.chromium.chrome.browser.tab.Tab;
@@ -214,8 +212,6 @@ import org.chromium.components.page_info.PageInfoController.OpenedFromSource;
@@ -215,8 +213,6 @@ import org.chromium.components.page_info.PageInfoController.OpenedFromSource;
import org.chromium.components.policy.CombinedPolicyProvider;
import org.chromium.components.policy.CombinedPolicyProvider.PolicyChangeListener;
import org.chromium.components.profile_metrics.BrowserProfileType;
@ -675,7 +675,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
import org.chromium.components.user_prefs.UserPrefs;
import org.chromium.components.webapk.lib.client.WebApkValidator;
import org.chromium.components.webapps.AddToHomescreenCoordinator;
@@ -310,9 +306,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
@@ -311,9 +307,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
private boolean mRemoveWindowBackgroundDone;
protected AccessibilityVisibilityHandler mAccessibilityVisibilityHandler;
@ -827,10 +827,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill_assist
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java
@@ -30,10 +30,7 @@ import org.chromium.chrome.browser.power_bookmarks.PowerBookmarkMeta;
import org.chromium.chrome.browser.power_bookmarks.PowerBookmarkType;
@@ -32,10 +32,7 @@ import org.chromium.chrome.browser.power_bookmarks.PowerBookmarkType;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.subscriptions.CommerceSubscriptionsServiceFactory;
import org.chromium.chrome.browser.subscriptions.SubscriptionsManager;
-import org.chromium.chrome.browser.sync.SyncService;
import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
-import org.chromium.chrome.browser.ui.signin.PersonalizedSigninPromoView;
@ -838,7 +838,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
import org.chromium.components.bookmarks.BookmarkId;
import org.chromium.components.bookmarks.BookmarkType;
import org.chromium.components.browser_ui.util.GlobalDiscardableReferencePool;
@@ -53,7 +50,7 @@ import java.util.List;
@@ -55,7 +52,7 @@ import java.util.List;
* BaseAdapter for {@link RecyclerView}. It manages bookmarks to list there.
*/
class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
@ -847,7 +847,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
private static final int MAXIMUM_NUMBER_OF_SEARCH_RESULTS = 500;
private static final String EMPTY_QUERY = null;
@@ -66,10 +63,8 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
@@ -68,10 +65,8 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
@ViewType
private int mPromoHeaderType = ViewType.INVALID;
private BookmarkDelegate mDelegate;
@ -858,7 +858,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
private CommerceSubscriptionsServiceFactory mCommerceSubscriptionsServiceFactory;
// Keep track of the currently highlighted bookmark - used for "show in folder" action.
@@ -123,8 +118,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
@@ -127,8 +122,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
BookmarkItemsAdapter(Context context, SnackbarManager snackbarManager) {
super(context);
@ -867,7 +867,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
mImageFetcher =
ImageFetcherFactory.createImageFetcher(ImageFetcherConfig.IN_MEMORY_WITH_DISK_CACHE,
@@ -233,9 +226,9 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
@@ -242,9 +235,9 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
case ViewType.PERSONALIZED_SIGNIN_PROMO:
// fall through
case ViewType.PERSONALIZED_SYNC_PROMO:
@ -879,7 +879,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
case ViewType.SECTION_HEADER:
return createSectionHeaderViewHolder(parent, viewType);
case ViewType.FOLDER:
@@ -273,10 +266,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
@@ -280,10 +273,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
public void onBindViewHolder(ViewHolder holder, int position) {
if (holder.getItemViewType() == ViewType.PERSONALIZED_SIGNIN_PROMO
|| holder.getItemViewType() == ViewType.PERSONALIZED_SYNC_PROMO) {
@ -890,7 +890,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
} else if (holder.getItemViewType() == ViewType.SECTION_HEADER) {
bindSectionHeaderViewHolder(holder.itemView, getItemByPosition(position));
} else if (BookmarkListEntry.isBookmarkEntry(holder.getItemViewType())) {
@@ -336,7 +325,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
@@ -343,7 +332,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
case ViewType.PERSONALIZED_SIGNIN_PROMO:
// fall through
case ViewType.PERSONALIZED_SYNC_PROMO:
@ -898,7 +898,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
break;
default:
// Other view holders don't have special recycling code.
@@ -362,7 +350,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
@@ -369,7 +357,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
updateHeader(!topLevelFoldersShowing());
};
@ -906,7 +906,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
populateTopLevelFoldersList();
mElements = new ArrayList<>();
@@ -377,8 +364,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
@@ -384,8 +371,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
mDelegate.getModel().removeObserver(mBookmarkModelObserver);
mDelegate.getSelectionDelegate().removeObserver(this);
mDelegate = null;
@ -915,7 +915,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
}
@Override
@@ -474,18 +459,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
@@ -481,18 +466,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
setOrder(mElements);
}
@ -934,7 +934,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
/**
* Updates mPromoHeaderType. Makes sure that the 0th index of mElements is consistent with the
* promo header. This 0th index is null iff there is a promo header.
@@ -505,23 +478,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
@@ -512,23 +485,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
return;
} else if (currentUIState == BookmarkUIState.STATE_SEARCHING) {
mPromoHeaderType = ViewType.INVALID;
@ -958,7 +958,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
}
boolean willShowPromo = hasPromoHeader();
@@ -644,7 +600,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
@@ -651,7 +607,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
@VisibleForTesting
void simulateSignInForTests() {
@ -1329,15 +1329,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
import org.chromium.chrome.browser.signin.services.FREMobileIdentityConsistencyFieldTrial;
import org.chromium.components.browser_ui.modaldialog.AppModalPresenter;
import org.chromium.ui.base.LocalizationUtils;
@@ -140,7 +136,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
FREMobileIdentityConsistencyFieldTrial.createFirstRunTrial();
@@ -139,7 +135,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
private void createFirstPage() {
BooleanSupplier showWelcomePage = () -> !FirstRunStatus.shouldSkipWelcomePage();
if (FREMobileIdentityConsistencyFieldTrial.isEnabled()) {
- mPages.add(new FirstRunPage<>(SigninFirstRunFragment.class, showWelcomePage));
} else {
// TODO(crbug.com/1111490): Revisit during post-MVP.
// There's an edge case where we accept the welcome page in the main app, abort the FRE,
@@ -199,20 +194,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
@@ -198,20 +193,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
mFreProgressStates.add(MobileFreProgress.DEFAULT_SEARCH_ENGINE_SHOWN);
}
@ -1358,7 +1358,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
if (mPagerAdapter != null) {
mPagerAdapter.notifyDataSetChanged();
}
@@ -486,18 +467,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
@@ -489,18 +470,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
FirstRunFlowSequencer.markFlowAsCompleted(mResultSyncConsentAccountName,
mFreProperties.getBoolean(OPEN_ADVANCED_SYNC_SETTINGS));
@ -2410,7 +2410,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
import org.chromium.chrome.browser.ui.system.StatusBarColorController.StatusBarColorProvider;
import org.chromium.chrome.browser.ui.tablet.emptybackground.EmptyBackgroundViewWrapper;
import org.chromium.chrome.browser.version.ChromeVersionInfo;
@@ -895,23 +892,6 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
@@ -891,23 +888,6 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
}
private boolean maybeShowPromo() {

2
build/patches/Revert-the-removal-of-an-option-to-block-autoplay.patch
View file

@ -235,7 +235,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
} else if (type == ContentSettingsType.SOUND) {
setUpSoundPreference(preference);
} else if (type == ContentSettingsType.JAVASCRIPT) {
@@ -987,6 +991,24 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
@@ -988,6 +992,24 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
setupContentSettingsPreference(preference, currentValue, false /* isEmbargoed */);
}

2
build/patches/Site-setting-for-images.patch
View file

@ -227,7 +227,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
} else if (type == ContentSettingsType.GEOLOCATION) {
setUpLocationPreference(preference);
} else if (type == ContentSettingsType.NOTIFICATIONS) {
@@ -1076,6 +1080,24 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
@@ -1077,6 +1081,24 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
setupContentSettingsPreference(preference, permission, false /* isEmbargoed */);
}

2
build/patches/Site-setting-for-javascript-jit.patch
View file

@ -248,7 +248,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
} else if (type == ContentSettingsType.GEOLOCATION) {
setUpLocationPreference(preference);
} else if (type == ContentSettingsType.NOTIFICATIONS) {
@@ -1049,6 +1053,23 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
@@ -1050,6 +1054,23 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
setupContentSettingsPreference(preference, currentValue, false /* isEmbargoed */);
}