diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-03 13:42:47 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-15 10:27:51 +0000 |
| commit | 8c5c43c7b138c9b4b0bf56d946e61d3bbc111bec (patch) | |
| tree | d29d987c4d7b173cf853279b79a51598f104b403 /chromium/content/renderer/push_messaging/push_messaging_client.cc | |
| parent | 830c9e163d31a9180fadca926b3e1d7dfffb5021 (diff) | |
| download | qtwebengine-chromium-8c5c43c7b138c9b4b0bf56d946e61d3bbc111bec.tar.gz | |
BASELINE: Update Chromium to 66.0.3359.156
Change-Id: I0c9831ad39911a086b6377b16f995ad75a51e441
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'chromium/content/renderer/push_messaging/push_messaging_client.cc')
| -rw-r--r-- | chromium/content/renderer/push_messaging/push_messaging_client.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/chromium/content/renderer/push_messaging/push_messaging_client.cc b/chromium/content/renderer/push_messaging/push_messaging_client.cc index f0450f49a6c..95f4c71dbab 100644 --- a/chromium/content/renderer/push_messaging/push_messaging_client.cc +++ b/chromium/content/renderer/push_messaging/push_messaging_client.cc @@ -57,10 +57,10 @@ void PushMessagingClient::Subscribe( if (options.application_server_key.IsEmpty()) { RenderFrameImpl::FromRoutingID(routing_id()) ->GetManifestManager() - .RequestManifest( - base::BindOnce(&PushMessagingClient::DidGetManifest, - base::Unretained(this), service_worker_registration, - options, user_gesture, base::Passed(&callbacks))); + .RequestManifest(base::BindOnce(&PushMessagingClient::DidGetManifest, + base::Unretained(this), + service_worker_registration, options, + user_gesture, std::move(callbacks))); } else { PushSubscriptionOptions content_options; content_options.user_visible_only = options.user_visible_only; @@ -122,7 +122,7 @@ void PushMessagingClient::DoSubscribe( // Safe to use base::Unretained because |push_messaging_manager_ |is // owned by |this|. base::BindOnce(&PushMessagingClient::DidSubscribe, base::Unretained(this), - base::Passed(&callbacks))); + std::move(callbacks))); } void PushMessagingClient::DidSubscribe( @@ -135,6 +135,8 @@ void PushMessagingClient::DidSubscribe( DCHECK(callbacks); if (status == mojom::PushRegistrationStatus::SUCCESS_FROM_PUSH_SERVICE || + status == mojom::PushRegistrationStatus:: + SUCCESS_NEW_SUBSCRIPTION_FROM_PUSH_SERVICE || status == mojom::PushRegistrationStatus::SUCCESS_FROM_CACHE) { DCHECK(endpoint); DCHECK(options); |