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

Side by Side Diff: content/renderer/push_messaging_dispatcher.cc

Issue 770023002: Push registration should read a "gcm_user_visible_only" key from the Manifest. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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 unified diff | Download patch
« no previous file with comments | « content/renderer/manifest/manifest_parser_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/push_messaging_dispatcher.h" 5 #include "content/renderer/push_messaging_dispatcher.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "content/child/service_worker/web_service_worker_provider_impl.h" 8 #include "content/child/service_worker/web_service_worker_provider_impl.h"
9 #include "content/common/push_messaging_messages.h" 9 #include "content/common/push_messaging_messages.h"
10 #include "content/renderer/manifest/manifest_manager.h" 10 #include "content/renderer/manifest/manifest_manager.h"
11 #include "content/renderer/render_frame_impl.h" 11 #include "content/renderer/render_frame_impl.h"
12 #include "ipc/ipc_message.h" 12 #include "ipc/ipc_message.h"
13 #include "third_party/WebKit/public/platform/WebPushError.h" 13 #include "third_party/WebKit/public/platform/WebPushError.h"
14 #include "third_party/WebKit/public/platform/WebPushRegistration.h" 14 #include "third_party/WebKit/public/platform/WebPushRegistration.h"
15 #include "third_party/WebKit/public/platform/WebServiceWorkerProvider.h" 15 #include "third_party/WebKit/public/platform/WebServiceWorkerProvider.h"
16 #include "third_party/WebKit/public/platform/WebString.h" 16 #include "third_party/WebKit/public/platform/WebString.h"
17 #include "third_party/WebKit/public/web/WebUserGestureIndicator.h"
18 #include "url/gurl.h" 17 #include "url/gurl.h"
19 18
20 using blink::WebString; 19 using blink::WebString;
21 20
22 namespace content { 21 namespace content {
23 22
24 PushMessagingDispatcher::PushMessagingDispatcher(RenderFrame* render_frame) 23 PushMessagingDispatcher::PushMessagingDispatcher(RenderFrame* render_frame)
25 : RenderFrameObserver(render_frame) { 24 : RenderFrameObserver(render_frame) {
26 } 25 }
27 26
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 OnRegisterFromDocumentError(request_id, 68 OnRegisterFromDocumentError(request_id,
70 PUSH_REGISTRATION_STATUS_NO_SENDER_ID); 69 PUSH_REGISTRATION_STATUS_NO_SENDER_ID);
71 return; 70 return;
72 } 71 }
73 72
74 Send(new PushMessagingHostMsg_RegisterFromDocument( 73 Send(new PushMessagingHostMsg_RegisterFromDocument(
75 routing_id(), request_id, 74 routing_id(), request_id,
76 manifest.gcm_sender_id.is_null() 75 manifest.gcm_sender_id.is_null()
77 ? std::string() 76 ? std::string()
78 : base::UTF16ToUTF8(manifest.gcm_sender_id.string()), 77 : base::UTF16ToUTF8(manifest.gcm_sender_id.string()),
79 blink::WebUserGestureIndicator::isProcessingUserGesture(), 78 manifest.gcm_user_visible_only,
80 service_worker_provider_id)); 79 service_worker_provider_id));
81 } 80 }
82 81
83 void PushMessagingDispatcher::getPermissionStatus( 82 void PushMessagingDispatcher::getPermissionStatus(
84 blink::WebPushPermissionStatusCallback* callback, 83 blink::WebPushPermissionStatusCallback* callback,
85 blink::WebServiceWorkerProvider* service_worker_provider) { 84 blink::WebServiceWorkerProvider* service_worker_provider) {
86 DCHECK(callback); 85 DCHECK(callback);
87 int permission_callback_id = permission_check_callbacks_.Add(callback); 86 int permission_callback_id = permission_check_callbacks_.Add(callback);
88 int service_worker_provider_id = static_cast<WebServiceWorkerProviderImpl*>( 87 int service_worker_provider_id = static_cast<WebServiceWorkerProviderImpl*>(
89 service_worker_provider)->provider_id(); 88 service_worker_provider)->provider_id();
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 132
134 void PushMessagingDispatcher::OnPermissionStatusFailure(int32 callback_id) { 133 void PushMessagingDispatcher::OnPermissionStatusFailure(int32 callback_id) {
135 blink::WebPushPermissionStatusCallback* callback = 134 blink::WebPushPermissionStatusCallback* callback =
136 permission_check_callbacks_.Lookup(callback_id); 135 permission_check_callbacks_.Lookup(callback_id);
137 DCHECK(callback); 136 DCHECK(callback);
138 callback->onError(); 137 callback->onError();
139 permission_check_callbacks_.Remove(callback_id); 138 permission_check_callbacks_.Remove(callback_id);
140 } 139 }
141 140
142 } // namespace content 141 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/manifest/manifest_parser_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698