[AUTO] Patches auto-rebase
This commit is contained in:
committed by
github-actions[bot]
parent
000a8d6bc2
commit
a4c08f8b05
@@ -17,7 +17,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
|
||||
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
|
||||
@@ -7660,9 +7660,9 @@
|
||||
@@ -7665,9 +7665,9 @@
|
||||
"expiry_milestone": 140
|
||||
},
|
||||
{
|
||||
|
||||
@@ -205,7 +205,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
|
||||
@@ -1647,6 +1649,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
|
||||
@@ -1644,6 +1646,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
|
||||
component_updater::RegisterPrefs(registry);
|
||||
domain_reliability::RegisterPrefs(registry);
|
||||
embedder_support::OriginTrialPrefs::RegisterPrefs(registry);
|
||||
|
||||
@@ -1772,7 +1772,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
|
||||
#include "chrome/browser/android/ntp/recent_tabs_page_prefs.h"
|
||||
#include "chrome/browser/android/oom_intervention/oom_intervention_decider.h"
|
||||
#include "chrome/browser/android/preferences/browser_prefs_android.h"
|
||||
@@ -2108,6 +2109,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
|
||||
@@ -2105,6 +2106,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
|
||||
usage_stats::UsageStatsBridge::RegisterProfilePrefs(registry);
|
||||
variations::VariationsService::RegisterProfilePrefs(registry);
|
||||
webapps::InstallPromptPrefs::RegisterProfilePrefs(registry);
|
||||
|
||||
@@ -632,7 +632,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tracing/setting
|
||||
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
|
||||
@@ -392,6 +392,10 @@ using flags_ui::kOsLinux;
|
||||
@@ -394,6 +394,10 @@ using flags_ui::kOsLinux;
|
||||
using flags_ui::kOsMac;
|
||||
using flags_ui::kOsWin;
|
||||
|
||||
@@ -643,7 +643,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
namespace about_flags {
|
||||
|
||||
namespace {
|
||||
@@ -4381,6 +4385,10 @@ const FeatureEntry::FeatureVariation kTabSwitcherColorBlendAnimateVariations[] =
|
||||
@@ -4383,6 +4387,10 @@ const FeatureEntry::FeatureVariation kTabSwitcherColorBlendAnimateVariations[] =
|
||||
std::size(kTabSwitcherColorBlendAnimateVariation3), nullptr}};
|
||||
#endif // BUILDFLAG(IS_ANDROID)
|
||||
|
||||
@@ -654,7 +654,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.
|
||||
@@ -4407,6 +4415,9 @@ const FeatureEntry::FeatureVariation kTabSwitcherColorBlendAnimateVariations[] =
|
||||
@@ -4409,6 +4417,9 @@ const FeatureEntry::FeatureVariation kTabSwitcherColorBlendAnimateVariations[] =
|
||||
const FeatureEntry kFeatureEntries[] = {
|
||||
// Include generated flags for flag unexpiry; see //docs/flag_expiry.md and
|
||||
// //tools/flags/generate_unexpire_flags.py.
|
||||
@@ -1596,7 +1596,7 @@ diff --git a/components/webui/version/version_handler_helper.cc b/components/web
|
||||
diff --git a/content/common/features.cc b/content/common/features.cc
|
||||
--- a/content/common/features.cc
|
||||
+++ b/content/common/features.cc
|
||||
@@ -481,4 +481,5 @@ BASE_FEATURE(kLimitCrossOriginNonActivatedPaintHolding,
|
||||
@@ -490,4 +490,5 @@ BASE_FEATURE(kLimitCrossOriginNonActivatedPaintHolding,
|
||||
|
||||
// Please keep features in alphabetical order.
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||||
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
|
||||
@@ -164,6 +164,7 @@
|
||||
@@ -166,6 +166,7 @@
|
||||
#include "components/sensitive_content/features.h"
|
||||
#include "components/services/heap_profiling/public/cpp/switches.h"
|
||||
#include "components/services/storage/public/cpp/buckets/bucket_info.h"
|
||||
|
||||
@@ -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
|
||||
@@ -2326,7 +2326,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
|
||||
@@ -2323,7 +2323,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
|
||||
registry->RegisterBooleanPref(
|
||||
prefs::kLensRegionSearchEnabled, true,
|
||||
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
|
||||
|
||||
@@ -82,7 +82,7 @@ diff --git a/chrome/browser/first_party_sets/first_party_sets_policy_service.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
|
||||
@@ -1298,7 +1298,7 @@ void RegisterProfilePrefsForMigration(
|
||||
@@ -1296,7 +1296,7 @@ void RegisterProfilePrefsForMigration(
|
||||
registry->RegisterTimePref(kPlusAddressLastFetchedTime, base::Time());
|
||||
|
||||
// Deprecated 03/2024.
|
||||
|
||||
@@ -52,7 +52,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
|
||||
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
|
||||
@@ -1928,7 +1928,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
|
||||
@@ -1925,7 +1925,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
|
||||
registry->RegisterBooleanPref(prefs::kUiAutomationProviderEnabled, false);
|
||||
#endif
|
||||
|
||||
|
||||
@@ -286,7 +286,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav
|
||||
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
|
||||
@@ -3660,28 +3660,6 @@ const FeatureEntry::FeatureVariation kLinkPreviewTriggerTypeVariations[] = {
|
||||
@@ -3662,28 +3662,6 @@ const FeatureEntry::FeatureVariation kLinkPreviewTriggerTypeVariations[] = {
|
||||
std::size(kLinkPreviewTriggerTypeLongPress), nullptr}};
|
||||
#endif // !BUILDFLAG(IS_ANDROID)
|
||||
|
||||
@@ -315,7 +315,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
const FeatureEntry::FeatureParam
|
||||
kPrerender2WarmUpCompositorTriggerPointDidCommitLoad[] = {
|
||||
{"trigger_point", "did_commit_load"}};
|
||||
@@ -6162,15 +6140,6 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -6164,15 +6142,6 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
#endif // BUILDFLAG(IS_CHROMEOS)
|
||||
|
||||
#if BUILDFLAG(IS_ANDROID)
|
||||
@@ -388,7 +388,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
|
||||
@@ -462,9 +462,6 @@ extern const char kAutofillUploadCardRequestTimeoutDescription[];
|
||||
@@ -463,9 +463,6 @@ extern const char kAutofillUploadCardRequestTimeoutDescription[];
|
||||
extern const char kAutofillVcnEnrollRequestTimeoutName[];
|
||||
extern const char kAutofillVcnEnrollRequestTimeoutDescription[];
|
||||
|
||||
|
||||
@@ -343,7 +343,7 @@ 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
|
||||
@@ -185,6 +185,7 @@
|
||||
@@ -187,6 +187,7 @@
|
||||
#include "components/ui_devtools/switches.h"
|
||||
#include "components/variations/variations_switches.h"
|
||||
#include "components/version_info/channel.h"
|
||||
@@ -362,7 +362,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
|
||||
#else // BUILDFLAG(IS_ANDROID)
|
||||
#include "chrome/browser/device_api/device_service_impl.h"
|
||||
#include "chrome/browser/gcm/gcm_product_util.h"
|
||||
@@ -2053,6 +2054,9 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
|
||||
@@ -2050,6 +2051,9 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
|
||||
translate::TranslatePrefs::RegisterProfilePrefs(registry);
|
||||
omnibox::RegisterProfilePrefs(registry);
|
||||
ZeroSuggestProvider::RegisterProfilePrefs(registry);
|
||||
|
||||
@@ -70,7 +70,7 @@ 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
|
||||
@@ -224,6 +224,7 @@
|
||||
@@ -226,6 +226,7 @@
|
||||
#include "sandbox/policy/features.h"
|
||||
#include "sandbox/policy/switches.h"
|
||||
#include "services/device/public/cpp/device_features.h"
|
||||
|
||||
@@ -28,7 +28,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/incognito/Incog
|
||||
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
|
||||
@@ -5218,9 +5218,9 @@
|
||||
@@ -5223,9 +5223,9 @@
|
||||
"expiry_milestone": 136
|
||||
},
|
||||
{
|
||||
|
||||
@@ -2105,7 +2105,7 @@ diff --git a/chrome/browser/hub/internal/android/res/layout/hub_toolbar_layout.x
|
||||
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
|
||||
@@ -2367,7 +2367,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
|
||||
@@ -2364,7 +2364,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
|
||||
|
||||
#if BUILDFLAG(IS_ANDROID)
|
||||
registry->RegisterBooleanPref(prefs::kVirtualKeyboardResizesLayoutByDefault,
|
||||
|
||||
@@ -74,7 +74,7 @@ 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
|
||||
@@ -251,6 +251,8 @@
|
||||
@@ -253,6 +253,8 @@
|
||||
#include "ui/ui_features.h"
|
||||
#include "url/url_features.h"
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ Subject: Temp disable experimental-web-platform-features
|
||||
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
|
||||
@@ -4622,10 +4622,10 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -4624,10 +4624,10 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
{"enable-fontations-backend", flag_descriptions::kFontationsFontBackendName,
|
||||
flag_descriptions::kFontationsFontBackendDescription, kOsAll,
|
||||
FEATURE_VALUE_TYPE(blink::features::kFontationsFontBackend)},
|
||||
|
||||
@@ -338,7 +338,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
|
||||
if (mPagerAdapter != null) {
|
||||
mPagerAdapter.notifyDataSetChanged();
|
||||
}
|
||||
@@ -695,11 +681,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
|
||||
@@ -697,11 +683,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
|
||||
public void acceptTermsOfService(boolean allowMetricsAndCrashUploading) {
|
||||
assert mNativeInitializationPromise.isFulfilled();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user