OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "modules/notifications/NotificationManager.h" | 5 #include "modules/notifications/NotificationManager.h" |
6 | 6 |
7 #include "bindings/core/v8/ScriptPromiseResolver.h" | 7 #include "bindings/core/v8/ScriptPromiseResolver.h" |
8 #include "bindings/core/v8/ScriptState.h" | 8 #include "bindings/core/v8/ScriptState.h" |
9 #include "modules/notifications/Notification.h" | 9 #include "modules/notifications/Notification.h" |
10 #include "modules/notifications/NotificationPermissionCallback.h" | 10 #include "modules/notifications/NotificationPermissionCallback.h" |
(...skipping 29 matching lines...) Expand all Loading... |
40 const char* NotificationManager::supplementName() { | 40 const char* NotificationManager::supplementName() { |
41 return "NotificationManager"; | 41 return "NotificationManager"; |
42 } | 42 } |
43 | 43 |
44 NotificationManager::NotificationManager() {} | 44 NotificationManager::NotificationManager() {} |
45 | 45 |
46 NotificationManager::~NotificationManager() {} | 46 NotificationManager::~NotificationManager() {} |
47 | 47 |
48 mojom::blink::PermissionStatus NotificationManager::permissionStatus( | 48 mojom::blink::PermissionStatus NotificationManager::permissionStatus( |
49 ExecutionContext* executionContext) { | 49 ExecutionContext* executionContext) { |
50 if (!m_notificationService) | 50 if (!m_notificationService) { |
51 Platform::current()->interfaceProvider()->getInterface( | 51 Platform::current()->interfaceProvider()->getInterface( |
52 mojo::GetProxy(&m_notificationService)); | 52 mojo::MakeRequest(&m_notificationService)); |
| 53 } |
53 | 54 |
54 mojom::blink::PermissionStatus permissionStatus; | 55 mojom::blink::PermissionStatus permissionStatus; |
55 const bool result = m_notificationService->GetPermissionStatus( | 56 const bool result = m_notificationService->GetPermissionStatus( |
56 executionContext->getSecurityOrigin()->toString(), &permissionStatus); | 57 executionContext->getSecurityOrigin()->toString(), &permissionStatus); |
57 DCHECK(result); | 58 DCHECK(result); |
58 | 59 |
59 return permissionStatus; | 60 return permissionStatus; |
60 } | 61 } |
61 | 62 |
62 ScriptPromise NotificationManager::requestPermission( | 63 ScriptPromise NotificationManager::requestPermission( |
63 ScriptState* scriptState, | 64 ScriptState* scriptState, |
64 NotificationPermissionCallback* deprecatedCallback) { | 65 NotificationPermissionCallback* deprecatedCallback) { |
65 ExecutionContext* context = scriptState->getExecutionContext(); | 66 ExecutionContext* context = scriptState->getExecutionContext(); |
66 | 67 |
67 if (!m_permissionService) { | 68 if (!m_permissionService) { |
68 connectToPermissionService(context, mojo::GetProxy(&m_permissionService)); | 69 connectToPermissionService(context, |
| 70 mojo::MakeRequest(&m_permissionService)); |
69 m_permissionService.set_connection_error_handler(convertToBaseCallback( | 71 m_permissionService.set_connection_error_handler(convertToBaseCallback( |
70 WTF::bind(&NotificationManager::onPermissionServiceConnectionError, | 72 WTF::bind(&NotificationManager::onPermissionServiceConnectionError, |
71 wrapWeakPersistent(this)))); | 73 wrapWeakPersistent(this)))); |
72 } | 74 } |
73 | 75 |
74 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState); | 76 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState); |
75 ScriptPromise promise = resolver->promise(); | 77 ScriptPromise promise = resolver->promise(); |
76 | 78 |
77 m_permissionService->RequestPermission( | 79 m_permissionService->RequestPermission( |
78 createPermissionDescriptor(mojom::blink::PermissionName::NOTIFICATIONS), | 80 createPermissionDescriptor(mojom::blink::PermissionName::NOTIFICATIONS), |
(...skipping 24 matching lines...) Expand all Loading... |
103 return; | 105 return; |
104 } | 106 } |
105 m_permissionService.reset(); | 107 m_permissionService.reset(); |
106 } | 108 } |
107 | 109 |
108 DEFINE_TRACE(NotificationManager) { | 110 DEFINE_TRACE(NotificationManager) { |
109 Supplement<ExecutionContext>::trace(visitor); | 111 Supplement<ExecutionContext>::trace(visitor); |
110 } | 112 } |
111 | 113 |
112 } // namespace blink | 114 } // namespace blink |
OLD | NEW |