Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2496)

Unified Diff: content/child/notifications/notification_manager.cc

Issue 1898153002: Migrate notifications to use the PermissionStatus enum (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix type traits conflicts Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/child/notifications/notification_manager.h ('k') | content/common/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/notifications/notification_manager.cc
diff --git a/content/child/notifications/notification_manager.cc b/content/child/notifications/notification_manager.cc
index a3e10def6b2e197c3a306988c663c897e2bcfab3..f769e7a7108d1b449b6681312d04481a94a60b2a 100644
--- a/content/child/notifications/notification_manager.cc
+++ b/content/child/notifications/notification_manager.cc
@@ -20,8 +20,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 {
@@ -211,17 +209,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;
+
// 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;
}
bool NotificationManager::OnMessageReceived(const IPC::Message& message) {
« no previous file with comments | « content/child/notifications/notification_manager.h ('k') | content/common/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698