| OLD | NEW |
| 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 "content/renderer/notification_permission_dispatcher.h" | 5 #include "content/renderer/notification_permission_dispatcher.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "content/public/common/service_registry.h" | 10 #include "content/public/common/service_registry.h" |
| (...skipping 19 matching lines...) Expand all Loading... |
| 30 if (!permission_service_.get()) { | 30 if (!permission_service_.get()) { |
| 31 render_frame()->GetServiceRegistry()->ConnectToRemoteService( | 31 render_frame()->GetServiceRegistry()->ConnectToRemoteService( |
| 32 mojo::GetProxy(&permission_service_)); | 32 mojo::GetProxy(&permission_service_)); |
| 33 } | 33 } |
| 34 | 34 |
| 35 scoped_ptr<WebNotificationPermissionCallback> owned_callback(callback); | 35 scoped_ptr<WebNotificationPermissionCallback> owned_callback(callback); |
| 36 | 36 |
| 37 // base::Unretained is safe here because the Mojo channel, with associated | 37 // base::Unretained is safe here because the Mojo channel, with associated |
| 38 // callbacks, will be deleted before the "this" instance is deleted. | 38 // callbacks, will be deleted before the "this" instance is deleted. |
| 39 permission_service_->RequestPermission( | 39 permission_service_->RequestPermission( |
| 40 PERMISSION_NAME_NOTIFICATIONS, origin.toString().utf8(), | 40 PermissionName::NOTIFICATIONS, origin.toString().utf8(), |
| 41 blink::WebUserGestureIndicator::isProcessingUserGesture(), | 41 blink::WebUserGestureIndicator::isProcessingUserGesture(), |
| 42 base::Bind(&NotificationPermissionDispatcher::OnPermissionRequestComplete, | 42 base::Bind(&NotificationPermissionDispatcher::OnPermissionRequestComplete, |
| 43 base::Unretained(this), | 43 base::Unretained(this), |
| 44 base::Passed(std::move(owned_callback)))); | 44 base::Passed(std::move(owned_callback)))); |
| 45 } | 45 } |
| 46 | 46 |
| 47 void NotificationPermissionDispatcher::OnPermissionRequestComplete( | 47 void NotificationPermissionDispatcher::OnPermissionRequestComplete( |
| 48 scoped_ptr<WebNotificationPermissionCallback> callback, | 48 scoped_ptr<WebNotificationPermissionCallback> callback, |
| 49 PermissionStatus status) { | 49 PermissionStatus status) { |
| 50 DCHECK(callback); | 50 DCHECK(callback); |
| 51 | 51 |
| 52 blink::WebNotificationPermission permission = | 52 blink::WebNotificationPermission permission = |
| 53 blink::WebNotificationPermissionDefault; | 53 blink::WebNotificationPermissionDefault; |
| 54 switch (status) { | 54 switch (status) { |
| 55 case PERMISSION_STATUS_GRANTED: | 55 case PermissionStatus::GRANTED: |
| 56 permission = blink::WebNotificationPermissionAllowed; | 56 permission = blink::WebNotificationPermissionAllowed; |
| 57 break; | 57 break; |
| 58 case PERMISSION_STATUS_DENIED: | 58 case PermissionStatus::DENIED: |
| 59 permission = blink::WebNotificationPermissionDenied; | 59 permission = blink::WebNotificationPermissionDenied; |
| 60 break; | 60 break; |
| 61 case PERMISSION_STATUS_ASK: | 61 case PermissionStatus::ASK: |
| 62 permission = blink::WebNotificationPermissionDefault; | 62 permission = blink::WebNotificationPermissionDefault; |
| 63 break; | 63 break; |
| 64 } | 64 } |
| 65 | 65 |
| 66 callback->permissionRequestComplete(permission); | 66 callback->permissionRequestComplete(permission); |
| 67 } | 67 } |
| 68 | 68 |
| 69 } // namespace content | 69 } // namespace content |
| OLD | NEW |