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

Unified Diff: content/renderer/notification_provider.cc

Issue 7242014: Update src/content/renderer to reflect WEBKIT_FRAME_TO_DOCUMENT_API_MOVE (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc ('k') | content/renderer/render_thread.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/notification_provider.cc
===================================================================
--- content/renderer/notification_provider.cc (revision 90236)
+++ content/renderer/notification_provider.cc (working copy)
@@ -102,8 +102,8 @@
int id) {
DCHECK(notification.isHTML());
DesktopNotificationHostMsg_Show_Params params;
- params.origin =
- GURL(render_view()->webview()->mainFrame()->url()).GetOrigin();
+ WebDocument document = render_view()->webview()->mainFrame()->document();
+ params.origin = GURL(document.securityOrigin().toString());
params.is_html = true;
params.contents_url = notification.url();
params.notification_id = id;
@@ -116,8 +116,8 @@
DCHECK(!notification.isHTML());
DesktopNotificationHostMsg_Show_Params params;
params.is_html = false;
- params.origin = GURL(
- render_view()->webview()->mainFrame()->url()).GetOrigin();
+ WebDocument document = render_view()->webview()->mainFrame()->document();
+ params.origin = GURL(document.securityOrigin().toString());
params.icon_url = notification.iconURL();
params.title = notification.title();
params.body = notification.body();
« no previous file with comments | « content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc ('k') | content/renderer/render_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698