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

Side by Side Diff: Source/web/NotificationPresenterImpl.cpp

Issue 103083002: Decouple FileSystem and WebSQL callbacks from VoidCallback and it non-refcounted (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years 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
« no previous file with comments | « Source/web/NotificationPresenterImpl.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 27 matching lines...) Expand all
38 #include "modules/notifications/NotificationBase.h" 38 #include "modules/notifications/NotificationBase.h"
39 #include "platform/weborigin/SecurityOrigin.h" 39 #include "platform/weborigin/SecurityOrigin.h"
40 40
41 using namespace WebCore; 41 using namespace WebCore;
42 42
43 namespace blink { 43 namespace blink {
44 44
45 #if ENABLE(LEGACY_NOTIFICATIONS) 45 #if ENABLE(LEGACY_NOTIFICATIONS)
46 class VoidCallbackClient : public WebNotificationPermissionCallback { 46 class VoidCallbackClient : public WebNotificationPermissionCallback {
47 public: 47 public:
48 explicit VoidCallbackClient(PassRefPtr<VoidCallback> callback) 48 explicit VoidCallbackClient(PassOwnPtr<VoidCallback> callback)
49 : m_callback(callback) 49 : m_callback(callback)
50 { 50 {
51 } 51 }
52 52
53 virtual void permissionRequestComplete() 53 virtual void permissionRequestComplete()
54 { 54 {
55 if (m_callback) 55 if (m_callback)
56 m_callback->handleEvent(); 56 m_callback->handleEvent();
57 delete this; 57 delete this;
58 } 58 }
59 59
60 private: 60 private:
61 virtual ~VoidCallbackClient() { } 61 virtual ~VoidCallbackClient() { }
62 62
63 RefPtr<VoidCallback> m_callback; 63 OwnPtr<VoidCallback> m_callback;
64 }; 64 };
65 #endif // ENABLE(LEGACY_NOTIFICATIONS) 65 #endif // ENABLE(LEGACY_NOTIFICATIONS)
66 66
67 class NotificationPermissionCallbackClient : public WebNotificationPermissionCal lback { 67 class NotificationPermissionCallbackClient : public WebNotificationPermissionCal lback {
68 public: 68 public:
69 NotificationPermissionCallbackClient(WebNotificationPresenter* presenter, Pa ssRefPtr<SecurityOrigin> securityOrigin, PassOwnPtr<NotificationPermissionCallba ck> callback) 69 NotificationPermissionCallbackClient(WebNotificationPresenter* presenter, Pa ssRefPtr<SecurityOrigin> securityOrigin, PassOwnPtr<NotificationPermissionCallba ck> callback)
70 : m_presenter(presenter) 70 : m_presenter(presenter)
71 , m_securityOrigin(securityOrigin) 71 , m_securityOrigin(securityOrigin)
72 , m_callback(callback) 72 , m_callback(callback)
73 { 73 {
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 { 117 {
118 } 118 }
119 119
120 NotificationClient::Permission NotificationPresenterImpl::checkPermission(Execut ionContext* context) 120 NotificationClient::Permission NotificationPresenterImpl::checkPermission(Execut ionContext* context)
121 { 121 {
122 int result = m_presenter->checkPermission(WebSecurityOrigin(context->securit yOrigin())); 122 int result = m_presenter->checkPermission(WebSecurityOrigin(context->securit yOrigin()));
123 return static_cast<NotificationClient::Permission>(result); 123 return static_cast<NotificationClient::Permission>(result);
124 } 124 }
125 125
126 #if ENABLE(LEGACY_NOTIFICATIONS) 126 #if ENABLE(LEGACY_NOTIFICATIONS)
127 void NotificationPresenterImpl::requestPermission(ExecutionContext* context, Pas sRefPtr<VoidCallback> callback) 127 void NotificationPresenterImpl::requestPermission(ExecutionContext* context, Pas sOwnPtr<VoidCallback> callback)
128 { 128 {
129 m_presenter->requestPermission(WebSecurityOrigin(context->securityOrigin()), new VoidCallbackClient(callback)); 129 m_presenter->requestPermission(WebSecurityOrigin(context->securityOrigin()), new VoidCallbackClient(callback));
130 } 130 }
131 #endif // ENABLE(LEGACY_NOTIFICATIONS) 131 #endif // ENABLE(LEGACY_NOTIFICATIONS)
132 132
133 void NotificationPresenterImpl::requestPermission(ExecutionContext* context, WTF ::PassOwnPtr<NotificationPermissionCallback> callback) 133 void NotificationPresenterImpl::requestPermission(ExecutionContext* context, WTF ::PassOwnPtr<NotificationPermissionCallback> callback)
134 { 134 {
135 m_presenter->requestPermission(WebSecurityOrigin(context->securityOrigin()), new NotificationPermissionCallbackClient(m_presenter, context->securityOrigin() , callback)); 135 m_presenter->requestPermission(WebSecurityOrigin(context->securityOrigin()), new NotificationPermissionCallbackClient(m_presenter, context->securityOrigin() , callback));
136 } 136 }
137 137
138 } // namespace blink 138 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/NotificationPresenterImpl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698