Patches for 126 (line changes)
This commit is contained in:
@@ -313,7 +313,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tasks/ReturnToC
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
|
||||
@@ -98,6 +98,7 @@ import org.chromium.chrome.browser.password_manager.ManagePasswordsReferrer;
|
||||
@@ -97,6 +97,7 @@ import org.chromium.chrome.browser.password_manager.ManagePasswordsReferrer;
|
||||
import org.chromium.chrome.browser.password_manager.PasswordManagerLauncher;
|
||||
import org.chromium.chrome.browser.pdf.PdfPage;
|
||||
import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
|
||||
@@ -321,7 +321,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
|
||||
import org.chromium.chrome.browser.price_tracking.CurrentTabPriceTrackingStateSupplier;
|
||||
import org.chromium.chrome.browser.price_tracking.PriceTrackingButtonController;
|
||||
import org.chromium.chrome.browser.profiles.Profile;
|
||||
@@ -1635,7 +1636,9 @@ public class RootUiCoordinator
|
||||
@@ -1610,7 +1611,9 @@ public class RootUiCoordinator
|
||||
if (!mSupportsFindInPageSupplier.getAsBoolean()) return;
|
||||
|
||||
int stubId = R.id.find_toolbar_stub;
|
||||
@@ -413,7 +413,7 @@ diff --git a/chrome/browser/single_tab/android/java/src/org/chromium/chrome/brow
|
||||
diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java
|
||||
--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java
|
||||
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java
|
||||
@@ -776,7 +776,7 @@ public class LocationBarCoordinator
|
||||
@@ -774,7 +774,7 @@ public class LocationBarCoordinator
|
||||
}
|
||||
|
||||
private boolean isTabletWindow() {
|
||||
|
||||
@@ -56,7 +56,7 @@ diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/
|
||||
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
||||
--- a/chrome/browser/BUILD.gn
|
||||
+++ b/chrome/browser/BUILD.gn
|
||||
@@ -3277,8 +3277,6 @@ static_library("browser") {
|
||||
@@ -3286,8 +3286,6 @@ static_library("browser") {
|
||||
"feed/android/refresh_task_scheduler_impl.cc",
|
||||
"feed/android/refresh_task_scheduler_impl.h",
|
||||
"feed/android/web_feed_bridge.cc",
|
||||
|
||||
@@ -138,7 +138,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
|
||||
import org.chromium.base.TraceEvent;
|
||||
import org.chromium.base.metrics.RecordUserAction;
|
||||
import org.chromium.base.supplier.ObservableSupplier;
|
||||
@@ -825,11 +826,16 @@ public class RootUiCoordinator
|
||||
@@ -823,11 +824,16 @@ public class RootUiCoordinator
|
||||
TrackerFactory.getTrackerForProfile(tab.getProfile())
|
||||
.notifyEvent(EventConstants.WEB_SEARCH_PERFORMED);
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@ diff --git a/chrome/android/java/res/layout/url_bar.xml b/chrome/android/java/re
|
||||
diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java
|
||||
--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java
|
||||
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java
|
||||
@@ -292,8 +292,17 @@ class LocationBarMediator
|
||||
@@ -291,8 +291,17 @@ class LocationBarMediator
|
||||
if (mNativeInitialized) RecordUserAction.record("FocusLocation");
|
||||
// Don't clear Omnibox if the user just pasted text to NTP Omnibox.
|
||||
if (mShouldClearOmniboxOnFocus) {
|
||||
|
||||
@@ -45,7 +45,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
||||
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
|
||||
--- a/chrome/android/chrome_java_sources.gni
|
||||
+++ b/chrome/android/chrome_java_sources.gni
|
||||
@@ -1004,7 +1004,6 @@ chrome_java_sources = [
|
||||
@@ -1003,7 +1003,6 @@ chrome_java_sources = [
|
||||
"java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingPasswordReuseDialogBridge.java",
|
||||
"java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingReferringAppBridge.java",
|
||||
"java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingSettingsLauncher.java",
|
||||
@@ -126,7 +126,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
|
||||
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
||||
--- a/chrome/browser/BUILD.gn
|
||||
+++ b/chrome/browser/BUILD.gn
|
||||
@@ -3597,7 +3597,6 @@ static_library("browser") {
|
||||
@@ -3606,7 +3606,6 @@ static_library("browser") {
|
||||
"//chrome/browser/reading_list/android",
|
||||
"//chrome/browser/recent_tabs:jni_headers",
|
||||
"//chrome/browser/safe_browsing/android:safe_browsing_enums",
|
||||
|
||||
@@ -33,7 +33,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
|
||||
import org.chromium.chrome.browser.share.scroll_capture.ScrollCaptureManager;
|
||||
import org.chromium.chrome.browser.tab.AccessibilityVisibilityHandler;
|
||||
import org.chromium.chrome.browser.tab.AutofillSessionLifetimeController;
|
||||
@@ -606,10 +605,6 @@ public class RootUiCoordinator
|
||||
@@ -605,10 +604,6 @@ public class RootUiCoordinator
|
||||
}
|
||||
|
||||
public void onAttachFragment(Fragment fragment) {
|
||||
|
||||
@@ -35,7 +35,7 @@ diff --git a/chrome/browser/browser_features.h b/chrome/browser/browser_features
|
||||
diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc
|
||||
--- a/chrome/browser/net/system_network_context_manager.cc
|
||||
+++ b/chrome/browser/net/system_network_context_manager.cc
|
||||
@@ -1038,7 +1038,7 @@ bool SystemNetworkContextManager::IsCertificateTransparencyEnabled() {
|
||||
@@ -1034,7 +1034,7 @@ bool SystemNetworkContextManager::IsCertificateTransparencyEnabled() {
|
||||
// - on an opt-in basis for other builds and embedders, controlled with the
|
||||
// kCertificateTransparencyAskBeforeEnabling flag
|
||||
return base::FeatureList::IsEnabled(
|
||||
|
||||
@@ -72,7 +72,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja
|
||||
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
|
||||
--- a/chrome/android/chrome_java_sources.gni
|
||||
+++ b/chrome/android/chrome_java_sources.gni
|
||||
@@ -977,6 +977,7 @@ chrome_java_sources = [
|
||||
@@ -976,6 +976,7 @@ chrome_java_sources = [
|
||||
"java/src/org/chromium/chrome/browser/settings/AdBlockPreferences.java",
|
||||
"java/src/org/chromium/chrome/browser/policy/PolicyAuditor.java",
|
||||
"java/src/org/chromium/chrome/browser/policy/PolicyAuditorBridge.java",
|
||||
|
||||
@@ -45,7 +45,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja
|
||||
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
|
||||
--- a/chrome/android/chrome_java_sources.gni
|
||||
+++ b/chrome/android/chrome_java_sources.gni
|
||||
@@ -1041,6 +1041,7 @@ chrome_java_sources = [
|
||||
@@ -1040,6 +1040,7 @@ chrome_java_sources = [
|
||||
"java/src/org/chromium/chrome/browser/signin/SyncConsentActivity.java",
|
||||
"java/src/org/chromium/chrome/browser/signin/SyncConsentActivityLauncherImpl.java",
|
||||
"java/src/org/chromium/chrome/browser/signin/SyncConsentFragment.java",
|
||||
|
||||
@@ -326,7 +326,7 @@ diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
|
||||
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
||||
--- a/chrome/browser/BUILD.gn
|
||||
+++ b/chrome/browser/BUILD.gn
|
||||
@@ -3757,6 +3757,13 @@ static_library("browser") {
|
||||
@@ -3766,6 +3766,13 @@ static_library("browser") {
|
||||
]
|
||||
deps += [ "//chrome/android/modules/dev_ui/provider:native" ]
|
||||
}
|
||||
|
||||
@@ -187,7 +187,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/net/connectivit
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java
|
||||
@@ -468,8 +468,7 @@ public class OmahaBase {
|
||||
@@ -462,8 +462,7 @@ public class OmahaBase {
|
||||
}""");
|
||||
try {
|
||||
URL url = new URL(getRequestGenerator().getServerUrl());
|
||||
|
||||
@@ -56,7 +56,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja
|
||||
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
|
||||
--- a/chrome/android/chrome_java_sources.gni
|
||||
+++ b/chrome/android/chrome_java_sources.gni
|
||||
@@ -985,6 +985,8 @@ chrome_java_sources = [
|
||||
@@ -984,6 +984,8 @@ chrome_java_sources = [
|
||||
"java/src/org/chromium/chrome/browser/privacy_sandbox/TrackingProtectionNoticeController.java",
|
||||
"java/src/org/chromium/chrome/browser/privacy_sandbox/TrackingProtectionSnackbarController.java",
|
||||
"java/src/org/chromium/chrome/browser/privacy/settings/IncognitoSettings.java",
|
||||
@@ -404,7 +404,7 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows
|
||||
pref_change_registrar_.Add(
|
||||
prefs::kExplicitlyAllowedNetworkPorts,
|
||||
base::BindRepeating(
|
||||
@@ -691,6 +694,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) {
|
||||
@@ -687,6 +690,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) {
|
||||
// the system NetworkContext, and the per-profile pref values are used for
|
||||
// the profile NetworkContexts.
|
||||
registry->RegisterBooleanPref(prefs::kEnableReferrers, true);
|
||||
|
||||
@@ -90,7 +90,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja
|
||||
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
|
||||
--- a/chrome/android/chrome_java_sources.gni
|
||||
+++ b/chrome/android/chrome_java_sources.gni
|
||||
@@ -956,6 +956,7 @@ chrome_java_sources = [
|
||||
@@ -955,6 +955,7 @@ chrome_java_sources = [
|
||||
"java/src/org/chromium/chrome/browser/payments/ui/DimmingDialog.java",
|
||||
"java/src/org/chromium/chrome/browser/payments/ui/LineItem.java",
|
||||
"java/src/org/chromium/chrome/browser/payments/ui/PaymentAppComparator.java",
|
||||
|
||||
@@ -132,7 +132,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
||||
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
||||
--- a/chrome/browser/BUILD.gn
|
||||
+++ b/chrome/browser/BUILD.gn
|
||||
@@ -3564,6 +3564,17 @@ static_library("browser") {
|
||||
@@ -3573,6 +3573,17 @@ static_library("browser") {
|
||||
"webauthn/android/webauthn_request_delegate_android.h",
|
||||
]
|
||||
|
||||
@@ -150,7 +150,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
||||
|
||||
public_deps += [
|
||||
"//chrome/android/features/dev_ui:buildflags",
|
||||
@@ -3770,6 +3781,9 @@ static_library("browser") {
|
||||
@@ -3779,6 +3790,9 @@ static_library("browser") {
|
||||
# `IdentityManagerFactory` in facilitated payments.
|
||||
allow_circular_includes_from += [ "//chrome/browser/facilitated_payments" ]
|
||||
|
||||
|
||||
@@ -176,7 +176,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
||||
"//components/assist_ranker",
|
||||
"//components/autofill/content/browser",
|
||||
"//components/autofill/content/common:features",
|
||||
@@ -3537,6 +3563,8 @@ static_library("browser") {
|
||||
@@ -3546,6 +3572,8 @@ static_library("browser") {
|
||||
"webauthn/android/webauthn_request_delegate_android.cc",
|
||||
"webauthn/android/webauthn_request_delegate_android.h",
|
||||
]
|
||||
@@ -185,7 +185,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
||||
public_deps += [
|
||||
"//chrome/android/features/dev_ui:buildflags",
|
||||
"//components/image_fetcher/core",
|
||||
@@ -3742,6 +3770,7 @@ static_library("browser") {
|
||||
@@ -3751,6 +3779,7 @@ static_library("browser") {
|
||||
# `IdentityManagerFactory` in facilitated payments.
|
||||
allow_circular_includes_from += [ "//chrome/browser/facilitated_payments" ]
|
||||
|
||||
|
||||
Reference in New Issue
Block a user