diff options
| author | rafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-31 01:09:42 +0000 |
|---|---|---|
| committer | rafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-31 01:09:42 +0000 |
| commit | 57a777f7584961290e87e6e4149c0ed042334425 (patch) | |
| tree | 94ccff83d4ac08208da52890d4e4ae8e33a0f946 /chrome/renderer | |
| parent | 151793fa77c13c94709ab5525a8f3fd9a5301450 (diff) | |
| download | chromium_src-57a777f7584961290e87e6e4149c0ed042334425.zip chromium_src-57a777f7584961290e87e6e4149c0ed042334425.tar.gz chromium_src-57a777f7584961290e87e6e4149c0ed042334425.tar.bz2 | |
Hook up extension apps notification permission, take two
This is the chromium side of a change which will wait to land on the webkit side landing. (https://bugs.webkit.org/show_bug.cgi?id=36625)
It changes the NotificationPresenter to pass the sourceURL, rather than the SecurityOrigin in checking permission.
The full URL is required to match the app extent.
BUG=32361, 31024
TEST=NONE
Review URL: http://codereview.chromium.org/1383001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43162 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/notification_provider.cc | 3 | ||||
| -rw-r--r-- | chrome/renderer/notification_provider.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/chrome/renderer/notification_provider.cc b/chrome/renderer/notification_provider.cc index 1bcefee..45fb7b9 100644 --- a/chrome/renderer/notification_provider.cc +++ b/chrome/renderer/notification_provider.cc @@ -52,12 +52,11 @@ void NotificationProvider::objectDestroyed( } WebNotificationPresenter::Permission NotificationProvider::checkPermission( - const WebURL& url, WebDocument* document) { + const WebURL& url) { int permission; Send(new ViewHostMsg_CheckNotificationPermission( view_->routing_id(), url, - document ? UTF16ToASCII(document->applicationID()) : "", &permission)); return static_cast<WebNotificationPresenter::Permission>(permission); } diff --git a/chrome/renderer/notification_provider.h b/chrome/renderer/notification_provider.h index 85cda25..1eb7dda 100644 --- a/chrome/renderer/notification_provider.h +++ b/chrome/renderer/notification_provider.h @@ -29,7 +29,7 @@ class NotificationProvider : public WebKit::WebNotificationPresenter { virtual void cancel(const WebKit::WebNotification& proxy); virtual void objectDestroyed(const WebKit::WebNotification& proxy); virtual WebKit::WebNotificationPresenter::Permission checkPermission( - const WebKit::WebURL& url, WebKit::WebDocument* document); + const WebKit::WebURL& url); virtual void requestPermission(const WebKit::WebString& origin, WebKit::WebNotificationPermissionCallback* callback); |