[AUTO] Patches auto-rebase
This commit is contained in:
committed by
github-actions[bot]
parent
75a75e9a8d
commit
4ae140d91a
@@ -90,7 +90,7 @@ diff --git a/base/android/android_image_reader_compat.h b/base/android/android_i
|
||||
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
|
||||
@@ -3281,9 +3281,9 @@
|
||||
@@ -3286,9 +3286,9 @@
|
||||
"expiry_milestone": 135
|
||||
},
|
||||
{
|
||||
|
||||
@@ -14,7 +14,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
|
||||
@@ -7689,9 +7689,9 @@
|
||||
@@ -7694,9 +7694,9 @@
|
||||
"expiry_milestone": 130
|
||||
},
|
||||
{
|
||||
|
||||
@@ -2648,7 +2648,7 @@ new file mode 100644
|
||||
diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml
|
||||
--- a/tools/metrics/histograms/enums.xml
|
||||
+++ b/tools/metrics/histograms/enums.xml
|
||||
@@ -20873,6 +20873,7 @@ from previous Chrome versions.
|
||||
@@ -20875,6 +20875,7 @@ from previous Chrome versions.
|
||||
<int value="188610022" label="NewMessageListView:enabled"/>
|
||||
<int value="189728101" label="FasterLocationReload:disabled"/>
|
||||
<int value="189777537" label="DisableInitialMostVisitedFadeIn:enabled"/>
|
||||
|
||||
@@ -331,7 +331,7 @@ diff --git a/components/variations/service/variations_service.cc b/components/va
|
||||
}
|
||||
|
||||
// Returns the already downloaded first run seed, and clear the seed from the
|
||||
@@ -623,7 +614,7 @@ bool VariationsService::DoFetchFromURL(const GURL& url, bool is_http_retry) {
|
||||
@@ -625,7 +616,7 @@ bool VariationsService::DoFetchFromURL(const GURL& url, bool is_http_retry) {
|
||||
// debugger or if the machine was suspended) and OnURLFetchComplete() hasn't
|
||||
// had a chance to run yet from the previous request. In this case, don't
|
||||
// start a new request and just let the previous one finish.
|
||||
|
||||
@@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.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
|
||||
@@ -1845,9 +1845,9 @@
|
||||
@@ -1850,9 +1850,9 @@
|
||||
"expiry_milestone": -1
|
||||
},
|
||||
{
|
||||
|
||||
@@ -214,7 +214,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav
|
||||
/**
|
||||
* Implementation of the interface {@link Tab}. Contains and manages a {@link ContentView}. This
|
||||
* class is not intended to be extended.
|
||||
@@ -970,6 +977,11 @@ class TabImpl implements Tab {
|
||||
@@ -984,6 +991,11 @@ class TabImpl implements Tab {
|
||||
for (TabObserver observer : mObservers) observer.onDestroyed(this);
|
||||
mObservers.clear();
|
||||
|
||||
@@ -226,7 +226,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav
|
||||
mUserDataHost.destroy();
|
||||
mTabViewManager.destroy();
|
||||
hideNativePage(false, null);
|
||||
@@ -1242,8 +1254,7 @@ class TabImpl implements Tab {
|
||||
@@ -1256,8 +1268,7 @@ class TabImpl implements Tab {
|
||||
*/
|
||||
boolean providesAutofillStructure() {
|
||||
// TODO(b/326231439): Check pref and AutofillService!
|
||||
@@ -236,7 +236,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav
|
||||
}
|
||||
|
||||
// Forwarded from TabWebContentsDelegateAndroid.
|
||||
@@ -1958,15 +1969,20 @@ class TabImpl implements Tab {
|
||||
@@ -1972,15 +1983,20 @@ class TabImpl implements Tab {
|
||||
* @return true if the the provider is available for the given WebContents.
|
||||
*/
|
||||
private boolean prepareAutofillProvider(WebContents newWebContents) {
|
||||
@@ -263,7 +263,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav
|
||||
mAutofillProvider =
|
||||
new AutofillProvider(
|
||||
getContext(),
|
||||
@@ -1975,7 +1991,16 @@ class TabImpl implements Tab {
|
||||
@@ -1989,7 +2005,16 @@ class TabImpl implements Tab {
|
||||
getContext().getString(R.string.app_name));
|
||||
TabImplJni.get().initializeAutofillIfNecessary(mNativeTabAndroid);
|
||||
}
|
||||
@@ -860,7 +860,7 @@ 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
|
||||
@@ -774,7 +774,7 @@ BASE_FEATURE(kAutofillEnableSecurityTouchEventFilteringAndroid,
|
||||
@@ -779,7 +779,7 @@ BASE_FEATURE(kAutofillEnableSecurityTouchEventFilteringAndroid,
|
||||
BASE_FEATURE(kAutofillVirtualViewStructureAndroid,
|
||||
"AutofillVirtualViewStructureAndroid",
|
||||
base::FEATURE_DISABLED_BY_DEFAULT);
|
||||
@@ -872,7 +872,7 @@ 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
|
||||
@@ -240,10 +240,6 @@ BASE_DECLARE_FEATURE(kAutofillEnableSecurityTouchEventFilteringAndroid);
|
||||
@@ -242,10 +242,6 @@ BASE_DECLARE_FEATURE(kAutofillEnableSecurityTouchEventFilteringAndroid);
|
||||
|
||||
COMPONENT_EXPORT(AUTOFILL)
|
||||
BASE_DECLARE_FEATURE(kAutofillVirtualViewStructureAndroid);
|
||||
|
||||
@@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.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
|
||||
@@ -5112,9 +5112,9 @@
|
||||
@@ -5117,9 +5117,9 @@
|
||||
"expiry_milestone": 120
|
||||
},
|
||||
{
|
||||
|
||||
@@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.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
|
||||
@@ -2064,6 +2064,10 @@
|
||||
@@ -2069,6 +2069,10 @@
|
||||
"yangsharon@google.com", "alexmos@google.com", "creis@google.com" ],
|
||||
"expiry_milestone": 140
|
||||
},
|
||||
|
||||
@@ -571,7 +571,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav
|
||||
/**
|
||||
* Implementation of the interface {@link Tab}. Contains and manages a {@link ContentView}. This
|
||||
* class is not intended to be extended.
|
||||
@@ -1909,9 +1915,6 @@ class TabImpl implements Tab {
|
||||
@@ -1923,9 +1929,6 @@ class TabImpl implements Tab {
|
||||
}
|
||||
|
||||
if (mWebContents != null) {
|
||||
@@ -581,7 +581,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav
|
||||
mWebContents.getNavigationController().loadIfNecessary();
|
||||
}
|
||||
mIsBeingRestored = true;
|
||||
@@ -2225,6 +2228,11 @@ class TabImpl implements Tab {
|
||||
@@ -2239,6 +2242,11 @@ class TabImpl implements Tab {
|
||||
url = webContents.getVisibleUrl();
|
||||
}
|
||||
|
||||
@@ -593,7 +593,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav
|
||||
// Do not override UA if there is a tab level setting.
|
||||
if (tabUserAgent != TabUserAgent.DEFAULT) {
|
||||
recordHistogramUseDesktopUserAgent(currentRequestDesktopSite);
|
||||
@@ -2304,6 +2312,54 @@ class TabImpl implements Tab {
|
||||
@@ -2318,6 +2326,54 @@ class TabImpl implements Tab {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -159,7 +159,7 @@ diff --git a/components/autofill/core/browser/crowdsourcing/autofill_crowdsourci
|
||||
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
|
||||
@@ -879,6 +879,8 @@ BASE_FEATURE(kAutofillUploadThrottling,
|
||||
@@ -884,6 +884,8 @@ BASE_FEATURE(kAutofillUploadThrottling,
|
||||
"AutofillUploadThrottling",
|
||||
base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user