Patches for 138 (line changes)

This commit is contained in:
Carmelo Messina
2025-06-26 14:47:38 +02:00
parent dfcd7c6bfa
commit dda808cf9f
6 changed files with 16 additions and 16 deletions
@@ -1318,7 +1318,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
#include "chrome/browser/bookmarks/bookmark_model_factory.h"
#include "chrome/browser/bookmarks/managed_bookmark_service_factory.h"
#include "chrome/browser/commerce/shopping_service_factory.h"
@@ -265,6 +266,12 @@ ScopedJavaLocalRef<jobject> JNI_BookmarkBridge_NativeGetForProfile(
@@ -264,6 +265,12 @@ ScopedJavaLocalRef<jobject> JNI_BookmarkBridge_NativeGetForProfile(
if (!profile)
return nullptr;
@@ -31,7 +31,7 @@ diff --git a/chrome/android/java/res/menu/bookmark_toolbar_menu_improved.xml b/c
diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
--- a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
+++ b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
@@ -29,6 +29,7 @@ import org.chromium.components.browser_ui.widget.selectable_list.SelectionDelega
@@ -28,6 +28,7 @@ import org.chromium.components.browser_ui.widget.selectable_list.SelectionDelega
import java.util.ArrayList;
import java.util.List;
import java.util.function.Function;
@@ -39,7 +39,7 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows
/**
* Main toolbar of bookmark UI. It is responsible for displaying title and buttons associated with
@@ -191,6 +192,11 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
@@ -190,6 +191,11 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
void setCurrentFolder(BookmarkId folder) {
mCurrentFolder = mBookmarkModel.getBookmarkById(folder);
enableImportExportMenu();
@@ -51,7 +51,7 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows
}
void enableImportExportMenu() {
@@ -227,6 +233,17 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
@@ -226,6 +232,17 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
mExportBookmarkRunnable.run();
return true;
}
@@ -69,7 +69,7 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows
return assumeNonNull(mMenuIdClickedFunction).apply(menuItem.getItemId());
}
@@ -249,6 +266,7 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
@@ -248,6 +265,7 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
getMenu().findItem(R.id.import_menu_id).setVisible(mCurrentFolder != null);
getMenu().findItem(R.id.export_menu_id).setVisible(mCurrentFolder != null);
@@ -83,7 +83,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
diff --git a/chrome/browser/ui/autofill/autofill_client_provider.cc b/chrome/browser/ui/autofill/autofill_client_provider.cc
--- a/chrome/browser/ui/autofill/autofill_client_provider.cc
+++ b/chrome/browser/ui/autofill/autofill_client_provider.cc
@@ -37,22 +37,6 @@ AutofillClientProvider::AutofillClientProvider(PrefService* prefs) {
@@ -29,22 +29,6 @@ AutofillClientProvider::AutofillClientProvider(PrefService* prefs) {
DelayRegisteringFieldTrialForA11yDeprecation();
prefs->SetBoolean(prefs::kAutofillUsingVirtualViewStructure,
true);
@@ -121,7 +121,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//components/test/data/autofill/",
"//components/test/data/payments/",
"//content/test/data/browsing_data/",
@@ -3226,6 +3232,12 @@ if (_is_default_toolchain) {
@@ -3225,6 +3231,12 @@ if (_is_default_toolchain) {
sources += [ "java/src/org/chromium/chrome/browser/media/MediaCapturePickerDialogBridge.java" ]
}
@@ -134,7 +134,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
# Used for testing only, should not be shipped to end users.
if (enable_offline_pages_harness) {
sources += [ "java/src/org/chromium/chrome/browser/offlinepages/evaluation/OfflinePageEvaluationBridge.java" ]
@@ -3321,6 +3333,7 @@ if (_is_default_toolchain) {
@@ -3320,6 +3332,7 @@ if (_is_default_toolchain) {
"//chrome/browser/ui/plus_addresses/android:jni_headers",
"//chrome/browser/util:jni_headers",
"//chrome/browser/webauthn/android:jni_headers",
@@ -3972,7 +3972,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
"//components/autofill/content/browser:test_support",
"//components/autofill/content/renderer:test_support",
"//components/autofill/core/common:common",
@@ -2390,6 +2394,7 @@ if (!is_android) {
@@ -2388,6 +2392,7 @@ if (!is_android) {
"//chrome/test/media_router/access_code_cast:access_code_cast_integration_base",
"//chrome/test/payments:test_support",
"//chrome/test/supervised_user:test_support",
@@ -3980,7 +3980,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
"//components/affiliations/core/browser:affiliation_proto",
"//components/affiliations/core/browser:test_support",
"//components/autofill/content/browser:autofill_shared_storage_proto",
@@ -2893,6 +2898,7 @@ if (!is_android) {
@@ -2891,6 +2896,7 @@ if (!is_android) {
"//chrome/renderer/resources/extensions/",
"//chrome/test/data/cart/",
"//components/test/data/ad_tagging/",
@@ -3988,7 +3988,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
"//components/test/data/ads_observer/",
"//components/test/data/autofill/",
"//components/test/data/custom_handlers",
@@ -2982,6 +2988,9 @@ if (!is_android) {
@@ -2980,6 +2986,9 @@ if (!is_android) {
"../browser/accessibility/live_translate_controller_browsertest.cc",
"../browser/accessibility/page_colors_browsertest.cc",
"../browser/accessibility/phrase_segmentation/dependency_parser_model_loader_browsertest.cc",
@@ -3998,7 +3998,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
"../browser/ai/ai_data_keyed_service_browsertest.cc",
"../browser/attribution_reporting/chrome_attribution_browsertest.cc",
"../browser/autocomplete/autocomplete_browsertest.cc",
@@ -4533,6 +4542,7 @@ if (!is_android) {
@@ -4531,6 +4540,7 @@ if (!is_android) {
]
}
@@ -4006,7 +4006,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
if (is_chromeos) {
deps +=
[ "//chromeos/ash/components/network/portal_detector:test_support" ]
@@ -6051,6 +6061,7 @@ test("unit_tests") {
@@ -6049,6 +6059,7 @@ test("unit_tests") {
sources = [
# All unittests in browser, common, renderer and service.
"../browser/about_flags_unittest.cc",
@@ -4014,7 +4014,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
"../browser/after_startup_task_utils_unittest.cc",
"../browser/apps/icon_standardizer_unittest.cc",
"../browser/apps/user_type_filter_unittest.cc",
@@ -6747,6 +6758,8 @@ test("unit_tests") {
@@ -6745,6 +6756,8 @@ test("unit_tests") {
"//chrome/common/themes:unit_tests",
"//chrome/services/file_util:unit_tests",
"//components/account_id",
@@ -4023,7 +4023,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
"//components/affiliations/core/browser:test_support",
"//components/assist_ranker/proto",
"//components/autofill/content/browser:test_support",
@@ -10582,6 +10595,7 @@ if (!is_android) {
@@ -10580,6 +10593,7 @@ if (!is_android) {
"//chrome/browser:test_support_ui",
"//chrome/browser/ui/exclusive_access",
"//chrome/browser/ui/views/side_panel",
@@ -4163,7 +4163,7 @@ diff --git a/chrome/common/extensions/permissions/permission_set_unittest.cc b/c
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -3930,6 +3930,20 @@ if (!is_android) {
@@ -3928,6 +3928,20 @@ if (!is_android) {
]
}