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

Unified Diff: Source/web/NotificationPermissionClientImpl.cpp

Issue 393863002: Switch Blink to the new Web Notifications permission path. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 5 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 | « Source/modules/notifications/NotificationClient.h ('k') | Source/web/NotificationPresenterImpl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/NotificationPermissionClientImpl.cpp
diff --git a/Source/web/NotificationPermissionClientImpl.cpp b/Source/web/NotificationPermissionClientImpl.cpp
index 580a50abf8db38e75b847cacb7a42d2f8badbf2d..23c253adbd1099713efb678fc29f1ea2033d1f55 100644
--- a/Source/web/NotificationPermissionClientImpl.cpp
+++ b/Source/web/NotificationPermissionClientImpl.cpp
@@ -30,14 +30,16 @@ public:
virtual void permissionRequestComplete(WebNotificationPermission permission) OVERRIDE
{
- m_callback->handleEvent(Notification::permissionString(static_cast<NotificationClient::Permission>(permission)));
+ if (m_callback)
+ m_callback->handleEvent(Notification::permissionString(static_cast<NotificationClient::Permission>(permission)));
}
// FIXME: Deprecated. Notification::permission() requires another round-trip
// to the browser process using a synchronous IPC.
virtual void permissionRequestComplete() OVERRIDE
{
- m_callback->handleEvent(Notification::permission(m_executionContext));
+ if (m_callback)
+ m_callback->handleEvent(Notification::permission(m_executionContext));
}
private:
@@ -63,7 +65,6 @@ NotificationPermissionClientImpl::~NotificationPermissionClientImpl()
void NotificationPermissionClientImpl::requestPermission(ExecutionContext* context, PassOwnPtr<NotificationPermissionCallback> callback)
{
ASSERT(context && context->isDocument());
- ASSERT(callback);
Document* document = toDocument(context);
WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(document->frame());
« no previous file with comments | « Source/modules/notifications/NotificationClient.h ('k') | Source/web/NotificationPresenterImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698