Patches for v137
This commit is contained in:
@@ -46,6 +46,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||||
.../PasswordManagerHelper.java | 9 -
|
||||
...swordSyncControllerDelegateBridgeImpl.java | 7 -
|
||||
.../push_messaging_service_factory.cc | 8 +-
|
||||
.../notification_telemetry_service.cc | 1 +
|
||||
chrome/browser/ui/BUILD.gn | 3 -
|
||||
chrome/browser/ui/android/omnibox/BUILD.gn | 4 -
|
||||
.../FullscreenSigninMediator.java | 4 +-
|
||||
@@ -108,7 +109,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||||
.../gms/ChromiumPlayServicesAvailability.java | 10 +-
|
||||
third_party/androidx/customizations.gni | 14 +-
|
||||
third_party/cardboard/BUILD.gn | 4 -
|
||||
84 files changed, 120 insertions(+), 2179 deletions(-)
|
||||
85 files changed, 121 insertions(+), 2179 deletions(-)
|
||||
create mode 100644 components/webauthn/android/java/src/org/chromium/components/webauthn/ConditionalUiState.java
|
||||
|
||||
diff --git a/android_webview/expectations/system_webview_bundle.AndroidManifest.expected b/android_webview/expectations/system_webview_bundle.AndroidManifest.expected
|
||||
@@ -833,6 +834,17 @@ diff --git a/chrome/browser/push_messaging/push_messaging_service_factory.cc b/c
|
||||
}
|
||||
|
||||
// static
|
||||
diff --git a/chrome/browser/safe_browsing/notification_telemetry/notification_telemetry_service.cc b/chrome/browser/safe_browsing/notification_telemetry/notification_telemetry_service.cc
|
||||
--- a/chrome/browser/safe_browsing/notification_telemetry/notification_telemetry_service.cc
|
||||
+++ b/chrome/browser/safe_browsing/notification_telemetry/notification_telemetry_service.cc
|
||||
@@ -116,6 +116,7 @@ NotificationTelemetryService::NotificationTelemetryService(
|
||||
// Notification Telemetry Service is a keyed service and will outlive
|
||||
// any invocations of the callback being registered with the push messaging
|
||||
// service (also a keyed service).
|
||||
+ if (push_messaging_service)
|
||||
push_messaging_service->SetSubscribeFromWorkerCallback(base::BindRepeating(
|
||||
&NotificationTelemetryService::OnNewNotificationServiceWorkerSubscription,
|
||||
base::Unretained(this)));
|
||||
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
|
||||
--- a/chrome/browser/ui/BUILD.gn
|
||||
+++ b/chrome/browser/ui/BUILD.gn
|
||||
|
||||
Reference in New Issue
Block a user