Chromium Code Reviews| Index: content/child/notifications/notification_manager.cc |
| diff --git a/content/child/notifications/notification_manager.cc b/content/child/notifications/notification_manager.cc |
| index 7a27ad024ff153cd46833e0350304daff6c2c9ef..62f63e5754627c2ad689407bf601ca451a25912b 100644 |
| --- a/content/child/notifications/notification_manager.cc |
| +++ b/content/child/notifications/notification_manager.cc |
| @@ -21,8 +21,6 @@ |
| #include "third_party/WebKit/public/platform/WebSecurityOrigin.h" |
| #include "third_party/WebKit/public/platform/modules/notifications/WebNotificationDelegate.h" |
| -using blink::WebNotificationPermission; |
| - |
| namespace content { |
| namespace { |
| @@ -212,17 +210,18 @@ void NotificationManager::notifyDelegateDestroyed( |
| } |
| } |
| -WebNotificationPermission NotificationManager::checkPermission( |
| +blink::mojom::PermissionStatus NotificationManager::checkPermission( |
| const blink::WebSecurityOrigin& origin) { |
| - WebNotificationPermission permission = |
| - blink::WebNotificationPermissionAllowed; |
| + blink::mojom::PermissionStatus permission_status = |
| + blink::mojom::PermissionStatus::DENIED; |
|
Peter Beverloo
2016/04/19 14:54:02
This shouldn't make any difference since the sync
|
| + |
| // TODO(mkwst): This is potentially doing the wrong thing with unique |
| // origins. Perhaps also 'file:', 'blob:' and 'filesystem:'. See |
| // https://crbug.com/490074 for detail. |
| thread_safe_sender_->Send(new PlatformNotificationHostMsg_CheckPermission( |
| - blink::WebStringToGURL(origin.toString()), &permission)); |
| + blink::WebStringToGURL(origin.toString()), &permission_status)); |
| - return permission; |
| + return permission_status; |
| } |
| size_t NotificationManager::maxActions() { |