| 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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 const bool result = notification_service_->GetPermissionStatus( | 56 const bool result = notification_service_->GetPermissionStatus( |
| 57 execution_context->GetSecurityOrigin()->ToString(), &permission_status); | 57 execution_context->GetSecurityOrigin()->ToString(), &permission_status); |
| 58 DCHECK(result); | 58 DCHECK(result); |
| 59 | 59 |
| 60 return permission_status; | 60 return permission_status; |
| 61 } | 61 } |
| 62 | 62 |
| 63 ScriptPromise NotificationManager::RequestPermission( | 63 ScriptPromise NotificationManager::RequestPermission( |
| 64 ScriptState* script_state, | 64 ScriptState* script_state, |
| 65 NotificationPermissionCallback* deprecated_callback) { | 65 NotificationPermissionCallback* deprecated_callback) { |
| 66 ExecutionContext* context = script_state->GetExecutionContext(); | 66 ExecutionContext* context = ExecutionContext::From(script_state); |
| 67 | 67 |
| 68 if (!permission_service_) { | 68 if (!permission_service_) { |
| 69 ConnectToPermissionService(context, | 69 ConnectToPermissionService(context, |
| 70 mojo::MakeRequest(&permission_service_)); | 70 mojo::MakeRequest(&permission_service_)); |
| 71 permission_service_.set_connection_error_handler(ConvertToBaseCallback( | 71 permission_service_.set_connection_error_handler(ConvertToBaseCallback( |
| 72 WTF::Bind(&NotificationManager::OnPermissionServiceConnectionError, | 72 WTF::Bind(&NotificationManager::OnPermissionServiceConnectionError, |
| 73 WrapWeakPersistent(this)))); | 73 WrapWeakPersistent(this)))); |
| 74 } | 74 } |
| 75 | 75 |
| 76 ScriptPromiseResolver* resolver = ScriptPromiseResolver::Create(script_state); | 76 ScriptPromiseResolver* resolver = ScriptPromiseResolver::Create(script_state); |
| (...skipping 24 matching lines...) Expand all Loading... |
| 101 | 101 |
| 102 void NotificationManager::OnPermissionServiceConnectionError() { | 102 void NotificationManager::OnPermissionServiceConnectionError() { |
| 103 permission_service_.reset(); | 103 permission_service_.reset(); |
| 104 } | 104 } |
| 105 | 105 |
| 106 DEFINE_TRACE(NotificationManager) { | 106 DEFINE_TRACE(NotificationManager) { |
| 107 Supplement<ExecutionContext>::Trace(visitor); | 107 Supplement<ExecutionContext>::Trace(visitor); |
| 108 } | 108 } |
| 109 | 109 |
| 110 } // namespace blink | 110 } // namespace blink |
| OLD | NEW |