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

Side by Side 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, 4 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "web/NotificationPermissionClientImpl.h" 6 #include "web/NotificationPermissionClientImpl.h"
7 7
8 #include "core/dom/Document.h" 8 #include "core/dom/Document.h"
9 #include "core/dom/ExecutionContext.h" 9 #include "core/dom/ExecutionContext.h"
10 #include "modules/notifications/Notification.h" 10 #include "modules/notifications/Notification.h"
(...skipping 12 matching lines...) Expand all
23 WebNotificationPermissionCallbackImpl(ExecutionContext* executionContext, Pa ssOwnPtr<NotificationPermissionCallback> callback) 23 WebNotificationPermissionCallbackImpl(ExecutionContext* executionContext, Pa ssOwnPtr<NotificationPermissionCallback> callback)
24 : m_executionContext(executionContext) 24 : m_executionContext(executionContext)
25 , m_callback(callback) 25 , m_callback(callback)
26 { 26 {
27 } 27 }
28 28
29 virtual ~WebNotificationPermissionCallbackImpl() { } 29 virtual ~WebNotificationPermissionCallbackImpl() { }
30 30
31 virtual void permissionRequestComplete(WebNotificationPermission permission) OVERRIDE 31 virtual void permissionRequestComplete(WebNotificationPermission permission) OVERRIDE
32 { 32 {
33 m_callback->handleEvent(Notification::permissionString(static_cast<Notif icationClient::Permission>(permission))); 33 if (m_callback)
34 m_callback->handleEvent(Notification::permissionString(static_cast<N otificationClient::Permission>(permission)));
34 } 35 }
35 36
36 // FIXME: Deprecated. Notification::permission() requires another round-trip 37 // FIXME: Deprecated. Notification::permission() requires another round-trip
37 // to the browser process using a synchronous IPC. 38 // to the browser process using a synchronous IPC.
38 virtual void permissionRequestComplete() OVERRIDE 39 virtual void permissionRequestComplete() OVERRIDE
39 { 40 {
40 m_callback->handleEvent(Notification::permission(m_executionContext)); 41 if (m_callback)
42 m_callback->handleEvent(Notification::permission(m_executionContext) );
41 } 43 }
42 44
43 private: 45 private:
44 ExecutionContext* m_executionContext; 46 ExecutionContext* m_executionContext;
45 OwnPtr<NotificationPermissionCallback> m_callback; 47 OwnPtr<NotificationPermissionCallback> m_callback;
46 }; 48 };
47 49
48 } // namespace 50 } // namespace
49 51
50 PassOwnPtrWillBeRawPtr<NotificationPermissionClientImpl> NotificationPermissionC lientImpl::create() 52 PassOwnPtrWillBeRawPtr<NotificationPermissionClientImpl> NotificationPermissionC lientImpl::create()
51 { 53 {
52 return adoptPtrWillBeNoop(new NotificationPermissionClientImpl()); 54 return adoptPtrWillBeNoop(new NotificationPermissionClientImpl());
53 } 55 }
54 56
55 NotificationPermissionClientImpl::NotificationPermissionClientImpl() 57 NotificationPermissionClientImpl::NotificationPermissionClientImpl()
56 { 58 {
57 } 59 }
58 60
59 NotificationPermissionClientImpl::~NotificationPermissionClientImpl() 61 NotificationPermissionClientImpl::~NotificationPermissionClientImpl()
60 { 62 {
61 } 63 }
62 64
63 void NotificationPermissionClientImpl::requestPermission(ExecutionContext* conte xt, PassOwnPtr<NotificationPermissionCallback> callback) 65 void NotificationPermissionClientImpl::requestPermission(ExecutionContext* conte xt, PassOwnPtr<NotificationPermissionCallback> callback)
64 { 66 {
65 ASSERT(context && context->isDocument()); 67 ASSERT(context && context->isDocument());
66 ASSERT(callback);
67 68
68 Document* document = toDocument(context); 69 Document* document = toDocument(context);
69 WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(document->frame() ); 70 WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(document->frame() );
70 71
71 webFrame->client()->requestNotificationPermission(WebSecurityOrigin(context- >securityOrigin()), new WebNotificationPermissionCallbackImpl(context, callback) ); 72 webFrame->client()->requestNotificationPermission(WebSecurityOrigin(context- >securityOrigin()), new WebNotificationPermissionCallbackImpl(context, callback) );
72 } 73 }
73 74
74 } // namespace blink 75 } // namespace blink
OLDNEW
« 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