[AUTO] Patches auto-rebase for next-148 branch (#2901)

[AUTO] Patches auto-rebase for next-148 branch
This commit is contained in:
uazo
2026-05-19 11:16:08 +02:00
committed by GitHub
3 changed files with 5 additions and 5 deletions
+2 -2
View File
@@ -33,7 +33,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -513,7 +513,7 @@ if (_is_default_toolchain) {
@@ -506,7 +506,7 @@ if (_is_default_toolchain) {
"//chrome/browser/touch_to_fill/common/android:java",
"//chrome/browser/translate/android:java",
"//chrome/browser/ui/android/actions:java",
@@ -42,7 +42,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//chrome/browser/ui/android/appmenu:factory_java",
"//chrome/browser/ui/android/appmenu:java",
"//chrome/browser/ui/android/bottombar:java",
@@ -1201,7 +1201,7 @@ if (_is_default_toolchain) {
@@ -1189,7 +1189,7 @@ if (_is_default_toolchain) {
"//chrome/browser/touch_to_fill/password_manager/password_generation/android/internal:junit",
"//chrome/browser/translate/android:junit",
"//chrome/browser/ui/android/actions:junit",
@@ -1,4 +1,4 @@
From: uazo <uazo@users.noreply.github.com>
From: uazo <uazo@users.noreply.github.com>
Date: Mon, 18 May 2026 14:39:41 +0000
Subject: Enable Android DevTools Frontend
@@ -750,7 +750,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/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
@@ -672,7 +672,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
@@ -671,7 +671,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
});
mCrossDeviceSettingImporter =
@@ -759,7 +759,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
? null
: new CrossDeviceSettingImporter(
activityLifecycleDispatcher,
@@ -2357,7 +2357,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
@@ -2351,7 +2351,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
} else if (id == R.id.toggle_bookmark_bar) {
// isActivityStateBookmarkBarCompatible already checks the flag sAndroidBookmarkBar.
if (BookmarkBarUtils.isActivityStateBookmarkBarCompatible(mActivity)) {