Rebase to 143.0.7499.147
This commit is contained in:
@@ -666,7 +666,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
namespace about_flags {
|
||||
|
||||
namespace {
|
||||
@@ -5183,6 +5187,10 @@ const FeatureEntry::FeatureVariation kProfilePickerTextVariations[] = {
|
||||
@@ -5198,6 +5202,10 @@ const FeatureEntry::FeatureVariation kProfilePickerTextVariations[] = {
|
||||
};
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
|
||||
@@ -677,7 +677,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.
|
||||
@@ -5209,6 +5217,9 @@ const FeatureEntry::FeatureVariation kProfilePickerTextVariations[] = {
|
||||
@@ -5224,6 +5232,9 @@ const FeatureEntry::FeatureVariation kProfilePickerTextVariations[] = {
|
||||
const FeatureEntry kFeatureEntries[] = {
|
||||
// Include generated flags for flag unexpiry; see //docs/flag_expiry.md and
|
||||
// //tools/flags/generate_unexpire_flags.py.
|
||||
|
||||
@@ -44,7 +44,7 @@ diff --git a/chrome/browser/resources/new_tab_page/app.html b/chrome/browser/res
|
||||
- ?ntp-realbox-next-enabled="${this.ntpRealboxNextEnabled_}"
|
||||
- ?cycling-placeholders="${this.searchboxCyclingPlaceholders_}"
|
||||
- @searchbox-input-focus-changed="${this.onInputFocusChanged_}"
|
||||
- ?ntp-next-features-enabled="${this.ntpNextFeaturesEnabled_}">
|
||||
- context-menu-glif-animation-state="${this.contextMenuGlifAnimationState_}">
|
||||
- </cr-searchbox>
|
||||
${this.showComposebox_ ? html`
|
||||
<cr-composebox id="composebox"
|
||||
|
||||
@@ -292,7 +292,7 @@ diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
|
||||
diff --git a/build/config/chrome_build.gni b/build/config/chrome_build.gni
|
||||
--- a/build/config/chrome_build.gni
|
||||
+++ b/build/config/chrome_build.gni
|
||||
@@ -31,7 +31,8 @@ declare_args() {
|
||||
@@ -26,7 +26,8 @@ declare_args() {
|
||||
|
||||
# Set to true to set defaults that enable features on Android that are more
|
||||
# typically available on desktop.
|
||||
@@ -302,7 +302,7 @@ diff --git a/build/config/chrome_build.gni b/build/config/chrome_build.gni
|
||||
|
||||
if (is_android) {
|
||||
# By default, Trichrome channels are compiled using separate package names.
|
||||
@@ -53,12 +54,12 @@ is_internal_chrome_branded = enable_src_internal && is_chrome_branded
|
||||
@@ -44,12 +45,12 @@ declare_args() {
|
||||
# Ensure !is_android implies !is_high_end_android.
|
||||
is_high_end_android = is_high_end_android && is_android
|
||||
|
||||
@@ -803,7 +803,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
#if BUILDFLAG(ENABLE_PDF)
|
||||
#include "pdf/pdf_features.h"
|
||||
#endif
|
||||
@@ -13570,7 +13574,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -13585,7 +13589,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(
|
||||
enterprise_signals::features::kProfileSignalsReportingEnabled)},
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@ https://bugs.chromium.org/p/chromium/issues/detail?id=1491776#c10
|
||||
diff --git a/BUILD.gn b/BUILD.gn
|
||||
--- a/BUILD.gn
|
||||
+++ b/BUILD.gn
|
||||
@@ -412,7 +412,6 @@ group("gn_all") {
|
||||
@@ -411,7 +411,6 @@ group("gn_all") {
|
||||
"//android_webview:empty_group",
|
||||
"//android_webview/test",
|
||||
"//android_webview/tools/automated_ui_tests:webview_ui_test_app_test_apk",
|
||||
|
||||
@@ -281,7 +281,7 @@ diff --git a/components/payments/core/payment_prefs.cc b/components/payments/cor
|
||||
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
|
||||
@@ -238,13 +238,13 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
|
||||
@@ -232,13 +232,13 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
|
||||
registry->RegisterBooleanPref(
|
||||
prefs::kSafeBrowsingSawInterstitialScoutReporting, false);
|
||||
registry->RegisterBooleanPref(
|
||||
|
||||
@@ -140,7 +140,7 @@ diff --git a/android_webview/expectations/system_webview_bundle.AndroidManifest.
|
||||
diff --git a/build/config/android/config.gni b/build/config/android/config.gni
|
||||
--- a/build/config/android/config.gni
|
||||
+++ b/build/config/android/config.gni
|
||||
@@ -203,9 +203,7 @@ if (is_android) {
|
||||
@@ -201,9 +201,7 @@ if (is_android) {
|
||||
|
||||
# google_play_services_package contains the path where individual client
|
||||
# targets (e.g. google_play_services_base_java) are located.
|
||||
|
||||
@@ -101,7 +101,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
|
||||
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
|
||||
@@ -12126,9 +12126,9 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -12141,9 +12141,9 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(::features::kBlockRootWindowAccessibleNameChangeEvent)},
|
||||
#endif // BUILDFLAG(IS_MAC)
|
||||
|
||||
|
||||
@@ -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
|
||||
@@ -5466,10 +5466,10 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -5481,10 +5481,10 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
{"enable-gpu-rasterization", flag_descriptions::kGpuRasterizationName,
|
||||
flag_descriptions::kGpuRasterizationDescription, kOsAll,
|
||||
MULTI_VALUE_TYPE(kEnableGpuRasterizationChoices)},
|
||||
|
||||
Reference in New Issue
Block a user