[REBASE] Patches for v133 (no changes)
This commit is contained in:
@@ -54,7 +54,7 @@ diff --git a/chrome/browser/ui/webui/searchbox/searchbox_handler.cc b/chrome/bro
|
||||
diff --git a/components/search/ntp_features.cc b/components/search/ntp_features.cc
|
||||
--- a/components/search/ntp_features.cc
|
||||
+++ b/components/search/ntp_features.cc
|
||||
@@ -120,7 +120,7 @@ BASE_FEATURE(kNtpDriveModuleShowSixFiles,
|
||||
@@ -121,7 +121,7 @@ BASE_FEATURE(kNtpDriveModuleShowSixFiles,
|
||||
|
||||
// If enabled, logo will be shown.
|
||||
// This is a kill switch. Keep indefinitely.
|
||||
@@ -63,7 +63,7 @@ diff --git a/components/search/ntp_features.cc b/components/search/ntp_features.
|
||||
|
||||
// If enabled, middle slot promo will be shown.
|
||||
// This is a kill switch. Keep indefinitely.
|
||||
@@ -178,8 +178,8 @@ BASE_FEATURE(kNtpModulesLoad,
|
||||
@@ -179,8 +179,8 @@ BASE_FEATURE(kNtpModulesLoad,
|
||||
// If enabled, OneGoogleBar will be shown.
|
||||
// This is a kill switch. Keep indefinitely.
|
||||
BASE_FEATURE(kNtpOneGoogleBar,
|
||||
|
||||
@@ -76,7 +76,7 @@ diff --git a/components/embedder_support/origin_trials/origin_trial_policy_impl.
|
||||
diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
|
||||
--- a/content/browser/renderer_host/navigation_request.cc
|
||||
+++ b/content/browser/renderer_host/navigation_request.cc
|
||||
@@ -9186,7 +9186,6 @@ void NavigationRequest::SetSourceSiteInstanceToInitiatorIfNeeded() {
|
||||
@@ -9187,7 +9187,6 @@ void NavigationRequest::SetSourceSiteInstanceToInitiatorIfNeeded() {
|
||||
void NavigationRequest::ForceEnableOriginTrials(
|
||||
const std::vector<std::string>& trials) {
|
||||
DCHECK(!HasCommitted());
|
||||
|
||||
@@ -35,7 +35,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe
|
||||
- });
|
||||
+ new AdaptiveToolbarStatePredictor(getContext(), getProfile(), null);
|
||||
|
||||
if (BuildInfo.getInstance().isAutomotive) {
|
||||
if (((true)) || BuildInfo.getInstance().isAutomotive) {
|
||||
getPreferenceScreen().removePreference(findPreference(PREF_SAFETY_CHECK));
|
||||
diff --git a/chrome/browser/segmentation_platform/segmentation_platform_config.cc b/chrome/browser/segmentation_platform/segmentation_platform_config.cc
|
||||
--- a/chrome/browser/segmentation_platform/segmentation_platform_config.cc
|
||||
|
||||
@@ -278,7 +278,7 @@ diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/j
|
||||
-->
|
||||
|
||||
<!-- The main_preferences file will be reordered with the upcoming autofill
|
||||
@@ -134,6 +137,11 @@ for the previous order (main_preferences_legacy). -->
|
||||
@@ -140,6 +143,11 @@ for the previous order (main_preferences_legacy). -->
|
||||
android:key="accessibility"
|
||||
android:order="24"
|
||||
android:title="@string/prefs_accessibility"/>
|
||||
|
||||
Reference in New Issue
Block a user