Chromium Code Reviews| Index: third_party/WebKit/Source/modules/notifications/NotificationManager.cpp |
| diff --git a/third_party/WebKit/Source/modules/notifications/NotificationManager.cpp b/third_party/WebKit/Source/modules/notifications/NotificationManager.cpp |
| index 66d2a76a50026f012cd35060390f342f387ec2db..07dd280f8d8266bb62dd32c739ccd5b55bdef507 100644 |
| --- a/third_party/WebKit/Source/modules/notifications/NotificationManager.cpp |
| +++ b/third_party/WebKit/Source/modules/notifications/NotificationManager.cpp |
| @@ -28,7 +28,7 @@ NotificationManager* NotificationManager::from( |
| NotificationManager* manager = static_cast<NotificationManager*>( |
| Supplement<ExecutionContext>::from(executionContext, supplementName())); |
| if (!manager) { |
| - manager = new NotificationManager(executionContext); |
| + manager = new NotificationManager(); |
| Supplement<ExecutionContext>::provideTo(*executionContext, supplementName(), |
| manager); |
| } |
| @@ -41,20 +41,19 @@ const char* NotificationManager::supplementName() { |
| return "NotificationManager"; |
| } |
| -NotificationManager::NotificationManager(ExecutionContext* executionContext) |
| - : ContextLifecycleObserver(executionContext) {} |
| +NotificationManager::NotificationManager() {} |
| NotificationManager::~NotificationManager() {} |
| -mojom::blink::PermissionStatus NotificationManager::permissionStatus() { |
| +mojom::blink::PermissionStatus NotificationManager::permissionStatus( |
| + ExecutionContext* executionContext) { |
| if (!m_notificationService) |
| Platform::current()->interfaceProvider()->getInterface( |
| mojo::GetProxy(&m_notificationService)); |
| mojom::blink::PermissionStatus permissionStatus; |
| const bool result = m_notificationService->GetPermissionStatus( |
| - getExecutionContext()->getSecurityOrigin()->toString(), |
| - &permissionStatus); |
| + executionContext->getSecurityOrigin()->toString(), &permissionStatus); |
| DCHECK(result); |
| return permissionStatus; |
| @@ -87,11 +86,6 @@ ScriptPromise NotificationManager::requestPermission( |
| return promise; |
| } |
| -void NotificationManager::contextDestroyed() { |
| - m_notificationService.reset(); |
| - m_permissionService.reset(); |
|
haraken
2016/12/07 06:56:06
As far as I understand, there is no benefit in res
|
| -} |
| - |
| void NotificationManager::onPermissionRequestComplete( |
| ScriptPromiseResolver* resolver, |
| NotificationPermissionCallback* deprecatedCallback, |
| @@ -112,7 +106,6 @@ void NotificationManager::onPermissionServiceConnectionError() { |
| } |
| DEFINE_TRACE(NotificationManager) { |
| - ContextLifecycleObserver::trace(visitor); |
| Supplement<ExecutionContext>::trace(visitor); |
| } |