PawletOS/cromite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

v111 must be checked

Browse Source
This commit is contained in:
Carmelo Messina
2023-03-04 12:01:41 +01:00
parent d092391c34
commit 6ddf8e2011
28 changed files with 11289 additions and 9699 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/patches/00109-ADDNEW-Move-navigation-bar-to-bottom.patch
+35 -35
View File
@@ -47,7 +47,7 @@ Subject: 109 ADDNEW Move navigation bar to bottom
diff --git a/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java b/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
--- a/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
+++ b/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
@@ -1163,7 +1163,7 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.
@@ -1182,7 +1182,7 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.
}
private void setTopMargin(int topMargin) {
@@ -59,7 +59,7 @@ diff --git a/chrome/android/features/start_surface/java/src/org/chromium/chrome/
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiToolbarView.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiToolbarView.java
--- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiToolbarView.java
+++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiToolbarView.java
@@ -177,7 +177,7 @@ public class TabGroupUiToolbarView extends FrameLayout {
@@ -176,7 +176,7 @@ public class TabGroupUiToolbarView extends FrameLayout {
}
void setPrimaryColorAndApplyTint(int color) {
@@ -71,7 +71,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListContainerViewBinder.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListContainerViewBinder.java
--- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListContainerViewBinder.java
+++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListContainerViewBinder.java
@@ -22,8 +22,6 @@ import org.chromium.components.browser_ui.styles.ChromeColors;
@@ -28,8 +28,6 @@ import org.chromium.components.browser_ui.styles.ChromeColors;
import org.chromium.ui.base.ViewUtils;
import org.chromium.ui.modelutil.PropertyKey;
import org.chromium.ui.modelutil.PropertyModel;
@@ -80,7 +80,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
/**
* ViewBinder for TabListRecyclerView.
@@ -60,8 +58,6 @@ class TabListContainerViewBinder {
@@ -68,8 +66,6 @@ class TabListContainerViewBinder {
params.topMargin = newTopMargin;
ViewUtils.requestLayout(view, "TabListContainerViewBinder.bind TOP_MARGIN");
} else if (BOTTOM_CONTROLS_HEIGHT == propertyKey) {
@@ -100,9 +100,9 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
@@ -99,6 +100,74 @@ public class TabListCoordinator
private boolean mLayoutListenerRegistered;
private @Nullable TabStripSnapshotter mTabStripSnapshotter;
@@ -103,6 +104,74 @@ public class TabListCoordinator
private ItemTouchHelper mItemTouchHelper;
private OnItemTouchListener mOnItemTouchListener;
+ public class GridLayoutManagerDockBottom extends GridLayoutManager {
+ Context mContext;
@@ -175,7 +175,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
/**
* Construct a coordinator for UI that shows a list of tabs.
* @param mode Modes of showing the list of tabs. Can be used in GRID or STRIP.
@@ -259,9 +328,12 @@ public class TabListCoordinator
@@ -266,9 +335,12 @@ public class TabListCoordinator
if (mMode == TabListMode.GRID) {
GridLayoutManager gridLayoutManager =
new GridLayoutManager(context, GRID_LAYOUT_SPAN_COUNT_COMPACT);
@@ -191,7 +191,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
mRecyclerView.setLayoutManager(gridLayoutManager);
mMediator.registerOrientationListener(gridLayoutManager);
mMediator.updateSpanCount(gridLayoutManager,
@@ -456,6 +528,9 @@ public class TabListCoordinator
@@ -508,6 +580,9 @@ public class TabListCoordinator
}
registerLayoutChangeListener();
mRecyclerView.prepareTabSwitcherView();
@@ -234,7 +234,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediator.java
--- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediator.java
+++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediator.java
@@ -474,7 +474,7 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView
@@ -454,7 +454,7 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView
updateTopControlsProperties();
mContainerViewModel.set(
BOTTOM_CONTROLS_HEIGHT, browserControlsStateProvider.getBottomControlsHeight());
@@ -243,7 +243,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
mContainerViewModel.set(
BOTTOM_CONTROLS_HEIGHT, mContainerViewModel.get(BOTTOM_CONTROLS_HEIGHT) +
mBrowserControlsStateProvider.getContentOffset());
@@ -484,7 +484,7 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView
@@ -464,7 +464,7 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView
if (mMode == TabListMode.GRID) {
mContainerViewModel.set(BOTTOM_PADDING,
(int) context.getResources().getDimension(R.dimen.tab_grid_bottom_padding));
@@ -252,7 +252,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
// adjust the bottom margin so as not to cover the top toolbar at the bottom
mContainerViewModel.set(
BOTTOM_PADDING, mContainerViewModel.get(BOTTOM_PADDING) +
@@ -617,7 +617,7 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView
@@ -602,7 +602,7 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView
final int contentOffset = mBrowserControlsStateProvider.getContentOffset();
mContainerViewModel.set(TOP_MARGIN, contentOffset);
@@ -261,16 +261,16 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
// move the view up since the toolbar is at the bottom
mContainerViewModel.set(TOP_MARGIN, 0);
}
@@ -777,6 +777,9 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView
@@ -732,6 +732,9 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView
}
private void setInitialScrollIndexOffset() {
int offset = mMode == TabListMode.CAROUSEL ? INITIAL_SCROLL_INDEX_OFFSET_CAROUSEL
: INITIAL_SCROLL_INDEX_OFFSET_GTS;
+ if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+ offset = 0;
+ }
int initialPosition = Math.max(
mTabModelSelector.getTabModelFilterProvider().getCurrentTabModelFilter().index()
- offset,
int initialPosition =
mTabModelSelector.getTabModelFilterProvider().getCurrentTabModelFilter().index();
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java
@@ -286,7 +286,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s
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
@@ -763,7 +763,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
@@ -757,7 +757,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
ImageView shadowImage = findViewById(R.id.toolbar_hairline);
if (shadowImage != null) {
// Invert the shadown if the top toolbar is at the bottom
@@ -298,7 +298,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java
@@ -323,7 +323,7 @@ public class CompositorViewHolder extends FrameLayout
@@ -322,7 +322,7 @@ public class CompositorViewHolder extends FrameLayout
WebContents webContents = mTabVisible.getWebContents();
if (webContents == null) return;
EventForwarder forwarder = webContents.getEventForwarder();
@@ -343,7 +343,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java
@@ -420,7 +420,7 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa
@@ -499,7 +499,7 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa
mWidth, mHeight, orientationChanged, LayoutManagerImpl.time());
float top = 0;
@@ -412,7 +412,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/findinpage/Find
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/BrowserControlsManager.java b/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/BrowserControlsManager.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/BrowserControlsManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/BrowserControlsManager.java
@@ -400,7 +400,7 @@ public class BrowserControlsManager
@@ -391,7 +391,7 @@ public class BrowserControlsManager implements ActivityStateListener, BrowserCon
@Override
public int getTopControlsHeightRealOffset() {
@@ -421,7 +421,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/Brow
return 0;
else
return mTopControlContainerHeight;
@@ -472,7 +472,7 @@ public class BrowserControlsManager
@@ -463,7 +463,7 @@ public class BrowserControlsManager implements ActivityStateListener, BrowserCon
@Override
public float getTopVisibleContentOffset() {
@@ -532,7 +532,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/status_indicato
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
@@ -1310,14 +1310,14 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
@@ -1289,14 +1289,14 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
return mLocationBar.getOmniboxStub().isUrlBarFocused();
}
@@ -551,7 +551,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
}
}
@@ -1325,10 +1325,10 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
@@ -1304,10 +1304,10 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
* Enable the bottom controls.
*/
public void enableBottomControls() {
@@ -564,7 +564,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
mScrimCoordinator, mOmniboxFocusStateSupplier, mBottomSheetController,
mActivityLifecycleDispatcher, mIsWarmOnResumeSupplier, mTabModelSelector,
mTabContentManager, mCompositorViewHolder,
@@ -1336,7 +1336,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
@@ -1315,7 +1315,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
mShareDelegateSupplier, mLayoutStateProviderSupplier, mSnackbarManager);
var bottomControlsCoordinator = new BottomControlsCoordinator(mActivity, mWindowAndroid,
mLayoutManager, mCompositorViewHolder.getResourceManager(), mBrowserControlsSizer,
@@ -573,7 +573,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
mTabObscuringHandler, mOverlayPanelVisibilitySupplier, mConstraintsProxy,
mTopUiThemeColorProvider, mActivityTabProvider);
mBottomControlsCoordinatorSupplier.set(bottomControlsCoordinator);
@@ -2128,7 +2128,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
@@ -2104,7 +2104,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
private void setControlContainerTopMargin(int margin) {
final ViewGroup.MarginLayoutParams layoutParams =
((ViewGroup.MarginLayoutParams) mControlContainer.getLayoutParams());
@@ -621,7 +621,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/system/Statu
import androidx.annotation.ColorInt;
import androidx.annotation.Nullable;
@@ -433,11 +434,11 @@ public class StatusBarColorController
@@ -434,11 +435,11 @@ public class StatusBarColorController
boolean needsDarkStatusBarIcons = !ColorUtils.shouldUseLightForegroundOnBackground(color);
ApiCompatibilityUtils.setStatusBarIconColor(root, needsDarkStatusBarIcons);
ApiCompatibilityUtils.setStatusBarColor(window, color);
@@ -734,7 +734,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java
--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java
@@ -1017,7 +1017,7 @@ class AutocompleteMediator implements OnSuggestionsReceivedListener,
@@ -1012,7 +1012,7 @@ class AutocompleteMediator implements OnSuggestionsReceivedListener,
@Override
public void onSuggestionDropdownScroll() {
mSuggestionsListScrolled = true;
@@ -746,7 +746,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListManager.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListManager.java
--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListManager.java
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListManager.java
@@ -11,6 +11,8 @@ import android.view.View;
@@ -10,6 +10,8 @@ import android.view.View;
import androidx.annotation.NonNull;
import androidx.annotation.Px;
@@ -755,7 +755,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
import org.chromium.chrome.browser.omnibox.OmniboxFeatures;
import org.chromium.chrome.browser.omnibox.R;
import org.chromium.chrome.browser.ui.theme.BrandedColorScheme;
@@ -165,6 +167,7 @@ class DropdownItemViewInfoListManager {
@@ -130,6 +132,7 @@ class DropdownItemViewInfoListManager {
GroupSection previousSection = null;
GroupSection currentSection;
@@ -763,7 +763,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
for (int i = 0; i < mSourceViewInfoList.size(); i++) {
final DropdownItemViewInfo item = mSourceViewInfoList.get(i);
final PropertyModel model = item.model;
@@ -180,18 +183,22 @@ class DropdownItemViewInfoListManager {
@@ -145,18 +148,22 @@ class DropdownItemViewInfoListManager {
var topMargin = applyRounding ? groupTopMargin : suggestionVerticalMargin;
var bottomMargin = applyRounding ? groupBottomMargin : suggestionVerticalMargin;
@@ -793,7 +793,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsDropdown.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsDropdown.java
--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsDropdown.java
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsDropdown.java
@@ -265,7 +265,7 @@ public class OmniboxSuggestionsDropdown extends RecyclerView {
@@ -266,7 +266,7 @@ public class OmniboxSuggestionsDropdown extends RecyclerView {
final Resources resources = context.getResources();
int paddingBottom =
resources.getDimensionPixelOffset(R.dimen.omnibox_suggestion_list_padding_bottom);
@@ -802,7 +802,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
// reverse the layout so that the items are at the bottom (in reverse order)
// and anchored to the bottom edge
mLayoutScrollListener.setReverseLayout(true);
@@ -496,7 +496,7 @@ public class OmniboxSuggestionsDropdown extends RecyclerView {
@@ -500,7 +500,7 @@ public class OmniboxSuggestionsDropdown extends RecyclerView {
}
private int calculateAnchorBottomRelativeToContent() {
@@ -850,7 +850,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java
--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java
+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java
@@ -113,7 +113,7 @@ public class ToolbarControlContainer extends OptimizedFrameLayout implements Con
@@ -118,7 +118,7 @@ public class ToolbarControlContainer extends OptimizedFrameLayout implements Con
@Override
public void initWithToolbar(int toolbarLayoutId) {
try (TraceEvent te = TraceEvent.scoped("ToolbarControlContainer.initWithToolbar")) {
build/patches/00109-ADDNEW-ungoogled-chr-no-special-hosts-domains.patch
+36 -34
View File
@@ -6,7 +6,7 @@ Subject: 109 ADDNEW ungoogled-chr no special hosts/domains
chrome/browser/BUILD.gn | 8 --
.../android/metrics/uma_session_stats.cc | 10 ---
chrome/browser/browser_process_impl.cc | 1 -
.../browser/chrome_content_browser_client.cc | 13 +--
.../browser/chrome_content_browser_client.cc | 18 ----
chrome/browser/extensions/BUILD.gn | 1 -
.../log_sources/chrome_internal_log_source.cc | 5 --
chrome/browser/first_run/first_run.cc | 9 --
@@ -27,7 +27,7 @@ Subject: 109 ADDNEW ungoogled-chr no special hosts/domains
.../webui/settings/reset_settings_handler.cc | 1 -
.../upgrade_detector/upgrade_detector_impl.cc | 2 +-
chrome/common/BUILD.gn | 2 -
.../url_loader_throttle_provider_impl.cc | 7 --
.../url_loader_throttle_provider_impl.cc | 6 --
chrome/test/BUILD.gn | 1 -
components/google/core/common/google_util.cc | 70 +---------------
components/google/core/common/google_util.h | 10 +--
@@ -35,12 +35,12 @@ Subject: 109 ADDNEW ungoogled-chr no special hosts/domains
components/search_provider_logos/BUILD.gn | 2 -
.../logo_service_impl.cc | 16 +---
components/url_matcher/url_util.cc | 83 -------------------
32 files changed, 20 insertions(+), 360 deletions(-)
32 files changed, 17 insertions(+), 367 deletions(-)
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -1000,10 +1000,6 @@ static_library("browser") {
@@ -995,10 +995,6 @@ static_library("browser") {
"page_load_metrics/observers/foreground_duration_ukm_observer.h",
"page_load_metrics/observers/formfill_page_load_metrics_observer.cc",
"page_load_metrics/observers/formfill_page_load_metrics_observer.h",
@@ -51,7 +51,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"page_load_metrics/observers/histogram_suffixes.cc",
"page_load_metrics/observers/histogram_suffixes.h",
"page_load_metrics/observers/https_engagement_metrics/https_engagement_page_load_metrics_observer.cc",
@@ -1916,7 +1912,6 @@ static_library("browser") {
@@ -1919,7 +1915,6 @@ static_library("browser") {
"//chrome/browser/autofill",
"//chrome/browser/devtools",
"//chrome/browser/favicon",
@@ -59,16 +59,16 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"//chrome/browser/profiling_host",
# TODO(crbug.com/1335199): break this dep when favicon is in its own target
@@ -1935,7 +1930,6 @@ static_library("browser") {
@@ -1939,7 +1934,6 @@ static_library("browser") {
public_deps = [
"//base",
- "//chrome/browser/google",
"//chrome/browser/headless",
"//chrome/common",
"//chrome/common:buildflags",
"//chrome/common:constants",
@@ -7690,8 +7684,6 @@ static_library("browser") {
"supervised_user/supervised_user_constants.h",
@@ -7389,8 +7383,6 @@ static_library("browser") {
"supervised_user/permission_request_creator.h",
"supervised_user/supervised_user_denylist.cc",
"supervised_user/supervised_user_denylist.h",
- "supervised_user/supervised_user_google_auth_navigation_throttle.cc",
@@ -99,7 +99,7 @@ diff --git a/chrome/browser/android/metrics/uma_session_stats.cc b/chrome/browse
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -1084,7 +1084,6 @@ BrowserProcessImpl::component_updater() {
@@ -1091,7 +1091,6 @@ BrowserProcessImpl::component_updater() {
std::make_unique<component_updater::TimerUpdateScheduler>();
std::string brand;
@@ -110,7 +110,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -2857,7 +2857,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
@@ -2873,7 +2873,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
switches::kForcePNaClSubzero,
#endif
switches::kForceUIDirection,
@@ -118,7 +118,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
switches::kJavaScriptHarmony,
switches::kEnableExperimentalWebAssemblyFeatures,
embedder_support::kOriginTrialDisabledFeatures,
@@ -4869,12 +4868,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
@@ -4897,12 +4896,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
&throttles);
#endif
@@ -131,25 +131,28 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
if (auto* throttle_manager =
subresource_filter::ContentSubresourceFilterThrottleManager::
FromNavigationHandle(*handle)) {
@@ -5382,11 +5375,11 @@ ChromeContentBrowserClient::CreateURLLoaderThrottles(
profile->GetPrefs()->GetInteger(prefs::kForceYouTubeRestrict),
profile->GetPrefs()->GetString(prefs::kAllowedDomainsForApps),
false /*-> allow_userscript, don't care */};
- result.push_back(std::make_unique<GoogleURLLoaderThrottle>(
#if BUILDFLAG(IS_ANDROID)
- client_data_header, is_tab_large_enough,
+ if (is_tab_large_enough) {
+ // do nothing, prevents "error: variable 'is_tab_large_enough' set but not used"
+ }
@@ -5418,17 +5411,6 @@ ChromeContentBrowserClient::CreateURLLoaderThrottles(
}
#endif
- std::move(dynamic_params)));
- chrome::mojom::DynamicParams dynamic_params = {
- profile->GetPrefs()->GetBoolean(prefs::kForceGoogleSafeSearch),
- profile->GetPrefs()->GetInteger(prefs::kForceYouTubeRestrict),
- profile->GetPrefs()->GetString(prefs::kAllowedDomainsForApps),
- false /*-> allow_userscript, don't care */};
- result.push_back(std::make_unique<GoogleURLLoaderThrottle>(
-#if BUILDFLAG(IS_ANDROID)
- client_data_header,
-#endif
- std::move(dynamic_params)));
-
{
auto* factory =
ProtocolHandlerRegistryFactory::GetForBrowserContext(browser_context);
diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -784,7 +784,6 @@ static_library("extensions") {
@@ -788,7 +788,6 @@ static_library("extensions") {
"//chrome/browser/browsing_data:constants",
"//chrome/browser/devtools",
"//chrome/browser/favicon",
@@ -182,7 +185,7 @@ diff --git a/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log
diff --git a/chrome/browser/first_run/first_run.cc b/chrome/browser/first_run/first_run.cc
--- a/chrome/browser/first_run/first_run.cc
+++ b/chrome/browser/first_run/first_run.cc
@@ -285,15 +285,6 @@ void SetupInitialPrefsFromInstallPrefs(
@@ -282,15 +282,6 @@ void SetupInitialPrefsFromInstallPrefs(
// -- Platform-specific functions --
@@ -266,7 +269,7 @@ diff --git a/chrome/browser/long_screenshots/long_screenshots_tab_service.cc b/c
diff --git a/chrome/browser/metrics/chrome_metrics_service_client.cc b/chrome/browser/metrics/chrome_metrics_service_client.cc
--- a/chrome/browser/metrics/chrome_metrics_service_client.cc
+++ b/chrome/browser/metrics/chrome_metrics_service_client.cc
@@ -579,7 +579,7 @@ ChromeMetricsServiceClient::GetNetworkTimeTracker() {
@@ -577,7 +577,7 @@ ChromeMetricsServiceClient::GetNetworkTimeTracker() {
}
bool ChromeMetricsServiceClient::GetBrand(std::string* brand_code) {
@@ -458,7 +461,7 @@ diff --git a/chrome/browser/new_tab_page/promos/promo_service.cc b/chrome/browse
diff --git a/chrome/browser/page_load_metrics/page_load_metrics_initialize.cc b/chrome/browser/page_load_metrics/page_load_metrics_initialize.cc
--- a/chrome/browser/page_load_metrics/page_load_metrics_initialize.cc
+++ b/chrome/browser/page_load_metrics/page_load_metrics_initialize.cc
@@ -128,8 +128,6 @@ void PageLoadMetricsEmbedder::RegisterEmbedderObservers(
@@ -127,8 +127,6 @@ void PageLoadMetricsEmbedder::RegisterEmbedderObservers(
tracker->AddObserver(std::make_unique<AMPPageLoadMetricsObserver>());
tracker->AddObserver(std::make_unique<JavascriptFrameworksUkmObserver>());
tracker->AddObserver(std::make_unique<SchemePageLoadMetricsObserver>());
@@ -470,7 +473,7 @@ diff --git a/chrome/browser/page_load_metrics/page_load_metrics_initialize.cc b/
diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -417,7 +417,6 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -426,7 +426,6 @@ void ChromeBrowserMainExtraPartsProfiles::
#if !BUILDFLAG(IS_ANDROID)
GlobalErrorServiceFactory::GetInstance();
#endif
@@ -506,7 +509,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
diff --git a/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc b/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc
--- a/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc
+++ b/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc
@@ -511,11 +511,6 @@ content::WebUIDataSource* CreateNewTabPageUiHtmlSource(Profile* profile) {
@@ -510,11 +510,6 @@ content::WebUIDataSource* CreateAndAddNewTabPageUiHtmlSource(Profile* profile) {
// chrome-untrusted://new-tab-page for other external content and resources.
// NOTE: Use caution when overriding content security policies as that cean
// lead to subtle security bugs such as https://crbug.com/1251541.
@@ -532,7 +535,7 @@ diff --git a/chrome/browser/ui/webui/settings/reset_settings_handler.cc b/chrome
diff --git a/chrome/browser/upgrade_detector/upgrade_detector_impl.cc b/chrome/browser/upgrade_detector/upgrade_detector_impl.cc
--- a/chrome/browser/upgrade_detector/upgrade_detector_impl.cc
+++ b/chrome/browser/upgrade_detector/upgrade_detector_impl.cc
@@ -214,7 +214,7 @@ void UpgradeDetectorImpl::StartOutdatedBuildDetector() {
@@ -209,7 +209,7 @@ void UpgradeDetectorImpl::StartOutdatedBuildDetector() {
// an outdated build is being simulated by command line switches.
if (!simulating_outdated_) {
std::string brand;
@@ -544,7 +547,7 @@ diff --git a/chrome/browser/upgrade_detector/upgrade_detector_impl.cc b/chrome/b
diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
@@ -134,8 +134,6 @@ static_library("common_lib") {
@@ -133,8 +133,6 @@ static_library("common_lib") {
"content_restriction.h",
"crash_keys.cc",
"crash_keys.h",
@@ -556,14 +559,13 @@ diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
diff --git a/chrome/renderer/url_loader_throttle_provider_impl.cc b/chrome/renderer/url_loader_throttle_provider_impl.cc
--- a/chrome/renderer/url_loader_throttle_provider_impl.cc
+++ b/chrome/renderer/url_loader_throttle_provider_impl.cc
@@ -181,13 +181,6 @@ URLLoaderThrottleProviderImpl::CreateThrottles(
@@ -180,12 +180,6 @@ URLLoaderThrottleProviderImpl::CreateThrottles(
}
#endif
- throttles.emplace_back(std::make_unique<GoogleURLLoaderThrottle>(
-#if BUILDFLAG(IS_ANDROID)
- client_data_header,
- /* is_tab_large_enough= */ false,
-#endif
- ChromeRenderThreadObserver::GetDynamicParams()));
-
@@ -573,7 +575,7 @@ diff --git a/chrome/renderer/url_loader_throttle_provider_impl.cc b/chrome/rende
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -5877,7 +5877,6 @@ test("unit_tests") {
@@ -5822,7 +5822,6 @@ test("unit_tests") {
"//chrome/browser/favicon",
"//chrome/browser/feature_guide/notifications:unit_tests",
"//chrome/browser/first_party_sets",
build/patches/00109-ADDTO-Disable-safe-browsing.patch
+4 -4
View File
@@ -27,7 +27,7 @@ diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permiss
void ShowFileSystemAccessDangerousFileDialogOnUIThread(
content::GlobalRenderFrameHostId frame_id,
const url::Origin& origin,
@@ -488,6 +488,7 @@ base::StringPiece GetGrantKeyFromGrantType(GrantType type) {
@@ -495,6 +495,7 @@ base::StringPiece GetGrantKeyFromGrantType(GrantType type) {
: kPermissionReadableKey;
}
@@ -35,7 +35,7 @@ diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permiss
bool FileHasDangerousExtension(const url::Origin& origin,
const base::FilePath& path,
Profile* profile) {
@@ -499,6 +500,7 @@ bool FileHasDangerousExtension(const url::Origin& origin,
@@ -506,6 +507,7 @@ bool FileHasDangerousExtension(const url::Origin& origin,
return danger_level == safe_browsing::DownloadFileType::DANGEROUS ||
danger_level == safe_browsing::DownloadFileType::ALLOW_ON_USER_GESTURE;
}
@@ -46,7 +46,7 @@ diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permiss
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -467,6 +467,9 @@ CHAR_LIMIT guidelines:
@@ -464,6 +464,9 @@ CHAR_LIMIT guidelines:
<message name="IDS_PRELOAD_PAGES_EXTENDED_PRELOADING_BULLET_FOUR" desc="Fourth bullet point under the Preload Pages extended preloading mode. Informs the user about what the extended preloading setting does.">
Because the preloaded pages are encrypted, Google will not learn anything about the preloaded page content. Google servers will learn which sites are privately preloaded. This information is only used to preload the pages, and is not linked to other information from your Google Account.
</message>
@@ -59,7 +59,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
--- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
+++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
@@ -536,10 +536,6 @@ void InterstitialHTMLSource::StartDataRequest(
@@ -537,10 +537,6 @@ void InterstitialHTMLSource::StartDataRequest(
interstitial_delegate = CreateMITMSoftwareBlockingPage(web_contents);
} else if (path_without_query == "/blocked-interception") {
interstitial_delegate = CreateBlockedInterceptionBlockingPage(web_contents);
build/patches/00109-ADDTO-Remove-binary-blob-integrations.patch
+1 -1
View File
@@ -11,7 +11,7 @@ Subject: 109 ADDTO Remove binary blob integrations
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
@@ -743,6 +743,8 @@ by a child template that "extends" this file.
@@ -753,6 +753,8 @@ by a child template that "extends" this file.
android:theme="@style/Theme.BrowserUI.Translucent.NoTitleBar"
android:excludeFromRecents="true"
android:process=":browser_restart_process">
build/patches/00109-ADDTO-Remove-price-shopping-commerce-integra.patch
+6 -27
View File
@@ -4,15 +4,14 @@ Subject: 109 ADDTO Remove price/shopping/commerce integra
---
.../chrome/browser/app/ChromeActivity.java | 4 ----
.../bookmarks/BookmarkItemsAdapter.java | 2 --
.../bookmarks/BookmarkSaveFlowMediator.java | 21 -------------------
.../bookmarks/BookmarkSaveFlowMediator.java | 20 -------------------
.../commerce/core/commerce_feature_list.cc | 4 ++--
4 files changed, 2 insertions(+), 29 deletions(-)
3 files changed, 2 insertions(+), 26 deletions(-)
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
@@ -2369,10 +2369,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
@@ -2335,10 +2335,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
}
if (id == R.id.disable_price_tracking_menu_id) {
@@ -23,25 +22,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
return true;
}
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
@@ -25,7 +25,6 @@ import org.chromium.chrome.browser.bookmarks.BookmarkRow.Location;
import org.chromium.chrome.browser.feature_engagement.TrackerFactory;
import org.chromium.chrome.browser.flags.ChromeFeatureList;
import org.chromium.chrome.browser.profiles.Profile;
-import org.chromium.chrome.browser.subscriptions.CommerceSubscriptionsServiceFactory;
import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
import org.chromium.components.bookmarks.BookmarkId;
import org.chromium.components.bookmarks.BookmarkItem;
@@ -226,7 +225,6 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
return createViewHolderHelper(parent, R.layout.bookmark_folder_row);
case ViewType.BOOKMARK:
return createViewHolderHelper(parent, R.layout.bookmark_item_row);
- .init(mImageFetcher, mDelegate.getModel(), mSnackbarManager);
case ViewType.DIVIDER:
return new ViewHolder(
LayoutInflater.from(parent.getContext())
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowMediator.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowMediator.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowMediator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowMediator.java
@@ -53,17 +33,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.components.bookmarks.BookmarkId;
import org.chromium.components.bookmarks.BookmarkItem;
@@ -39,9 +38,6 @@ public class BookmarkSaveFlowMediator
@@ -39,8 +38,6 @@ public class BookmarkSaveFlowMediator
private BookmarkId mBookmarkId;
private PowerBookmarkMeta mPowerBookmarkMeta;
private boolean mWasBookmarkMoved;
- private SubscriptionsManager mSubscriptionsManager;
- private CommerceSubscription mSubscription;
- private Callback<Boolean> mSubscriptionsManagerCallback;
private String mFolderName;
/**
@@ -121,23 +117,6 @@ public class BookmarkSaveFlowMediator
@@ -120,23 +117,6 @@ public class BookmarkSaveFlowMediator
}
void handleNotificationSwitchToggle(CompoundButton view, boolean toggled) {
@@ -90,7 +69,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
diff --git a/components/commerce/core/commerce_feature_list.cc b/components/commerce/core/commerce_feature_list.cc
--- a/components/commerce/core/commerce_feature_list.cc
+++ b/components/commerce/core/commerce_feature_list.cc
@@ -119,8 +119,8 @@ BASE_FEATURE(kCommerceMerchantViewer,
@@ -128,8 +128,8 @@ BASE_FEATURE(kCommerceMerchantViewer,
base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kCommercePriceTracking,
build/patches/00109-ADDTO-Remove-signin-and-sync-integrations.patch
+3 -3
View File
@@ -10,7 +10,7 @@ Subject: 109 ADDTO Remove signin and sync integrations
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -273,6 +273,7 @@ if (current_toolchain == default_toolchain) {
@@ -258,6 +258,7 @@ if (current_toolchain == default_toolchain) {
"//chrome/browser/ui/android/management:java_resources",
"//chrome/browser/ui/android/omnibox:java_resources",
"//chrome/browser/ui/android/quickactionsearchwidget:java_resources",
@@ -21,7 +21,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/feed/FeedActionDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/app/feed/FeedActionDelegateImpl.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/app/feed/FeedActionDelegateImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/feed/FeedActionDelegateImpl.java
@@ -19,7 +19,6 @@ import org.chromium.chrome.browser.offlinepages.OfflinePageBridge;
@@ -21,7 +21,6 @@ import org.chromium.chrome.browser.offlinepages.OfflinePageBridge;
import org.chromium.chrome.browser.offlinepages.RequestCoordinatorBridge;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.share.crow.CrowButtonDelegate;
@@ -29,7 +29,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/feed/FeedAc
import org.chromium.chrome.browser.suggestions.SuggestionsConfig;
import org.chromium.chrome.browser.tab.EmptyTabObserver;
import org.chromium.chrome.browser.tab.Tab;
@@ -129,8 +128,6 @@ public class FeedActionDelegateImpl implements FeedActionDelegate {
@@ -156,8 +155,6 @@ public class FeedActionDelegateImpl implements FeedActionDelegate {
@Override
public void showSignInActivity() {
if (ChromeFeatureList.isEnabled(ChromeFeatureList.FEED_SHOW_SIGN_IN_COMMAND)) {
build/patches/00110-ADDTO-Disable-safe-browsing.patch
+1 -1
View File
@@ -17,7 +17,7 @@ diff --git a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/b
import org.chromium.chrome.browser.sync.SyncService;
import org.chromium.components.content_settings.CookieControlsMode;
import org.chromium.components.content_settings.PrefNames;
@@ -24,15 +23,14 @@ import java.util.Set;
@@ -22,15 +21,14 @@ import java.util.Set;
*/
class PrivacyGuideUtils {
public static boolean isMsbbEnabled() {
build/patches/00AdblockPlus.patch
+9893 -7886
View File
File diff suppressed because it is too large Load Diff
build/patches/00Eyeo-Adblock-Remove-Privacy-Issues.patch
+74 -92
View File
@@ -22,8 +22,7 @@ Subject: Eyeo Adblock Remove
components/adblock/core/BUILD.gn | 45 -
.../activeping_telemetry_topic_provider.cc | 241 --
.../activeping_telemetry_topic_provider.h | 83 -
.../adblock/core/adblock_controller_impl.cc | 6 +-
.../core/adblock_controller_legacy_impl.cc | 6 +-
.../adblock/core/adblock_controller_impl.cc | 7 +-
components/adblock/core/adblock_switches.cc | 1 -
components/adblock/core/adblock_switches.h | 1 -
.../adblock/core/adblock_telemetry_service.h | 107 -
@@ -31,7 +30,7 @@ Subject: Eyeo Adblock Remove
.../adblock/core/common/adblock_constants.h | 1 -
.../adblock/core/common/adblock_prefs.cc | 42 +-
.../adblock/core/common/adblock_utils.cc | 23 -
components/adblock/core/converter/metadata.cc | 6 +-
.../adblock/core/converter/parser/metadata.cc | 6 +-
.../adblock/core/sitekey_storage_impl.cc | 6 +
...filtering_configuration_maintainer_impl.cc | 10 -
.../filtering_configuration_maintainer_impl.h | 1 -
@@ -53,7 +52,7 @@ Subject: Eyeo Adblock Remove
.../blink/renderer/core/css/style_engine.cc | 8 +
.../blink/renderer/core/css/style_engine.h | 1 +
.../renderer/core/exported/web_document.cc | 13 +-
50 files changed, 3279 insertions(+), 901 deletions(-)
49 files changed, 3278 insertions(+), 897 deletions(-)
delete mode 100644 chrome/browser/adblock/adblock_telemetry_service_factory.cc
delete mode 100644 chrome/browser/adblock/adblock_telemetry_service_factory.h
rename components/adblock/android/java/res/xml/{adblock_preferences.xml => eyeo_adblock_preferences.xml} (100%)
@@ -93,7 +92,7 @@ diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/j
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -158,8 +158,6 @@ static_library("browser") {
@@ -159,8 +159,6 @@ static_library("browser") {
"adblock/adblock_content_browser_client.h",
"adblock/adblock_controller_factory.cc",
"adblock/adblock_controller_factory.h",
@@ -139,7 +138,7 @@ diff --git a/chrome/browser/adblock/adblock_content_browser_client.cc b/chrome/b
diff --git a/chrome/browser/adblock/adblock_controller_factory.cc b/chrome/browser/adblock/adblock_controller_factory.cc
--- a/chrome/browser/adblock/adblock_controller_factory.cc
+++ b/chrome/browser/adblock/adblock_controller_factory.cc
@@ -64,8 +64,7 @@ KeyedService* AdblockControllerFactory::BuildServiceInstanceFor(
@@ -63,8 +63,7 @@ KeyedService* AdblockControllerFactory::BuildServiceInstanceFor(
auto adblock_filtering_configuration =
std::make_unique<PersistentFilteringConfiguration>(prefs, "adblock");
@@ -338,7 +337,7 @@ deleted file mode 100644
diff --git a/chrome/browser/adblock/subscription_service_factory.cc b/chrome/browser/adblock/subscription_service_factory.cc
--- a/chrome/browser/adblock/subscription_service_factory.cc
+++ b/chrome/browser/adblock/subscription_service_factory.cc
@@ -65,7 +65,7 @@ base::TimeDelta GetUpdateCheckInterval() {
@@ -66,7 +66,7 @@ base::TimeDelta GetUpdateCheckInterval() {
static base::TimeDelta kCheckInterval =
g_update_check_interval_for_testing
? g_update_check_interval_for_testing.value()
@@ -358,7 +357,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
#include "chrome/browser/adblock/resource_classification_runner_factory.h"
#include "chrome/browser/adblock/session_stats_factory.h"
#include "chrome/browser/adblock/sitekey_storage_factory.h"
@@ -394,7 +393,6 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -401,7 +400,6 @@ void ChromeBrowserMainExtraPartsProfiles::
ExitTypeServiceFactory::GetInstance();
#endif
adblock::AdblockControllerFactory::GetInstance();
@@ -369,7 +368,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
@@ -328,6 +328,8 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
@@ -327,6 +327,8 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
}
#endif
@@ -392,7 +391,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
diff --git a/components/adblock/android/BUILD.gn b/components/adblock/android/BUILD.gn
--- a/components/adblock/android/BUILD.gn
+++ b/components/adblock/android/BUILD.gn
@@ -83,7 +83,7 @@ android_resources("java_resources") {
@@ -87,7 +87,7 @@ android_resources("java_resources") {
"java/res/layout/adblock_filter_lists_list_item.xml",
"java/res/values/adblock_settings_locales_titles.xml",
"java/res/xml/adblock_more_options.xml",
@@ -485,7 +484,7 @@ diff --git a/components/adblock/content/browser/BUILD.gn b/components/adblock/co
-
deps = [
"//base",
"//url:url",
"//components/resources:components_resources_grit",
diff --git a/components/adblock/core/BUILD.gn b/components/adblock/core/BUILD.gn
--- a/components/adblock/core/BUILD.gn
+++ b/components/adblock/core/BUILD.gn
@@ -497,7 +496,7 @@ diff --git a/components/adblock/core/BUILD.gn b/components/adblock/core/BUILD.gn
import("//third_party/flatbuffers/flatbuffer.gni")
flatbuffer("schema") {
@@ -61,49 +60,9 @@ generate_sha256_header("schema_hash") {
@@ -61,56 +60,14 @@ generate_sha256_header("schema_hash") {
files_to_hash = [ "${target_gen_dir}/schema/filter_list_schema_generated.h" ]
}
@@ -547,8 +546,6 @@ diff --git a/components/adblock/core/BUILD.gn b/components/adblock/core/BUILD.gn
"adblock_controller.h",
"adblock_controller_impl.cc",
"adblock_controller_impl.h",
@@ -111,8 +70,6 @@ source_set("core") {
"adblock_controller_legacy_impl.h", # Remove in 111
"adblock_switches.cc",
"adblock_switches.h",
- "adblock_telemetry_service.cc",
@@ -556,9 +553,9 @@ diff --git a/components/adblock/core/BUILD.gn b/components/adblock/core/BUILD.gn
"features.cc",
"features.h",
"sitekey_storage.h",
@@ -133,8 +90,6 @@ source_set("core") {
"//components/adblock/core/subscription",
"//components/pref_registry:pref_registry",
@@ -134,8 +91,6 @@ source_set("core") {
"//components/prefs",
"//components/version_info",
]
-
- all_dependent_configs = [ ":adblock_core_config" ]
@@ -902,7 +899,7 @@ deleted file mode 100644
diff --git a/components/adblock/core/adblock_controller_impl.cc b/components/adblock/core/adblock_controller_impl.cc
--- a/components/adblock/core/adblock_controller_impl.cc
+++ b/components/adblock/core/adblock_controller_impl.cc
@@ -125,6 +125,7 @@ bool AdblockControllerImpl::IsAdblockEnabled() const {
@@ -116,6 +116,7 @@ bool AdblockControllerImpl::IsAdblockEnabled() const {
}
void AdblockControllerImpl::SetAcceptableAdsEnabled(bool enabled) {
@@ -910,7 +907,15 @@ diff --git a/components/adblock/core/adblock_controller_impl.cc b/components/adb
if (enabled) {
InstallSubscription(AcceptableAdsUrl());
} else {
@@ -237,9 +238,7 @@ void AdblockControllerImpl::RunFirstRunLogic(PrefService* pref_service) {
@@ -130,6 +131,7 @@ bool AdblockControllerImpl::IsAcceptableAdsEnabled() const {
}
void AdblockControllerImpl::InstallSubscription(const GURL& url) {
+ if (url == AcceptableAdsUrl()) return;
adblock_filtering_configuration_->AddFilterList(url);
}
@@ -184,9 +186,7 @@ void AdblockControllerImpl::RunFirstRunLogic(PrefService* pref_service) {
// On first run, install additional subscriptions.
for (const auto& cur : known_subscriptions_) {
if (cur.first_run == SubscriptionFirstRunBehavior::Subscribe) {
@@ -921,7 +926,7 @@ diff --git a/components/adblock/core/adblock_controller_impl.cc b/components/adb
// Do not install Acceptable Ads on first run because a command line
// switch forbids it. Mostly used for testing.
continue;
@@ -296,6 +295,7 @@ void AdblockControllerImpl::MigrateLegacyPrefs(PrefService* pref_service) {
@@ -243,6 +243,7 @@ void AdblockControllerImpl::MigrateLegacyPrefs(PrefService* pref_service) {
}
void AdblockControllerImpl::InstallLanguageBasedRecommendedSubscriptions() {
@@ -929,29 +934,6 @@ diff --git a/components/adblock/core/adblock_controller_impl.cc b/components/adb
bool language_specific_subscription_installed = false;
for (const auto& subscription : known_subscriptions_) {
if (subscription.first_run ==
diff --git a/components/adblock/core/adblock_controller_legacy_impl.cc b/components/adblock/core/adblock_controller_legacy_impl.cc
--- a/components/adblock/core/adblock_controller_legacy_impl.cc
+++ b/components/adblock/core/adblock_controller_legacy_impl.cc
@@ -148,8 +148,7 @@ void AdblockControllerLegacyImpl::ReadStateFromPrefs() {
switches::kDisableAdblock)) {
adblock_enabled_.SetValue(false);
}
- if (base::CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kDisableAcceptableAds)) {
+ if ((true)) {
aa_enabled_.SetValue(false);
}
OnPrefChangedAdblockEnabled();
@@ -171,8 +170,7 @@ void AdblockControllerLegacyImpl::OnPrefChangedSubscriptions() {
std::back_inserter(subscriptions_in_prefs),
&GurlFromString);
if (aa_enabled_.GetValue() &&
- !base::CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kDisableAcceptableAds)) {
+ ((false))) {
subscriptions_in_prefs.push_back(AcceptableAdsUrl());
} else {
subscriptions_in_prefs.erase(
diff --git a/components/adblock/core/adblock_switches.cc b/components/adblock/core/adblock_switches.cc
--- a/components/adblock/core/adblock_switches.cc
+++ b/components/adblock/core/adblock_switches.cc
@@ -1210,36 +1192,36 @@ diff --git a/components/adblock/core/common/adblock_utils.cc b/components/adbloc
return info;
}
diff --git a/components/adblock/core/converter/metadata.cc b/components/adblock/core/converter/metadata.cc
--- a/components/adblock/core/converter/metadata.cc
+++ b/components/adblock/core/converter/metadata.cc
@@ -38,7 +38,7 @@ bool ParseAdblockHeader(std::istream& stream) {
if (!re2::RE2::FullMatch(
re2::StringPiece(adblock_header.data(), adblock_header.size()),
adblock_header_re)) {
- DLOG(ERROR)
+ LOG(ERROR)
<< "[eyeo] Invalid filter list. Should start with [Adblock Plus "
"<x>.<y>]. Won't parse.";
return false;
@@ -156,7 +156,7 @@ bool Metadata::ParseComment(const std::string& comment) {
if (redirect_url.is_valid()) {
redirect_url_ = redirect_url;
} else {
- DLOG(WARNING) << "[eyeo] Invalid redirect URL: " << value
+ LOG(WARNING) << "[eyeo] Invalid redirect URL: " << value
<< ". Will not redirect.";
}
} else if (key == "title")
@@ -179,7 +179,7 @@ void Metadata::ParseExpirationTime(const std::string& expiration_value) {
if (!re2::RE2::FullMatch(
re2::StringPiece(expiration_value.data(), expiration_value.size()),
expiration_time_re, &expiration_time, &expiration_unit)) {
- DLOG(INFO) << "[eyeo] Invalid expiration time format: " << expiration_value
+ LOG(INFO) << "[eyeo] Invalid expiration time format: " << expiration_value
<< ". Will use default value of "
<< kDefaultExpirationInterval.InDays() << " days.";
return;
diff --git a/components/adblock/core/converter/parser/metadata.cc b/components/adblock/core/converter/parser/metadata.cc
--- a/components/adblock/core/converter/parser/metadata.cc
+++ b/components/adblock/core/converter/parser/metadata.cc
@@ -40,7 +40,7 @@ absl::optional<Metadata> Metadata::FromStream(std::istream& filter_stream) {
std::string line;
std::getline(filter_stream, line);
if (!IsValidAdblockHeader(line)) {
- VLOG(1) << "[eyeo] Invalid filter list. Should start with [Adblock Plus "
+ LOG(ERROR) << "[eyeo] Invalid filter list. Should start with [Adblock Plus "
"<x>.<y>].";
return {};
}
@@ -62,7 +62,7 @@ absl::optional<Metadata> Metadata::FromStream(std::istream& filter_stream) {
if (url.is_valid()) {
redirect_url = url;
} else {
- VLOG(1) << "[eyeo] Invalid redirect URL: " << value
+ LOG(ERROR) << "[eyeo] Invalid redirect URL: " << value
<< ". Will not redirect.";
}
} else if (key == "title") {
@@ -131,7 +131,7 @@ base::TimeDelta Metadata::ParseExpirationTime(
if (!re2::RE2::FullMatch(expiration_value, expiration_time_re,
&expiration_time, &expiration_unit)) {
- VLOG(1) << "[eyeo] Invalid expiration time format: " << expiration_value
+ LOG(ERROR) << "[eyeo] Invalid expiration time format: " << expiration_value
<< ". Will use default value of "
<< kDefaultExpirationInterval.InDays() << " days.";
return kDefaultExpirationInterval;
diff --git a/components/adblock/core/sitekey_storage_impl.cc b/components/adblock/core/sitekey_storage_impl.cc
--- a/components/adblock/core/sitekey_storage_impl.cc
+++ b/components/adblock/core/sitekey_storage_impl.cc
@@ -1273,7 +1255,7 @@ diff --git a/components/adblock/core/sitekey_storage_impl.cc b/components/adbloc
diff --git a/components/adblock/core/subscription/filtering_configuration_maintainer_impl.cc b/components/adblock/core/subscription/filtering_configuration_maintainer_impl.cc
--- a/components/adblock/core/subscription/filtering_configuration_maintainer_impl.cc
+++ b/components/adblock/core/subscription/filtering_configuration_maintainer_impl.cc
@@ -278,7 +278,6 @@ void FilteringConfigurationMaintainerImpl::RunUpdateCheck() {
@@ -282,7 +282,6 @@ void FilteringConfigurationMaintainerImpl::RunUpdateCheck() {
AcceptableAdsUrl();
}) &&
persistent_metadata_->IsExpired(AcceptableAdsUrl())) {
@@ -1281,7 +1263,7 @@ diff --git a/components/adblock/core/subscription/filtering_configuration_mainta
}
}
@@ -370,15 +369,6 @@ void FilteringConfigurationMaintainerImpl::SubscriptionAddedToStorage(
@@ -374,15 +373,6 @@ void FilteringConfigurationMaintainerImpl::SubscriptionAddedToStorage(
subscription_updated_callback_.Run(subscription->GetSourceUrl());
}
@@ -1300,7 +1282,7 @@ diff --git a/components/adblock/core/subscription/filtering_configuration_mainta
diff --git a/components/adblock/core/subscription/filtering_configuration_maintainer_impl.h b/components/adblock/core/subscription/filtering_configuration_maintainer_impl.h
--- a/components/adblock/core/subscription/filtering_configuration_maintainer_impl.h
+++ b/components/adblock/core/subscription/filtering_configuration_maintainer_impl.h
@@ -85,7 +85,6 @@ class FilteringConfigurationMaintainerImpl
@@ -83,7 +83,6 @@ class FilteringConfigurationMaintainerImpl
void SubscriptionAddedToStorage(
scoped_refptr<OngoingInstallation> ongoing_installation,
scoped_refptr<InstalledSubscription> subscription);
@@ -1455,7 +1437,7 @@ diff --git a/components/adblock/core/subscription/subscription_downloader_impl.c
<< subscription_url << ", will abort";
std::move(std::get<DownloadCompletedCallback>(download_it->second))
.Run(nullptr);
@@ -230,14 +227,14 @@ void SubscriptionDownloaderImpl::OnConversionFinished(
@@ -229,14 +226,14 @@ void SubscriptionDownloaderImpl::OnConversionFinished(
TRACE_ID_LOCAL(GenerateTraceId(subscription_url)));
const auto download_it = ongoing_downloads_.find(subscription_url);
if (download_it == ongoing_downloads_.end()) {
@@ -1465,17 +1447,17 @@ diff --git a/components/adblock/core/subscription/subscription_downloader_impl.c
return;
}
switch (converter_result.status) {
case ConverterResult::Ok:
- VLOG(1) << "[eyeo] Finished converting " << subscription_url
+ LOG(WARNING) << "[eyeo] Finished converting " << subscription_url
<< " successfully";
std::move(std::get<DownloadCompletedCallback>(download_it->second))
.Run(std::move(converter_result.data));
if (absl::holds_alternative<std::unique_ptr<FlatbufferData>>(
converter_result)) {
- VLOG(1) << "[eyeo] Finished converting " << subscription_url
+ LOG(WARNING) << "[eyeo] Finished converting " << subscription_url
<< " successfully";
std::move(std::get<DownloadCompletedCallback>(download_it->second))
.Run(std::move(
@@ -279,7 +276,7 @@ void SubscriptionDownloaderImpl::AbortWithWarning(
const std::string& warning) {
if (ongoing_download_it == ongoing_downloads_.end())
if (ongoing_download_it == ongoing_downloads_.end()) {
return;
}
- DLOG(WARNING) << "[eyeo] " << warning << " Aborting download of "
+ LOG(WARNING) << "[eyeo] " << warning << " Aborting download of "
<< ongoing_download_it->first;
@@ -1613,7 +1595,7 @@ deleted file mode 100644
diff --git a/components/resources/BUILD.gn b/components/resources/BUILD.gn
--- a/components/resources/BUILD.gn
+++ b/components/resources/BUILD.gn
@@ -69,7 +69,6 @@ grit("components_resources") {
@@ -75,7 +75,6 @@ grit("components_resources") {
deps += [
"//components/resources/adblocking:copy_snippets_lib",
@@ -4884,7 +4866,7 @@ new file mode 100755
diff --git a/third_party/blink/renderer/core/css/style_engine.cc b/third_party/blink/renderer/core/css/style_engine.cc
--- a/third_party/blink/renderer/core/css/style_engine.cc
+++ b/third_party/blink/renderer/core/css/style_engine.cc
@@ -486,6 +486,14 @@ void StyleEngine::UpdateActiveStyleSheetsInShadow(
@@ -539,6 +539,14 @@ void StyleEngine::UpdateActiveStyleSheetsInShadow(
}
}
@@ -4902,8 +4884,8 @@ diff --git a/third_party/blink/renderer/core/css/style_engine.cc b/third_party/b
diff --git a/third_party/blink/renderer/core/css/style_engine.h b/third_party/blink/renderer/core/css/style_engine.h
--- a/third_party/blink/renderer/core/css/style_engine.h
+++ b/third_party/blink/renderer/core/css/style_engine.h
@@ -236,6 +236,7 @@ class CORE_EXPORT StyleEngine final : public GarbageCollected<StyleEngine>,
}
@@ -238,6 +238,7 @@ class CORE_EXPORT StyleEngine final : public GarbageCollected<StyleEngine>,
const ComputedStyle* embedder_style) const;
void ViewportStyleSettingChanged();
+ bool ActiveUserStyleSheetsContainsKey(const StyleSheetKey& injection_key);
@@ -4913,7 +4895,7 @@ diff --git a/third_party/blink/renderer/core/css/style_engine.h b/third_party/bl
diff --git a/third_party/blink/renderer/core/exported/web_document.cc b/third_party/blink/renderer/core/exported/web_document.cc
--- a/third_party/blink/renderer/core/exported/web_document.cc
+++ b/third_party/blink/renderer/core/exported/web_document.cc
@@ -272,6 +272,16 @@ WebStyleSheetKey WebDocument::InsertAbpElemhideStylesheet(
@@ -270,6 +270,16 @@ WebStyleSheetKey WebDocument::InsertAbpElemhideStylesheet(
Document* document = Unwrap<Document>();
DCHECK(document);
@@ -4930,7 +4912,7 @@ diff --git a/third_party/blink/renderer/core/exported/web_document.cc b/third_pa
auto* parsed_sheet = MakeGarbageCollected<StyleSheetContents>(
MakeGarbageCollected<CSSParserContext>(*document));
parsed_sheet->ParseString(source_code);
@@ -293,9 +303,6 @@ WebStyleSheetKey WebDocument::InsertAbpElemhideStylesheet(
@@ -291,9 +301,6 @@ WebStyleSheetKey WebDocument::InsertAbpElemhideStylesheet(
{SchedulingPolicy::DisableBackForwardCache()});
}
build/patches/00Partitioning-all-cookies-by-top-frame-domain.patch
+20 -32
View File
@@ -7,19 +7,19 @@ user's possible wish to disable all third-party cookies.
Disabling the flag via the ui restores the normal mode, where
samesite=none first-party cookies are sent in third-party contexts.
---
components/browsing_data/core/features.cc | 2 +-
.../browsing_data/same_site_data_remover_impl.cc | 3 ++-
net/base/features.cc | 16 ++++++++--------
net/cookies/canonical_cookie.cc | 4 +---
net/cookies/cookie_deletion_info.cc | 3 ++-
net/cookies/parsed_cookie.h | 7 ++++++-
.../sqlite/sqlite_persistent_cookie_store.cc | 10 ++++++++++
services/network/cookie_settings.cc | 12 ++++++++++--
services/network/restricted_cookie_manager.cc | 3 +++
.../modules/cookie_store/cookie_init.idl | 2 +-
.../modules/cookie_store/cookie_store.cc | 12 ++++++++++++
.../cookie_store/cookie_store_delete_options.idl | 2 +-
12 files changed, 57 insertions(+), 19 deletions(-)
components/browsing_data/core/features.cc | 2 +-
.../browsing_data/same_site_data_remover_impl.cc | 3 ++-
net/base/features.cc | 8 ++++----
net/cookies/canonical_cookie.cc | 4 +---
net/cookies/cookie_deletion_info.cc | 3 ++-
net/cookies/parsed_cookie.h | 7 ++++++-
net/extras/sqlite/sqlite_persistent_cookie_store.cc | 10 ++++++++++
services/network/cookie_settings.cc | 12 ++++++++++--
services/network/restricted_cookie_manager.cc | 3 +++
.../renderer/modules/cookie_store/cookie_init.idl | 2 +-
.../renderer/modules/cookie_store/cookie_store.cc | 12 ++++++++++++
.../cookie_store/cookie_store_delete_options.idl | 2 +-
12 files changed, 53 insertions(+), 15 deletions(-)
diff --git a/components/browsing_data/core/features.cc b/components/browsing_data/core/features.cc
--- a/components/browsing_data/core/features.cc
@@ -49,21 +49,9 @@ diff --git a/content/browser/browsing_data/same_site_data_remover_impl.cc b/cont
diff --git a/net/base/features.cc b/net/base/features.cc
--- a/net/base/features.cc
+++ b/net/base/features.cc
@@ -255,16 +255,16 @@ BASE_FEATURE(kCookieSameSiteConsidersRedirectChain,
@@ -269,8 +269,8 @@ BASE_FEATURE(kSamePartyAttributeEnabled,
base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kSamePartyCookiesConsideredFirstParty,
- "SamePartyCookiesConsideredFirstParty",
- base::FEATURE_DISABLED_BY_DEFAULT);
+ "SamePartyCookiesConsideredFirstParty", // guard this
+ base::FEATURE_DISABLED_BY_DEFAULT); // guard this
BASE_FEATURE(kSamePartyAttributeEnabled,
- "SamePartyAttributeEnabled",
- base::FEATURE_DISABLED_BY_DEFAULT);
+ "SamePartyAttributeEnabled", // guard this
+ base::FEATURE_DISABLED_BY_DEFAULT); // guard this
BASE_FEATURE(kPartitionedCookies,
- "PartitionedCookies",
- base::FEATURE_DISABLED_BY_DEFAULT);
@@ -72,7 +60,7 @@ diff --git a/net/base/features.cc b/net/base/features.cc
BASE_FEATURE(kNoncedPartitionedCookies,
"NoncedPartitionedCookies",
@@ -283,8 +283,8 @@ BASE_FEATURE(kStaticKeyPinningEnforcement,
@@ -289,8 +289,8 @@ BASE_FEATURE(kStaticKeyPinningEnforcement,
base::FEATURE_ENABLED_BY_DEFAULT);
BASE_FEATURE(kCookieDomainRejectNonASCII,
@@ -164,7 +152,7 @@ diff --git a/net/extras/sqlite/sqlite_persistent_cookie_store.cc b/net/extras/sq
diff --git a/services/network/cookie_settings.cc b/services/network/cookie_settings.cc
--- a/services/network/cookie_settings.cc
+++ b/services/network/cookie_settings.cc
@@ -35,6 +35,11 @@ bool IsExplicitSetting(const ContentSettingPatternSource& setting) {
@@ -33,6 +33,11 @@ bool IsExplicitSetting(const ContentSettingPatternSource& setting) {
!setting.secondary_pattern.MatchesAllHosts();
}
@@ -178,7 +166,7 @@ diff --git a/services/network/cookie_settings.cc b/services/network/cookie_setti
const GURL& secondary_url,
@@ -192,11 +197,14 @@ net::NetworkDelegate::PrivacySetting CookieSettings::IsPrivacyModeEnabled(
CookieSettings::ThirdPartyBlockingOutcome
CookieSettings::ThirdPartyBlockingScope
CookieSettings::GetThirdPartyBlockingScope(const GURL& first_party_url) const {
- // If cookies are allowed for the first-party URL then we allow
+ // If cookies are allowed for the thirdy-party URL then we allow
@@ -190,13 +178,13 @@ diff --git a/services/network/cookie_settings.cc b/services/network/cookie_setti
- !match || match->GetContentSetting() == CONTENT_SETTING_ALLOW) {
+ match && IsThirdPartyAllowed(*match) &&
+ match->GetContentSetting() == CONTENT_SETTING_ALLOW) {
return ThirdPartyBlockingOutcome::kPartitionedStateAllowed;
return ThirdPartyBlockingScope::kUnpartitionedOnly;
}
return ThirdPartyBlockingOutcome::kAllStateDisallowed;
return ThirdPartyBlockingScope::kUnpartitionedAndPartitioned;
diff --git a/services/network/restricted_cookie_manager.cc b/services/network/restricted_cookie_manager.cc
--- a/services/network/restricted_cookie_manager.cc
+++ b/services/network/restricted_cookie_manager.cc
@@ -734,6 +734,9 @@ void RestrictedCookieManager::SetCookieFromString(
@@ -736,6 +736,9 @@ void RestrictedCookieManager::SetCookieFromString(
std::move(callback).Run(site_for_cookies_ok, top_frame_origin_ok);
callback = base::DoNothing();
build/patches/00WIN-ADDTO-Disable-safe-browsing.patch
+47 -46
View File
@@ -59,10 +59,10 @@ Subject: WIN ADDTO Disable safe browsing
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -1923,10 +1923,6 @@ static_library("browser") {
"//chrome/browser/share",
@@ -1927,10 +1927,6 @@ static_library("browser") {
"//chrome/browser/ui",
"//chrome/browser/storage_access_api:permissions",
"//chrome/browser/top_level_storage_access_api:permissions",
- "//chrome/browser/safe_browsing",
- "//chrome/browser/safe_browsing:verdict_cache_manager_factory",
- "//chrome/browser/safe_browsing:advanced_protection",
@@ -70,7 +70,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
# TODO(crbug.com/1030821): Eliminate usages of browser.h from Media Router.
"//chrome/browser/media/router",
@@ -2027,10 +2023,7 @@ static_library("browser") {
@@ -2033,10 +2029,7 @@ static_library("browser") {
"//chrome/browser/push_messaging:budget_proto",
"//chrome/browser/resource_coordinator:mojo_bindings",
"//chrome/browser/resource_coordinator:tab_manager_features",
@@ -82,7 +82,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"//chrome/browser/share",
"//chrome/browser/sharing:buildflags",
"//chrome/browser/sharing/proto",
@@ -3687,18 +3680,12 @@ static_library("browser") {
@@ -3651,18 +3644,12 @@ static_library("browser") {
"enterprise/connectors/analysis/analysis_service_settings.h",
"enterprise/connectors/analysis/analysis_settings.cc",
"enterprise/connectors/analysis/analysis_settings.h",
@@ -101,7 +101,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"enterprise/connectors/analysis/request_handler_base.cc",
"enterprise/connectors/analysis/request_handler_base.h",
"enterprise/connectors/common.cc",
@@ -8231,7 +8218,6 @@ static_library("test_support") {
@@ -7915,7 +7902,6 @@ static_library("test_support") {
":browser",
"//chrome/browser/autofill:test_support",
"//chrome/browser/profiles:profile",
@@ -154,7 +154,7 @@ diff --git a/chrome/browser/download/bubble/download_bubble_controller.cc b/chro
diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrome/browser/download/chrome_download_manager_delegate.cc
--- a/chrome/browser/download/chrome_download_manager_delegate.cc
+++ b/chrome/browser/download/chrome_download_manager_delegate.cc
@@ -1721,8 +1721,8 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAllowed(
@@ -1705,8 +1705,8 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAllowed(
DCHECK(download_item);
DCHECK(download_item->IsSavePackageDownload());
@@ -168,7 +168,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/download/download_item_model.cc
--- a/chrome/browser/download/download_item_model.cc
+++ b/chrome/browser/download/download_item_model.cc
@@ -936,6 +936,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommands* download_commands,
@@ -891,6 +891,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommands* download_commands,
DownloadUIModel::ExecuteCommand(download_commands, command);
break;
case DownloadCommands::DEEP_SCAN:
@@ -176,7 +176,7 @@ diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/dow
safe_browsing::SafeBrowsingService* sb_service =
g_browser_process->safe_browsing_service();
if (!sb_service)
@@ -968,106 +969,17 @@ void DownloadItemModel::ExecuteCommand(DownloadCommands* download_commands,
@@ -923,106 +924,17 @@ void DownloadItemModel::ExecuteCommand(DownloadCommands* download_commands,
safe_browsing::DeepScanningRequest::DeepScanTrigger::
TRIGGER_APP_PROMPT,
safe_browsing::DownloadCheckResult::UNKNOWN, std::move(settings));
@@ -612,7 +612,7 @@ diff --git a/chrome/browser/enterprise/connectors/analysis/request_handler_base.
diff --git a/chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc b/chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc
--- a/chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc
+++ b/chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc
@@ -335,6 +335,7 @@ void RealtimeReportingClient::ReportRealtimeEvent(
@@ -322,6 +322,7 @@ void RealtimeReportingClient::ReportRealtimeEvent(
const std::string& name,
const enterprise_connectors::ReportingSettings& settings,
base::Value::Dict event) {
@@ -620,7 +620,7 @@ diff --git a/chrome/browser/enterprise/connectors/reporting/realtime_reporting_c
if (rejected_dm_token_timers_.contains(settings.dm_token)) {
return;
}
@@ -400,7 +401,7 @@ void RealtimeReportingClient::ReportRealtimeEvent(
@@ -387,7 +388,7 @@ void RealtimeReportingClient::ReportRealtimeEvent(
}
std::string RealtimeReportingClient::GetProfileUserName() const {
@@ -632,7 +632,7 @@ diff --git a/chrome/browser/enterprise/connectors/reporting/realtime_reporting_c
diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -743,9 +743,6 @@ static_library("extensions") {
@@ -745,9 +745,6 @@ static_library("extensions") {
# TODO(crbug.com/1065748): Remove this circular dependency.
"//chrome/browser/web_applications/extensions",
@@ -642,7 +642,7 @@ diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUIL
]
# Since browser and browser_extensions actually depend on each other,
@@ -796,8 +793,6 @@ static_library("extensions") {
@@ -800,8 +797,6 @@ static_library("extensions") {
"//chrome/browser/profiles:profile",
"//chrome/browser/resource_coordinator:intervention_policy_database_proto",
"//chrome/browser/resource_coordinator:mojo_bindings",
@@ -905,7 +905,7 @@ diff --git a/chrome/browser/extensions/blocklist_state_fetcher.cc b/chrome/brows
diff --git a/chrome/browser/extensions/chrome_extensions_browser_client.cc b/chrome/browser/extensions/chrome_extensions_browser_client.cc
--- a/chrome/browser/extensions/chrome_extensions_browser_client.cc
+++ b/chrome/browser/extensions/chrome_extensions_browser_client.cc
@@ -666,56 +666,17 @@ void ChromeExtensionsBrowserClient::NotifyExtensionApiTabExecuteScript(
@@ -703,56 +703,17 @@ void ChromeExtensionsBrowserClient::NotifyExtensionApiTabExecuteScript(
content::BrowserContext* context,
const ExtensionId& extension_id,
const std::string& code) const {
@@ -1066,7 +1066,7 @@ diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b
// Retrieves and formats the saved passwords domains from signon_realms.
std::vector<std::string> GetMatchingDomains(
const std::vector<password_manager::MatchingReusedCredential>&
@@ -924,7 +924,7 @@ void ChromePasswordManagerClient::CheckProtectedPasswordEntry(
@@ -921,7 +921,7 @@ void ChromePasswordManagerClient::CheckProtectedPasswordEntry(
bool password_field_exists,
uint64_t reused_password_hash,
const std::string& domain) {
@@ -1075,7 +1075,7 @@ diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b
// If the webpage is not an extension page, do nothing.
if (!GURL(domain).SchemeIs(kExtensionScheme)) {
return;
@@ -964,7 +964,18 @@ void ChromePasswordManagerClient::CheckProtectedPasswordEntry(
@@ -961,7 +961,18 @@ void ChromePasswordManagerClient::CheckProtectedPasswordEntry(
void ChromePasswordManagerClient::LogPasswordReuseDetectedEvent() {
}
@@ -1098,7 +1098,7 @@ diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b
diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -1943,13 +1943,6 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildHandlerList(
@@ -1959,13 +1959,6 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildHandlerList(
prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckMode,
prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckScope, chrome_schema));
@@ -1115,7 +1115,7 @@ diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -1638,8 +1638,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
@@ -1694,8 +1694,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
component_updater::RegisterProfilePrefsForSwReporter(registry);
FontPrewarmerTabHelper::RegisterProfilePrefs(registry);
NetworkProfileBubble::RegisterProfilePrefs(registry);
@@ -1129,7 +1129,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
diff --git a/chrome/browser/printing/print_view_manager.cc b/chrome/browser/printing/print_view_manager.cc
--- a/chrome/browser/printing/print_view_manager.cc
+++ b/chrome/browser/printing/print_view_manager.cc
@@ -275,21 +275,6 @@ void PrintViewManager::OnDlpPrintingRestrictionsChecked(
@@ -269,21 +269,6 @@ void PrintViewManager::OnDlpPrintingRestrictionsChecked(
void PrintViewManager::RejectPrintPreviewRequestIfRestrictedByContentAnalysis(
content::GlobalRenderFrameHostId rfh_id,
base::OnceCallback<void(bool should_proceed)> callback) {
@@ -1166,7 +1166,7 @@ diff --git a/chrome/browser/profiles/profiles_state.cc b/chrome/browser/profiles
diff --git a/chrome/browser/resources/BUILD.gn b/chrome/browser/resources/BUILD.gn
--- a/chrome/browser/resources/BUILD.gn
+++ b/chrome/browser/resources/BUILD.gn
@@ -100,7 +100,6 @@ group("resources") {
@@ -106,7 +106,6 @@ group("resources") {
if (!is_android && !is_chromeos_ash) {
public_deps += [
@@ -1186,7 +1186,7 @@ diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsin
if (false) {
sources = [
"chrome_controller_client.cc",
@@ -435,7 +435,7 @@ static_library("safe_browsing") {
@@ -442,7 +442,7 @@ static_library("safe_browsing") {
}
}
@@ -1195,7 +1195,7 @@ diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsin
sources = [
"verdict_cache_manager_factory.cc",
"verdict_cache_manager_factory.h",
@@ -456,7 +456,7 @@ source_set("verdict_cache_manager_factory") {
@@ -463,7 +463,7 @@ source_set("verdict_cache_manager_factory") {
]
}
@@ -1204,7 +1204,7 @@ diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsin
sources = [
"advanced_protection_status_manager.cc",
"advanced_protection_status_manager.h",
@@ -476,7 +476,7 @@ static_library("advanced_protection") {
@@ -483,7 +483,7 @@ static_library("advanced_protection") {
]
}
@@ -1343,25 +1343,25 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
- "//chrome/browser/safe_browsing",
"//chrome/browser/share",
"//chrome/browser/ui/webui:configs",
"//chrome/browser/ui/webui/bluetooth_internals",
@@ -676,7 +675,6 @@ static_library("ui") {
"//chrome/browser/ui/webui/omnibox:mojo_bindings",
@@ -677,7 +676,6 @@ static_library("ui") {
# TODO(crbug.com/1158905): Remove this circular dependency.
"//chrome/browser/devtools",
"//chrome/browser/favicon",
- "//chrome/browser/safe_browsing",
"//chrome/browser/ui/webui/bluetooth_internals",
"//chrome/browser/profiling_host",
"//chrome/browser/ui/webui:configs",
@@ -1793,8 +1791,6 @@ static_library("ui") {
"//chrome/browser/resource_coordinator/tab_ranker",
]
@@ -1781,8 +1779,6 @@ static_library("ui") {
"//chrome/browser/resources/identity_internals:resources",
"//chrome/browser/resources/support_tool:resources",
"//chrome/browser/resources/web_app_internals:resources",
- "//chrome/browser/safe_browsing",
- "//chrome/browser/safe_browsing:advanced_protection",
"//chrome/browser/support_tool:support_tool_proto",
"//chrome/browser/ui/color:color_headers",
"//chrome/browser/ui/color:mixers",
@@ -3580,8 +3576,6 @@ static_library("ui") {
@@ -3626,8 +3622,6 @@ static_library("ui") {
"views/profiles/profile_picker_force_signin_dialog_host.h",
"views/profiles/profile_picker_signed_in_flow_controller.cc",
"views/profiles/profile_picker_signed_in_flow_controller.h",
@@ -1604,7 +1604,7 @@ diff --git a/chrome/browser/ui/views/download/download_item_view.cc b/chrome/bro
case download::DOWNLOAD_DANGER_TYPE_DANGEROUS_URL:
case download::DOWNLOAD_DANGER_TYPE_DANGEROUS_CONTENT:
case download::DOWNLOAD_DANGER_TYPE_DANGEROUS_HOST:
@@ -1279,7 +1261,6 @@ void DownloadItemView::ShowContextMenuImpl(const gfx::Rect& rect,
@@ -1270,7 +1252,6 @@ void DownloadItemView::ShowContextMenuImpl(const gfx::Rect& rect,
}
void DownloadItemView::OpenDownloadDuringAsyncScanning() {
@@ -1615,7 +1615,7 @@ diff --git a/chrome/browser/ui/views/download/download_item_view.cc b/chrome/bro
diff --git a/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc b/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
--- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
+++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
@@ -207,15 +207,6 @@ void DownloadsDOMHandler::DiscardDangerous(const std::string& id) {
@@ -209,15 +209,6 @@ void DownloadsDOMHandler::DiscardDangerous(const std::string& id) {
!GetMainNotifierManager()->GetBrowserContext()->IsOffTheRecord() &&
base::FeatureList::IsEnabled(
safe_browsing::kSafeBrowsingCsbrrNewDownloadTrigger)) {
@@ -1631,7 +1631,7 @@ diff --git a/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc b/chrome
}
}
RemoveDownloadInArgs(id);
@@ -425,11 +416,6 @@ void DownloadsDOMHandler::ReviewDangerousRequiringGesture(
@@ -454,11 +445,6 @@ void DownloadsDOMHandler::ReviewDangerousRequiringGesture(
}
CountDownloadsDOMEvents(DOWNLOADS_DOM_EVENT_REVIEW_DANGEROUS);
@@ -1643,7 +1643,7 @@ diff --git a/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc b/chrome
}
// DownloadsDOMHandler, private: --------------------------------------------
@@ -458,12 +444,7 @@ void DownloadsDOMHandler::FinalizeRemovals() {
@@ -487,12 +473,7 @@ void DownloadsDOMHandler::FinalizeRemovals() {
void DownloadsDOMHandler::ShowDangerPrompt(
download::DownloadItem* dangerous_item) {
@@ -1660,7 +1660,7 @@ diff --git a/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc b/chrome
diff --git a/chrome/browser/ui/webui/downloads/downloads_ui.cc b/chrome/browser/ui/webui/downloads/downloads_ui.cc
--- a/chrome/browser/ui/webui/downloads/downloads_ui.cc
+++ b/chrome/browser/ui/webui/downloads/downloads_ui.cc
@@ -63,10 +63,7 @@ content::WebUIDataSource* CreateDownloadsUIHTMLSource(Profile* profile) {
@@ -63,10 +63,7 @@ content::WebUIDataSource* CreateAndAddDownloadsUIHTMLSource(Profile* profile) {
source, base::make_span(kDownloadsResources, kDownloadsResourcesSize),
IDR_DOWNLOADS_DOWNLOADS_HTML);
@@ -1675,12 +1675,13 @@ diff --git a/chrome/browser/ui/webui/downloads/downloads_ui.cc b/chrome/browser/
diff --git a/chrome/browser/ui/webui/intro/intro_ui.cc b/chrome/browser/ui/webui/intro/intro_ui.cc
--- a/chrome/browser/ui/webui/intro/intro_ui.cc
+++ b/chrome/browser/ui/webui/intro/intro_ui.cc
@@ -10,13 +10,13 @@
@@ -12,14 +12,14 @@
#include "chrome/browser/ui/webui/webui_util.h"
#include "chrome/common/webui_url_constants.h"
#include "chrome/grit/chrome_unscaled_resources.h"
-#include "chrome/grit/intro_resources.h"
-#include "chrome/grit/intro_resources_map.h"
#include "chrome/grit/signin_resources.h"
#include "components/signin/public/base/signin_buildflags.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_ui_data_source.h"
@@ -1691,7 +1692,7 @@ diff --git a/chrome/browser/ui/webui/intro/intro_ui.cc b/chrome/browser/ui/webui
#include "chrome/grit/chromium_strings.h"
#include "chrome/grit/generated_resources.h"
#endif
@@ -51,9 +51,11 @@ IntroUI::IntroUI(content::WebUI* web_ui) : content::WebUIController(web_ui) {
@@ -52,9 +52,11 @@ IntroUI::IntroUI(content::WebUI* web_ui) : content::WebUIController(web_ui) {
web_ui->GetWebContents()->GetBrowserContext(),
chrome::kChromeUIIntroHost);
@@ -1736,7 +1737,7 @@ diff --git a/chrome/browser/webshare/share_service_impl.cc b/chrome/browser/webs
diff --git a/chrome/chrome_paks.gni b/chrome/chrome_paks.gni
--- a/chrome/chrome_paks.gni
+++ b/chrome/chrome_paks.gni
@@ -389,12 +389,10 @@ template("chrome_extra_paks") {
@@ -410,12 +410,10 @@ template("chrome_extra_paks") {
}
if (!is_android && !is_chromeos_ash) {
sources += [
@@ -1799,7 +1800,7 @@ diff --git a/chrome/services/file_util/public/cpp/sandboxed_rar_analyzer.h b/chr
--- a/chrome/services/file_util/public/cpp/sandboxed_rar_analyzer.h
+++ b/chrome/services/file_util/public/cpp/sandboxed_rar_analyzer.h
@@ -9,7 +9,6 @@
#include "base/files/file_path.h"
#include "base/functional/callback.h"
#include "base/memory/ref_counted_delete_on_sequence.h"
#include "chrome/services/file_util/public/mojom/file_util_service.mojom.h"
-#include "chrome/services/file_util/public/mojom/safe_archive_analyzer.mojom.h"
@@ -1818,7 +1819,7 @@ diff --git a/chrome/services/file_util/public/cpp/sandboxed_zip_analyzer.h b/chr
--- a/chrome/services/file_util/public/cpp/sandboxed_zip_analyzer.h
+++ b/chrome/services/file_util/public/cpp/sandboxed_zip_analyzer.h
@@ -10,7 +10,6 @@
#include "base/files/file_path.h"
#include "base/functional/callback.h"
#include "base/memory/ref_counted_delete_on_sequence.h"
#include "chrome/services/file_util/public/mojom/file_util_service.mojom.h"
-#include "chrome/services/file_util/public/mojom/safe_archive_analyzer.mojom.h"
@@ -1836,15 +1837,15 @@ diff --git a/chrome/services/file_util/public/cpp/sandboxed_zip_analyzer.h b/chr
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -233,7 +233,6 @@ static_library("test_support") {
@@ -247,7 +247,6 @@ static_library("test_support") {
"//chrome:strings",
"//chrome/browser:browser_process",
"//chrome/browser:test_support",
- "//chrome/browser/safe_browsing",
"//chrome/browser/sharing/proto",
"//chrome/child",
"//chrome/common:non_code_constants",
"//chrome/common:test_support",
@@ -1297,7 +1296,6 @@ if (!is_android) {
@@ -1268,7 +1267,6 @@ if (!is_android) {
"//chrome/browser/resource_coordinator:mojo_bindings",
"//chrome/browser/resource_coordinator:tab_manager_features",
"//chrome/browser/resource_coordinator:tab_metrics_event_proto",
@@ -1852,7 +1853,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
"//chrome/browser/segmentation_platform:test_utils",
"//chrome/browser/sharing/proto",
"//chrome/browser/ui/color:color_headers",
@@ -5897,9 +5895,6 @@ test("unit_tests") {
@@ -5842,9 +5840,6 @@ test("unit_tests") {
"//chrome/browser/profile_resetter:profile_reset_report_proto",
"//chrome/browser/profiling_host",
"//chrome/browser/push_messaging:budget_proto",
@@ -1865,9 +1866,9 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
diff --git a/components/safe_browsing/content/browser/mojo_safe_browsing_impl.cc b/components/safe_browsing/content/browser/mojo_safe_browsing_impl.cc
--- a/components/safe_browsing/content/browser/mojo_safe_browsing_impl.cc
+++ b/components/safe_browsing/content/browser/mojo_safe_browsing_impl.cc
@@ -118,6 +118,7 @@ void MojoSafeBrowsingImpl::MaybeCreate(
if (!resource_context || !delegate)
@@ -121,6 +121,7 @@ void MojoSafeBrowsingImpl::MaybeCreate(
return;
}
+ NOTREACHED();
std::unique_ptr<MojoSafeBrowsingImpl> impl(new MojoSafeBrowsingImpl(
@@ -1876,7 +1877,7 @@ diff --git a/components/safe_browsing/content/browser/mojo_safe_browsing_impl.cc
diff --git a/components/safe_browsing/core/common/safe_browsing_prefs.cc b/components/safe_browsing/core/common/safe_browsing_prefs.cc
--- a/components/safe_browsing/core/common/safe_browsing_prefs.cc
+++ b/components/safe_browsing/core/common/safe_browsing_prefs.cc
@@ -217,7 +217,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
@@ -219,7 +219,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
registry->RegisterIntegerPref(prefs::kPasswordProtectionWarningTrigger,
PASSWORD_PROTECTION_OFF);
registry->RegisterInt64Pref(prefs::kAdvancedProtectionLastRefreshInUs, 0);
@@ -1900,7 +1901,7 @@ diff --git a/printing/buildflags/buildflags.gni b/printing/buildflags/buildflags
diff --git a/services/preferences/tracked/tracked_persistent_pref_store_factory.cc b/services/preferences/tracked/tracked_persistent_pref_store_factory.cc
--- a/services/preferences/tracked/tracked_persistent_pref_store_factory.cc
+++ b/services/preferences/tracked/tracked_persistent_pref_store_factory.cc
@@ -102,24 +102,18 @@ PersistentPrefStore* CreateTrackedPersistentPrefStore(
@@ -103,24 +103,18 @@ PersistentPrefStore* CreateTrackedPersistentPrefStore(
}
#endif
build/patches/00WIN-ADDTO-Eyeo-Adblock.patch
+7 -20
View File
@@ -3,35 +3,22 @@ Date: Thu, 13 Oct 2022 10:24:51 +0000
Subject: WIN ADDTO Eyeo Adblock
---
.../browser/resources/settings/adblock_page/adblock_page.ts | 2 +-
chrome/test/BUILD.gn | 4 ----
2 files changed, 1 insertion(+), 5 deletions(-)
chrome/test/BUILD.gn | 4 ----
1 file changed, 4 deletions(-)
diff --git a/chrome/browser/resources/settings/adblock_page/adblock_page.ts b/chrome/browser/resources/settings/adblock_page/adblock_page.ts
--- a/chrome/browser/resources/settings/adblock_page/adblock_page.ts
+++ b/chrome/browser/resources/settings/adblock_page/adblock_page.ts
@@ -15,7 +15,7 @@
* along with eyeo Chromium SDK. If not, see <http://www.gnu.org/licenses/>.
*/
import 'chrome://resources/cr_elements/cr_button/cr_button.js';
-import 'chrome://resources/cr_elements/cr_shared_style.css.js';
+//import 'chrome://resources/cr_elements/cr_shared_style.css.js';
import 'chrome://resources/polymer/v3_0/iron-collapse/iron-collapse.js';
import 'chrome://resources/polymer/v3_0/iron-flex-layout/iron-flex-layout-classes.js';
import 'chrome://resources/polymer/v3_0/iron-icon/iron-icon.js';
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -2403,10 +2403,6 @@ if (!is_android) {
"v8/wasm_trap_handler_browsertest.cc",
]
@@ -2372,10 +2372,6 @@ if (!is_android) {
sources += [ "../browser/chrome_for_testing/chrome_for_testing_info_bar_browsertest.cc" ]
}
- if (eyeo_intercept_debug_url) {
- sources += [ "../browser/adblock/adblock_debug_url_browsertest.cc" ]
- }
-
if (is_chrome_branded) {
sources += [ "../browser/ui/views/side_panel/lens/lens_side_panel_coordinator_browsertest.cc" ]
if (enable_reporting) {
sources += [ "../browser/net/reporting_browsertest.cc" ]
}
--
2.25.1
build/patches/00WIN-ADDTO-ungoogled-chromium--no-special-hosts-d.patch
+1 -1
View File
@@ -82,9 +82,9 @@ diff --git a/components/domain_reliability/BUILD.gn b/components/domain_reliabil
deps = [
- ":bake_in_configs",
":prefs",
"//base",
"//net",
"//url",
diff --git a/components/domain_reliability/monitor.cc b/components/domain_reliability/monitor.cc
--- a/components/domain_reliability/monitor.cc
+++ b/components/domain_reliability/monitor.cc
build/patches/Add-AllowUserCertificates-flag.patch
+24 -24
View File
@@ -19,7 +19,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
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
@@ -226,6 +226,7 @@ import org.chromium.content_public.browser.ScreenOrientationProvider;
@@ -225,6 +225,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;
@@ -27,30 +27,30 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
import org.chromium.printing.PrintManagerDelegateImpl;
import org.chromium.printing.PrintingController;
import org.chromium.printing.PrintingControllerImpl;
@@ -960,6 +961,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
UpdateMenuItemHelper.getInstance().onStart();
@@ -953,6 +954,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
super.onStartWithNative();
ChromeActivitySessionTracker.getInstance().onStartWithNative();
ChromeCachedFlags.getInstance().cacheNativeFlags();
+ X509Util.AllowUserCertificates = ChromeFeatureList.isEnabled(
+ ChromeFeatureList.ALLOW_USER_CERTIFICATES);
OfflineIndicatorController.initialize();
// postDeferredStartupIfNeeded() is called in TabModelSelectorTabObsever#onLoadStopped(),
// #onPageLoadFinished() and #onCrash(). If we are not actively loading a tab (e.g.
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java b/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java
@@ -77,6 +77,7 @@ public class ChromeCachedFlags {
add(ChromeFeatureList.sAndroidAuxiliarySearch);
add(ChromeFeatureList.sAnonymousUpdateChecks);
add(ChromeFeatureList.sAppMenuMobileSiteOption);
@@ -67,6 +67,7 @@ public class ChromeCachedFlags {
// clang-format off
List<CachedFlag> featuresToCache = List.of(ChromeFeatureList.sAppMenuMobileSiteOption,
+ add(ChromeFeatureList.sAllowUserCertificates);
add(ChromeFeatureList.sBackGestureRefactorAndroid);
add(ChromeFeatureList.sCctAutoTranslate);
add(ChromeFeatureList.sCctBrandTransparency);
ChromeFeatureList.sBackGestureRefactorAndroid,
ChromeFeatureList.sBaselineGm3SurfaceColors,
ChromeFeatureList.sCctAutoTranslate,
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -8447,6 +8447,10 @@ const FeatureEntry kFeatureEntries[] = {
@@ -8256,6 +8256,10 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kWin10TabSearchCaptionButton)},
#endif // BUILDFLAG(IS_WIN)
@@ -64,7 +64,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -13,6 +13,11 @@
@@ -14,6 +14,11 @@
namespace flag_descriptions {
@@ -79,7 +79,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -40,6 +40,9 @@ namespace flag_descriptions {
@@ -41,6 +41,9 @@ namespace flag_descriptions {
// Cross-platform -------------------------------------------------------------
@@ -92,15 +92,15 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
--- a/chrome/browser/flags/android/chrome_feature_list.cc
+++ b/chrome/browser/flags/android/chrome_feature_list.cc
@@ -153,6 +153,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
&feed::kFeedReplaceAll,
@@ -144,6 +144,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
&feed::kFeedPerformanceStudy,
&feed::kFeedShowSignInCommand,
&feed::kInterestFeedContentSuggestions,
+ &kAllowUserCertificates,
&feed::kInterestFeedV1ClicksAndViewsConditionalUpload,
&feed::kInterestFeedV2,
&feed::kInterestFeedV2Autoplay,
@@ -463,6 +464,10 @@ BASE_FEATURE(kAllowNewIncognitoTabIntents,
&feed::kInterestFeedV2Hearts,
@@ -436,6 +437,10 @@ BASE_FEATURE(kAllowNewIncognitoTabIntents,
"AllowNewIncognitoTabIntents",
base::FEATURE_ENABLED_BY_DEFAULT);
@@ -121,7 +121,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser
+BASE_DECLARE_FEATURE(kAllowUserCertificates);
BASE_DECLARE_FEATURE(kAndroidScrollOptimizations);
BASE_DECLARE_FEATURE(kAndroidSearchEngineChoiceNotification);
BASE_DECLARE_FEATURE(kAssistantConsentSimplifiedText);
BASE_DECLARE_FEATURE(kAndroidImprovedBookmarks);
diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -133,15 +133,15 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR = "AdaptiveButtonInTopToolbar";
public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_CUSTOMIZATION_V2 =
"AdaptiveButtonInTopToolbarCustomizationV2";
@@ -608,6 +609,8 @@ public abstract class ChromeFeatureList {
"SkipServiceWorkerForInstallPromot";
@@ -561,6 +562,8 @@ public abstract class ChromeFeatureList {
public static final String XSURFACE_METRICS_REPORTING = "XsurfaceMetricsReporting";
/* Alphabetical: */
+ public static final CachedFlag sAllowUserCertificates =
+ new CachedFlag(ALLOW_USER_CERTIFICATES, false);
public static final CachedFlag sAndroidAuxiliarySearch =
new CachedFlag(OMNIBOX_ANDROID_AUXILIARY_SEARCH, false);
public static final CachedFlag sAnonymousUpdateChecks =
public static final CachedFlag sAppMenuMobileSiteOption =
new CachedFlag(APP_MENU_MOBILE_SITE_OPTION, false);
public static final CachedFlag sBackGestureRefactorActivityAndroid =
diff --git a/net/android/java/src/org/chromium/net/X509Util.java b/net/android/java/src/org/chromium/net/X509Util.java
--- a/net/android/java/src/org/chromium/net/X509Util.java
+++ b/net/android/java/src/org/chromium/net/X509Util.java
build/patches/Add-menu-item-to-bookmark-all-tabs.patch
+33 -33
View File
@@ -62,7 +62,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
import org.chromium.chrome.browser.compositor.layouts.Layout;
import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChrome;
import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChromePhone;
@@ -2229,6 +2230,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
@@ -2212,6 +2213,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
CloseAllTabsDialog.show(this, getModalDialogManagerSupplier(),
() -> getTabModelSelector().closeAllTabs(), /*isIncognito=*/false);
RecordUserAction.record("MobileMenuCloseAllTabs");
@@ -71,7 +71,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
} else if (id == R.id.close_all_incognito_tabs_menu_id) {
// Close only incognito tabs
CloseAllTabsDialog.show(this, getModalDialogManagerSupplier(),
@@ -2281,6 +2284,27 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
@@ -2262,6 +2265,27 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
mTabModalHandler.onOmniboxFocusChanged(hasFocus);
}
@@ -110,7 +110,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
import org.chromium.base.ObserverList;
import org.chromium.base.ThreadUtils;
import org.chromium.base.annotations.CalledByNative;
@@ -40,6 +41,10 @@ import org.chromium.chrome.browser.partnerbookmarks.PartnerBookmarksShim;
@@ -41,6 +42,10 @@ import org.chromium.chrome.browser.partnerbookmarks.PartnerBookmarksShim;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.read_later.ReadingListUtils;
import org.chromium.chrome.browser.tab.Tab;
@@ -121,7 +121,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.BookmarkItem;
import org.chromium.components.bookmarks.BookmarkType;
@@ -84,6 +89,8 @@ import java.io.File;
@@ -90,6 +95,8 @@ import java.io.File;
* bookmark model stored in native.
*/
class BookmarkBridge {
@@ -130,7 +130,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
private long mNativeBookmarkBridge;
private boolean mIsDestroyed;
private boolean mIsDoingExtensiveChanges;
@@ -373,6 +380,16 @@ class BookmarkBridge {
@@ -379,6 +386,16 @@ class BookmarkBridge {
mNativeBookmarkBridge, BookmarkBridge.this);
}
@@ -147,7 +147,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
/**
* @return Id representing the special "other" folder from bookmark model.
*/
@@ -996,6 +1013,49 @@ class BookmarkBridge {
@@ -1002,6 +1019,49 @@ class BookmarkBridge {
mNativeBookmarkBridge, BookmarkBridge.this, title, url);
}
@@ -197,7 +197,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
/**
* @param url The URL of the reading list item.
* @return The reading list item with the URL, or null if no such reading list item.
@@ -1212,6 +1272,7 @@ class BookmarkBridge {
@@ -1218,6 +1278,7 @@ class BookmarkBridge {
void getAllFoldersWithDepths(long nativeBookmarkBridge, BookmarkBridge caller,
List<BookmarkId> folderList, List<Integer> depthList);
BookmarkId getRootFolderId(long nativeBookmarkBridge, BookmarkBridge caller);
@@ -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
@@ -729,6 +729,7 @@ public class BookmarkUtils {
@@ -692,6 +692,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 =
@@ -754,6 +755,9 @@ public class BookmarkUtils {
@@ -717,6 +718,9 @@ public class BookmarkUtils {
if (bookmarkModel.isFolderVisible(mobileNodeId)) {
topLevelFolders.add(mobileNodeId);
}
@@ -229,7 +229,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browser/bookmarks/android/bookmark_bridge.cc
--- a/chrome/browser/bookmarks/android/bookmark_bridge.cc
+++ b/chrome/browser/bookmarks/android/bookmark_bridge.cc
@@ -441,6 +441,11 @@ void BookmarkBridge::GetTopLevelFolderIDs(
@@ -440,6 +440,11 @@ void BookmarkBridge::GetTopLevelFolderIDs(
top_level_folders.push_back(node.get());
}
@@ -241,7 +241,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
for (const auto& node : bookmark_model_->bookmark_bar_node()->children()) {
if (node->is_folder())
top_level_folders.push_back(node.get());
@@ -488,6 +493,7 @@ void BookmarkBridge::GetAllFoldersWithDepths(
@@ -487,6 +492,7 @@ void BookmarkBridge::GetAllFoldersWithDepths(
// Vector to temporarily contain all child bookmarks at same level for sorting
std::vector<const BookmarkNode*> bookmarks = {
bookmark_model_->mobile_node(),
@@ -249,7 +249,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
bookmark_model_->bookmark_bar_node(),
bookmark_model_->other_node(),
};
@@ -540,6 +546,17 @@ ScopedJavaLocalRef<jobject> BookmarkBridge::GetMobileFolderId(
@@ -539,6 +545,17 @@ ScopedJavaLocalRef<jobject> BookmarkBridge::GetMobileFolderId(
return folder_id_obj;
}
@@ -284,27 +284,27 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser
diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc
--- a/chrome/browser/bookmarks/bookmark_html_writer.cc
+++ b/chrome/browser/bookmarks/bookmark_html_writer.cc
@@ -190,6 +190,8 @@ class Writer : public base::RefCountedThreadSafe<Writer> {
roots->FindDictKey(BookmarkCodec::kOtherBookmarkFolderNameKey);
base::Value* mobile_folder_value =
roots->FindDictKey(BookmarkCodec::kMobileBookmarkFolderNameKey);
@@ -191,6 +191,8 @@ class Writer : public base::RefCountedThreadSafe<Writer> {
roots->FindDict(BookmarkCodec::kOtherBookmarkFolderNameKey);
base::Value::Dict* mobile_folder_value =
roots->FindDict(BookmarkCodec::kMobileBookmarkFolderNameKey);
+ base::Value* tabs_collection_value =
+ roots->FindDictKey(BookmarkCodec::kTabsBookmarkFolderNameKey);
DCHECK(root_folder_value);
DCHECK(other_folder_value);
DCHECK(mobile_folder_value);
@@ -201,7 +203,9 @@ class Writer : public base::RefCountedThreadSafe<Writer> {
!WriteNode(*static_cast<base::DictionaryValue*>(other_folder_value),
BookmarkNode::OTHER_NODE) ||
!WriteNode(*static_cast<base::DictionaryValue*>(mobile_folder_value),
- BookmarkNode::MOBILE)) {
+ BookmarkNode::MOBILE) ||
@@ -199,7 +201,9 @@ class Writer : public base::RefCountedThreadSafe<Writer> {
if (!WriteNode(*root_folder_value, BookmarkNode::BOOKMARK_BAR) ||
!WriteNode(*other_folder_value, BookmarkNode::OTHER_NODE) ||
- !WriteNode(*mobile_folder_value, BookmarkNode::MOBILE)) {
+ !WriteNode(*mobile_folder_value, BookmarkNode::MOBILE) ||
+ !WriteNode(*static_cast<base::DictionaryValue*>(tabs_collection_value),
+ BookmarkNode::TABS_COLLECTION)) {
NotifyOnFinish(BookmarksExportObserver::Result::kCouldNotWriteNodes);
return;
}
@@ -466,6 +470,8 @@ void BookmarkFaviconFetcher::ExportBookmarks() {
@@ -463,6 +467,8 @@ void BookmarkFaviconFetcher::ExportBookmarks() {
BookmarkModelFactory::GetForBrowserContext(profile_)->other_node());
ExtractUrls(
BookmarkModelFactory::GetForBrowserContext(profile_)->mobile_node());
@@ -349,7 +349,7 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -3920,6 +3920,9 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
@@ -3737,6 +3737,9 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
<message name="IDS_MENU_SELECT_TABS" desc="Menu item for bulk editing tabs. [CHAR_LIMIT=27]">
Select tabs
</message>
@@ -473,7 +473,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
DecodeNode(*other_folder_value, nullptr, other_folder_node);
DecodeNode(*mobile_folder_value, nullptr, mobile_folder_node);
@@ -508,11 +522,13 @@ void BookmarkCodec::DecodeMetaInfoHelper(
@@ -509,11 +523,13 @@ void BookmarkCodec::DecodeMetaInfoHelper(
void BookmarkCodec::ReassignIDs(BookmarkNode* bb_node,
BookmarkNode* other_node,
@@ -491,7 +491,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmarks/browser/bookmark_codec.h
--- a/components/bookmarks/browser/bookmark_codec.h
+++ b/components/bookmarks/browser/bookmark_codec.h
@@ -49,6 +49,7 @@ class BookmarkCodec {
@@ -46,6 +46,7 @@ class BookmarkCodec {
const BookmarkNode* bookmark_bar_node,
const BookmarkNode* other_folder_node,
const BookmarkNode* mobile_folder_node,
@@ -499,7 +499,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmark
const BookmarkNode::MetaInfoMap* model_meta_info_map,
const BookmarkNode::MetaInfoMap* model_unsynced_meta_info_map,
std::string sync_metadata_str);
@@ -62,6 +63,7 @@ class BookmarkCodec {
@@ -59,6 +60,7 @@ class BookmarkCodec {
BookmarkNode* bb_node,
BookmarkNode* other_folder_node,
BookmarkNode* mobile_folder_node,
@@ -507,7 +507,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmark
int64_t* max_node_id,
std::string* sync_metadata_str);
@@ -113,6 +115,7 @@ class BookmarkCodec {
@@ -110,6 +112,7 @@ class BookmarkCodec {
// Allows the BookmarkClient to read and a write a string blob from the JSON
// file. That string captures the bookmarks sync metadata.
static const char kSyncMetadata[];
@@ -515,7 +515,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmark
static const char kDateLastUsed[];
// Possible values for kTypeKey.
@@ -130,6 +133,7 @@ class BookmarkCodec {
@@ -127,6 +130,7 @@ class BookmarkCodec {
bool DecodeHelper(BookmarkNode* bb_node,
BookmarkNode* other_folder_node,
BookmarkNode* mobile_folder_node,
@@ -523,7 +523,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmark
const base::Value& value,
std::string* sync_metadata_str);
@@ -141,7 +145,8 @@ class BookmarkCodec {
@@ -138,7 +142,8 @@ class BookmarkCodec {
// Reassigns bookmark IDs for all nodes.
void ReassignIDs(BookmarkNode* bb_node,
BookmarkNode* other_node,
@@ -569,7 +569,7 @@ diff --git a/components/bookmarks/browser/bookmark_load_details.h b/components/b
diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmarks/browser/bookmark_model.cc
--- a/components/bookmarks/browser/bookmark_model.cc
+++ b/components/bookmarks/browser/bookmark_model.cc
@@ -670,7 +670,7 @@ bool BookmarkModel::HasBookmarks() {
@@ -673,7 +673,7 @@ bool BookmarkModel::HasBookmarks() {
bool BookmarkModel::HasNoUserCreatedBookmarksOrFolders() {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
return bookmark_bar_node_->children().empty() &&
@@ -578,7 +578,7 @@ diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmar
}
bool BookmarkModel::IsBookmarked(const GURL& url) {
@@ -926,6 +926,7 @@ void BookmarkModel::DoneLoading(std::unique_ptr<BookmarkLoadDetails> details) {
@@ -929,6 +929,7 @@ void BookmarkModel::DoneLoading(std::unique_ptr<BookmarkLoadDetails> details) {
bookmark_bar_node_ = details->bb_node();
other_node_ = details->other_folder_node();
mobile_node_ = details->mobile_folder_node();
@@ -602,7 +602,7 @@ diff --git a/components/bookmarks/browser/bookmark_model.h b/components/bookmark
bool is_root_node(const BookmarkNode* node) const {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
return node == root_;
@@ -448,6 +454,7 @@ class BookmarkModel : public BookmarkUndoProvider,
@@ -453,6 +459,7 @@ class BookmarkModel : public BookmarkUndoProvider,
nullptr;
raw_ptr<BookmarkPermanentNode, DanglingUntriaged> other_node_ = nullptr;
raw_ptr<BookmarkPermanentNode, DanglingUntriaged> mobile_node_ = nullptr;
build/patches/Add-option-to-force-tablet-UI.patch
+48 -28
View File
@@ -4,19 +4,19 @@ Subject: Add option to force tablet UI
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
.../ChromeAccessibilitySettingsDelegate.java | 19 +++++++++++++++++++
.../ChromeAccessibilitySettingsDelegate.java | 19 ++++++++++
.../preferences/ChromePreferenceKeys.java | 1 +
.../LegacyChromePreferenceKeys.java | 1 +
.../omnibox/LocationBarCoordinator.java | 2 +-
.../strings/android_chrome_strings.grd | 6 ++++++
.../toolbar/top/ToolbarControlContainer.java | 16 ----------------
components/BUILD.gn | 6 +++---
.../res/xml/accessibility_preferences.xml | 5 +++++
.../accessibility/AccessibilitySettings.java | 10 ++++++++++
.../strings/android_chrome_strings.grd | 6 ++++
.../toolbar/top/ToolbarControlContainer.java | 36 -------------------
components/BUILD.gn | 6 ++--
.../res/xml/accessibility_preferences.xml | 5 +++
.../accessibility/AccessibilitySettings.java | 10 ++++++
.../AccessibilitySettingsDelegate.java | 2 ++
ui/android/BUILD.gn | 2 ++
.../chromium/ui/base/DeviceFormFactor.java | 5 +++++
12 files changed, 55 insertions(+), 20 deletions(-)
.../chromium/ui/base/DeviceFormFactor.java | 5 +++
12 files changed, 55 insertions(+), 40 deletions(-)
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java
@@ -50,7 +50,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s
diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
--- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
+++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
@@ -418,6 +418,7 @@ public final class ChromePreferenceKeys {
@@ -394,6 +394,7 @@ public final class ChromePreferenceKeys {
AccessibilityConstants.FONT_USER_SET_FORCE_ENABLE_ZOOM;
public static final String HISTORY_SHOW_HISTORY_INFO = "history_home_show_info";
@@ -61,7 +61,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java
--- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java
+++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java
@@ -67,6 +67,7 @@ public class LegacyChromePreferenceKeys {
@@ -66,6 +66,7 @@ public class LegacyChromePreferenceKeys {
ChromePreferenceKeys.FLAGS_CACHED_SWAP_PIXEL_FORMAT_TO_FIX_CONVERT_FROM_TRANSLUCENT,
ChromePreferenceKeys.FLAGS_CACHED_TAB_GROUPS_ANDROID_ENABLED,
ChromePreferenceKeys.FONT_USER_FONT_SCALE_FACTOR,
@@ -72,7 +72,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java
--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java
@@ -381,7 +381,7 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
@@ -385,7 +385,7 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
// OmniboxSuggestionsDropdownEmbedder implementation
@Override
public boolean isTablet() {
@@ -84,7 +84,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -1736,6 +1736,12 @@ Your Google account may have other forms of browsing history like searches and a
@@ -1576,6 +1576,12 @@ Your Google account may have other forms of browsing history like searches and a
<message name="IDS_PRIVACY_GUIDE_SB_ENHANCED_ITEM_SEVEN" desc="Seventh bullet point that describes the details of the Safe Browsing control.">
Temporarily links this data to your Google Account when you’re signed in, to protect you across Google apps
</message>
@@ -100,7 +100,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java
--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java
+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java
@@ -142,22 +142,6 @@ public class ToolbarControlContainer extends OptimizedFrameLayout implements Con
@@ -147,42 +147,6 @@ public class ToolbarControlContainer extends OptimizedFrameLayout implements Con
mToolbarContainer.setPostInitializationDependencies(mToolbar, constraintsSupplier,
tabSupplier, compositorInMotionSupplier,
browserStateBrowserControlsVisibilityDelegate, isVisible);
@@ -112,13 +112,33 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
- // On tablet, draw a fake tab strip and toolbar until the compositor is
- // ready to draw the real tab strip. (On phone, the toolbar is made entirely
- // of Android views, which are already initialized.)
- final Drawable backgroundDrawable =
- AppCompatResources.getDrawable(getContext(), R.drawable.toolbar_background)
- .mutate();
- backgroundDrawable.setTint(
- ChromeColors.getDefaultThemeColor(getContext(), isIncognito));
- backgroundDrawable.setTintMode(PorterDuff.Mode.MULTIPLY);
- setBackground(backgroundDrawable);
-
- if (ChromeFeatureList.sTabStripRedesign.isEnabled()) {
- Drawable bgdColor = new ColorDrawable(
- TabUiThemeUtil.getTabStripBackgroundColor(getContext(), isIncognito));
- Drawable bdgTabImage = ResourcesCompat.getDrawable(getContext().getResources(),
- TabUiThemeUtil.getTSRTabResource(), getContext().getTheme());
- bdgTabImage.setTint(
- TabUiThemeUtil.getTabStripContainerColor(getContext(), false, true, false));
- LayerDrawable backgroundDrawable =
- new LayerDrawable(new Drawable[] {bgdColor, bdgTabImage});
- // Set image size to match tab size.
- backgroundDrawable.setPadding(0, 0, 0, 0);
- backgroundDrawable.setLayerSize(1,
- ViewUtils.dpToPx(getContext(), TabUiThemeUtil.getMaxTabStripTabWidthDp()),
- mToolbar.getTabStripHeight());
- // Tab should show up at start of layer based on layout.
- backgroundDrawable.setLayerGravity(1, Gravity.START);
- setBackground(backgroundDrawable);
- } else {
- final Drawable backgroundDrawable =
- AppCompatResources.getDrawable(getContext(), R.drawable.toolbar_background)
- .mutate();
- backgroundDrawable.setTint(
- ChromeColors.getDefaultThemeColor(getContext(), isIncognito));
- backgroundDrawable.setTintMode(PorterDuff.Mode.MULTIPLY);
- setBackground(backgroundDrawable);
- }
- }
}
@@ -135,7 +155,7 @@ diff --git a/components/BUILD.gn b/components/BUILD.gn
disallowed_extension_deps_ = [
# Components should largely not depend on //extensions. Since // extensions
# is not a component target and is linked with //chrome, depending on most
@@ -690,7 +690,7 @@ test("components_unittests") {
@@ -696,7 +696,7 @@ test("components_unittests") {
# On other platforms, no components should depend on Chrome.
# Since //chrome depends on //extensions, we also only assert_no_deps on
# extensions targets for non-lacros builds.
@@ -144,7 +164,7 @@ diff --git a/components/BUILD.gn b/components/BUILD.gn
assert_no_deps = [ "//chrome/*" ]
assert_no_deps += disallowed_extension_deps_
}
@@ -961,7 +961,7 @@ if (!is_ios) {
@@ -963,7 +963,7 @@ if (!is_ios) {
# dependency. On other platforms, no components should depend on Chrome.
# Since //chrome depends on //extensions, we also only assert_no_deps on
# extensions targets for non-lacros builds.
@@ -171,7 +191,7 @@ diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibil
diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
--- a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
+++ b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
@@ -30,6 +30,8 @@ public class AccessibilitySettings
@@ -30,6 +30,8 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
public static final String PREF_READER_FOR_ACCESSIBILITY = "reader_for_accessibility";
public static final String PREF_CAPTIONS = "captions";
@@ -180,7 +200,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
private TextScalePreference mTextScalePref;
private PageZoomPreference mPageZoomDefaultZoomPref;
private ChromeSwitchPreference mPageZoomAlwaysShowPref;
@@ -106,6 +108,12 @@ public class AccessibilitySettings
@@ -109,6 +111,12 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
getPreferenceScreen().removePreference(readerForAccessibilityPref);
}
@@ -190,10 +210,10 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
+ forceTabletUiPref.setChecked(mForceTabletUIDelegate.isEnabled());
+ forceTabletUiPref.setOnPreferenceChangeListener(this);
+
ChromeBaseCheckBoxPreference accessibilityTabSwitcherPref =
(ChromeBaseCheckBoxPreference) findPreference(
ChromeSwitchPreference accessibilityTabSwitcherPref =
(ChromeSwitchPreference) findPreference(
AccessibilityConstants.ACCESSIBILITY_TAB_SWITCHER);
@@ -162,6 +170,8 @@ public class AccessibilitySettings
@@ -165,6 +173,8 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
mFontSizePrefs.setUserFontScaleFactor((Float) newValue);
} else if (PREF_FORCE_ENABLE_ZOOM.equals(preference.getKey())) {
mFontSizePrefs.setForceEnableZoomFromUser((Boolean) newValue);
@@ -217,7 +237,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
diff --git a/ui/android/BUILD.gn b/ui/android/BUILD.gn
--- a/ui/android/BUILD.gn
+++ b/ui/android/BUILD.gn
@@ -382,6 +382,8 @@ android_library("ui_no_recycler_view_java") {
@@ -379,6 +379,8 @@ android_library("ui_no_recycler_view_java") {
deps = [
":ui_java_resources",
":ui_utils_java",
build/patches/Disable-FLoC-and-privacy-sandbox.patch
+99 -52
View File
@@ -11,12 +11,14 @@ Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
.../java/res/xml/privacy_preferences.xml | 4 ---
.../privacy/settings/PrivacySettings.java | 22 --------------
.../privacy/settings/PrivacySettings.java | 22 -------------
.../browser/chrome_content_browser_client.cc | 3 ++
.../privacy_sandbox_settings_delegate.cc | 1 +
.../history/core/browser/history_backend.cc | 13 +-------
.../privacy_sandbox_features.cc | 10 +++---
.../privacy_sandbox/privacy_sandbox_prefs.cc | 2 +-
.../privacy_sandbox_settings.cc | 30 +++++++++++--------
6 files changed, 23 insertions(+), 51 deletions(-)
.../privacy_sandbox_settings_impl.cc | 33 +++++++++----------
8 files changed, 27 insertions(+), 61 deletions(-)
diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
--- a/chrome/android/java/res/xml/privacy_preferences.xml
@@ -81,7 +83,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -3283,6 +3283,9 @@ bool ChromeContentBrowserClient::IsAttributionReportingOperationAllowed(
@@ -3304,6 +3304,9 @@ bool ChromeContentBrowserClient::IsAttributionReportingOperationAllowed(
const url::Origin* source_origin,
const url::Origin* destination_origin,
const url::Origin* reporting_origin) {
@@ -91,10 +93,21 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
Profile* profile = Profile::FromBrowserContext(browser_context);
auto* privacy_sandbox_settings =
diff --git a/chrome/browser/privacy_sandbox/privacy_sandbox_settings_delegate.cc b/chrome/browser/privacy_sandbox/privacy_sandbox_settings_delegate.cc
--- a/chrome/browser/privacy_sandbox/privacy_sandbox_settings_delegate.cc
+++ b/chrome/browser/privacy_sandbox/privacy_sandbox_settings_delegate.cc
@@ -16,6 +16,7 @@
namespace {
bool PrivacySandboxRestrictedByAcccountCapability(Profile* profile) {
+ if ((true)) return true;
auto* identity_manager = IdentityManagerFactory::GetForProfile(profile);
if (!identity_manager ||
diff --git a/components/history/core/browser/history_backend.cc b/components/history/core/browser/history_backend.cc
--- a/components/history/core/browser/history_backend.cc
+++ b/components/history/core/browser/history_backend.cc
@@ -573,18 +573,7 @@ void HistoryBackend::SetBrowsingTopicsAllowed(ContextID context_id,
@@ -551,18 +551,7 @@ void HistoryBackend::SetBrowsingTopicsAllowed(ContextID context_id,
if (!visit_id)
return;
@@ -114,10 +127,44 @@ diff --git a/components/history/core/browser/history_backend.cc b/components/his
ScheduleCommit();
}
diff --git a/components/privacy_sandbox/privacy_sandbox_features.cc b/components/privacy_sandbox/privacy_sandbox_features.cc
--- a/components/privacy_sandbox/privacy_sandbox_features.cc
+++ b/components/privacy_sandbox/privacy_sandbox_features.cc
@@ -7,8 +7,8 @@
namespace privacy_sandbox {
BASE_FEATURE(kPrivacySandboxSettings4,
- "PrivacySandboxSettings4",
- base::FEATURE_DISABLED_BY_DEFAULT);
+ "PrivacySandboxSettings4", // must be disabled
+ base::FEATURE_DISABLED_BY_DEFAULT); // in bromite
const char kPrivacySandboxSettings4ConsentRequiredName[] = "consent-required";
const char kPrivacySandboxSettings4NoticeRequiredName[] = "notice-required";
@@ -45,8 +45,8 @@ const base::FeatureParam<bool> kPrivacySandboxSettings4ShowSampleDataForTesting{
kPrivacySandboxSettings4ShowSampleDataForTestingName, false};
BASE_FEATURE(kPrivacySandboxSettings3,
- "PrivacySandboxSettings3",
- base::FEATURE_ENABLED_BY_DEFAULT);
+ "PrivacySandboxSettings3", // must be disabled
+ base::FEATURE_DISABLED_BY_DEFAULT); // in bromite
const base::FeatureParam<bool> kPrivacySandboxSettings3ConsentRequired{
&kPrivacySandboxSettings3, "consent-required", false};
const base::FeatureParam<bool> kPrivacySandboxSettings3NoticeRequired{
@@ -69,7 +69,7 @@ BASE_FEATURE(kOverridePrivacySandboxSettingsLocalTesting,
BASE_FEATURE(kDisablePrivacySandboxPrompts,
"DisablePrivacySandboxPrompts",
- base::FEATURE_DISABLED_BY_DEFAULT);
+ base::FEATURE_ENABLED_BY_DEFAULT);
BASE_FEATURE(kPrivacySandboxFirstPartySetsUI,
"PrivacySandboxFirstPartySetsUI",
diff --git a/components/privacy_sandbox/privacy_sandbox_prefs.cc b/components/privacy_sandbox/privacy_sandbox_prefs.cc
--- a/components/privacy_sandbox/privacy_sandbox_prefs.cc
+++ b/components/privacy_sandbox/privacy_sandbox_prefs.cc
@@ -87,7 +87,7 @@ namespace privacy_sandbox {
@@ -98,7 +98,7 @@ namespace privacy_sandbox {
void RegisterProfilePrefs(PrefRegistrySimple* registry) {
registry->RegisterBooleanPref(
@@ -126,90 +173,90 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_prefs.cc b/components/pr
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
registry->RegisterBooleanPref(prefs::kPrivacySandboxApisEnabledV2, false);
registry->RegisterBooleanPref(prefs::kPrivacySandboxM1ConsentDecisionMade,
diff --git a/components/privacy_sandbox/privacy_sandbox_settings.cc b/components/privacy_sandbox/privacy_sandbox_settings.cc
--- a/components/privacy_sandbox/privacy_sandbox_settings.cc
+++ b/components/privacy_sandbox/privacy_sandbox_settings.cc
@@ -92,7 +92,8 @@ PrivacySandboxSettings::PrivacySandboxSettings(
diff --git a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc b/components/privacy_sandbox/privacy_sandbox_settings_impl.cc
--- a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc
+++ b/components/privacy_sandbox/privacy_sandbox_settings_impl.cc
@@ -120,7 +120,8 @@ PrivacySandboxSettingsImpl::GetM1TopicAllowedStatus() const {
return control_status;
}
PrivacySandboxSettings::~PrivacySandboxSettings() = default;
-bool PrivacySandboxSettings::IsTopicsAllowed() const {
+bool PrivacySandboxSettings::IsTopicsAllowed() const { // disabled in Bromite
-bool PrivacySandboxSettingsImpl::IsTopicsAllowed() const {
+bool PrivacySandboxSettingsImpl::IsTopicsAllowed() const { // disabled in Bromite
+ if ((true)) return false;
// M1 specific
if (base::FeatureList::IsEnabled(privacy_sandbox::kPrivacySandboxSettings4)) {
return IsM1PrivacySandboxApiEnabled(prefs::kPrivacySandboxM1TopicsEnabled);
@@ -127,7 +128,8 @@ bool PrivacySandboxSettings::IsTopicsAllowedForContext(
IsPrivacySandboxEnabledForContext(url, top_frame_origin);
Status status = GetM1TopicAllowedStatus();
@@ -163,7 +164,8 @@ bool PrivacySandboxSettingsImpl::IsTopicsAllowedForContext(
IsPrivacySandboxEnabledForContext(top_frame_origin, url);
}
-bool PrivacySandboxSettings::IsTopicAllowed(const CanonicalTopic& topic) {
+bool PrivacySandboxSettings::IsTopicAllowed(const CanonicalTopic& topic) { // disabled in Bromite
-bool PrivacySandboxSettingsImpl::IsTopicAllowed(const CanonicalTopic& topic) {
+bool PrivacySandboxSettingsImpl::IsTopicAllowed(const CanonicalTopic& topic) { // disabled in Bromite
+ if ((true)) return false;
const auto& blocked_topics =
pref_service_->GetList(prefs::kPrivacySandboxBlockedTopics);
@@ -195,9 +197,8 @@ base::Time PrivacySandboxSettings::TopicsDataAccessibleSince() const {
bool PrivacySandboxSettings::IsAttributionReportingAllowed(
@@ -262,17 +264,7 @@ bool PrivacySandboxSettingsImpl::IsAttributionReportingEverAllowed() const {
bool PrivacySandboxSettingsImpl::IsAttributionReportingAllowed(
const url::Origin& top_frame_origin,
- const url::Origin& reporting_origin) const {
- return IsPrivacySandboxEnabledForContext(reporting_origin.GetURL(),
- top_frame_origin);
+ const url::Origin& reporting_origin) const { // disabled in Bromite
const url::Origin& reporting_origin) const {
- // M1 specific
- if (base::FeatureList::IsEnabled(privacy_sandbox::kPrivacySandboxSettings4)) {
- Status status = GetM1AttributionReportingAllowedStatus(top_frame_origin,
- reporting_origin);
- base::UmaHistogramEnumeration(
- "PrivacySandbox.IsAttributionReportingAllowed", status);
- return IsAllowed(status);
- }
-
- return IsPrivacySandboxEnabledForContext(top_frame_origin,
- reporting_origin.GetURL());
+ return false;
}
bool PrivacySandboxSettings::MaySendAttributionReport(
@@ -286,7 +287,8 @@ void PrivacySandboxSettings::ClearFledgeJoiningAllowedSettings(
bool PrivacySandboxSettingsImpl::MaySendAttributionReport(
@@ -378,7 +370,8 @@ void PrivacySandboxSettingsImpl::ClearFledgeJoiningAllowedSettings(
}
bool PrivacySandboxSettings::IsFledgeJoiningAllowed(
bool PrivacySandboxSettingsImpl::IsFledgeJoiningAllowed(
- const url::Origin& top_frame_origin) const {
+ const url::Origin& top_frame_origin) const { // disabled in Bromite
+ if ((true)) return false;
ScopedDictPrefUpdate scoped_pref_update(
pref_service_, prefs::kPrivacySandboxFledgeJoinBlocked);
auto& pref_data = scoped_pref_update.Get();
@@ -353,7 +355,9 @@ bool PrivacySandboxSettings::IsPrivateAggregationAllowed(
top_frame_origin);
@@ -469,7 +462,9 @@ bool PrivacySandboxSettingsImpl::IsPrivateAggregationAllowed(
reporting_origin.GetURL());
}
-bool PrivacySandboxSettings::IsPrivacySandboxEnabled() const {
+bool PrivacySandboxSettings::IsPrivacySandboxEnabled() const { // disabled in Bromite
-bool PrivacySandboxSettingsImpl::IsPrivacySandboxEnabled() const {
+bool PrivacySandboxSettingsImpl::IsPrivacySandboxEnabled() const { // disabled in Bromite
+ if ((true))
+ return false;
// If the delegate is restricting access the Privacy Sandbox is disabled.
if (delegate_->IsPrivacySandboxRestricted())
PrivacySandboxSettingsImpl::Status status = GetPrivacySandboxAllowedStatus();
if (!IsAllowed(status)) {
return false;
@@ -372,11 +376,13 @@ bool PrivacySandboxSettings::IsPrivacySandboxEnabled() const {
return pref_service_->GetBoolean(prefs::kPrivacySandboxApisEnabledV2);
@@ -507,7 +502,8 @@ void PrivacySandboxSettingsImpl::SetTopicsBlockedForTesting() {
pref_service_->SetBoolean(prefs::kPrivacySandboxApisEnabledV2, false);
}
-void PrivacySandboxSettings::SetPrivacySandboxEnabled(bool enabled) {
+void PrivacySandboxSettings::SetPrivacySandboxEnabled(bool enabled) { // disabled in Bromite
-void PrivacySandboxSettingsImpl::SetPrivacySandboxEnabled(bool enabled) {
+void PrivacySandboxSettingsImpl::SetPrivacySandboxEnabled(bool enabled) { // disabled in Bromite
+ enabled = false;
pref_service_->SetBoolean(prefs::kPrivacySandboxApisEnabledV2, enabled);
}
-bool PrivacySandboxSettings::IsTrustTokensAllowed() {
+bool PrivacySandboxSettings::IsTrustTokensAllowed() { // disabled in Bromite
+ if ((true)) return false;
return IsPrivacySandboxEnabled();
}
@@ -431,9 +437,9 @@ bool PrivacySandboxSettings::IsPrivacySandboxEnabledForContext(
@@ -568,7 +564,10 @@ bool PrivacySandboxSettingsImpl::IsPrivacySandboxEnabledForContext(
content_settings::CookieSettings::QueryReason::kPrivacySandbox);
}
-void PrivacySandboxSettings::SetTopicsDataAccessibleFromNow() const {
- pref_service_->SetTime(prefs::kPrivacySandboxTopicsDataAccessibleSince,
- base::Time::Now());
+void PrivacySandboxSettings::SetTopicsDataAccessibleFromNow() const { // disabled in Bromite
-void PrivacySandboxSettingsImpl::SetTopicsDataAccessibleFromNow() const {
+void PrivacySandboxSettingsImpl::SetTopicsDataAccessibleFromNow() const { // disabled in Bromite
+ pref_service_->ClearPref(prefs::kPrivacySandboxTopicsDataAccessibleSince);
+ if ((true)) return;
+
pref_service_->SetTime(prefs::kPrivacySandboxTopicsDataAccessibleSince,
base::Time::Now());
for (auto& observer : observers_)
observer.OnTopicsDataAccessibleSinceUpdated();
--
2.25.1
build/patches/Disable-PrivacyGuide.patch
+4 -8
View File
@@ -4,13 +4,13 @@ Subject: Disable PrivacyGuide
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
chrome/common/chrome_features.cc | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
chrome/common/chrome_features.cc | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
--- a/chrome/common/chrome_features.cc
+++ b/chrome/common/chrome_features.cc
@@ -492,8 +492,8 @@ BASE_FEATURE(kHaTSDesktopDevToolsIssuesCSP,
@@ -460,8 +460,8 @@ BASE_FEATURE(kHaTSDesktopDevToolsIssuesCSP,
// Enables or disables the Happiness Tracking System for Desktop Privacy Guide.
BASE_FEATURE(kHappinessTrackingSurveysForDesktopPrivacyGuide,
@@ -21,13 +21,9 @@ diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
const base::FeatureParam<base::TimeDelta>
kHappinessTrackingSurveysForDesktopPrivacyGuideTime{
&kHappinessTrackingSurveysForDesktopPrivacyGuide, "settings-time",
@@ -917,11 +917,11 @@ BASE_FEATURE(kPrerenderFallbackToPreconnect,
"PrerenderFallbackToPreconnect",
@@ -906,8 +906,8 @@ BASE_FEATURE(kPrerenderFallbackToPreconnect,
base::FEATURE_ENABLED_BY_DEFAULT);
-BASE_FEATURE(kPrivacyGuide2, "PrivacyGuide2", base::FEATURE_ENABLED_BY_DEFAULT);
+BASE_FEATURE(kPrivacyGuide2, "PrivacyGuide2", base::FEATURE_DISABLED_BY_DEFAULT); // always disabled in Bromite
BASE_FEATURE(kPrivacyGuideAndroid,
- "PrivacyGuideAndroid",
- base::FEATURE_DISABLED_BY_DEFAULT);
build/patches/Disable-all-predictors-code.patch
+29 -27
View File
@@ -32,7 +32,7 @@ diff --git a/chrome/browser/optimization_guide/chrome_hints_manager.cc b/chrome/
diff --git a/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc b/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc
--- a/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc
+++ b/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc
@@ -326,7 +326,6 @@ void OptimizationGuideKeyedService::RemoveObserverForOptimizationTargetModel(
@@ -330,7 +330,6 @@ void OptimizationGuideKeyedService::RemoveObserverForOptimizationTargetModel(
void OptimizationGuideKeyedService::RegisterOptimizationTypes(
const std::vector<optimization_guide::proto::OptimizationType>&
optimization_types) {
@@ -43,7 +43,7 @@ diff --git a/chrome/browser/optimization_guide/optimization_guide_keyed_service.
diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
--- a/chrome/common/chrome_features.cc
+++ b/chrome/common/chrome_features.cc
@@ -891,8 +891,8 @@ BASE_FEATURE(kPermissionAuditing,
@@ -879,8 +879,8 @@ BASE_FEATURE(kPermissionAuditing,
// Enables using the prediction service for permission prompts. We will keep
// this feature in order to allow us to update the holdback chance via finch.
BASE_FEATURE(kPermissionPredictions,
@@ -54,7 +54,7 @@ diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
// The holdback chance is 30% but it can also be configured/updated
// through finch if needed.
@@ -903,8 +903,8 @@ const base::FeatureParam<double> kPermissionPredictionsHoldbackChance(
@@ -891,8 +891,8 @@ const base::FeatureParam<double> kPermissionPredictionsHoldbackChance(
// Enables using the prediction service for geolocation permission prompts.
BASE_FEATURE(kPermissionGeolocationPredictions,
@@ -154,7 +154,18 @@ diff --git a/components/optimization_guide/core/optimization_guide_features.cc b
);
// Enables page content to be annotated.
@@ -143,8 +139,8 @@ BASE_FEATURE(kPageEntitiesModelResetOnShutdown,
@@ -118,8 +114,8 @@ BASE_FEATURE(kPageContentAnnotations,
// Enables fetching page metadata from the remote Optimization Guide service.
BASE_FEATURE(kRemotePageMetadata,
- "RemotePageMetadata",
- base::FEATURE_DISABLED_BY_DEFAULT);
+ "RemotePageMetadata", // disabled by default
+ base::FEATURE_DISABLED_BY_DEFAULT); // in Bromite
// Enables the page entities model to be annotated on every page load.
BASE_FEATURE(kPageEntitiesPageContentAnnotations,
@@ -149,8 +145,8 @@ BASE_FEATURE(kPageEntitiesModelBatchEntityMetadataSimplification,
// Enables push notification of hints.
BASE_FEATURE(kPushNotifications,
@@ -165,7 +176,7 @@ diff --git a/components/optimization_guide/core/optimization_guide_features.cc b
// This feature flag does not turn off any behavior, it is only used for
// experiment parameters.
@@ -158,15 +154,15 @@ BASE_FEATURE(kOptimizationGuideMetadataValidation,
@@ -164,8 +160,8 @@ BASE_FEATURE(kOptimizationGuideMetadataValidation,
base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kPageTopicsBatchAnnotations,
@@ -176,16 +187,7 @@ diff --git a/components/optimization_guide/core/optimization_guide_features.cc b
BASE_FEATURE(kPageVisibilityBatchAnnotations,
"PageVisibilityBatchAnnotations",
base::FEATURE_ENABLED_BY_DEFAULT);
BASE_FEATURE(kUseLocalPageEntitiesMetadataProvider,
- "UseLocalPageEntitiesMetadataProvider",
- base::FEATURE_DISABLED_BY_DEFAULT);
+ "UseLocalPageEntitiesMetadataProvider", // disabled by default
+ base::FEATURE_DISABLED_BY_DEFAULT); // in Bromite
BASE_FEATURE(kPageContentAnnotationsValidation,
"PageContentAnnotationsValidation",
@@ -418,7 +414,7 @@ size_t MaxURLKeyedHintCacheSize() {
@@ -420,7 +416,7 @@ size_t MaxURLKeyedHintCacheSize() {
bool ShouldPersistHintsToDisk() {
return GetFieldTrialParamByFeatureAsBool(kOptimizationHints,
@@ -206,16 +208,16 @@ diff --git a/components/optimization_guide/core/prediction_model_download_manage
0x5c, 0x7f, 0xd0, 0x0c, 0xa1, 0x6e, 0xef, 0xdd, 0x63, 0x7a};
const net::NetworkTrafficAnnotationTag
kOptimizationGuidePredictionModelsTrafficAnnotation =
@@ -106,7 +106,7 @@ PredictionModelDownloadManager::PredictionModelDownloadManager(
const proto::ModelCacheKey& model_cache_key,
@@ -104,7 +104,7 @@ PredictionModelDownloadManager::PredictionModelDownloadManager(
GetBaseModelDirForDownloadCallback get_base_model_dir_for_download_callback,
scoped_refptr<base::SequencedTaskRunner> background_task_runner)
: download_service_(download_service),
- is_available_for_downloads_(true),
+ is_available_for_downloads_(false),
api_key_(features::GetOptimizationGuideServiceAPIKey()),
models_dir_path_(models_dir_path),
prediction_model_store_(prediction_model_store),
@@ -118,6 +118,7 @@ PredictionModelDownloadManager::~PredictionModelDownloadManager() = default;
get_base_model_dir_for_download_callback_(
get_base_model_dir_for_download_callback),
@@ -115,6 +115,7 @@ PredictionModelDownloadManager::~PredictionModelDownloadManager() = default;
void PredictionModelDownloadManager::StartDownload(
const GURL& download_url,
proto::OptimizationTarget optimization_target) {
@@ -223,13 +225,13 @@ diff --git a/components/optimization_guide/core/prediction_model_download_manage
download::DownloadParams download_params;
download_params.client =
download::DownloadClient::OPTIMIZATION_GUIDE_PREDICTION_MODELS;
@@ -254,6 +255,7 @@ void PredictionModelDownloadManager::OnDownloadFailed(
absl::optional<std::pair<base::FilePath, base::FilePath>>
PredictionModelDownloadManager::VerifyDownload(const base::FilePath& file_path,
bool delete_file_on_error) {
@@ -260,6 +261,7 @@ bool PredictionModelDownloadManager::VerifyDownload(
const base::FilePath& download_file_path,
const base::FilePath& base_model_dir,
bool delete_file_on_error) {
+ if ((true)) return absl::nullopt;
if (!switches::ShouldSkipModelDownloadVerificationForTesting()) {
// Verify that the |file_path| contains a valid CRX file.
// Verify that the |download_file_path| contains a valid CRX file.
std::string public_key;
diff --git a/components/optimization_guide/core/prediction_model_fetcher_impl.cc b/components/optimization_guide/core/prediction_model_fetcher_impl.cc
--- a/components/optimization_guide/core/prediction_model_fetcher_impl.cc
@@ -259,7 +261,7 @@ diff --git a/components/optimization_guide/features.gni b/components/optimizatio
diff --git a/components/permissions/features.cc b/components/permissions/features.cc
--- a/components/permissions/features.cc
+++ b/components/permissions/features.cc
@@ -78,12 +78,12 @@ const base::FeatureParam<int> kPermissionChipAutoDismissDelay{
@@ -79,12 +79,12 @@ const base::FeatureParam<int> kPermissionChipAutoDismissDelay{
// When enabled, use the value of the `service_url` FeatureParam as the url
// for the Web Permission Predictions Service.
BASE_FEATURE(kPermissionPredictionServiceUseUrlOverride,
@@ -279,7 +281,7 @@ diff --git a/components/permissions/features.cc b/components/permissions/feature
diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
--- a/third_party/blink/common/features.cc
+++ b/third_party/blink/common/features.cc
@@ -230,12 +230,8 @@ BASE_FEATURE(kMixedContentAutoupgrade,
@@ -225,12 +225,8 @@ BASE_FEATURE(kMixedContentAutoupgrade,
// predictor may preconnect/prefetch to resources/origins to make the
// future navigations faster.
BASE_FEATURE(kNavigationPredictor,
build/patches/Disable-safe-browsing.patch
+183 -192
View File
File diff suppressed because it is too large Load Diff
build/patches/Logcat-crash-reports-UI.patch
+24 -24
View File
@@ -159,7 +159,7 @@ diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -640,6 +640,7 @@ static_library("ui") {
@@ -641,6 +641,7 @@ static_library("ui") {
"//third_party/re2",
"//third_party/webrtc_overrides:webrtc_component",
"//third_party/zlib",
@@ -188,8 +188,8 @@ diff --git a/chrome/browser/ui/webui/crashes_ui.cc b/chrome/browser/ui/webui/cra
#if BUILDFLAG(IS_CHROMEOS_ASH)
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
#endif
@@ -73,6 +84,10 @@ content::WebUIDataSource* CreateCrashesUIHTMLSource() {
return source;
@@ -72,6 +83,10 @@ void CreateAndAddCrashesUIHTMLSource(Profile* profile) {
source->SetDefaultResource(IDR_CRASH_CRASHES_HTML);
}
+constexpr base::TaskTraits kLoadingTaskTraits = {
@@ -199,7 +199,7 @@ diff --git a/chrome/browser/ui/webui/crashes_ui.cc b/chrome/browser/ui/webui/cra
////////////////////////////////////////////////////////////////////////////////
//
// CrashesDOMHandler
@@ -82,7 +97,7 @@ content::WebUIDataSource* CreateCrashesUIHTMLSource() {
@@ -81,7 +96,7 @@ void CreateAndAddCrashesUIHTMLSource(Profile* profile) {
// The handler for Javascript messages for the chrome://crashes/ page.
class CrashesDOMHandler : public WebUIMessageHandler {
public:
@@ -208,7 +208,7 @@ diff --git a/chrome/browser/ui/webui/crashes_ui.cc b/chrome/browser/ui/webui/cra
CrashesDOMHandler(const CrashesDOMHandler&) = delete;
CrashesDOMHandler& operator=(const CrashesDOMHandler&) = delete;
@@ -98,6 +113,8 @@ class CrashesDOMHandler : public WebUIMessageHandler {
@@ -97,6 +112,8 @@ class CrashesDOMHandler : public WebUIMessageHandler {
// Asynchronously fetches the list of crashes. Called from JS.
void HandleRequestCrashes(const base::Value::List& args);
@@ -217,7 +217,7 @@ diff --git a/chrome/browser/ui/webui/crashes_ui.cc b/chrome/browser/ui/webui/cra
#if BUILDFLAG(IS_CHROMEOS_ASH)
// Asynchronously triggers crash uploading. Called from JS.
void HandleRequestUploads(const base::Value::List& args);
@@ -109,13 +126,26 @@ class CrashesDOMHandler : public WebUIMessageHandler {
@@ -108,13 +125,26 @@ class CrashesDOMHandler : public WebUIMessageHandler {
// Asynchronously requests a user triggered upload. Called from JS.
void HandleRequestSingleCrashUpload(const base::Value::List& args);
@@ -246,7 +246,7 @@ diff --git a/chrome/browser/ui/webui/crashes_ui.cc b/chrome/browser/ui/webui/cra
upload_list_ = CreateCrashUploadList();
}
@@ -142,10 +172,24 @@ void CrashesDOMHandler::RegisterMessages() {
@@ -141,10 +171,24 @@ void CrashesDOMHandler::RegisterMessages() {
crash_reporter::kCrashesUIRequestSingleCrashUpload,
base::BindRepeating(&CrashesDOMHandler::HandleRequestSingleCrashUpload,
base::Unretained(this)));
@@ -271,7 +271,7 @@ diff --git a/chrome/browser/ui/webui/crashes_ui.cc b/chrome/browser/ui/webui/cra
if (first_load_) {
first_load_ = false;
if (list_available_)
@@ -177,8 +221,7 @@ void CrashesDOMHandler::OnUploadListAvailable() {
@@ -176,8 +220,7 @@ void CrashesDOMHandler::OnUploadListAvailable() {
}
void CrashesDOMHandler::UpdateUI() {
@@ -281,7 +281,7 @@ diff --git a/chrome/browser/ui/webui/crashes_ui.cc b/chrome/browser/ui/webui/cra
bool system_crash_reporter = false;
#if BUILDFLAG(IS_CHROMEOS)
@@ -226,14 +269,112 @@ void CrashesDOMHandler::UpdateUI() {
@@ -225,14 +268,112 @@ void CrashesDOMHandler::UpdateUI() {
void CrashesDOMHandler::HandleRequestSingleCrashUpload(
const base::Value::List& args) {
@@ -400,7 +400,7 @@ diff --git a/chrome/browser/ui/webui/crashes_ui.cc b/chrome/browser/ui/webui/cra
}
} // namespace
@@ -245,7 +386,8 @@ void CrashesDOMHandler::HandleRequestSingleCrashUpload(
@@ -244,7 +385,8 @@ void CrashesDOMHandler::HandleRequestSingleCrashUpload(
///////////////////////////////////////////////////////////////////////////////
CrashesUI::CrashesUI(content::WebUI* web_ui) : WebUIController(web_ui) {
@@ -409,7 +409,7 @@ diff --git a/chrome/browser/ui/webui/crashes_ui.cc b/chrome/browser/ui/webui/cra
+ web_ui->GetWebContents()));
// Set up the chrome://crashes/ source.
Profile* profile = Profile::FromWebUI(web_ui);
CreateAndAddCrashesUIHTMLSource(Profile::FromWebUI(web_ui));
diff --git a/components/crash/core/browser/crashes_ui_util.cc b/components/crash/core/browser/crashes_ui_util.cc
--- a/components/crash/core/browser/crashes_ui_util.cc
+++ b/components/crash/core/browser/crashes_ui_util.cc
@@ -795,7 +795,7 @@ diff --git a/components/minidump_uploader/android/java/src/org/chromium/componen
diff --git a/components/upload_list/text_log_upload_list.cc b/components/upload_list/text_log_upload_list.cc
--- a/components/upload_list/text_log_upload_list.cc
+++ b/components/upload_list/text_log_upload_list.cc
@@ -110,6 +110,7 @@ std::unique_ptr<TextLogUploadList::UploadInfo> TryParseCsvLogEntry(
@@ -111,6 +111,7 @@ std::unique_ptr<TextLogUploadList::UploadInfo> TryParseCsvLogEntry(
}
auto info = std::make_unique<TextLogUploadList::UploadInfo>(components[1],
upload_time);
@@ -806,17 +806,17 @@ diff --git a/components/upload_list/text_log_upload_list.cc b/components/upload_
diff --git a/components/upload_list/upload_list.cc b/components/upload_list/upload_list.cc
--- a/components/upload_list/upload_list.cc
+++ b/components/upload_list/upload_list.cc
@@ -55,7 +55,8 @@ UploadList::UploadInfo::UploadInfo(const UploadInfo& upload_info)
capture_time(upload_info.capture_time),
state(upload_info.state),
source(upload_info.source),
- file_size(upload_info.file_size) {}
+ file_size(upload_info.file_size),
@@ -42,7 +42,8 @@ UploadList::UploadInfo::UploadInfo(const std::string& local_id,
: local_id(local_id),
capture_time(capture_time),
state(state),
- file_size(file_size) {}
+ file_size(file_size),
+ file_path(upload_info.file_path) {}
UploadList::UploadInfo::~UploadInfo() = default;
@@ -108,6 +109,11 @@ void UploadList::RequestSingleUpload(const std::string& local_id) {
UploadList::UploadInfo::UploadInfo(const std::string& upload_id,
const base::Time& upload_time)
@@ -101,6 +102,11 @@ void UploadList::RequestSingleUpload(const std::string& local_id) {
NOTREACHED();
}
@@ -828,7 +828,7 @@ diff --git a/components/upload_list/upload_list.cc b/components/upload_list/uplo
void UploadList::OnLoadComplete(const std::vector<UploadInfo>& uploads) {
uploads_ = uploads;
if (!load_callback_.is_null())
@@ -118,3 +124,12 @@ void UploadList::OnClearComplete() {
@@ -111,3 +117,12 @@ void UploadList::OnClearComplete() {
if (!clear_callback_.is_null())
std::move(clear_callback_).Run();
}
@@ -844,7 +844,7 @@ diff --git a/components/upload_list/upload_list.cc b/components/upload_list/uplo
diff --git a/components/upload_list/upload_list.h b/components/upload_list/upload_list.h
--- a/components/upload_list/upload_list.h
+++ b/components/upload_list/upload_list.h
@@ -65,6 +65,9 @@ class UploadList : public base::RefCountedThreadSafe<UploadList> {
@@ -68,6 +68,9 @@ class UploadList : public base::RefCountedThreadSafe<UploadList> {
// Formatted file size for locally stored data.
std::u16string file_size;
@@ -854,7 +854,7 @@ diff --git a/components/upload_list/upload_list.h b/components/upload_list/uploa
};
UploadList();
@@ -94,6 +97,12 @@ class UploadList : public base::RefCountedThreadSafe<UploadList> {
@@ -97,6 +100,12 @@ class UploadList : public base::RefCountedThreadSafe<UploadList> {
// Must be called only after a Load() callback has been received.
void GetUploads(size_t max_count, std::vector<UploadInfo>* uploads);
build/patches/Move-navigation-bar-to-bottom.patch
+111 -115
View File
@@ -93,7 +93,7 @@ diff --git a/cc/base/features.cc b/cc/base/features.cc
+++ b/cc/base/features.cc
@@ -40,6 +40,10 @@ BASE_FEATURE(kAvoidRasterDuringElasticOverscroll,
"AvoidRasterDuringElasticOverscroll",
base::FEATURE_DISABLED_BY_DEFAULT);
base::FEATURE_ENABLED_BY_DEFAULT);
+BASE_FEATURE(kMoveTopToolbarToBottom,
+ "MoveTopToolbarToBottom",
@@ -139,7 +139,7 @@ diff --git a/cc/input/browser_controls_offset_manager.cc b/cc/input/browser_cont
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -4277,6 +4277,9 @@ bool LayerTreeHostImpl::AnimateBrowserControls(base::TimeTicks time) {
@@ -4258,6 +4258,9 @@ bool LayerTreeHostImpl::AnimateBrowserControls(base::TimeTicks time) {
if (scroll_delta.IsZero())
return false;
@@ -152,7 +152,7 @@ diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
diff --git a/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java b/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
--- a/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
+++ b/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
@@ -88,6 +88,9 @@ import org.chromium.content_public.browser.LoadUrlParams;
@@ -90,6 +90,9 @@ import org.chromium.content_public.browser.LoadUrlParams;
import org.chromium.ui.modelutil.PropertyModel;
import org.chromium.ui.util.ColorUtils;
@@ -162,7 +162,7 @@ diff --git a/chrome/android/features/start_surface/java/src/org/chromium/chrome/
/** The mediator implements the logic to interact with the surfaces and caller. */
class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.OnClickListener,
StartSurface.OnTabSelectingListener, BackPressHandler,
@@ -1160,6 +1163,8 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.
@@ -1179,6 +1182,8 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.
}
private void setTopMargin(int topMargin) {
@@ -192,21 +192,21 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
try (TraceEvent e = TraceEvent.scoped("TabGroupUiCoordinator.initializeWithNative")) {
if (UmaSessionStats.isMetricsServiceAvailable()) {
UmaSessionStats.registerSyntheticFieldTrial(
@@ -170,7 +172,8 @@ public class TabGroupUiCoordinator implements TabGroupUiMediator.ResetHandler, T
@@ -168,7 +170,8 @@ public class TabGroupUiCoordinator implements TabGroupUiMediator.ResetHandler, T
mMediator = new TabGroupUiMediator(mActivity, visibilityController, this, mModel,
mTabModelSelector, mTabCreatorManager, mLayoutStateProviderSupplier,
mIncognitoStateProvider, dialogController, mActivityLifecycleDispatcher,
- mSnackbarManager, mOmniboxFocusStateSupplier);
+ mSnackbarManager, mOmniboxFocusStateSupplier,
+ topUiThemeColorProvider, tabSupplier);
- mIncognitoStateProvider, dialogController, mOmniboxFocusStateSupplier);
+ mIncognitoStateProvider, dialogController, mOmniboxFocusStateSupplier,
+ topUiThemeColorProvider, tabSupplier);
TabGroupUtils.startObservingForCreationIPH();
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediator.java
--- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediator.java
+++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediator.java
@@ -57,6 +57,12 @@ import org.chromium.url.GURL;
import java.util.ArrayList;
@@ -48,6 +48,12 @@ import org.chromium.url.GURL;
import java.util.List;
+import org.chromium.chrome.browser.theme.TopUiThemeColorProvider;
@@ -218,22 +218,21 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
/**
* A mediator for the TabGroupUi. Responsible for managing the internal state of the component.
*/
@@ -129,6 +135,11 @@ public class TabGroupUiMediator implements SnackbarManager.SnackbarController, B
@@ -115,13 +121,20 @@ public class TabGroupUiMediator implements BackPressHandler {
private boolean mIsTabGroupUiVisible;
private boolean mIsShowingOverViewMode;
private boolean mActivatedButNotShown;
+ private final TopUiThemeColorProvider mTopUiThemeColorProvider;
+
+ /** An observer that watches for changes in the active tab. */
+ private final CurrentTabObserver mTabObserver;
+
TabGroupUiMediator(Context context,
BottomControlsCoordinator.BottomControlsVisibilityController visibilityController,
TabGroupUiMediator(Context context, BottomControlsVisibilityController visibilityController,
ResetHandler resetHandler, PropertyModel model, TabModelSelector tabModelSelector,
@@ -138,7 +149,9 @@ public class TabGroupUiMediator implements SnackbarManager.SnackbarController, B
TabCreatorManager tabCreatorManager,
OneshotSupplier<LayoutStateProvider> layoutStateProviderSupplier,
IncognitoStateProvider incognitoStateProvider,
@Nullable TabGridDialogMediator.DialogController dialogController,
ActivityLifecycleDispatcher activityLifecycleDispatcher,
SnackbarManager snackbarManager,
- ObservableSupplier<Boolean> omniboxFocusStateSupplier) {
+ ObservableSupplier<Boolean> omniboxFocusStateSupplier,
+ TopUiThemeColorProvider topUiThemeColorProvider, ObservableSupplier<Tab> tabSupplier) {
@@ -241,7 +240,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
mContext = context;
mResetHandler = resetHandler;
mModel = model;
@@ -165,6 +178,24 @@ public class TabGroupUiMediator implements SnackbarManager.SnackbarController, B
@@ -140,10 +153,29 @@ public class TabGroupUiMediator implements BackPressHandler {
mIsShowingOverViewMode = true;
}
@@ -265,24 +264,21 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
+
// register for tab model
mTabModelObserver = new TabModelObserver() {
private int mAddedTabId = Tab.INVALID_TAB_ID;
@@ -189,6 +220,7 @@ public class TabGroupUiMediator implements SnackbarManager.SnackbarController, B
maybeActivateConditionalTabStrip(ReasonToShow.TAB_SWITCHED);
}
}
@Override
public void didSelectTab(Tab tab, @TabSelectionType int type, int lastId) {
+ updateThemeColor(tab);
if (TabUiFeatureUtilities.isTabGroupsAndroidEnabled(mContext)
&& getTabsToShowForId(lastId).contains(tab)) {
return;
@@ -258,6 +290,7 @@ public class TabGroupUiMediator implements SnackbarManager.SnackbarController, B
@@ -198,6 +230,7 @@ public class TabGroupUiMediator implements BackPressHandler {
return;
}
resetTabStripWithRelatedTabsForId(currentTab.getId());
RecordUserAction.record("TabStrip.SessionVisibility."
+ (mIsTabGroupUiVisible ? "Visible" : "Hidden"));
+ updateThemeColor(currentTab);
}
@Override
@@ -395,6 +428,20 @@ public class TabGroupUiMediator implements SnackbarManager.SnackbarController, B
@@ -313,6 +346,20 @@ public class TabGroupUiMediator implements BackPressHandler {
if (tab != null) {
resetTabStripWithRelatedTabsForId(tab.getId());
}
@@ -303,7 +299,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
}
void setupLeftButtonDrawable(int drawableId) {
@@ -552,6 +599,7 @@ public class TabGroupUiMediator implements SnackbarManager.SnackbarController, B
@@ -425,6 +472,7 @@ public class TabGroupUiMediator implements BackPressHandler {
}
public void destroy() {
@@ -338,7 +334,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiToolbarView.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiToolbarView.java
--- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiToolbarView.java
+++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiToolbarView.java
@@ -29,6 +29,11 @@ import org.chromium.components.browser_ui.styles.SemanticColorUtils;
@@ -28,6 +28,11 @@ import org.chromium.components.browser_ui.styles.SemanticColorUtils;
import org.chromium.ui.KeyboardVisibilityDelegate;
import org.chromium.ui.widget.ChromeImageView;
@@ -350,7 +346,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
/**
* Represents a generic toolbar used in the bottom strip/grid component.
* {@link TabGridPanelToolbarCoordinator}
@@ -171,6 +176,19 @@ public class TabGroupUiToolbarView extends FrameLayout {
@@ -170,6 +175,19 @@ public class TabGroupUiToolbarView extends FrameLayout {
mFadingEdgeEnd.setColorFilter(color, PorterDuff.Mode.SRC_IN);
}
@@ -368,8 +364,8 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
+ }
+
void setTint(ColorStateList tint) {
ApiCompatibilityUtils.setImageTintList(mLeftButton, tint);
ApiCompatibilityUtils.setImageTintList(mRightButton, tint);
ImageViewCompat.setImageTintList(mLeftButton, tint);
ImageViewCompat.setImageTintList(mRightButton, tint);
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiViewBinder.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiViewBinder.java
--- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiViewBinder.java
+++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiViewBinder.java
@@ -393,7 +389,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListContainerViewBinder.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListContainerViewBinder.java
--- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListContainerViewBinder.java
+++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListContainerViewBinder.java
@@ -22,6 +22,8 @@ import org.chromium.components.browser_ui.styles.ChromeColors;
@@ -28,6 +28,8 @@ import org.chromium.components.browser_ui.styles.ChromeColors;
import org.chromium.ui.base.ViewUtils;
import org.chromium.ui.modelutil.PropertyKey;
import org.chromium.ui.modelutil.PropertyModel;
@@ -402,7 +398,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
/**
* ViewBinder for TabListRecyclerView.
@@ -58,6 +60,8 @@ class TabListContainerViewBinder {
@@ -66,6 +68,8 @@ class TabListContainerViewBinder {
params.topMargin = newTopMargin;
ViewUtils.requestLayout(view, "TabListContainerViewBinder.bind TOP_MARGIN");
} else if (BOTTOM_CONTROLS_HEIGHT == propertyKey) {
@@ -414,7 +410,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListCoordinator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListCoordinator.java
--- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListCoordinator.java
+++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListCoordinator.java
@@ -48,6 +48,9 @@ import org.chromium.ui.modelutil.SimpleRecyclerViewAdapter;
@@ -50,6 +50,9 @@ import org.chromium.ui.modelutil.SimpleRecyclerViewAdapter;
import org.chromium.ui.resources.dynamics.DynamicResourceLoader;
import org.chromium.ui.widget.ViewLookupCachingFrameLayout;
@@ -424,7 +420,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.List;
@@ -256,6 +259,9 @@ public class TabListCoordinator
@@ -263,6 +266,9 @@ public class TabListCoordinator
if (mMode == TabListMode.GRID) {
GridLayoutManager gridLayoutManager =
new GridLayoutManager(context, GRID_LAYOUT_SPAN_COUNT_COMPACT);
@@ -508,7 +504,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediator.java
--- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediator.java
+++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediator.java
@@ -45,6 +45,7 @@ import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;
@@ -43,6 +43,7 @@ import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;
import org.chromium.chrome.browser.flags.ChromeFeatureList;
import org.chromium.chrome.browser.incognito.reauth.IncognitoReauthController;
import org.chromium.chrome.browser.incognito.reauth.IncognitoReauthManager;
@@ -516,7 +512,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
import org.chromium.chrome.browser.multiwindow.MultiWindowModeStateDispatcher;
import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
@@ -473,11 +474,22 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView
@@ -453,11 +454,22 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView
updateTopControlsProperties();
mContainerViewModel.set(
BOTTOM_CONTROLS_HEIGHT, browserControlsStateProvider.getBottomControlsHeight());
@@ -536,10 +532,10 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
+ BOTTOM_PADDING, mContainerViewModel.get(BOTTOM_PADDING) +
+ mBrowserControlsStateProvider.getContentOffset());
+ }
}
mContainerView = containerView;
@@ -605,6 +617,10 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView
if (backPressManager != null && BackPressManager.isEnabled()) {
assert !mIsStartSurfaceEnabled || mIsStartSurfaceRefactorEnabled;
backPressManager.addHandler(this, BackPressHandler.Type.TAB_SWITCHER);
@@ -590,6 +602,10 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView
final int contentOffset = mBrowserControlsStateProvider.getContentOffset();
mContainerViewModel.set(TOP_MARGIN, contentOffset);
@@ -629,7 +625,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s
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
@@ -244,6 +244,9 @@ import java.util.ArrayList;
@@ -243,6 +243,9 @@ import java.util.ArrayList;
import java.util.List;
import java.util.function.Consumer;
@@ -639,7 +635,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
/**
* A {@link AsyncInitializationActivity} that builds and manages a {@link CompositorViewHolder}
* and associated classes.
@@ -757,6 +760,16 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
@@ -751,6 +754,16 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
int toolbarLayoutId = getToolbarLayoutId();
if (toolbarLayoutId != ActivityUtils.NO_RESOURCE_ID && controlContainer != null) {
controlContainer.initWithToolbar(toolbarLayoutId);
@@ -659,14 +655,14 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java b/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java
@@ -112,6 +112,7 @@ public class ChromeCachedFlags {
add(ChromeFeatureList.sInstanceSwitcher);
add(ChromeFeatureList.sInstantStart);
add(ChromeFeatureList.sInterestFeedV2);
@@ -100,6 +100,7 @@ public class ChromeCachedFlags {
ChromeFeatureList.sInstanceSwitcher,
ChromeFeatureList.sInstantStart,
ChromeFeatureList.sInterestFeedV2,
+ add(ChromeFeatureList.sMoveTopToolbarToBottom);
add(ChromeFeatureList.sNewWindowAppMenu);
add(ChromeFeatureList.sOmniboxMatchToolbarAndStatusBarColor);
add(ChromeFeatureList.sOmniboxModernizeVisualUpdate);
ChromeFeatureList.sOmniboxMatchToolbarAndStatusBarColor,
ChromeFeatureList.sOmniboxModernizeVisualUpdate,
ChromeFeatureList.sOmniboxMostVisitedTilesAddRecycledViewPool,
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java
@@ -679,7 +675,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/Comp
import java.util.ArrayList;
import java.util.HashSet;
@@ -321,6 +323,10 @@ public class CompositorViewHolder extends FrameLayout
@@ -320,6 +322,10 @@ public class CompositorViewHolder extends FrameLayout
WebContents webContents = mTabVisible.getWebContents();
if (webContents == null) return;
EventForwarder forwarder = webContents.getEventForwarder();
@@ -818,7 +814,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java
@@ -473,7 +473,7 @@ public class StripLayoutHelper implements StripLayoutTab.StripLayoutTabDelegate
@@ -504,7 +504,7 @@ public class StripLayoutHelper implements StripLayoutTab.StripLayoutTabDelegate
// position 0 is on the left. Account for that in the offset calculation.
boolean isRtl = LocalizationUtils.isLayoutRtl();
boolean useUnadjustedScrollOffset = isRtl != isLeft;
@@ -830,7 +826,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java
@@ -58,6 +58,9 @@ import org.chromium.ui.base.LocalizationUtils;
@@ -59,6 +59,9 @@ import org.chromium.ui.base.LocalizationUtils;
import org.chromium.ui.base.PageTransition;
import org.chromium.ui.resources.ResourceManager;
import org.chromium.url.GURL;
@@ -840,7 +836,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
import java.util.List;
@@ -121,9 +124,13 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa
@@ -132,9 +135,13 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa
private final String mDefaultTitle;
private final Supplier<LayerTitleCache> mLayerTitleCacheSupplier;
@@ -854,7 +850,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
if (mModelSelectorButton.onDown(x, y)) return;
if (mStripScrim.isVisible()) return;
getActiveStripLayoutHelper().onDown(time(), x, y, fromMouse, buttons);
@@ -143,6 +150,7 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa
@@ -154,6 +161,7 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa
@Override
public void drag(float x, float y, float dx, float dy, float tx, float ty) {
@@ -862,7 +858,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
mModelSelectorButton.drag(x, y);
if (mStripScrim.isVisible()) return;
getActiveStripLayoutHelper().drag(time(), x, y, dx, dy, tx, ty);
@@ -150,6 +158,7 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa
@@ -161,6 +169,7 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa
@Override
public void click(float x, float y, boolean fromMouse, int buttons) {
@@ -870,7 +866,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
long time = time();
if (mModelSelectorButton.click(x, y)) {
mModelSelectorButton.handleClick(time);
@@ -161,13 +170,13 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa
@@ -172,13 +181,13 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa
@Override
public void fling(float x, float y, float velocityX, float velocityY) {
@@ -886,7 +882,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
getActiveStripLayoutHelper().onLongPress(time(), x, y);
}
@@ -251,7 +260,8 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa
@@ -262,7 +271,8 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa
*/
public StripLayoutHelperManager(Context context, LayoutUpdateHost updateHost,
LayoutRenderHost renderHost, Supplier<LayerTitleCache> layerTitleCacheSupplier,
@@ -896,7 +892,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
mUpdateHost = updateHost;
mLayerTitleCacheSupplier = layerTitleCacheSupplier;
mTabStripTreeProvider = new TabStripSceneLayer(context);
@@ -294,6 +304,8 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa
@@ -348,6 +358,8 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa
new StripLayoutHelper(context, updateHost, renderHost, false, mModelSelectorButton);
mIncognitoHelper =
new StripLayoutHelper(context, updateHost, renderHost, true, mModelSelectorButton);
@@ -905,7 +901,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
onContextChanged(context);
}
@@ -363,9 +375,13 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa
@@ -443,9 +455,13 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa
Tab selectedTab = mTabModelSelector.getCurrentModel().getTabAt(
mTabModelSelector.getCurrentModel().index());
int selectedTabId = selectedTab == null ? TabModel.INVALID_TAB_INDEX : selectedTab.getId();
@@ -920,7 +916,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
return mTabStripTreeProvider;
}
@@ -403,7 +419,17 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa
@@ -482,7 +498,17 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa
mIncognitoHelper.onSizeChanged(
mWidth, mHeight, orientationChanged, LayoutManagerImpl.time());
@@ -1005,7 +1001,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scen
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java
@@ -23,6 +23,8 @@ import org.chromium.chrome.browser.layouts.scene_layer.SceneLayer;
@@ -22,6 +22,8 @@ import org.chromium.chrome.browser.layouts.scene_layer.SceneLayer;
import org.chromium.chrome.browser.layouts.scene_layer.SceneOverlayLayer;
import org.chromium.ui.base.LocalizationUtils;
import org.chromium.ui.resources.ResourceManager;
@@ -1067,7 +1063,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/findinpage/Find
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/BrowserControlsManager.java b/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/BrowserControlsManager.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/BrowserControlsManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/BrowserControlsManager.java
@@ -51,6 +51,9 @@ import org.chromium.ui.vr.VrModeObserver;
@@ -49,6 +49,9 @@ import org.chromium.ui.util.TokenHolder;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -1077,7 +1073,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/Brow
/**
* A class that manages browser control visibility and positioning.
*/
@@ -395,6 +398,14 @@ public class BrowserControlsManager
@@ -386,6 +389,14 @@ public class BrowserControlsManager implements ActivityStateListener, BrowserCon
return mTopControlContainerHeight;
}
@@ -1092,7 +1088,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/Brow
@Override
public int getTopControlsMinHeight() {
return mTopControlsMinHeight;
@@ -461,6 +472,8 @@ public class BrowserControlsManager
@@ -452,6 +463,8 @@ public class BrowserControlsManager implements ActivityStateListener, BrowserCon
@Override
public float getTopVisibleContentOffset() {
@@ -1301,7 +1297,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
@@ -260,6 +260,11 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
@@ -317,6 +317,11 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
if (fragment instanceof INeedSnackbarManager) {
((INeedSnackbarManager)fragment).setSnackbarManager(mSnackbarManager);
}
@@ -1367,7 +1363,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/status_indicato
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
@@ -176,6 +176,9 @@ import org.chromium.url.GURL;
@@ -174,6 +174,9 @@ import org.chromium.url.GURL;
import java.util.List;
@@ -1377,7 +1373,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.
@@ -669,7 +672,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
@@ -648,7 +651,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
mEphemeralTabCoordinatorSupplier);
// clang-format off
LocationBarCoordinator locationBarCoordinator = new LocationBarCoordinator(
@@ -1386,7 +1382,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,
@@ -909,11 +912,13 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
@@ -888,11 +891,13 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
// the height won't be measured by the background image.
if (mControlContainer.getBackground() == null) {
setControlContainerTopMargin(getToolbarExtraYOffset());
@@ -1400,7 +1396,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
mControlContainer.removeOnLayoutChangeListener(mLayoutChangeListener);
mLayoutChangeListener = null;
}
@@ -1305,13 +1310,25 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
@@ -1284,13 +1289,25 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
return mLocationBar.getOmniboxStub().isUrlBarFocused();
}
@@ -1428,7 +1424,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
mScrimCoordinator, mOmniboxFocusStateSupplier, mBottomSheetController,
mActivityLifecycleDispatcher, mIsWarmOnResumeSupplier, mTabModelSelector,
mTabContentManager, mCompositorViewHolder,
@@ -1320,7 +1337,8 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
@@ -1299,7 +1316,8 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
var bottomControlsCoordinator = new BottomControlsCoordinator(mActivity, mWindowAndroid,
mLayoutManager, mCompositorViewHolder.getResourceManager(), mBrowserControlsSizer,
mFullscreenManager, (ScrollingBottomViewResourceFrameLayout) root, mTabGroupUi,
@@ -1438,7 +1434,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
mBottomControlsCoordinatorSupplier.set(bottomControlsCoordinator);
bottomControlsCoordinator.getHandleBackPressChangedSupplier().addObserver(
(x) -> { onBackPressStateChanged(); });
@@ -2110,6 +2128,15 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
@@ -2086,6 +2104,15 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
private void setControlContainerTopMargin(int margin) {
final ViewGroup.MarginLayoutParams layoutParams =
((ViewGroup.MarginLayoutParams) mControlContainer.getLayoutParams());
@@ -1507,7 +1503,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/system/Statu
import org.chromium.base.ApiCompatibilityUtils;
import org.chromium.base.CallbackController;
import org.chromium.base.supplier.ObservableSupplier;
@@ -430,6 +433,12 @@ public class StatusBarColorController
@@ -431,6 +434,12 @@ public class StatusBarColorController
boolean needsDarkStatusBarIcons = !ColorUtils.shouldUseLightForegroundOnBackground(color);
ApiCompatibilityUtils.setStatusBarIconColor(root, needsDarkStatusBarIcons);
ApiCompatibilityUtils.setStatusBarColor(window, color);
@@ -1523,7 +1519,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/system/Statu
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -7212,6 +7212,11 @@ const FeatureEntry kFeatureEntries[] = {
@@ -7036,6 +7036,11 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kWindowsScrollingPersonalityDescription, kOsAll,
FEATURE_VALUE_TYPE(features::kWindowsScrollingPersonality)},
@@ -1546,7 +1542,7 @@ diff --git a/chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer
using base::android::JavaParamRef;
using base::android::JavaRef;
@@ -89,8 +90,10 @@ void TabStripSceneLayer::SetContentTree(
@@ -93,8 +94,10 @@ void TabStripSceneLayer::SetContentTree(
content_tree_ = content_tree;
if (content_tree) {
layer()->InsertChild(content_tree->layer(), 0);
@@ -1559,7 +1555,7 @@ diff --git a/chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer
}
}
}
@@ -123,13 +126,18 @@ void TabStripSceneLayer::UpdateTabStripLayer(JNIEnv* env,
@@ -127,13 +130,18 @@ void TabStripSceneLayer::UpdateTabStripLayer(JNIEnv* env,
jboolean should_readd_background,
jint background_color) {
gfx::RectF content(0, y_offset, width, height);
@@ -1606,7 +1602,7 @@ diff --git a/chrome/browser/browser_controls/android/java/src/org/chromium/chrom
diff --git a/chrome/browser/browser_controls/android/java/src/org/chromium/chrome/browser/browser_controls/BrowserControlsStateProvider.java b/chrome/browser/browser_controls/android/java/src/org/chromium/chrome/browser/browser_controls/BrowserControlsStateProvider.java
--- a/chrome/browser/browser_controls/android/java/src/org/chromium/chrome/browser/browser_controls/BrowserControlsStateProvider.java
+++ b/chrome/browser/browser_controls/android/java/src/org/chromium/chrome/browser/browser_controls/BrowserControlsStateProvider.java
@@ -64,6 +64,12 @@ public interface BrowserControlsStateProvider {
@@ -59,6 +59,12 @@ public interface BrowserControlsStateProvider {
*/
int getTopControlsHeight();
@@ -1622,7 +1618,7 @@ diff --git a/chrome/browser/browser_controls/android/java/src/org/chromium/chrom
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -1706,6 +1706,10 @@ const char kImprovedKeyboardShortcutsDescription[] =
@@ -1773,6 +1773,10 @@ const char kImprovedKeyboardShortcutsDescription[] =
"Ensure keyboard shortcuts work consistently with international keyboard "
"layouts and deprecate legacy shortcuts.";
@@ -1636,7 +1632,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -965,6 +965,9 @@ extern const char kImprovedKeyboardShortcutsDescription[];
@@ -999,6 +999,9 @@ extern const char kImprovedKeyboardShortcutsDescription[];
extern const char kCompositorThreadedScrollbarScrollingName[];
extern const char kCompositorThreadedScrollbarScrollingDescription[];
@@ -1689,18 +1685,18 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
#include "base/metrics/field_trial_params.h"
#include "base/no_destructor.h"
#include "base/strings/string_piece_forward.h"
@@ -253,6 +254,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
@@ -237,6 +238,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
&kIsVoiceSearchEnabledCache,
&kLensCameraAssistedSearch,
&kLensOnQuickActionSearchWidget,
+ &features::kMoveTopToolbarToBottom,
&kNewTabPageTilesTitleWrapAround,
&kNewWindowAppMenu,
&kNotificationPermissionVariant,
&kNotificationPermissionBottomSheet,
&kOfflineIndicatorV2,
diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
@@ -124,6 +124,23 @@ public class CachedFeatureFlags {
@@ -122,6 +122,23 @@ public class CachedFeatureFlags {
SharedPreferencesManager.getInstance().writeBoolean(preferenceName, isEnabledInNative);
}
@@ -1724,7 +1720,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
/**
* Forces a feature to be enabled or disabled for testing.
*
@@ -434,6 +451,7 @@ public class CachedFeatureFlags {
@@ -432,6 +449,7 @@ public class CachedFeatureFlags {
@NativeMethods
interface Natives {
@@ -1735,24 +1731,24 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -390,6 +390,8 @@ public abstract class ChromeFeatureList {
public static final String MESSAGES_FOR_ANDROID_SYNC_ERROR = "MessagesForAndroidSyncError";
@@ -373,6 +373,8 @@ public abstract class ChromeFeatureList {
public static final String METRICS_SETTINGS_ANDROID = "MetricsSettingsAndroid";
public static final String SEARCH_READY_OMNIBOX = "SearchReadyOmnibox";
public static final String MODAL_PERMISSION_DIALOG_VIEW = "ModalPermissionDialogView";
+ public static final String MOVE_TOP_TOOLBAR_TO_BOTTOM =
+ "MoveTopToolbarToBottom";
public static final String METRICS_SETTINGS_ANDROID = "MetricsSettingsAndroid";
public static final String NEW_TAB_PAGE_TILES_TITLE_WRAP_AROUND =
"NewTabPageTilesTitleWrapAround";
@@ -676,6 +678,8 @@ public abstract class ChromeFeatureList {
public static final String NOTIFICATION_PERMISSION_VARIANT = "NotificationPermissionVariant";
public static final String NOTIFICATION_PERMISSION_BOTTOM_SHEET =
"NotificationPermissionBottomSheet";
@@ -625,6 +627,8 @@ public abstract class ChromeFeatureList {
public static final CachedFlag sInterestFeedV2 = new CachedFlag(INTEREST_FEED_V2, true);
public static final CachedFlag sLensCameraAssistedSearch =
new CachedFlag(LENS_CAMERA_ASSISTED_SEARCH, true);
+ public static final CachedFlag sMoveTopToolbarToBottom =
+ new CachedFlag(MOVE_TOP_TOOLBAR_TO_BOTTOM, false);
public static final CachedFlag sNewWindowAppMenu = new CachedFlag(NEW_WINDOW_APP_MENU, true);
public static final CachedFlag sOSKResizesVisualViewportByDefault =
new CachedFlag(OSK_RESIZES_VISUAL_VIEWPORT, false);
public static final CachedFlag sOmahaMinSdkVersionAndroid =
new CachedFlag(OMAHA_MIN_SDK_VERSION_ANDROID, false);
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
--- 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
@@ -1852,7 +1848,7 @@ diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/ch
diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java
--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java
@@ -88,6 +88,7 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
@@ -89,6 +89,7 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
private WindowDelegate mWindowDelegate;
private WindowAndroid mWindowAndroid;
private View mAutocompleteAnchorView;
@@ -1860,7 +1856,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
private LocationBarMediator mLocationBarMediator;
private View mUrlBar;
private View mDeleteButton;
@@ -145,7 +146,7 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
@@ -146,7 +147,7 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
* @param reportExceptionCallback A {@link Callback} to report exceptions.
* @param backPressManager The {@link BackPressManager} for intercepting back press.
*/
@@ -1869,7 +1865,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
ObservableSupplier<Profile> profileObservableSupplier,
PrivacyPreferencesManager privacyPreferencesManager,
LocationBarDataProvider locationBarDataProvider, ActionMode.Callback actionModeCallback,
@@ -177,6 +178,7 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
@@ -178,6 +179,7 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
mActivityLifecycleDispatcher = activityLifecycleDispatcher;
mActivityLifecycleDispatcher.register(this);
mAutocompleteAnchorView = autocompleteAnchorView;
@@ -1877,7 +1873,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
Context context = mLocationBarLayout.getContext();
mUrlBar = mLocationBarLayout.findViewById(R.id.url_bar);
@@ -394,6 +396,11 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
@@ -398,6 +400,11 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
return mAutocompleteAnchorView;
}
@@ -1991,7 +1987,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.List;
@@ -1014,7 +1017,9 @@ class AutocompleteMediator implements OnSuggestionsReceivedListener,
@@ -1009,7 +1012,9 @@ class AutocompleteMediator implements OnSuggestionsReceivedListener,
@Override
public void onSuggestionDropdownScroll() {
mSuggestionsListScrolled = true;
@@ -2005,7 +2001,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsDropdown.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsDropdown.java
--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsDropdown.java
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsDropdown.java
@@ -42,6 +42,9 @@ import org.chromium.ui.base.ViewUtils;
@@ -43,6 +43,9 @@ import org.chromium.ui.base.ViewUtils;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -2015,7 +2011,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
/** A widget for showing a list of omnibox suggestions. */
public class OmniboxSuggestionsDropdown extends RecyclerView {
private static final long DEFERRED_INITIAL_SHRINKING_LAYOUT_FROM_IME_DURATION_MS = 300;
@@ -245,7 +248,8 @@ public class OmniboxSuggestionsDropdown extends RecyclerView {
@@ -246,7 +249,8 @@ public class OmniboxSuggestionsDropdown extends RecyclerView {
* Constructs a new list designed for containing omnibox suggestions.
* @param context Context used for contained views.
*/
@@ -2025,7 +2021,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
super(context, null, android.R.attr.dropDownListViewStyle);
setFocusable(true);
setFocusableInTouchMode(true);
@@ -255,13 +259,25 @@ public class OmniboxSuggestionsDropdown extends RecyclerView {
@@ -256,13 +260,25 @@ public class OmniboxSuggestionsDropdown extends RecyclerView {
setItemAnimator(null);
mLayoutScrollListener = new SuggestionLayoutScrollListener(context);
@@ -2052,7 +2048,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
ViewCompat.setPaddingRelative(this, 0, 0, 0, paddingBottom);
mStandardBgColor = shouldShowModernizeVisualUpdate
@@ -480,6 +496,8 @@ public class OmniboxSuggestionsDropdown extends RecyclerView {
@@ -484,6 +500,8 @@ public class OmniboxSuggestionsDropdown extends RecyclerView {
}
private int calculateAnchorBottomRelativeToContent() {
@@ -2078,7 +2074,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -1777,6 +1777,12 @@ Your Google account may have other forms of browsing history like searches and a
@@ -1617,6 +1617,12 @@ Your Google account may have other forms of browsing history like searches and a
<message name="IDS_FORCE_TABLET_UI_TITLE" desc="Title of the preference that allows the user to update force tablet UI settings.">
Force Tablet Mode
</message>
@@ -2094,7 +2090,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
diff --git a/chrome/browser/ui/android/toolbar/BUILD.gn b/chrome/browser/ui/android/toolbar/BUILD.gn
--- a/chrome/browser/ui/android/toolbar/BUILD.gn
+++ b/chrome/browser/ui/android/toolbar/BUILD.gn
@@ -164,6 +164,7 @@ android_library("java") {
@@ -167,6 +167,7 @@ android_library("java") {
"//components/user_prefs/android:java",
"//content/public/android:content_java",
"//third_party/android_deps:material_design_java",
@@ -2318,7 +2314,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java
--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java
+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java
@@ -52,6 +52,11 @@ import java.lang.annotation.Retention;
@@ -57,6 +57,11 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.function.BooleanSupplier;
@@ -2330,7 +2326,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
/**
* Layout for the browser controls (omnibox, menu, tab strip, etc..).
*/
@@ -108,6 +113,12 @@ public class ToolbarControlContainer extends OptimizedFrameLayout implements Con
@@ -113,6 +118,12 @@ public class ToolbarControlContainer extends OptimizedFrameLayout implements Con
@Override
public void initWithToolbar(int toolbarLayoutId) {
try (TraceEvent te = TraceEvent.scoped("ToolbarControlContainer.initWithToolbar")) {
@@ -2442,7 +2438,7 @@ diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibil
diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
--- a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
+++ b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
@@ -35,6 +35,7 @@ public class AccessibilitySettings
@@ -35,6 +35,7 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
private BooleanPreferenceDelegate mForceTabletUIDelegate;
static final String PREF_FORCE_TABLET_UI = "force_tablet_ui";
@@ -2450,7 +2446,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
private TextScalePreference mTextScalePref;
private PageZoomPreference mPageZoomDefaultZoomPref;
private ChromeSwitchPreference mPageZoomAlwaysShowPref;
@@ -44,6 +45,7 @@ public class AccessibilitySettings
@@ -44,6 +45,7 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
private BooleanPreferenceDelegate mReaderForAccessibilityDelegate;
private BooleanPreferenceDelegate mAccessibilityTabSwitcherDelegate;
private double mPageZoomLatestDefaultZoomPrefValue;
@@ -2458,7 +2454,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
private FontSizePrefs mFontSizePrefs;
private FontSizePrefsObserver mFontSizePrefsObserver = new FontSizePrefsObserver() {
@@ -63,6 +65,10 @@ public class AccessibilitySettings
@@ -63,6 +65,10 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
mFontSizePrefs = FontSizePrefs.getInstance(delegate.getBrowserContextHandle());
}
@@ -2469,7 +2465,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
@Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
@@ -127,6 +133,12 @@ public class AccessibilitySettings
@@ -130,6 +136,12 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
getPreferenceScreen().removePreference(accessibilityTabSwitcherPref);
}
@@ -2482,7 +2478,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
Preference captions = findPreference(PREF_CAPTIONS);
captions.setOnPreferenceClickListener(preference -> {
Intent intent = new Intent(Settings.ACTION_CAPTIONING_SETTINGS);
@@ -186,7 +198,11 @@ public class AccessibilitySettings
@@ -189,7 +201,11 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
mDelegate.getBrowserContextHandle(), (Integer) newValue);
} else if (PREF_PAGE_ZOOM_ALWAYS_SHOW.equals(preference.getKey())) {
PageZoomUtils.setShouldAlwaysShowZoomMenuItem((Boolean) newValue);
@@ -2520,15 +2516,15 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc
--- a/content/browser/renderer_host/render_widget_host_view_android.cc
+++ b/content/browser/renderer_host/render_widget_host_view_android.cc
@@ -27,6 +27,7 @@
@@ -26,6 +26,7 @@
#include "base/task/single_thread_task_runner.h"
#include "base/task/thread_pool.h"
#include "base/threading/scoped_blocking_call.h"
#include "base/threading/thread_task_runner_handle.h"
+#include "cc/base/features.h"
#include "cc/base/math_util.h"
#include "cc/layers/layer.h"
#include "cc/layers/surface_layer.h"
@@ -844,6 +845,8 @@ void RenderWidgetHostViewAndroid::OnRenderFrameMetadataChangedBeforeActivation(
@@ -840,6 +841,8 @@ void RenderWidgetHostViewAndroid::OnRenderFrameMetadataChangedBeforeActivation(
// factor. Thus, |top_content_offset| in CSS pixels is also in DIPs.
float top_content_offset =
metadata.top_controls_height * metadata.top_controls_shown_ratio;
build/patches/Remove-binary-blob-integrations.patch
+61 -130
View File
@@ -28,7 +28,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
chrome/android/BUILD.gn | 45 +-
chrome/android/chrome_java_sources.gni | 5 -
.../features/cablev2_authenticator/BUILD.gn | 2 -
chrome/android/java/AndroidManifest.xml | 61 --
chrome/android/java/AndroidManifest.xml | 53 --
.../java/res/xml/privacy_preferences.xml | 5 -
.../org/chromium/chrome/browser/AppHooks.java | 12 +-
.../browser/ChromeBackgroundService.java | 12 +-
@@ -57,9 +57,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../authenticator_request_dialog_model.cc | 4 -
chrome/browser/webauthn/cablev2_devices.cc | 3 +
chrome/test/android/BUILD.gn | 2 -
components/background_task_scheduler/BUILD.gn | 5 -
.../internal/BUILD.gn | 6 -
...ackgroundTaskSchedulerFactoryInternal.java | 6 +-
.../ExternalNavigationHandler.java | 8 -
components/externalauth/android/BUILD.gn | 3 -
.../externalauth/ExternalAuthUtils.java | 19 +-
@@ -106,7 +103,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
third_party/android_deps/BUILD.gn | 539 +-----------------
.../preconditions/javatests/BUILD.gn | 1 -
.../gms/ChromiumPlayServicesAvailability.java | 10 +-
82 files changed, 94 insertions(+), 1956 deletions(-)
79 files changed, 93 insertions(+), 1932 deletions(-)
diff --git a/android_webview/expectations/system_webview_bundle.AndroidManifest.expected b/android_webview/expectations/system_webview_bundle.AndroidManifest.expected
--- a/android_webview/expectations/system_webview_bundle.AndroidManifest.expected
@@ -133,7 +130,7 @@ diff --git a/android_webview/expectations/system_webview_bundle.AndroidManifest.
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -372,14 +372,6 @@ if (current_toolchain == default_toolchain) {
@@ -357,14 +357,6 @@ if (current_toolchain == default_toolchain) {
":chrome_public_apk_template_resources",
":update_proto_java",
":usage_stats_proto_java",
@@ -148,7 +145,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//base:jni_java",
"//cc:cc_java",
"//chrome/android/features/keyboard_accessory:public_java",
@@ -664,8 +656,19 @@ if (current_toolchain == default_toolchain) {
@@ -649,8 +641,19 @@ if (current_toolchain == default_toolchain) {
"//services/shape_detection:shape_detection_java",
"//services/shape_detection/public/mojom:mojom_java",
"//skia/public/mojom:mojom_java",
@@ -169,7 +166,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//third_party/android_deps:com_google_code_findbugs_jsr305_java",
"//third_party/android_deps:com_google_guava_listenablefuture_java",
"//third_party/android_deps:dagger_java",
@@ -955,11 +958,6 @@ if (current_toolchain == default_toolchain) {
@@ -941,11 +944,6 @@ if (current_toolchain == default_toolchain) {
":chrome_jni_headers",
":chrome_public_android_manifest",
":delegate_public_impl_java",
@@ -181,9 +178,9 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//base:base_java_test_support",
"//base:base_junit_test_support",
"//base/test:test_support_java",
@@ -1491,13 +1489,6 @@ if (current_toolchain == default_toolchain) {
@@ -1477,13 +1475,6 @@ if (current_toolchain == default_toolchain) {
":chrome_app_java_resources",
":chrome_test_util_java",
":chrome_test_util_jni",
":delegate_public_impl_java",
- "$google_play_services_package:google_play_services_base_java",
- "$google_play_services_package:google_play_services_basement_java",
@@ -192,10 +189,10 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
- "$google_play_services_package:google_play_services_gcm_java",
- "$google_play_services_package:google_play_services_iid_java",
- "$google_play_services_package:google_play_services_tasks_java",
"//base:base_java",
"//base:base_java_test_support",
"//base/test:test_support_java",
"//cc:cc_java",
@@ -2425,7 +2416,6 @@ if (current_toolchain == default_toolchain) {
"//base:jni_java",
@@ -2392,7 +2383,6 @@ if (current_toolchain == default_toolchain) {
]
deps = [
":chrome_java",
@@ -203,7 +200,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//base:base_java",
"//base:base_java_test_support",
"//base:jni_java",
@@ -2572,7 +2562,6 @@ if (current_toolchain == default_toolchain) {
@@ -2539,7 +2529,6 @@ if (current_toolchain == default_toolchain) {
# is in a DFM.
android_library("base_module_java") {
sources = [
@@ -211,7 +208,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"java/src/org/chromium/chrome/app/TrichromeZygotePreload.java",
"java/src/org/chromium/chrome/browser/ChromeBackgroundService.java",
"java/src/org/chromium/chrome/browser/ChromeBackupAgent.java",
@@ -2588,8 +2577,6 @@ if (current_toolchain == default_toolchain) {
@@ -2555,8 +2544,6 @@ if (current_toolchain == default_toolchain) {
"java/src/org/chromium/chrome/browser/base/SplitCompatBackupAgent.java",
"java/src/org/chromium/chrome/browser/base/SplitCompatContentProvider.java",
"java/src/org/chromium/chrome/browser/base/SplitCompatCustomTabsService.java",
@@ -220,7 +217,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"java/src/org/chromium/chrome/browser/base/SplitCompatIntentService.java",
"java/src/org/chromium/chrome/browser/base/SplitCompatJobService.java",
"java/src/org/chromium/chrome/browser/base/SplitCompatMinidumpUploadJobService.java",
@@ -2613,17 +2600,11 @@ if (current_toolchain == default_toolchain) {
@@ -2581,17 +2568,11 @@ if (current_toolchain == default_toolchain) {
"java/src/org/chromium/chrome/browser/photo_picker/DecoderService.java",
"java/src/org/chromium/chrome/browser/prerender/ChromePrerenderService.java",
"java/src/org/chromium/chrome/browser/provider/ChromeBrowserProvider.java",
@@ -238,7 +235,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//base:base_java",
"//base:jni_java",
"//chrome/browser/download/android:file_provider_java",
@@ -2637,7 +2618,6 @@ if (current_toolchain == default_toolchain) {
@@ -2605,7 +2586,6 @@ if (current_toolchain == default_toolchain) {
"//components/media_router/browser/android:cast_options_provider_java",
"//components/minidump_uploader:minidump_uploader_java",
"//components/module_installer/android:module_installer_java",
@@ -246,7 +243,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//third_party/androidx:androidx_annotation_annotation_java",
"//third_party/androidx:androidx_collection_collection_java",
"//ui/android:ui_no_recycler_view_java",
@@ -2656,7 +2636,6 @@ if (current_toolchain == default_toolchain) {
@@ -2624,7 +2604,6 @@ if (current_toolchain == default_toolchain) {
# Deps to pull services into base module.
# TODO(crbug.com/1126301): Consider moving these to the chrome module to
# reduce base dex size.
@@ -265,7 +262,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
"java/src/org/chromium/chrome/browser/ChromeBackupAgentImpl.java",
"java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java",
"java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java",
@@ -937,10 +936,6 @@ chrome_java_sources = [
@@ -924,10 +923,6 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/segmentation_platform/PriceTrackingActionProvider.java",
"java/src/org/chromium/chrome/browser/segmentation_platform/ReaderModeActionProvider.java",
"java/src/org/chromium/chrome/browser/segmentation_platform/SignalAccumulator.java",
@@ -313,7 +310,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
<uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
{% block extra_uses_permissions %}
@@ -742,16 +737,6 @@ by a child template that "extends" this file.
@@ -752,16 +747,6 @@ by a child template that "extends" this file.
</intent-filter>
</activity>
@@ -330,7 +327,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
<!-- This activity is used to restart the main Chrome process. Should never be exported. -->
<activity android:name="org.chromium.chrome.browser.BrowserRestartActivity"
android:launchMode="singleInstance"
@@ -759,8 +744,6 @@ by a child template that "extends" this file.
@@ -769,8 +754,6 @@ by a child template that "extends" this file.
android:theme="@style/Theme.BrowserUI.Translucent.NoTitleBar"
android:excludeFromRecents="true"
android:process=":browser_restart_process">
@@ -339,7 +336,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
<activity
android:name="org.chromium.chrome.browser.vr.VrCancelAnimationActivity"
android:exported="false"
@@ -939,26 +922,6 @@ by a child template that "extends" this file.
@@ -953,26 +936,6 @@ by a child template that "extends" this file.
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
android:hardwareAccelerated="false" />
@@ -366,18 +363,10 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
<!-- Android Notification service listener -->
<service android:name="org.chromium.chrome.browser.notifications.NotificationService"
android:exported="false"/>
@@ -990,28 +953,10 @@ by a child template that "extends" this file.
@@ -1003,20 +966,10 @@ by a child template that "extends" this file.
<service android:name="org.chromium.components.background_task_scheduler.internal.BackgroundTaskJobService"
android:exported="false"
android:permission="android.permission.BIND_JOB_SERVICE"/>
- <!-- Background Task Scheduler GCM task service -->
- <service android:name="org.chromium.components.background_task_scheduler.internal.BackgroundTaskGcmTaskService"
- android:permission="com.google.android.gms.permission.BIND_NETWORK_TASK_SERVICE"
- android:exported="true">
- <intent-filter>
- <action android:name="com.google.android.gms.gcm.ACTION_TASK_READY" />
- </intent-filter>
- </service>
-
<!-- Background Task Scheduler alarm receiver -->
<receiver android:name="org.chromium.components.background_task_scheduler.internal.BackgroundTaskBroadcastReceiver"
@@ -395,8 +384,8 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
<service android:name="org.chromium.chrome.browser.prerender.ChromePrerenderService"
android:exported="true"
tools:ignore="ExportedService" />
@@ -1237,12 +1182,6 @@ by a child template that "extends" this file.
<meta-data android:name="com.google.ar.core" android:value="optional" />
@@ -1248,12 +1201,6 @@ by a child template that "extends" this file.
{% endif %}
- <!-- Cast support -->
@@ -510,7 +499,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/PlayServicesVer
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/background_task_scheduler/ChromeBackgroundTaskFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/background_task_scheduler/ChromeBackgroundTaskFactory.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/background_task_scheduler/ChromeBackgroundTaskFactory.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/background_task_scheduler/ChromeBackgroundTaskFactory.java
@@ -15,7 +15,6 @@ import org.chromium.chrome.browser.notifications.scheduler.NotificationScheduler
@@ -14,7 +14,6 @@ import org.chromium.chrome.browser.notifications.scheduler.NotificationScheduler
import org.chromium.chrome.browser.offlinepages.OfflineBackgroundTask;
import org.chromium.chrome.browser.offlinepages.prefetch.PrefetchBackgroundTask;
import org.chromium.chrome.browser.omaha.OmahaService;
@@ -518,7 +507,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/background_task
import org.chromium.chrome.browser.webapps.WebApkUpdateTask;
import org.chromium.components.background_task_scheduler.BackgroundTask;
import org.chromium.components.background_task_scheduler.BackgroundTaskFactory;
@@ -56,8 +55,6 @@ public class ChromeBackgroundTaskFactory implements BackgroundTaskFactory {
@@ -55,8 +54,6 @@ public class ChromeBackgroundTaskFactory implements BackgroundTaskFactory {
switch (taskId) {
case TaskIds.OMAHA_JOB_ID:
return new OmahaService();
@@ -825,7 +814,7 @@ diff --git a/chrome/android/modules/chrome_feature_modules.gni b/chrome/android/
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -7331,8 +7331,6 @@ static_library("browser") {
@@ -7031,8 +7031,6 @@ static_library("browser") {
"offline_pages/offliner_helper.h",
"offline_pages/offliner_user_data.cc",
"offline_pages/offliner_user_data.h",
@@ -1102,7 +1091,7 @@ diff --git a/chrome/browser/push_messaging/push_messaging_service_factory.cc b/c
diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resources/settings/route.ts
--- a/chrome/browser/resources/settings/route.ts
+++ b/chrome/browser/resources/settings/route.ts
@@ -42,8 +42,6 @@ function addPrivacyChildRoutes(r: Partial<SettingsRoutes>) {
@@ -43,8 +43,6 @@ function addPrivacyChildRoutes(r: Partial<SettingsRoutes>) {
if (loadTimeData.getBoolean('enableSecurityKeysSubpage')) {
r.SECURITY_KEYS = r.SECURITY.createChild('/securityKeys');
@@ -1114,7 +1103,7 @@ diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resourc
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -254,8 +254,6 @@ static_library("ui") {
@@ -252,8 +252,6 @@ static_library("ui") {
"webui/flags/flags_ui.h",
"webui/flags/flags_ui_handler.cc",
"webui/flags/flags_ui_handler.h",
@@ -1134,7 +1123,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
diff --git a/chrome/browser/ui/webauthn/sheet_models.cc b/chrome/browser/ui/webauthn/sheet_models.cc
--- a/chrome/browser/ui/webauthn/sheet_models.cc
+++ b/chrome/browser/ui/webauthn/sheet_models.cc
@@ -209,12 +209,7 @@ bool AuthenticatorMechanismSelectorSheetModel::IsManageDevicesButtonVisible()
@@ -186,12 +186,7 @@ bool AuthenticatorMechanismSelectorSheetModel::IsManageDevicesButtonVisible()
const {
// If any phones are shown then also show a button that goes to the settings
// page to manage them.
@@ -1159,7 +1148,7 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrom
#include "chrome/browser/ui/webui/internals/internals_ui.h"
#include "chrome/browser/ui/webui/interstitials/interstitial_ui.h"
#include "chrome/browser/ui/webui/intro/intro_ui.h"
@@ -787,8 +786,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
@@ -789,8 +788,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
return &NewWebUI<FlagsDeprecatedUI>;
if (url.host_piece() == chrome::kChromeUIFlagsHost)
return &NewWebUI<FlagsUI>;
@@ -1171,7 +1160,7 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrom
diff --git a/chrome/browser/webauthn/authenticator_request_dialog_model.cc b/chrome/browser/webauthn/authenticator_request_dialog_model.cc
--- a/chrome/browser/webauthn/authenticator_request_dialog_model.cc
+++ b/chrome/browser/webauthn/authenticator_request_dialog_model.cc
@@ -1124,10 +1124,6 @@ void AuthenticatorRequestDialogModel::PopulateMechanisms(
@@ -1097,10 +1097,6 @@ void AuthenticatorRequestDialogModel::PopulateMechanisms(
if (cable_ui_type_) {
switch (*cable_ui_type_) {
case AuthenticatorRequestDialogModel::CableUIType::CABLE_V2_2ND_FACTOR:
@@ -1198,7 +1187,7 @@ diff --git a/chrome/browser/webauthn/cablev2_devices.cc b/chrome/browser/webauth
diff --git a/chrome/test/android/BUILD.gn b/chrome/test/android/BUILD.gn
--- a/chrome/test/android/BUILD.gn
+++ b/chrome/test/android/BUILD.gn
@@ -283,8 +283,6 @@ android_library("chrome_java_integration_test_support") {
@@ -267,8 +267,6 @@ android_library("chrome_java_integration_test_support") {
deps = [
":chrome_java_test_support_common",
@@ -1207,68 +1196,10 @@ diff --git a/chrome/test/android/BUILD.gn b/chrome/test/android/BUILD.gn
"//base:base_java",
"//base:base_java_test_support",
"//build/android:build_java",
diff --git a/components/background_task_scheduler/BUILD.gn b/components/background_task_scheduler/BUILD.gn
--- a/components/background_task_scheduler/BUILD.gn
+++ b/components/background_task_scheduler/BUILD.gn
@@ -123,11 +123,6 @@ if (is_android) {
deps = [
":background_task_scheduler_task_ids_java",
- "$google_play_services_package:google_play_services_auth_base_java",
- "$google_play_services_package:google_play_services_base_java",
- "$google_play_services_package:google_play_services_basement_java",
- "$google_play_services_package:google_play_services_gcm_java",
- "$google_play_services_package:google_play_services_tasks_java",
"internal:internal_java",
"internal:proto_java",
"//base:base_java",
diff --git a/components/background_task_scheduler/internal/BUILD.gn b/components/background_task_scheduler/internal/BUILD.gn
--- a/components/background_task_scheduler/internal/BUILD.gn
+++ b/components/background_task_scheduler/internal/BUILD.gn
@@ -11,12 +11,10 @@ if (is_android) {
android_library("internal_java") {
sources = [
"android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskBroadcastReceiver.java",
- "android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskGcmTaskService.java",
"android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskJobService.java",
"android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerAlarmManager.java",
"android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerDelegate.java",
"android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerFactoryInternal.java",
- "android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerGcmNetworkManager.java",
"android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerImpl.java",
"android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerJobService.java",
"android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerPrefs.java",
@@ -27,10 +25,6 @@ if (is_android) {
deps = [
":proto_java",
- "$google_play_services_package:google_play_services_base_java",
- "$google_play_services_package:google_play_services_basement_java",
- "$google_play_services_package:google_play_services_gcm_java",
- "$google_play_services_package:google_play_services_tasks_java",
"//base:base_java",
"//build/android:build_java",
"//components/background_task_scheduler:background_task_scheduler_task_ids_java",
diff --git a/components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerFactoryInternal.java b/components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerFactoryInternal.java
--- a/components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerFactoryInternal.java
+++ b/components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerFactoryInternal.java
@@ -21,11 +21,7 @@ public final class BackgroundTaskSchedulerFactoryInternal {
private static BackgroundTaskFactory sBackgroundTaskFactory;
static BackgroundTaskSchedulerDelegate getSchedulerDelegateForSdk(int sdkInt) {
- if (sdkInt >= Build.VERSION_CODES.M) {
- return new BackgroundTaskSchedulerJobService();
- } else {
- return new BackgroundTaskSchedulerGcmNetworkManager();
- }
+ return new BackgroundTaskSchedulerJobService();
}
/**
diff --git a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java
--- a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java
+++ b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java
@@ -2361,14 +2361,6 @@ public class ExternalNavigationHandler {
@@ -2372,14 +2372,6 @@ public class ExternalNavigationHandler {
* @return Whether the given intent is going to open an Instant App.
*/
private static boolean isIntentToInstantApp(Intent intent) {
@@ -3140,15 +3071,15 @@ diff --git a/components/webauthn/android/BUILD.gn b/components/webauthn/android/
diff --git a/components/webauthn/android/java/src/org/chromium/components/webauthn/AuthenticatorImpl.java b/components/webauthn/android/java/src/org/chromium/components/webauthn/AuthenticatorImpl.java
--- a/components/webauthn/android/java/src/org/chromium/components/webauthn/AuthenticatorImpl.java
+++ b/components/webauthn/android/java/src/org/chromium/components/webauthn/AuthenticatorImpl.java
@@ -12,7 +12,6 @@ import android.util.Pair;
import androidx.annotation.RequiresApi;
@@ -10,7 +10,6 @@ import android.os.Build;
import android.util.Pair;
import org.chromium.base.Callback;
-import org.chromium.base.PackageUtils;
import org.chromium.base.metrics.RecordHistogram;
import org.chromium.blink.mojom.Authenticator;
import org.chromium.blink.mojom.AuthenticatorStatus;
@@ -55,9 +54,6 @@ public final class AuthenticatorImpl implements Authenticator {
@@ -53,9 +52,6 @@ public final class AuthenticatorImpl implements Authenticator {
/** The payment information to be added to the "clientDataJson". */
private PaymentOptions mPayment;
@@ -3158,7 +3089,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut
private MakeCredential_Response mMakeCredentialCallback;
private GetAssertion_Response mGetAssertionCallback;
// A queue is used to store pending IsUserVerifyingPlatformAuthenticatorAvailable request
@@ -66,9 +62,6 @@ public final class AuthenticatorImpl implements Authenticator {
@@ -64,9 +60,6 @@ public final class AuthenticatorImpl implements Authenticator {
// situation does not matter because all pending requests will return the same value.
private Queue<org.chromium.mojo.bindings.Callbacks.Callback1<Boolean>>
mIsUserVerifyingPlatformAuthenticatorAvailableCallbackQueue = new LinkedList<>();
@@ -3168,7 +3099,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut
/**
* Builds the Authenticator service implementation.
@@ -93,20 +86,6 @@ public final class AuthenticatorImpl implements Authenticator {
@@ -91,20 +84,6 @@ public final class AuthenticatorImpl implements Authenticator {
mRenderFrameHost = renderFrameHost;
mSupportLevel = supportLevel;
mOrigin = mRenderFrameHost.getLastCommittedOrigin();
@@ -3189,7 +3120,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut
}
/**
@@ -136,17 +115,9 @@ public final class AuthenticatorImpl implements Authenticator {
@@ -134,17 +113,9 @@ public final class AuthenticatorImpl implements Authenticator {
mMakeCredentialCallback = callback;
mIsOperationPending = true;
@@ -3209,7 +3140,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut
}
@Override
@@ -160,15 +131,8 @@ public final class AuthenticatorImpl implements Authenticator {
@@ -158,15 +129,8 @@ public final class AuthenticatorImpl implements Authenticator {
mGetAssertionCallback = callback;
mIsOperationPending = true;
@@ -3227,7 +3158,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut
}
@Override
@@ -181,15 +145,8 @@ public final class AuthenticatorImpl implements Authenticator {
@@ -178,15 +142,8 @@ public final class AuthenticatorImpl implements Authenticator {
callback.call(isUvpaa);
};
@@ -3245,7 +3176,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut
}
/**
@@ -198,7 +155,7 @@ public final class AuthenticatorImpl implements Authenticator {
@@ -195,7 +152,7 @@ public final class AuthenticatorImpl implements Authenticator {
* version.
*/
public boolean isGetMatchingCredentialIdsSupported() {
@@ -3254,7 +3185,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut
}
/**
@@ -212,34 +169,13 @@ public final class AuthenticatorImpl implements Authenticator {
@@ -209,34 +166,13 @@ public final class AuthenticatorImpl implements Authenticator {
*/
public void getMatchingCredentialIds(String relyingPartyId, byte[][] credentialIds,
boolean requireThirdPartyPayment, GetMatchingCredentialIdsResponseCallback callback) {
@@ -3291,7 +3222,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut
}
@Override
@@ -251,8 +187,6 @@ public final class AuthenticatorImpl implements Authenticator {
@@ -248,8 +184,6 @@ public final class AuthenticatorImpl implements Authenticator {
if (!mIsOperationPending || mGetAssertionCallback == null) {
return;
}
@@ -3300,7 +3231,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut
}
/**
@@ -302,7 +236,6 @@ public final class AuthenticatorImpl implements Authenticator {
@@ -299,7 +233,6 @@ public final class AuthenticatorImpl implements Authenticator {
mIsOperationPending = false;
mMakeCredentialCallback = null;
mGetAssertionCallback = null;
@@ -3361,7 +3292,7 @@ diff --git a/content/browser/push_messaging/push_messaging_manager.cc b/content/
diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn
--- a/content/public/android/BUILD.gn
+++ b/content/public/android/BUILD.gn
@@ -137,10 +137,6 @@ android_library("content_main_dex_java") {
@@ -132,10 +132,6 @@ android_library("content_main_dex_java") {
android_library("content_full_java") {
deps = [
":content_main_dex_java",
@@ -3371,11 +3302,11 @@ diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn
- "$google_play_services_package:google_play_services_tasks_java",
"//base:base_java",
"//base:jni_java",
"//build:chromeos_buildflags",
"//base:process_launcher_java",
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -3174,10 +3174,6 @@ if (is_android) {
@@ -3193,10 +3193,6 @@ if (is_android) {
testonly = true
sources = content_java_sources_needing_jni
deps = [
@@ -3389,7 +3320,7 @@ diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
diff --git a/device/BUILD.gn b/device/BUILD.gn
--- a/device/BUILD.gn
+++ b/device/BUILD.gn
@@ -473,9 +473,6 @@ if (is_android) {
@@ -474,9 +474,6 @@ if (is_android) {
"gamepad/android/junit/src/org/chromium/device/gamepad/GamepadMappingsTest.java",
]
deps = [
@@ -3411,15 +3342,15 @@ diff --git a/device/fido/features.cc b/device/fido/features.cc
+ "WebAuthenticationPasskeysUI", // disabled by default
+ base::FEATURE_DISABLED_BY_DEFAULT); // in Bromite
-BASE_FEATURE(kWebAuthnNewDiscoverableCredentialsUi,
- "WebAuthenticationNewDiscoverableCredentialsUi",
-BASE_FEATURE(kWebAuthnNoEmptyDisplayNameCBOR,
- "WebAuthenticationNoEmptyDisplayNameCBOR",
- base::FEATURE_ENABLED_BY_DEFAULT);
+BASE_FEATURE(kWebAuthnNewDiscoverableCredentialsUi, // disabled by default
+ "WebAuthenticationNewDiscoverableCredentialsUi", // in Bromite
+BASE_FEATURE(kWebAuthnNoEmptyDisplayNameCBOR, // disabled by default
+ "WebAuthenticationNoEmptyDisplayNameCBOR", // in Bromite
+ base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kWebAuthnNoEmptyDisplayNameCBOR,
"WebAuthenticationNoEmptyDisplayNameCBOR",
BASE_FEATURE(kWebAuthnNonDiscoverableMakeCredentialQRFlag,
"WebAuthenticationNonDiscoverableMakeCredentialQRFlag",
diff --git a/remoting/android/client_java_tmpl.gni b/remoting/android/client_java_tmpl.gni
--- a/remoting/android/client_java_tmpl.gni
+++ b/remoting/android/client_java_tmpl.gni
@@ -3436,7 +3367,7 @@ diff --git a/remoting/android/client_java_tmpl.gni b/remoting/android/client_jav
diff --git a/services/BUILD.gn b/services/BUILD.gn
--- a/services/BUILD.gn
+++ b/services/BUILD.gn
@@ -121,11 +121,6 @@ if (is_android) {
@@ -117,11 +117,6 @@ if (is_android) {
"shape_detection/android/junit/src/org/chromium/shape_detection/BitmapUtilsTest.java",
]
deps = [
@@ -3448,7 +3379,7 @@ diff --git a/services/BUILD.gn b/services/BUILD.gn
"//base:base_java",
"//base:base_java_test_support",
"//base:base_junit_test_support",
@@ -153,10 +148,6 @@ if (is_android) {
@@ -149,10 +144,6 @@ if (is_android) {
"shape_detection/android/javatests/src/org/chromium/shape_detection/TextDetectionImplTest.java",
]
deps = [
@@ -3497,7 +3428,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
}
robolectric_library("chromium_play_services_availability_shadows_java") {
@@ -967,210 +967,6 @@ if (!limit_android_deps) {
@@ -964,210 +964,6 @@ if (!limit_android_deps) {
]
}
@@ -3708,7 +3639,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
android_aar_prebuilt("com_google_android_material_material_java") {
aar_path =
@@ -1216,60 +1012,6 @@ if (!limit_android_deps) {
@@ -1213,60 +1009,6 @@ if (!limit_android_deps) {
]
}
@@ -3769,7 +3700,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
java_prebuilt("com_google_guava_guava_android_java") {
jar_path = "libs/com_google_guava_guava_android/guava-31.1-android.jar"
@@ -1514,19 +1256,6 @@ if (!limit_android_deps) {
@@ -1519,19 +1261,6 @@ if (!limit_android_deps) {
is_robolectric = true
}
@@ -3789,7 +3720,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
java_prebuilt("org_robolectric_utils_java") {
jar_path = "libs/org_robolectric_utils/utils-4.8.1.jar"
@@ -1887,272 +1616,6 @@ if (!limit_android_deps) {
@@ -1892,272 +1621,6 @@ if (!limit_android_deps) {
deps = [ "//third_party/androidx:androidx_annotation_annotation_java" ]
}
build/patches/Remove-contextual-search-manager.patch
+85 -85
View File
@@ -16,7 +16,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
...ontextual_search_related_searches_view.xml | 23 -----
.../layout/contextual_search_term_view.xml | 21 -----
.../res/xml/contextual_search_preferences.xml | 27 ------
.../res/xml/google_services_preferences.xml | 4 -
.../res/xml/google_services_preferences.xml | 8 --
.../java/res/xml/privacy_preferences.xml | 4 -
.../chrome/browser/ChromeTabbedActivity.java | 4 +-
.../chrome/browser/app/ChromeActivity.java | 50 +----------
@@ -32,8 +32,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../tabbed_mode/TabbedRootUiCoordinator.java | 5 +-
.../chrome/browser/ui/RootUiCoordinator.java | 39 +-------
chrome/browser/BUILD.gn | 17 ----
chrome/browser/about_flags.cc | 36 --------
.../flags/android/chrome_feature_list.cc | 28 ------
chrome/browser/about_flags.cc | 33 -------
.../flags/android/chrome_feature_list.cc | 27 ------
.../flags/android/chrome_feature_list.h | 5 --
...nfiguration_policy_handler_list_factory.cc | 6 +-
.../strings/android_chrome_strings.grd | 59 -------------
@@ -53,7 +53,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -724,7 +724,6 @@ if (current_toolchain == default_toolchain) {
@@ -709,7 +709,6 @@ if (current_toolchain == default_toolchain) {
"//chrome/browser/ui:duplicate_download_enums_java",
"//components/browsing_data/core:browsing_data_utils_java",
"//components/browsing_data/core:clear_browsing_data_tab_java",
@@ -61,7 +61,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//components/dom_distiller/core:distiller_type_java",
"//components/ntp_tiles:ntp_tiles_enums_java",
"//components/offline_pages/core:offline_page_model_enums_java",
@@ -3974,16 +3973,12 @@ generate_jni("chrome_jni_headers") {
@@ -3757,16 +3756,12 @@ generate_jni("chrome_jni_headers") {
"java/src/org/chromium/chrome/browser/compositor/LayerTitleCache.java",
"java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java",
"java/src/org/chromium/chrome/browser/compositor/layouts/content/TabContentManager.java",
@@ -81,7 +81,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni
--- a/chrome/android/chrome_java_resources.gni
+++ b/chrome/android/chrome_java_resources.gni
@@ -493,13 +493,6 @@ chrome_java_resources = [
@@ -485,13 +485,6 @@ chrome_java_resources = [
"java/res/layout/context_menu_header.xml",
"java/res/layout/context_menu_row.xml",
"java/res/layout/context_menu_share_row.xml",
@@ -95,7 +95,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja
"java/res/layout/custom_tabs_bottombar.xml",
"java/res/layout/custom_tabs_bottombar_item.xml",
"java/res/layout/custom_tabs_control_container.xml",
@@ -653,7 +646,6 @@ chrome_java_resources = [
@@ -635,7 +628,6 @@ chrome_java_resources = [
"java/res/xml/autofill_assistant_preferences.xml",
"java/res/xml/bookmark_widget_info.xml",
"java/res/xml/clear_browsing_data_preferences_tab.xml",
@@ -106,7 +106,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
--- a/chrome/android/chrome_java_sources.gni
+++ b/chrome/android/chrome_java_sources.gni
@@ -299,21 +299,6 @@ chrome_java_sources = [
@@ -301,21 +301,6 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelManager.java",
"java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelRepaddingTextView.java",
"java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelTextViewInflater.java",
@@ -127,8 +127,8 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
- "java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/RelatedSearchesControl.java",
"java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabCoordinator.java",
"java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabMediator.java",
"java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabSheetContent.java",
@@ -354,7 +339,6 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabObserver.java",
@@ -357,7 +342,6 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/compositor/overlays/strip/TabLoadTracker.java",
"java/src/org/chromium/chrome/browser/compositor/resources/StaticResourcePreloads.java",
"java/src/org/chromium/chrome/browser/compositor/resources/SystemResourcePreloads.java",
@@ -136,7 +136,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
"java/src/org/chromium/chrome/browser/compositor/scene_layer/StaticTabSceneLayer.java",
"java/src/org/chromium/chrome/browser/compositor/scene_layer/TabListSceneLayer.java",
"java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java",
@@ -380,34 +364,6 @@ chrome_java_sources = [
@@ -383,34 +367,6 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/contextmenu/ContextMenuUi.java",
"java/src/org/chromium/chrome/browser/contextmenu/ContextMenuUtils.java",
"java/src/org/chromium/chrome/browser/contextmenu/LensChipDelegate.java",
@@ -182,9 +182,9 @@ diff --git a/chrome/android/features/keyboard_accessory/internal/java/src/org/ch
import org.chromium.chrome.browser.flags.ChromeFeatureList;
import org.chromium.chrome.browser.fullscreen.FullscreenManager;
import org.chromium.chrome.browser.fullscreen.FullscreenOptions;
@@ -539,14 +538,6 @@ class ManualFillingMediator
// When in VR mode, don't extend the keyboard
if (VrModuleProvider.getDelegate().isInVr()) return false;
@@ -535,14 +534,6 @@ class ManualFillingMediator
private boolean canExtendKeyboard() {
if (!mModel.get(SHOW_WHEN_VISIBLE)) return false;
- // Don't open the accessory inside the contextual search panel.
- ObservableSupplier<ContextualSearchManager> contextualSearchSupplier =
@@ -473,11 +473,15 @@ deleted file mode 100644
diff --git a/chrome/android/java/res/xml/google_services_preferences.xml b/chrome/android/java/res/xml/google_services_preferences.xml
--- a/chrome/android/java/res/xml/google_services_preferences.xml
+++ b/chrome/android/java/res/xml/google_services_preferences.xml
@@ -43,8 +43,4 @@ found in the LICENSE file.
@@ -43,12 +43,4 @@ found in the LICENSE file.
android:summary="@string/prefs_autofill_assistant_summary"
android:fragment="org.chromium.chrome.browser.autofill_assistant.AutofillAssistantPreferenceFragment"
app:isPreferenceVisible="false"/>
- <org.chromium.components.browser_ui.settings.ChromeBasePreference
- android:key="usage_stats_reporting"
- android:title="@string/usage_stats_setting_title"
- app:isPreferenceVisible="false" />
- <org.chromium.components.browser_ui.settings.ChromeBasePreference
- android:key="contextual_search"
- android:title="@string/contextual_search_title"
- android:fragment="org.chromium.chrome.browser.contextualsearch.ContextualSearchPreferenceFragment"/>
@@ -499,7 +503,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
@@ -1734,7 +1734,7 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
@@ -1715,7 +1715,7 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
return new TabbedRootUiCoordinator(this, this::onOmniboxFocusChanged,
getShareDelegateSupplier(), getActivityTabProvider(), mTabModelProfileSupplier,
mBookmarkModelSupplier, mTabBookmarkerSupplier,
@@ -508,7 +512,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
mStartSurfaceSupplier, mTabSwitcherSupplier, mIntentMetadataOneshotSupplier,
mLayoutStateProviderSupplier, mStartSurfaceParentTabSupplier,
getBrowserControlsManager(), getWindowAndroid(), mJankTracker,
@@ -2844,7 +2844,7 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
@@ -2825,7 +2825,7 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
// TODO(crbug.com/1157310): Transition this::method refs to dedicated suppliers.
mTabModalHandler = new TabModalLifetimeHandler(this, getLifecycleDispatcher(), manager,
this::getAppBrowserControlsVisibilityDelegate, this::getTabObscuringHandler,
@@ -530,7 +534,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
import org.chromium.chrome.browser.dependency_injection.ChromeActivityCommonsModule;
import org.chromium.chrome.browser.dependency_injection.ChromeActivityComponent;
import org.chromium.chrome.browser.dependency_injection.ModuleFactoryOverrides;
@@ -256,7 +253,7 @@ import java.util.function.Consumer;
@@ -255,7 +252,7 @@ import java.util.function.Consumer;
*/
public abstract class ChromeActivity<C extends ChromeActivityComponent>
extends AsyncInitializationActivity
@@ -539,7 +543,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
SnackbarManageable, SceneChangeObserver,
StatusBarColorController.StatusBarColorProvider, AppMenuDelegate, AppMenuBlocker,
MenuOrKeyboardActionController, CompositorViewHolder.Initializer,
@@ -323,8 +320,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
@@ -322,8 +319,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
new ObservableSupplierImpl<>();
protected final UnownedUserDataSupplier<InsetObserverView> mInsetObserverViewSupplier =
new InsetObserverViewSupplier();
@@ -548,7 +552,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
private SnackbarManager mSnackbarManager;
@@ -515,7 +510,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
@@ -512,7 +507,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
// clang-format off
return new RootUiCoordinator(this, null, getShareDelegateSupplier(),
getActivityTabProvider(), mTabModelProfileSupplier, mBookmarkModelSupplier,
@@ -557,7 +561,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
getTabModelSelectorSupplier(), new OneshotSupplierImpl<>(),
new OneshotSupplierImpl<>(), new OneshotSupplierImpl<>(),
new OneshotSupplierImpl<>(), () -> null, mBrowserControlsManagerSupplier.get(),
@@ -955,14 +950,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
@@ -949,14 +944,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
mCompositorViewHolderSupplier.get().onNativeLibraryReady(
getWindowAndroid(), getTabContentManager(), getPrefService());
@@ -572,7 +576,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
TraceEvent.end("ChromeActivity:CompositorInitialization");
}
@@ -1439,11 +1426,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
@@ -1417,11 +1404,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
@SuppressLint("NewApi")
@Override
protected final void onDestroy() {
@@ -584,7 +588,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
if (mSnackbarManager != null) {
SnackbarManagerProvider.detach(mSnackbarManager);
}
@@ -1945,13 +1927,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
@@ -1919,13 +1901,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
return mCompositorViewHolderSupplier.get();
}
@@ -598,7 +602,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
/**
* Exits the fullscreen mode, if any. Does nothing if no fullscreen is present.
* @return Whether the fullscreen mode is currently showing.
@@ -1997,15 +1972,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
@@ -1971,15 +1946,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
}
mActivityTabProvider.setLayoutStateProvider(layoutManager);
@@ -614,7 +618,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
}
/**
@@ -2283,18 +2249,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
@@ -2249,18 +2215,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
return webContents != null ? SelectionPopupController.fromWebContents(webContents) : null;
}
@@ -668,7 +672,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java
@@ -155,7 +155,7 @@ public abstract class BaseCustomTabActivity extends ChromeActivity<BaseCustomTab
@@ -156,7 +156,7 @@ public abstract class BaseCustomTabActivity extends ChromeActivity<BaseCustomTab
mBaseCustomTabRootUiCoordinator = new BaseCustomTabRootUiCoordinator(this,
getShareDelegateSupplier(), getActivityTabProvider(), mTabModelProfileSupplier,
mBookmarkModelSupplier, mTabBookmarkerSupplier,
@@ -688,7 +692,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Base
import org.chromium.chrome.browser.crash.ChromePureJavaExceptionReporter;
import org.chromium.chrome.browser.customtabs.content.CustomTabActivityNavigationController;
import org.chromium.chrome.browser.customtabs.content.CustomTabActivityTabController;
@@ -94,7 +93,6 @@ public class BaseCustomTabRootUiCoordinator extends RootUiCoordinator {
@@ -101,7 +100,6 @@ public class BaseCustomTabRootUiCoordinator extends RootUiCoordinator {
* @param profileSupplier Supplier of the currently applicable profile.
* @param bookmarkModelSupplier Supplier of the bookmark bridge for the current profile.
* @param tabBookmarkerSupplier Supplier of {@link TabBookmarker} for bookmarking a given tab.
@@ -696,7 +700,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Base
* @param tabModelSelectorSupplier Supplies the {@link TabModelSelector}.
* @param browserControlsManager Manages the browser controls.
* @param windowAndroid The current {@link WindowAndroid}.
@@ -128,7 +126,7 @@ public class BaseCustomTabRootUiCoordinator extends RootUiCoordinator {
@@ -135,7 +133,7 @@ public class BaseCustomTabRootUiCoordinator extends RootUiCoordinator {
@NonNull ObservableSupplier<Profile> profileSupplier,
@NonNull ObservableSupplier<BookmarkModel> bookmarkModelSupplier,
@NonNull ObservableSupplier<TabBookmarker> tabBookmarkerSupplier,
@@ -705,7 +709,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Base
@NonNull ObservableSupplier<TabModelSelector> tabModelSelectorSupplier,
@NonNull BrowserControlsManager browserControlsManager,
@NonNull ActivityWindowAndroid windowAndroid,
@@ -159,7 +157,7 @@ public class BaseCustomTabRootUiCoordinator extends RootUiCoordinator {
@@ -166,7 +164,7 @@ public class BaseCustomTabRootUiCoordinator extends RootUiCoordinator {
// clang-format off
super(activity, null, shareDelegateSupplier, tabProvider,
profileSupplier, bookmarkModelSupplier, tabBookmarkerSupplier,
@@ -714,8 +718,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Base
new OneshotSupplierImpl<>(), new OneshotSupplierImpl<>(),
new OneshotSupplierImpl<>(), new OneshotSupplierImpl<>(), () -> null,
browserControlsManager, windowAndroid, new DummyJankTracker(),
@@ -212,16 +210,6 @@ public class BaseCustomTabRootUiCoordinator extends RootUiCoordinator {
((PartialCustomTabHeightStrategy) mCustomTabHeightStrategy)::onShowSoftInput;
@@ -226,16 +224,6 @@ public class BaseCustomTabRootUiCoordinator extends RootUiCoordinator {
mTabController.get().registerTabObserver(
new PartialCustomTabTabObserver(softInputCallback));
- mTabController.get().registerTabObserver(new EmptyTabObserver() {
@@ -898,15 +902,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabHelpers.
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
@@ -37,7 +37,6 @@ import org.chromium.chrome.browser.compositor.CompositorViewHolder;
@@ -38,7 +38,6 @@ import org.chromium.chrome.browser.compositor.CompositorViewHolder;
import org.chromium.chrome.browser.compositor.bottombar.ephemeraltab.EphemeralTabCoordinator;
import org.chromium.chrome.browser.compositor.layouts.LayoutManagerImpl;
import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;
-import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager;
import org.chromium.chrome.browser.desktop_site.DesktopSiteSettingsIPHController;
import org.chromium.chrome.browser.feature_guide.notifications.FeatureNotificationUtils;
import org.chromium.chrome.browser.feature_guide.notifications.FeatureType;
import org.chromium.chrome.browser.feed.webfeed.WebFeedFollowIntroController;
@@ -264,7 +263,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
@@ -268,7 +267,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
@NonNull ObservableSupplier<Profile> profileSupplier,
@NonNull ObservableSupplier<BookmarkModel> bookmarkModelSupplier,
@NonNull ObservableSupplier<TabBookmarker> tabBookmarkerSupplier,
@@ -915,7 +919,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
@NonNull ObservableSupplier<TabModelSelector> tabModelSelectorSupplier,
@NonNull OneshotSupplier<StartSurface> startSurfaceSupplier,
@NonNull OneshotSupplier<TabSwitcher> tabSwitcherSupplier,
@@ -299,7 +298,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
@@ -303,7 +302,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
boolean initializeUiWithIncognitoColors, @NonNull BackPressManager backPressManager) {
super(activity, onOmniboxFocusChangedListener, shareDelegateSupplier, tabProvider,
profileSupplier, bookmarkModelSupplier, tabBookmarkerSupplier,
@@ -927,7 +931,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
@@ -53,7 +53,6 @@ import org.chromium.chrome.browser.compositor.bottombar.OverlayPanelManager;
@@ -51,7 +51,6 @@ import org.chromium.chrome.browser.compositor.bottombar.OverlayPanelManager;
import org.chromium.chrome.browser.compositor.bottombar.ephemeraltab.EphemeralTabCoordinator;
import org.chromium.chrome.browser.compositor.layouts.LayoutManagerImpl;
import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;
@@ -935,7 +939,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
import org.chromium.chrome.browser.crash.ChromePureJavaExceptionReporter;
import org.chromium.chrome.browser.directactions.DirectActionInitializer;
import org.chromium.chrome.browser.dom_distiller.ReaderModeToolbarButtonController;
@@ -97,7 +96,6 @@ import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
@@ -95,7 +94,6 @@ import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
import org.chromium.chrome.browser.price_tracking.PriceTrackingButtonController;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
@@ -943,7 +947,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
import org.chromium.chrome.browser.share.ShareButtonController;
import org.chromium.chrome.browser.share.ShareDelegate;
@@ -244,7 +242,6 @@ public class RootUiCoordinator
@@ -237,7 +235,6 @@ public class RootUiCoordinator
private List<ButtonDataProvider> mButtonDataProviders;
@Nullable
private AdaptiveToolbarButtonController mAdaptiveToolbarButtonController;
@@ -951,7 +955,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
private IdentityDiscController mIdentityDiscController;
private ChromeActionModeHandler mChromeActionModeHandler;
private final ToolbarActionModeCallback mActionModeControllerCallback;
@@ -257,7 +254,6 @@ public class RootUiCoordinator
@@ -250,7 +247,6 @@ public class RootUiCoordinator
private final ObservableSupplier<TabBookmarker> mTabBookmarkerSupplier;
private final OneshotSupplierImpl<AppMenuCoordinator> mAppMenuSupplier;
private BottomSheetObserver mBottomSheetObserver;
@@ -959,7 +963,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
protected final CallbackController mCallbackController;
protected final BrowserControlsManager mBrowserControlsManager;
private BrowserControlsStateProvider.Observer mBrowserControlsObserver;
@@ -362,7 +358,7 @@ public class RootUiCoordinator
@@ -355,7 +351,7 @@ public class RootUiCoordinator
@NonNull ObservableSupplier<Profile> profileSupplier,
@NonNull ObservableSupplier<BookmarkModel> bookmarkModelSupplier,
@NonNull ObservableSupplier<TabBookmarker> tabBookmarkerSupplier,
@@ -968,7 +972,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
@NonNull ObservableSupplier<TabModelSelector> tabModelSelectorSupplier,
@NonNull OneshotSupplier<StartSurface> startSurfaceSupplier,
@NonNull OneshotSupplier<TabSwitcher> tabSwitcherSupplier,
@@ -455,7 +451,6 @@ public class RootUiCoordinator
@@ -448,7 +444,6 @@ public class RootUiCoordinator
mBookmarkModelSupplier = bookmarkModelSupplier;
mTabBookmarkerSupplier = tabBookmarkerSupplier;
mAppMenuSupplier = new OneshotSupplierImpl<>();
@@ -976,7 +980,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
mActionModeControllerCallback = new ToolbarActionModeCallback();
mTabModelSelectorSupplier = tabModelSelectorSupplier;
@@ -559,11 +554,6 @@ public class RootUiCoordinator
@@ -552,11 +547,6 @@ public class RootUiCoordinator
mToolbarManager = null;
}
@@ -988,7 +992,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
if (mAdaptiveToolbarButtonController != null) {
mAdaptiveToolbarButtonController.destroy();
mAdaptiveToolbarButtonController = null;
@@ -995,15 +985,6 @@ public class RootUiCoordinator
@@ -968,15 +958,6 @@ public class RootUiCoordinator
@Override
public boolean canShowAppMenu() {
@@ -1004,7 +1008,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
// Do not show the menu if we are in find in page view.
if (mFindToolbarManager != null && mFindToolbarManager.isShowing()
&& !DeviceFormFactor.isNonMultiDisplayContextOnTablet(mActivity)) {
@@ -1158,11 +1139,6 @@ public class RootUiCoordinator
@@ -1131,11 +1112,6 @@ public class RootUiCoordinator
AdaptiveToolbarButtonVariant.PRICE_TRACKING, priceTrackingButtonController);
adaptiveToolbarButtonController.addButtonVariant(
AdaptiveToolbarButtonVariant.READER_MODE, readerModeToolbarButtonController);
@@ -1016,7 +1020,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
mButtonDataProviders =
Arrays.asList(mIdentityDiscController, adaptiveToolbarButtonController);
@@ -1232,10 +1208,6 @@ public class RootUiCoordinator
@@ -1204,10 +1180,6 @@ public class RootUiCoordinator
public void onStartedShowing(int layoutType, boolean showToolbar) {
if (layoutType != LayoutType.BROWSING
&& layoutType != LayoutType.SIMPLE_ANIMATION) {
@@ -1027,7 +1031,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
}
if (layoutType == LayoutType.TAB_SWITCHER) {
@@ -1356,10 +1328,6 @@ public class RootUiCoordinator
@@ -1328,10 +1300,6 @@ public class RootUiCoordinator
* cross-feature interaction, e.g. hide other features when this feature is shown.
*/
protected void onFindToolbarShown() {
@@ -1038,7 +1042,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
}
/**
@@ -1516,9 +1484,6 @@ public class RootUiCoordinator
@@ -1488,9 +1456,6 @@ public class RootUiCoordinator
case SheetState.FULL:
if (!mOpened) {
mOpened = true;
@@ -1048,7 +1052,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
}
// On visible bottom sheet, hide page zoom dialog
@@ -1526,8 +1491,6 @@ public class RootUiCoordinator
@@ -1498,8 +1463,6 @@ public class RootUiCoordinator
break;
case SheetState.HIDDEN:
mOpened = false;
@@ -1060,7 +1064,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2073,7 +2073,6 @@ static_library("browser") {
@@ -2080,7 +2080,6 @@ static_library("browser") {
"//components/content_settings/common:mojom",
"//components/content_settings/core/browser",
"//components/content_settings/core/common",
@@ -1068,7 +1072,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"//components/cookie_config",
"//components/country_codes",
"//components/crash/core/browser",
@@ -2552,8 +2551,6 @@ static_library("browser") {
@@ -2561,8 +2560,6 @@ static_library("browser") {
"android/compositor/decoration_title.h",
"android/compositor/layer/content_layer.cc",
"android/compositor/layer/content_layer.h",
@@ -1077,7 +1081,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"android/compositor/layer/layer.h",
"android/compositor/layer/overlay_panel_layer.cc",
"android/compositor/layer/overlay_panel_layer.h",
@@ -2574,8 +2571,6 @@ static_library("browser") {
@@ -2583,8 +2580,6 @@ static_library("browser") {
"android/compositor/resources/resource_factory.cc",
"android/compositor/resources/toolbar_resource.cc",
"android/compositor/resources/toolbar_resource.h",
@@ -1086,7 +1090,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"android/compositor/scene_layer/overscroll_scene_layer.cc",
"android/compositor/scene_layer/overscroll_scene_layer.h",
"android/compositor/scene_layer/scrolling_bottom_view_scene_layer.cc",
@@ -2598,16 +2593,6 @@ static_library("browser") {
@@ -2607,16 +2602,6 @@ static_library("browser") {
"android/content/content_utils.cc",
"android/context_menu/context_menu_native_delegate_impl.cc",
"android/context_menu/context_menu_native_delegate_impl.h",
@@ -1103,7 +1107,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"android/cookies/cookies_fetcher_util.cc",
"android/customtabs/chrome_origin_verifier.cc",
"android/customtabs/chrome_origin_verifier.h",
@@ -3167,8 +3152,6 @@ static_library("browser") {
@@ -3170,8 +3155,6 @@ static_library("browser") {
"safe_browsing/android/safe_browsing_referring_app_bridge_android.h",
"safe_browsing/android/safe_browsing_settings_launcher_android.cc",
"safe_browsing/android/safe_browsing_settings_launcher_android.h",
@@ -1115,9 +1119,9 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1956,27 +1956,6 @@ const FeatureEntry::FeatureVariation kRelatedSearchesInBarVariations[] = {
kRelatedSearchesInBarShowDefaultChipWith120SpEllipsis,
std::size(kRelatedSearchesInBarShowDefaultChipWith120SpEllipsis), nullptr},
@@ -1913,27 +1913,6 @@ const FeatureEntry::FeatureVariation kRelatedSearchesUiVariations[] = {
{"verbose", &kRelatedSearchesUiVerbose, 1, nullptr},
{"extreme", &kRelatedSearchesUiExtreme, 1, nullptr},
};
-
-const FeatureEntry::FeatureParam kContextualSearchSuppressShortViewWith300Dp[] =
@@ -1143,13 +1147,10 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
#endif // BUILDFLAG(IS_ANDROID)
const FeatureEntry::FeatureParam kResamplingInputEventsLSQEnabled[] = {
@@ -3427,21 +3406,6 @@ const FeatureEntry kFeatureEntries[] = {
@@ -3322,18 +3301,6 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kEnableOskResizesVisualViewportByDefaultDescription,
kOsAndroid,
FEATURE_VALUE_TYPE(blink::features::kOSKResizesVisualViewportByDefault)},
- {"contextual-search-debug", flag_descriptions::kContextualSearchDebugName,
- flag_descriptions::kContextualSearchDebugDescription, kOsAndroid,
- FEATURE_VALUE_TYPE(kContextualSearchDebug)},
- {"contextual-search-force-caption",
- flag_descriptions::kContextualSearchForceCaptionName,
- flag_descriptions::kContextualSearchForceCaptionDescription, kOsAndroid,
@@ -1162,34 +1163,33 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
- chrome::android::kContextualSearchSuppressShortView,
- kContextualSearchSuppressShortViewVariations,
- "ContextualSearchSuppressShortView")},
{"explore-sites", flag_descriptions::kExploreSitesName,
flag_descriptions::kExploreSitesDescription, kOsAndroid,
FEATURE_WITH_PARAMS_VALUE_TYPE(chrome::android::kExploreSites,
{"related-searches", flag_descriptions::kRelatedSearchesName,
flag_descriptions::kRelatedSearchesDescription, kOsAndroid,
FEATURE_WITH_PARAMS_VALUE_TYPE(chrome::android::kRelatedSearches,
diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
--- a/chrome/browser/flags/android/chrome_feature_list.cc
+++ b/chrome/browser/flags/android/chrome_feature_list.cc
@@ -36,7 +36,6 @@
@@ -34,7 +34,6 @@
#include "components/commerce/core/commerce_feature_list.h"
#include "components/content_creation/notes/core/note_features.h"
#include "components/content_creation/reactions/core/reactions_features.h"
#include "components/content_settings/core/common/features.h"
-#include "components/contextual_search/core/browser/contextual_search_field_trial.h"
#include "components/download/public/common/download_features.h"
#include "components/embedder_support/android/util/cdn_utils.h"
#include "components/feature_engagement/public/feature_list.h"
@@ -230,12 +229,6 @@ const base::Feature* const kFeaturesExposedToJava[] = {
@@ -218,11 +217,6 @@ const base::Feature* const kFeaturesExposedToJava[] = {
&kContextMenuSearchAndShopWithGoogleLens,
&kContextMenuTranslateWithGoogleLens,
&kContextMenuPopupForAllScreenSizes,
- &kContextualSearchDebug,
- &kContextualSearchDelayedIntelligence,
- &kContextualSearchDisableOnlineDetection,
- &kContextualSearchForceCaption,
- &kContextualSearchSuppressShortView,
- &kContextualSearchThinWebViewImplementation,
&kDeferKeepScreenOnDuringGesture,
&kDirectActions,
&kDuetTabStripIntegrationAndroid,
@@ -707,26 +700,6 @@ BASE_FEATURE(kLensOnQuickActionSearchWidget,
&kExperimentsForAgsa,
&kExploreSites,
@@ -675,26 +669,6 @@ BASE_FEATURE(kLensOnQuickActionSearchWidget,
"LensOnQuickActionSearchWidget",
base::FEATURE_ENABLED_BY_DEFAULT);
@@ -1216,18 +1216,18 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
BASE_FEATURE(kDeferKeepScreenOnDuringGesture,
"DeferKeepScreenOnDuringGesture",
base::FEATURE_DISABLED_BY_DEFAULT);
@@ -740,7 +713,6 @@ BASE_FEATURE(kDownloadAutoResumptionThrottling,
@@ -706,7 +680,6 @@ BASE_FEATURE(kDownloadAutoResumptionThrottling,
BASE_FEATURE(kDownloadHomeForExternalApp,
"DownloadHomeForExternalApp",
base::FEATURE_ENABLED_BY_DEFAULT);
-
BASE_FEATURE(kDuetTabStripIntegrationAndroid,
"DuetTabStripIntegrationAndroid",
base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kExperimentsForAgsa,
"ExperimentsForAgsa",
base::FEATURE_ENABLED_BY_DEFAULT);
diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h
--- a/chrome/browser/flags/android/chrome_feature_list.h
+++ b/chrome/browser/flags/android/chrome_feature_list.h
@@ -77,11 +77,6 @@ BASE_DECLARE_FEATURE(kContextMenuSearchWithGoogleLens);
@@ -76,11 +76,6 @@ BASE_DECLARE_FEATURE(kContextMenuSearchWithGoogleLens);
BASE_DECLARE_FEATURE(kContextMenuShopWithGoogleLens);
BASE_DECLARE_FEATURE(kContextMenuSearchAndShopWithGoogleLens);
BASE_DECLARE_FEATURE(kContextMenuTranslateWithGoogleLens);
@@ -1237,12 +1237,12 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser
-BASE_DECLARE_FEATURE(kContextualSearchSuppressShortView);
-BASE_DECLARE_FEATURE(kContextualSearchThinWebViewImplementation);
BASE_DECLARE_FEATURE(kDeferKeepScreenOnDuringGesture);
BASE_DECLARE_FEATURE(kDirectActions);
BASE_DECLARE_FEATURE(kDontPrefetchLibraries);
BASE_DECLARE_FEATURE(kDownloadAutoResumptionThrottling);
diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -122,7 +122,6 @@
@@ -123,7 +123,6 @@
#if BUILDFLAG(IS_ANDROID)
#include "chrome/browser/first_run/android/first_run_prefs.h"
#include "chrome/browser/lens/android/lens_prefs.h"
@@ -1250,14 +1250,14 @@ diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
#else // BUILDFLAG(IS_ANDROID)
#include "chrome/browser/download/default_download_dir_policy_handler.h"
#include "chrome/browser/download/download_auto_open_policy_handler.h"
@@ -1895,10 +1894,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildHandlerList(
@@ -1911,10 +1910,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildHandlerList(
std::make_unique<URLBlocklistPolicyHandler>(key::kURLBlocklist));
// Policies for all platforms - End
-#if BUILDFLAG(IS_ANDROID)
- handlers->AddHandler(
- std::make_unique<ContextualSearchPolicyHandlerAndroid>());
-#else
-#else // !BUILDFLAG(IS_ANDROID)
+#if !BUILDFLAG(IS_ANDROID)
handlers->AddHandler(std::make_unique<BrowsingHistoryPolicyHandler>());
handlers->AddHandler(std::make_unique<BrowsingDataLifetimePolicyHandler>(
@@ -1265,9 +1265,9 @@ diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -803,33 +803,6 @@ CHAR_LIMIT guidelines:
<message name="IDS_AD_PRIVACY_LINK_ROW_SUB_LABEL" translateable="false" desc="Sublabel for the ad privacy row.">
Fusce purus nibh, dictum sit amet mi in, fringilla ullamcorper tortor
@@ -797,33 +797,6 @@ CHAR_LIMIT guidelines:
<message name="IDS_AD_PRIVACY_LINK_ROW_SUB_LABEL" desc="A string that describes 'Ad privacy', the label that appears just above it. For context, this new 'Ad privacy' / 'Customize the info...' pair of strings is similar to the existing 'Clear browsing data' / 'Clear history, cookies...' that you find on chrome://settings/privacy. * 'Customize': From our word list: 'This word describes user agency in refining their personalized recommendations, elements of the experience, or sometimes products'. Please don't confuse with 'personalize', which we reserve to mean: '...when Google provides recommendations and other content for users based on their data'. **** CONTEXT PRIVACY SANDBOX **** Chrome’s Privacy Sandbox initiative 1) deprecates third-party cookies in Chrome, 2) supports free and open content on the web (by finding better ways to support ads online), 3) while providing stronger privacy protections for users. You can see a high-level description of this public project at www.privacysanbox.com. **** NEW SETTINGS SECTION IN CHROME **** 3 new ad-specific settings appear on an “Ad privacy” page in Chrome settings. For an equivalent structure, see “Security” on chrome://settings/privacy that opens chrome://settings/security. Likewise, “Ad privacy” on chrome://settings/privacy will open chrome://settings/AdPrivacy.">
Customize the info used by sites to show you ads
</message>
- <message name="IDS_CONTEXTUAL_SEARCH_TITLE" desc="Name for the Contextual Search feature, which allows users to search for a term in a web page by tapping on it.">
- Touch to Search
@@ -1299,7 +1299,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
<message name="IDS_DO_NOT_TRACK_TITLE" desc="Title for 'Do Not Track' preference">
“Do Not Track”
</message>
@@ -4291,38 +4264,6 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
@@ -4105,38 +4078,6 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
Tabs
</message>
@@ -1341,7 +1341,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
diff --git a/content/browser/browser_interface_binders.cc b/content/browser/browser_interface_binders.cc
--- a/content/browser/browser_interface_binders.cc
+++ b/content/browser/browser_interface_binders.cc
@@ -179,7 +179,6 @@
@@ -180,7 +180,6 @@
#include "content/browser/renderer_host/render_widget_host_view_android.h"
#include "services/device/public/mojom/nfc.mojom.h"
#include "third_party/blink/public/mojom/hid/hid.mojom.h"
@@ -1352,7 +1352,7 @@ diff --git a/content/browser/browser_interface_binders.cc b/content/browser/brow
diff --git a/third_party/blink/public/mojom/BUILD.gn b/third_party/blink/public/mojom/BUILD.gn
--- a/third_party/blink/public/mojom/BUILD.gn
+++ b/third_party/blink/public/mojom/BUILD.gn
@@ -977,8 +977,8 @@ mojom("android_mojo_bindings") {
@@ -1021,8 +1021,8 @@ mojom("android_mojo_bindings") {
# This Android unhandled-tap feature uses another mojo source, add it in.
if (enable_unhandled_tap) {
sources += [ "unhandled_tap_notifier/unhandled_tap_notifier.mojom" ]
build/patches/Remove-price-shopping-commerce-integrations.patch
+234 -437
View File
File diff suppressed because it is too large Load Diff
build/patches/Remove-signin-and-sync-integrations.patch
+167 -289
View File
File diff suppressed because it is too large Load Diff
build/patches/Remove-voice-recognition-integration.patch
+35 -35
View File
@@ -28,7 +28,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java b/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
--- a/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
+++ b/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
@@ -446,8 +446,7 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.
@@ -450,8 +450,7 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.
// Initialize
// Note that isVoiceSearchEnabled will return false in incognito mode.
@@ -38,7 +38,7 @@ diff --git a/chrome/android/features/start_surface/java/src/org/chromium/chrome/
boolean shouldShowLensButton = mOmniboxStub.isLensEnabled(LensEntryPoint.TASKS_SURFACE);
LensMetrics.recordShown(LensEntryPoint.TASKS_SURFACE, shouldShowLensButton);
mPropertyModel.set(IS_LENS_BUTTON_VISIBLE, shouldShowLensButton);
@@ -1228,10 +1227,6 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.
@@ -1247,10 +1246,6 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.
// incorrect state if check synchronously.
ThreadUtils.postOnUiThread(() -> {
if (mOmniboxStub != null) {
@@ -73,15 +73,15 @@ diff --git a/chrome/android/features/start_surface/java/src/org/chromium/chrome/
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
@@ -65,7 +65,6 @@ import org.chromium.chrome.browser.metrics.PackageMetrics;
import org.chromium.chrome.browser.metrics.WebApkUninstallUmaTracker;
@@ -66,7 +66,6 @@ import org.chromium.chrome.browser.metrics.WebApkUninstallUmaTracker;
import org.chromium.chrome.browser.notifications.channels.ChannelsUpdater;
import org.chromium.chrome.browser.ntp.FeedPositionUtils;
import org.chromium.chrome.browser.offlinepages.measurements.OfflineMeasurementsBackgroundTask;
-import org.chromium.chrome.browser.omnibox.voice.AssistantVoiceSearchService;
import org.chromium.chrome.browser.optimization_guide.OptimizationGuideBridgeFactory;
import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations;
import org.chromium.chrome.browser.photo_picker.DecoderService;
@@ -431,10 +430,6 @@ public class ProcessInitializationHandler {
@@ -430,10 +429,6 @@ public class ProcessInitializationHandler {
deferredStartupHandler.addDeferredTask(
() -> OfflineMeasurementsBackgroundTask.clearPersistedDataFromPrefs());
deferredStartupHandler.addDeferredTask(() -> QueryTileUtils.isQueryTilesEnabledOnNTP());
@@ -167,8 +167,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.
}
@Override
@@ -229,21 +225,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
if (VrModuleProvider.getDelegate().isInVr()) return;
@@ -228,21 +224,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
if (mIsDestroyed) return;
FeedReliabilityLogger feedReliabilityLogger =
mFeedSurfaceProvider.getReliabilityLogger();
- if (mVoiceRecognitionHandler != null && beginVoiceSearch) {
@@ -339,7 +339,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se
import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManagerImpl;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.tab.Tab;
@@ -354,14 +353,12 @@ public class SearchActivity extends AsyncInitializationActivity
@@ -355,14 +354,12 @@ public class SearchActivity extends AsyncInitializationActivity
// will navigate to Tabbed mode. Investigate whether this can inflate
// the tabbed mode layout in the background instead of CCTs.
CustomTabsConnection.getInstance().warmup(0);
@@ -355,7 +355,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se
RecordUserAction.record("SearchWidget.WidgetSelected");
getActivityDelegate().onFinishDeferredInitialization();
@@ -432,8 +429,7 @@ public class SearchActivity extends AsyncInitializationActivity
@@ -433,8 +430,7 @@ public class SearchActivity extends AsyncInitializationActivity
if (isFromQuickActionSearchWidget()) {
recordQuickActionSearchType(searchType);
}
@@ -482,7 +482,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
import org.chromium.chrome.browser.page_info.ChromePageInfo;
import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations;
import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManagerImpl;
@@ -2076,11 +2075,6 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
@@ -2052,11 +2051,6 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
return mLocationBar.getOmniboxStub();
}
@@ -497,7 +497,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
@@ -88,8 +88,6 @@ import org.chromium.chrome.browser.messages.MessagesResourceMapperInitializer;
@@ -87,8 +87,6 @@ import org.chromium.chrome.browser.messages.MessagesResourceMapperInitializer;
import org.chromium.chrome.browser.omnibox.OmniboxFocusReason;
import org.chromium.chrome.browser.omnibox.geo.GeolocationHeader;
import org.chromium.chrome.browser.omnibox.suggestions.OmniboxPedalDelegate;
@@ -506,7 +506,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
import org.chromium.chrome.browser.paint_preview.DemoPaintPreview;
import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
import org.chromium.chrome.browser.profiles.Profile;
@@ -269,7 +267,6 @@ public class RootUiCoordinator
@@ -264,7 +262,6 @@ public class RootUiCoordinator
protected OneshotSupplierImpl<Boolean> mPromoShownOneshotSupplier = new OneshotSupplierImpl<>();
protected Supplier<Tab> mStartSurfaceParentTabSupplier;
@Nullable
@@ -514,7 +514,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
private MediaCaptureOverlayController mCaptureController;
private @Nullable ScrollCaptureManager mScrollCaptureManager;
protected final ActivityLifecycleDispatcher mActivityLifecycleDispatcher;
@@ -544,9 +541,6 @@ public class RootUiCoordinator
@@ -539,9 +536,6 @@ public class RootUiCoordinator
}
if (mToolbarManager != null) {
@@ -524,7 +524,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
mToolbarManager.destroy();
mToolbarManager = null;
}
@@ -1080,19 +1074,11 @@ public class RootUiCoordinator
@@ -1066,19 +1060,11 @@ public class RootUiCoordinator
new VoiceToolbarButtonController.VoiceSearchDelegate() {
@Override
public boolean isVoiceSearchEnabled() {
@@ -545,7 +545,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
}
};
VoiceToolbarButtonController voiceToolbarButtonController =
@@ -1142,13 +1128,6 @@ public class RootUiCoordinator
@@ -1127,13 +1113,6 @@ public class RootUiCoordinator
if (!mSupportsAppMenuSupplier.getAsBoolean()) {
mToolbarManager.getToolbar().disableMenuButton();
}
@@ -562,7 +562,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
diff --git a/chrome/browser/ui/android/omnibox/BUILD.gn b/chrome/browser/ui/android/omnibox/BUILD.gn
--- a/chrome/browser/ui/android/omnibox/BUILD.gn
+++ b/chrome/browser/ui/android/omnibox/BUILD.gn
@@ -128,11 +128,6 @@ android_library("java") {
@@ -127,11 +127,6 @@ android_library("java") {
"java/src/org/chromium/chrome/browser/omnibox/suggestions/tail/TailSuggestionView.java",
"java/src/org/chromium/chrome/browser/omnibox/suggestions/tail/TailSuggestionViewBinder.java",
"java/src/org/chromium/chrome/browser/omnibox/suggestions/tail/TailSuggestionViewProperties.java",
@@ -600,7 +600,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java
--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java
@@ -39,7 +39,6 @@ import org.chromium.chrome.browser.omnibox.suggestions.OmniboxPedalDelegate;
@@ -40,7 +40,6 @@ import org.chromium.chrome.browser.omnibox.suggestions.OmniboxPedalDelegate;
import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestionsDropdownEmbedder;
import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestionsDropdownScrollListener;
import org.chromium.chrome.browser.omnibox.suggestions.basic.BasicSuggestionProcessor.BookmarkState;
@@ -608,7 +608,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManager;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
@@ -368,13 +367,6 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
@@ -372,13 +371,6 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
return mLocationBarLayout.getSecurityIconView();
}
@@ -622,7 +622,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
@Nullable
@Override
public OmniboxStub getOmniboxStub() {
@@ -659,11 +651,6 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
@@ -663,11 +655,6 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
// End tablet-specific methods.
@@ -656,7 +656,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
UrlBarDelegate, OnKeyListener, ComponentCallbacks,
TemplateUrlService.TemplateUrlServiceObserver, BackPressHandler {
private static final int ICON_FADE_ANIMATION_DURATION_MS = 150;
@@ -146,10 +143,7 @@ class LocationBarMediator
@@ -147,10 +144,7 @@ class LocationBarMediator
};
private final LocationBarLayout mLocationBarLayout;
@@ -667,7 +667,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
private StatusCoordinator mStatusCoordinator;
private AutocompleteCoordinator mAutocompleteCoordinator;
private OmniboxPrerender mOmniboxPrerender;
@@ -214,10 +208,6 @@ class LocationBarMediator
@@ -215,10 +209,6 @@ class LocationBarMediator
mLocationBarDataProvider.addObserver(this);
mOverrideUrlLoadingDelegate = overrideUrlLoadingDelegate;
mLocaleManager = localeManager;
@@ -678,7 +678,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
mProfileSupplier = profileSupplier;
mProfileSupplier.addObserver(mCallbackController.makeCancelable(this::setProfile));
mPrivacyPreferencesManager = privacyPreferencesManager;
@@ -252,9 +242,6 @@ class LocationBarMediator
@@ -253,9 +243,6 @@ class LocationBarMediator
}
/*package */ void destroy() {
@@ -688,7 +688,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
if (mTemplateUrlServiceSupplier.hasValue()) {
mTemplateUrlServiceSupplier.get().removeObserver(this);
}
@@ -262,8 +249,6 @@ class LocationBarMediator
@@ -263,8 +250,6 @@ class LocationBarMediator
mAutocompleteCoordinator = null;
mUrlCoordinator = null;
mPrivacyPreferencesManager = null;
@@ -697,7 +697,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
mLocationBarDataProvider.removeObserver(this);
mDeferredNativeRunnables.clear();
mUrlFocusChangeListeners.clear();
@@ -321,13 +306,6 @@ class LocationBarMediator
@@ -322,13 +307,6 @@ class LocationBarMediator
if (templateUrlService != null) {
templateUrlService.addObserver(this);
}
@@ -711,7 +711,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
mLocationBarLayout.onFinishNativeInitialization();
setProfile(mProfileSupplier.get());
onPrimaryColorChanged();
@@ -376,17 +354,6 @@ class LocationBarMediator
@@ -377,17 +355,6 @@ class LocationBarMediator
mLocationBarLayout.setUnfocusedWidth(unfocusedWidth);
}
@@ -729,7 +729,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
/* package */ void setLensControllerForTesting(LensController lensController) {
mLensController = lensController;
}
@@ -395,11 +362,6 @@ class LocationBarMediator
@@ -396,11 +363,6 @@ class LocationBarMediator
sLastCachedIsLensOnOmniboxEnabled = null;
}
@@ -741,16 +741,16 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
/* package */ void setIsUrlBarFocusedWithoutAnimationsForTesting(
boolean isUrlBarFocusedWithoutAnimations) {
mUrlFocusedWithoutAnimations = isUrlBarFocusedWithoutAnimations;
@@ -592,8 +554,6 @@ class LocationBarMediator
/* package */ void micButtonClicked(View view) {
if (!mNativeInitialized) return;
@@ -600,8 +562,6 @@ class LocationBarMediator
mUrlCoordinator.setKeyboardVisibility(false, false);
RecordUserAction.record("MobileOmniboxVoiceSearch");
- mVoiceRecognitionHandler.startVoiceRecognition(
- VoiceRecognitionHandler.VoiceInteractionSource.OMNIBOX);
}
/** package */ void lensButtonClicked(View view) {
@@ -939,28 +899,6 @@ class LocationBarMediator
@@ -947,28 +907,6 @@ class LocationBarMediator
}
}
@@ -779,7 +779,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
/**
* Update visuals to use a correct color scheme depending on the primary color.
*/
@@ -1047,8 +985,7 @@ class LocationBarMediator
@@ -1055,8 +993,7 @@ class LocationBarMediator
private boolean shouldShowMicButton() {
if (shouldShowDeleteButton()) return false;
@@ -789,7 +789,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
return false;
}
boolean isToolbarMicEnabled = mIsToolbarMicEnabledSupplier.getAsBoolean();
@@ -1243,9 +1180,6 @@ class LocationBarMediator
@@ -1251,9 +1188,6 @@ class LocationBarMediator
public void onPrimaryColorChanged() {
// This method needs to be called first as it computes |mBrandedColorScheme|.
updateBrandedColorScheme();
@@ -799,7 +799,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
}
@Override
@@ -1317,16 +1251,6 @@ class LocationBarMediator
@@ -1325,16 +1259,6 @@ class LocationBarMediator
}
}
@@ -816,7 +816,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
@Override
public void addUrlFocusChangeListener(UrlFocusChangeListener listener) {
mUrlFocusChangeListeners.addObserver(listener);
@@ -1342,37 +1266,10 @@ class LocationBarMediator
@@ -1350,37 +1274,10 @@ class LocationBarMediator
return mUrlHasFocus;
}
@@ -854,7 +854,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
public void setSearchQuery(String query) {
if (TextUtils.isEmpty(query)) return;
@@ -1391,17 +1288,14 @@ class LocationBarMediator
@@ -1399,17 +1296,14 @@ class LocationBarMediator
mUrlCoordinator.setKeyboardVisibility(true, false);
}
build/patches/Restore-offline-indicator-v2-flag.patch
+24 -38
View File
@@ -7,7 +7,6 @@ Reverts acc8b6f4542703211e5f3c5181914fd3374c9e84
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
.../indicator/OfflineDetector.java | 38 ++++++++++++++++++-
.../indicator/OfflineIndicatorController.java | 3 +-
.../tabbed_mode/TabbedRootUiCoordinator.java | 8 +++-
chrome/browser/about_flags.cc | 3 ++
chrome/browser/flag-metadata.json | 5 +++
@@ -16,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../flags/android/chrome_feature_list.cc | 5 +++
.../flags/android/chrome_feature_list.h | 1 +
.../browser/flags/ChromeFeatureList.java | 1 +
10 files changed, 67 insertions(+), 4 deletions(-)
9 files changed, 65 insertions(+), 3 deletions(-)
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineDetector.java b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineDetector.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineDetector.java
@@ -87,23 +86,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/in
+ return defaultValue;
+ }
}
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineIndicatorController.java b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineIndicatorController.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineIndicatorController.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineIndicatorController.java
@@ -90,7 +90,8 @@ public class OfflineIndicatorController implements ConnectivityDetector.Observer
public static void initialize() {
// No need to create the singleton if the feature is not enabled. Also, if V2 is enabled,
// this version will be disabled.
- if (!ChromeFeatureList.isEnabled(ChromeFeatureList.OFFLINE_INDICATOR)) {
+ if (!ChromeFeatureList.isEnabled(ChromeFeatureList.OFFLINE_INDICATOR)
+ || ChromeFeatureList.isEnabled(ChromeFeatureList.OFFLINE_INDICATOR_V2)) {
return;
}
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
@@ -798,7 +798,8 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
@@ -829,7 +829,8 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
private void initStatusIndicatorCoordinator(LayoutManagerImpl layoutManager) {
// TODO(crbug.com/1035584): Disable on tablets for now as we need to do one or two extra
// things for tablets.
@@ -113,7 +99,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
return;
}
@@ -820,6 +821,11 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
@@ -851,6 +852,11 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
mStatusIndicatorCoordinator.addObserver(mStatusIndicatorObserver);
mStatusIndicatorCoordinator.addObserver(mStatusBarColorController);
@@ -128,7 +114,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -4577,6 +4577,9 @@ const FeatureEntry kFeatureEntries[] = {
@@ -4481,6 +4481,9 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kOfflinePagesLivePageSharingName,
flag_descriptions::kOfflinePagesLivePageSharingDescription, kOsAndroid,
FEATURE_VALUE_TYPE(offline_pages::kOfflinePagesLivePageSharingFeature)},
@@ -141,7 +127,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
--- a/chrome/browser/flag-metadata.json
+++ b/chrome/browser/flag-metadata.json
@@ -5002,6 +5002,11 @@
@@ -5097,6 +5097,11 @@
"owners": [ "adamta", "sczs" ],
"expiry_milestone": 115
},
@@ -156,9 +142,9 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -3822,6 +3822,10 @@ const char kNotificationPermissionRationaleDescription[] =
"Configure the dialog shown before requesting notification permission. "
"Only works with builds targeting Android T.";
@@ -3837,6 +3837,10 @@ const char kNotificationPermissionRationaleBottomSheetDescription[] =
"flow. "
"Only works with builds targeting Android T+.";
+const char kOfflineIndicatorV2Name[] = "Offline indicator V2";
+const char kOfflineIndicatorV2Description[] =
@@ -170,28 +156,28 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -2196,6 +2196,9 @@ extern const char kNewWindowAppMenuDescription[];
@@ -2202,6 +2202,9 @@ extern const char kNetworkServiceInProcessDescription[];
extern const char kNotificationPermissionRationaleName[];
extern const char kNotificationPermissionRationaleDescription[];
+extern const char kOfflineIndicatorV2Name[];
+extern const char kOfflineIndicatorV2Description[];
+
extern const char kOfflinePagesLivePageSharingName[];
extern const char kOfflinePagesLivePageSharingDescription[];
extern const char kNotificationPermissionRationaleBottomSheetName[];
extern const char kNotificationPermissionRationaleBottomSheetDescription[];
diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
--- a/chrome/browser/flags/android/chrome_feature_list.cc
+++ b/chrome/browser/flags/android/chrome_feature_list.cc
@@ -256,6 +256,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
&kNewTabPageTilesTitleWrapAround,
&kNewWindowAppMenu,
@@ -239,6 +239,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
&kLensOnQuickActionSearchWidget,
&kNotificationPermissionVariant,
&kNotificationPermissionBottomSheet,
+ &kOfflineIndicatorV2,
&kPageAnnotationsService,
&kInlineUpdateFlow,
&kBookmarksImprovedSaveFlow,
@@ -733,6 +734,10 @@ BASE_FEATURE(kDownloadAutoResumptionThrottling,
@@ -700,6 +701,10 @@ BASE_FEATURE(kDownloadAutoResumptionThrottling,
BASE_FEATURE(kDownloadHomeForExternalApp,
"DownloadHomeForExternalApp",
base::FEATURE_ENABLED_BY_DEFAULT);
@@ -199,27 +185,27 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
+ "OfflineIndicatorV2",
+ base::FEATURE_ENABLED_BY_DEFAULT);
+
BASE_FEATURE(kDuetTabStripIntegrationAndroid,
"DuetTabStripIntegrationAndroid",
base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kExperimentsForAgsa,
"ExperimentsForAgsa", // disabled by default
base::FEATURE_DISABLED_BY_DEFAULT); // in Bromite
diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h
--- a/chrome/browser/flags/android/chrome_feature_list.h
+++ b/chrome/browser/flags/android/chrome_feature_list.h
@@ -106,6 +106,7 @@ BASE_DECLARE_FEATURE(kLanguagesPreference);
@@ -101,6 +101,7 @@ BASE_DECLARE_FEATURE(kLanguagesPreference);
BASE_DECLARE_FEATURE(kLensCameraAssistedSearch);
BASE_DECLARE_FEATURE(kLensOnQuickActionSearchWidget);
BASE_DECLARE_FEATURE(kLocationBarModelOptimizations);
+BASE_DECLARE_FEATURE(kOfflineIndicatorV2);
BASE_DECLARE_FEATURE(kNewTabPageTilesTitleWrapAround);
BASE_DECLARE_FEATURE(kNewWindowAppMenu);
BASE_DECLARE_FEATURE(kNotificationPermissionVariant);
BASE_DECLARE_FEATURE(kNotificationPermissionBottomSheet);
BASE_DECLARE_FEATURE(kOmahaMinSdkVersionAndroid);
diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -396,6 +396,7 @@ public abstract class ChromeFeatureList {
public static final String NEW_WINDOW_APP_MENU = "NewWindowAppMenu";
@@ -376,6 +376,7 @@ public abstract class ChromeFeatureList {
public static final String NOTIFICATION_PERMISSION_VARIANT = "NotificationPermissionVariant";
public static final String OFFLINE_INDICATOR = "OfflineIndicator";
public static final String NOTIFICATION_PERMISSION_BOTTOM_SHEET =
"NotificationPermissionBottomSheet";
+ public static final String OFFLINE_INDICATOR_V2 = "OfflineIndicatorV2";
public static final String OFFLINE_PAGES_DESCRIPTIVE_FAIL_STATUS =
"OfflinePagesDescriptiveFailStatus";