Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(746)

Unified Diff: content/renderer/push_messaging_dispatcher.cc

Issue 640593003: Remove the sender_id from the Push API code path. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git/+/master
Patch Set: add TODOs Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/push_messaging_dispatcher.cc
diff --git a/content/renderer/push_messaging_dispatcher.cc b/content/renderer/push_messaging_dispatcher.cc
index 1be95bd0b1119031c46329d90910bd0d39693eed..e699a309f9ad3d8ccaad48bf33c5742916babe83 100644
--- a/content/renderer/push_messaging_dispatcher.cc
+++ b/content/renderer/push_messaging_dispatcher.cc
@@ -41,16 +41,20 @@ void PushMessagingDispatcher::registerPushMessaging(
const WebString& sender_id,
blink::WebPushRegistrationCallbacks* callbacks,
blink::WebServiceWorkerProvider* service_worker_provider) {
+ registerPushMessaging(callbacks, service_worker_provider);
+}
+
+void PushMessagingDispatcher::registerPushMessaging(
+ blink::WebPushRegistrationCallbacks* callbacks,
+ blink::WebServiceWorkerProvider* service_worker_provider) {
RenderFrameImpl::FromRoutingID(routing_id())->manifest_manager()->GetManifest(
base::Bind(&PushMessagingDispatcher::DoRegister,
base::Unretained(this),
- sender_id.utf8(),
callbacks,
service_worker_provider));
}
void PushMessagingDispatcher::DoRegister(
- const std::string& sender_id,
blink::WebPushRegistrationCallbacks* callbacks,
blink::WebServiceWorkerProvider* service_worker_provider,
const Manifest& manifest) {
@@ -62,7 +66,7 @@ void PushMessagingDispatcher::DoRegister(
routing_id(),
callbacks_id,
manifest.gcm_sender_id.is_null()
- ? sender_id
+ ? std::string()
: base::UTF16ToUTF8(manifest.gcm_sender_id.string()),
blink::WebUserGestureIndicator::isProcessingUserGesture(),
service_worker_provider_id));
« no previous file with comments | « content/renderer/push_messaging_dispatcher.h ('k') | content/shell/renderer/test_runner/mock_web_push_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698