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

Unified Diff: content/browser/push_messaging_message_filter.cc

Issue 343743004: Implement a permission check for push. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add content settings html sections Created 6 years, 6 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
« no previous file with comments | « content/browser/push_messaging_message_filter.h ('k') | content/public/browser/push_messaging_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/push_messaging_message_filter.cc
diff --git a/content/browser/push_messaging_message_filter.cc b/content/browser/push_messaging_message_filter.cc
index 451c11253f6be876828459a742e4928d4780a679..a4075c5076164072aa9193631d9592fc70a30fe4 100644
--- a/content/browser/push_messaging_message_filter.cc
+++ b/content/browser/push_messaging_message_filter.cc
@@ -33,53 +33,58 @@ bool PushMessagingMessageFilter::OnMessageReceived(
return handled;
}
-void PushMessagingMessageFilter::OnRegister(int routing_id,
+void PushMessagingMessageFilter::OnRegister(int render_view_id,
int callbacks_id,
const std::string& sender_id) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
// TODO(mvanouwerkerk): Validate arguments?
// TODO(mvanouwerkerk): A WebContentsObserver could avoid this PostTask
// by receiving the IPC on the UI thread.
+ // TODO(mvanouwerkerk): move WebPushClient to WebFrameClient and its
+ // content implementation to RenderFrameObserver instead of
+ // RenderViewObserver
BrowserThread::PostTask(BrowserThread::UI,
FROM_HERE,
base::Bind(&PushMessagingMessageFilter::DoRegister,
weak_factory_.GetWeakPtr(),
- routing_id,
+ render_view_id,
callbacks_id,
sender_id));
}
-void PushMessagingMessageFilter::DoRegister(int routing_id,
+void PushMessagingMessageFilter::DoRegister(int render_view_id,
int callbacks_id,
const std::string& sender_id) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
if (!service()) {
- DidRegister(routing_id, callbacks_id, GURL(), "", false);
+ DidRegister(render_view_id, callbacks_id, GURL(), "", false);
return;
}
// TODO(mvanouwerkerk): Pass in a real app ID based on Service Worker ID.
std::string app_id = "https://example.com 0";
service_->Register(app_id,
sender_id,
+ render_process_id_,
+ render_view_id,
base::Bind(&PushMessagingMessageFilter::DidRegister,
weak_factory_.GetWeakPtr(),
- routing_id,
+ render_view_id,
callbacks_id));
}
-void PushMessagingMessageFilter::DidRegister(int routing_id,
+void PushMessagingMessageFilter::DidRegister(int render_view_id,
int callbacks_id,
const GURL& endpoint,
const std::string& registration_id,
bool success) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
if (success) {
- Send(new PushMessagingMsg_RegisterSuccess(routing_id,
+ Send(new PushMessagingMsg_RegisterSuccess(render_view_id,
callbacks_id,
endpoint,
registration_id));
} else {
- Send(new PushMessagingMsg_RegisterError(routing_id, callbacks_id));
+ Send(new PushMessagingMsg_RegisterError(render_view_id, callbacks_id));
}
}
« no previous file with comments | « content/browser/push_messaging_message_filter.h ('k') | content/public/browser/push_messaging_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698