summaryrefslogtreecommitdiffstats
path: root/content/renderer/notification_provider.cc
diff options
context:
space:
mode:
authorabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-24 18:28:41 +0000
committerabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-24 18:28:41 +0000
commitb6cb3a84711ab0169d44eee967fe238a805dda70 (patch)
tree1ffc3bbb5adf8ecbfccab87a1ba3251619489920 /content/renderer/notification_provider.cc
parentf5462fdb35a3e41308c49b3308d59ab94f52bb58 (diff)
downloadchromium_src-b6cb3a84711ab0169d44eee967fe238a805dda70.zip
chromium_src-b6cb3a84711ab0169d44eee967fe238a805dda70.tar.gz
chromium_src-b6cb3a84711ab0169d44eee967fe238a805dda70.tar.bz2
Update src/content/renderer to reflect WEBKIT_FRAME_TO_DOCUMENT_API_MOVE
Review URL: http://codereview.chromium.org/7242014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90392 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/notification_provider.cc')
-rw-r--r--content/renderer/notification_provider.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/content/renderer/notification_provider.cc b/content/renderer/notification_provider.cc
index ea6b54a..4cc04b7 100644
--- a/content/renderer/notification_provider.cc
+++ b/content/renderer/notification_provider.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -102,8 +102,8 @@ bool NotificationProvider::ShowHTML(const WebNotification& notification,
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 @@ bool NotificationProvider::ShowText(const WebNotification& notification,
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();