Skip to content

Commit

Permalink
Patches for 124.0.6367.118
Browse files Browse the repository at this point in the history
  • Loading branch information
uazo committed May 1, 2024
1 parent 222f637 commit 76c806d
Show file tree
Hide file tree
Showing 46 changed files with 63 additions and 66 deletions.
2 changes: 1 addition & 1 deletion build/patches/Add-AllowUserCertificates-flag.patch
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
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
@@ -134,6 +134,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
@@ -133,6 +133,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
&feed::kFeedShowSignInCommand,
&feed::kFeedSignedOutViewDemotion,
&feed::kFeedUserInteractionReliabilityReport,
Expand Down
2 changes: 1 addition & 1 deletion build/patches/Add-a-flag-to-disable-GamePad-API.patch
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ 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
@@ -3089,7 +3089,7 @@ const char kResetShortcutCustomizationsDescription[] =
@@ -3083,7 +3083,7 @@ const char kResetShortcutCustomizationsDescription[] =

const char kRestrictGamepadAccessName[] = "Restrict gamepad access";
const char kRestrictGamepadAccessDescription[] =
Expand Down
2 changes: 1 addition & 1 deletion build/patches/Add-a-proxy-configuration-page.patch
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
#if BUILDFLAG(ENABLE_BACKGROUND_MODE)
#include "chrome/browser/background/background_mode_manager.h"
#endif
@@ -1476,6 +1478,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
@@ -1483,6 +1485,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
component_updater::RegisterPrefs(registry);
domain_reliability::RegisterPrefs(registry);
embedder_support::OriginTrialPrefs::RegisterPrefs(registry);
Expand Down
2 changes: 1 addition & 1 deletion build/patches/Add-an-always-incognito-mode.patch
Original file line number Diff line number Diff line change
Expand Up @@ -1724,7 +1724,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
#include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h"
#include "chrome/browser/android/ntp/recent_tabs_page_prefs.h"
#include "chrome/browser/android/oom_intervention/oom_intervention_decider.h"
@@ -1885,6 +1886,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
@@ -1892,6 +1893,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
usage_stats::UsageStatsBridge::RegisterProfilePrefs(registry);
variations::VariationsService::RegisterProfilePrefs(registry);
webapps::InstallPromptPrefs::RegisterProfilePrefs(registry);
Expand Down
6 changes: 3 additions & 3 deletions build/patches/Add-cromite-flags-support.patch
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
namespace about_flags {

namespace {
@@ -3789,6 +3793,10 @@ const FeatureEntry::FeatureVariation kDefaultBrowserPromptRefreshVariations[] =
@@ -3776,6 +3780,10 @@ const FeatureEntry::FeatureVariation kDefaultBrowserPromptRefreshVariations[] =
kDefaultBrowserPromptRefreshTesting,
std::size(kDefaultBrowserPromptRefreshTesting), nullptr}};

Expand All @@ -560,7 +560,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
// RECORDING USER METRICS FOR FLAGS:
// -----------------------------------------------------------------------------
// The first line of the entry is the internal name.
@@ -3815,6 +3823,9 @@ const FeatureEntry::FeatureVariation kDefaultBrowserPromptRefreshVariations[] =
@@ -3802,6 +3810,9 @@ const FeatureEntry::FeatureVariation kDefaultBrowserPromptRefreshVariations[] =
const FeatureEntry kFeatureEntries[] = {
// Include generated flags for flag unexpiry; see //docs/flag_expiry.md and
// //tools/flags/generate_unexpire_flags.py.
Expand Down Expand Up @@ -621,7 +621,7 @@ diff --git a/chrome/browser/flags/BUILD.gn b/chrome/browser/flags/BUILD.gn
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
@@ -1010,5 +1010,6 @@ BASE_FEATURE(kWebApkIconUpdateThreshold,
@@ -1009,5 +1009,6 @@ BASE_FEATURE(kWebApkIconUpdateThreshold,
"WebApkIconUpdateThreshold",
base::FEATURE_ENABLED_BY_DEFAULT);

Expand Down
2 changes: 1 addition & 1 deletion build/patches/Add-flag-to-disable-vibration.patch
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ diff --git a/third_party/blink/renderer/platform/exported/web_runtime_features.c
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -656,6 +656,10 @@
@@ -648,6 +648,10 @@
status: {"Android": "stable"},
base_feature: "none",
},
Expand Down
2 changes: 1 addition & 1 deletion build/patches/Add-setting-to-invert-tap-and-long-tap.patch
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ diff --git a/chrome/browser/contextmenu/java/src/org/chromium/chrome/browser/con
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
@@ -282,6 +282,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
@@ -281,6 +281,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
&kTabGroupParityAndroid,
&kTabletTabSwitcherLongPressMenu,
&kTabletToolbarIncognitoStatus,
Expand Down
4 changes: 2 additions & 2 deletions build/patches/Allow-building-without-supervised-users.patch
Original file line number Diff line number Diff line change
Expand Up @@ -92,15 +92,15 @@ 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
@@ -7886,6 +7886,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -7864,6 +7864,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif

#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
{"enable-family-link-extensions-permissions",
flag_descriptions::
kEnableExtensionsPermissionsForSupervisedUsersOnDesktopName,
@@ -7895,6 +7896,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -7873,6 +7874,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(
supervised_user::
kEnableExtensionsPermissionsForSupervisedUsersOnDesktop)},
Expand Down
2 changes: 1 addition & 1 deletion build/patches/Bromite-auto-updater.patch
Original file line number Diff line number Diff line change
Expand Up @@ -1614,7 +1614,7 @@ new file mode 100644
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
@@ -237,6 +237,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
@@ -236,6 +236,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
&kPreconnectOnTabCreation,
&kPriceChangeModule,
&kPwaRestoreUi,
Expand Down
2 changes: 1 addition & 1 deletion build/patches/Client-hints-overrides.patch
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ diff --git a/third_party/blink/renderer/core/loader/base_fetch_context.cc b/thir
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -332,6 +332,11 @@
@@ -324,6 +324,11 @@
name: "AsyncClipboardImplicitPermission",
status: "stable",
},
Expand Down
2 changes: 1 addition & 1 deletion build/patches/Cromite-Branding.patch
Original file line number Diff line number Diff line change
Expand Up @@ -18202,7 +18202,7 @@ diff --git a/tools/grit/grit/grd_reader.py b/tools/grit/grit/grd_reader.py
diff --git a/ui/base/ui_base_features.cc b/ui/base/ui_base_features.cc
--- a/ui/base/ui_base_features.cc
+++ b/ui/base/ui_base_features.cc
@@ -648,4 +648,6 @@ BASE_FEATURE(kUseGammaContrastRegistrySettings,
@@ -653,4 +653,6 @@ BASE_FEATURE(kUseGammaContrastRegistrySettings,
base::FEATURE_ENABLED_BY_DEFAULT);
#endif // BUILDFLAG(IS_WIN)

Expand Down
2 changes: 1 addition & 1 deletion build/patches/Deprecate-Data-URL-in-SVGUseElement.patch
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -3208,8 +3208,8 @@
@@ -3201,8 +3201,8 @@
status: "stable",
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -672,16 +672,18 @@
@@ -665,16 +665,18 @@
}
},
{
Expand Down
4 changes: 2 additions & 2 deletions build/patches/Disable-FLoC-and-privacy-sandbox.patch
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
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
@@ -1428,7 +1428,7 @@ void RegisterProfilePrefsForMigration(
@@ -1432,7 +1432,7 @@ void RegisterProfilePrefsForMigration(
registry->RegisterTimePref(kPlusAddressLastFetchedTime, base::Time());

// Deprecated 03/2024.
Expand Down Expand Up @@ -231,7 +231,7 @@ new file mode 100644
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
@@ -2514,6 +2514,7 @@ bool IsAllowPageWithIDBConnectionAndTransactionInBFCacheEnabled() {
@@ -2519,6 +2519,7 @@ bool IsAllowPageWithIDBConnectionAndTransactionInBFCacheEnabled() {
}

bool IsAllowURNsInIframeEnabled() {
Expand Down
2 changes: 1 addition & 1 deletion build/patches/Disable-FedCm.patch
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ new file mode 100644
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -1604,7 +1604,7 @@
@@ -1597,7 +1597,7 @@
{
name: "FedCm",
public: true,
Expand Down
2 changes: 1 addition & 1 deletion build/patches/Disable-GetInstalledRelatedApps-API.patch
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ new file mode 100644
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -2190,9 +2190,9 @@
@@ -2183,9 +2183,9 @@
status: {"Android": "test", "default": "stable"},
},
{
Expand Down
2 changes: 1 addition & 1 deletion build/patches/Disable-Real-Box.patch
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Real-box is search box in ntp
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
@@ -2101,7 +2101,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
@@ -2108,7 +2108,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
registry->RegisterBooleanPref(
prefs::kLensRegionSearchEnabled, true,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
Expand Down
2 changes: 1 addition & 1 deletion build/patches/Disable-all-predictors-code.patch
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ diff --git a/third_party/blink/renderer/core/speculation_rules/document_speculat
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -3056,7 +3056,7 @@
@@ -3049,7 +3049,7 @@
//
// It also has some feature params defined throughout the codebase.
name: "Prerender2",
Expand Down
2 changes: 1 addition & 1 deletion build/patches/Disable-feeds-support-by-default.patch
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
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
@@ -1869,10 +1869,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
@@ -1876,10 +1876,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
supervised_user::RegisterProfilePrefs(registry);
#endif

Expand Down
2 changes: 1 addition & 1 deletion build/patches/Disable-idle-detection.patch
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ diff --git a/third_party/blink/renderer/modules/idle/idle_detector.idl b/third_p
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -2115,6 +2115,11 @@
@@ -2108,6 +2108,11 @@
name: "HTMLUnsafeMethods",
status: "stable",
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ diff --git a/third_party/blink/renderer/modules/remoteplayback/remote_playback.c
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -3184,14 +3184,10 @@
@@ -3176,14 +3176,10 @@
base_feature: "none",
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ diff --git a/third_party/blink/renderer/core/preferences/preference_manager.idl
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -3040,7 +3040,11 @@
@@ -3033,7 +3033,11 @@
settable_from_internals: true,
},
{
Expand Down
2 changes: 1 addition & 1 deletion build/patches/Disable-smart-selection-by-default.patch
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearc
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
@@ -181,6 +181,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
@@ -180,6 +180,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
&kCCTEmbedderSpecialBehaviorTrigger,
&kCCTExtendTrustedCdnPublisher,
&kCCTFeatureUsage,
Expand Down
2 changes: 1 addition & 1 deletion build/patches/Disable-text-fragments-by-default.patch
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -3822,10 +3822,9 @@
@@ -3814,10 +3814,9 @@
},
{
name: "TextFragmentIdentifiers",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -1440,7 +1440,6 @@
@@ -1433,7 +1433,6 @@
{
name: "DocumentOpenSandboxInheritanceRemoval",
status: "stable",
Expand Down
2 changes: 1 addition & 1 deletion build/patches/Enable-gwp-asan-on-Android.patch
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tracing/setting
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
--- a/chrome/app/chrome_main_delegate.cc
+++ b/chrome/app/chrome_main_delegate.cc
@@ -2029,7 +2029,7 @@ void ChromeMainDelegate::InitializeMemorySystem() {
@@ -2036,7 +2036,7 @@ void ChromeMainDelegate::InitializeMemorySystem() {
const version_info::Channel channel = chrome::GetChannel();
const bool is_canary_dev = (channel == version_info::Channel::CANARY ||
channel == version_info::Channel::DEV);
Expand Down
25 changes: 11 additions & 14 deletions build/patches/Enable-native-Android-autofill.patch
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../autofill/core/browser/autofill_manager.h | 2 +
.../core/browser/browser_autofill_manager.cc | 2 +
.../core/browser/browser_autofill_manager.h | 2 +
.../autofill/core/common/autofill_features.cc | 9 ---
.../autofill/core/common/autofill_features.h | 9 ---
.../autofill/core/common/autofill_features.cc | 8 --
.../autofill/core/common/autofill_features.h | 7 --
.../autofill/core/common/autofill_prefs.cc | 2 +
.../autofill/core/common/autofill_prefs.h | 5 ++
.../embedder_support/view/ContentView.java | 47 +++++++++++
.../chromium/ui/base/ViewAndroidDelegate.java | 4 +
38 files changed, 384 insertions(+), 76 deletions(-)
38 files changed, 384 insertions(+), 73 deletions(-)
create mode 100644 components/android_autofill/browser/java/src/org/chromium/components/autofill/BrowserSelectionActionMenuDelegate.java

diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
Expand Down Expand Up @@ -421,10 +421,10 @@ 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
@@ -87,7 +87,6 @@ const base::Feature* const kFeaturesExposedToJava[] = {
&autofill::features::kAutofillEnableCardArtImage,
@@ -88,7 +88,6 @@ const base::Feature* const kFeaturesExposedToJava[] = {
&autofill::features::kAutofillEnableCardProductName,
&autofill::features::kAutofillEnableLocalIban,
&autofill::features::kAutofillEnableSecurityTouchEventFilteringAndroid,
- &autofill::features::kAutofillVirtualViewStructureAndroid,
&autofill::features::kAutofillEnablePaymentsMandatoryReauth,
&autofill::features::kAutofillEnableMovingGPayLogoToTheRightOnClank,
Expand Down Expand Up @@ -1004,11 +1004,10 @@ diff --git a/components/autofill/core/browser/browser_autofill_manager.h b/compo
diff --git a/components/autofill/core/common/autofill_features.cc b/components/autofill/core/common/autofill_features.cc
--- a/components/autofill/core/common/autofill_features.cc
+++ b/components/autofill/core/common/autofill_features.cc
@@ -692,15 +692,6 @@ const base::FeatureParam<int>
kAutofillEnableCacheForRegexMatchingCacheSizeParam{
&kAutofillEnableCacheForRegexMatching, "cache_size", 300};
@@ -699,14 +699,6 @@ BASE_FEATURE(kAutofillEnableSecurityTouchEventFilteringAndroid,
"AutofillEnableSecurityTouchEventFilteringAndroid",
base::FEATURE_DISABLED_BY_DEFAULT);

-#if BUILDFLAG(IS_ANDROID)
-// Controls the whether the Chrome may provide a virtual view structure for
-// Android Autofill.
-BASE_FEATURE(kAutofillVirtualViewStructureAndroid,
Expand All @@ -1023,12 +1022,10 @@ diff --git a/components/autofill/core/common/autofill_features.cc b/components/a
diff --git a/components/autofill/core/common/autofill_features.h b/components/autofill/core/common/autofill_features.h
--- a/components/autofill/core/common/autofill_features.h
+++ b/components/autofill/core/common/autofill_features.h
@@ -223,15 +223,6 @@ COMPONENT_EXPORT(AUTOFILL)
extern const base::FeatureParam<int>
kAutofillEnableCacheForRegexMatchingCacheSizeParam;
@@ -228,13 +228,6 @@ COMPONENT_EXPORT(AUTOFILL)
BASE_DECLARE_FEATURE(kAutofillEnableSecurityTouchEventFilteringAndroid);

-#if BUILDFLAG(IS_ANDROID)
-COMPONENT_EXPORT(AUTOFILL)
COMPONENT_EXPORT(AUTOFILL)
-BASE_DECLARE_FEATURE(kAutofillVirtualViewStructureAndroid);
-inline constexpr base::FeatureParam<bool>
- kAutofillVirtualViewStructureAndroidSkipsCompatibilityCheck{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
diff --git a/ui/base/ui_base_features.cc b/ui/base/ui_base_features.cc
--- a/ui/base/ui_base_features.cc
+++ b/ui/base/ui_base_features.cc
@@ -154,6 +154,9 @@ static_assert(!BUILDFLAG(IS_MAC) ||
@@ -155,6 +155,9 @@ static_assert(!BUILDFLAG(IS_MAC) ||
BASE_FEATURE(kWindowsScrollingPersonality,
"WindowsScrollingPersonality",
kWindowsScrollingPersonalityDefaultStatus);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ new file mode 100644
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -3661,6 +3661,9 @@ static_library("browser") {
@@ -3663,6 +3663,9 @@ static_library("browser") {
"//components/user_scripts/android",
]
}
Expand Down
Loading

0 comments on commit 76c806d

Please sign in to comment.