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

Unified Diff: content/renderer/notification_permission_dispatcher.cc

Issue 1943963004: Revert of (reland) Move permission.mojom from WebKit/public/platform/ to components/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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/renderer/notification_permission_dispatcher.h ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/notification_permission_dispatcher.cc
diff --git a/content/renderer/notification_permission_dispatcher.cc b/content/renderer/notification_permission_dispatcher.cc
index 2206f876fe8b5b02595b0b0f42eb2360aaaa5419..bb07048e52e422fa62f381ad3a8e4bc146ca2b35 100644
--- a/content/renderer/notification_permission_dispatcher.cc
+++ b/content/renderer/notification_permission_dispatcher.cc
@@ -7,11 +7,11 @@
#include <utility>
#include "base/bind.h"
-#include "components/permissions/permission_status.mojom.h"
#include "content/public/common/service_registry.h"
#include "content/public/renderer/render_frame.h"
#include "third_party/WebKit/public/platform/WebSecurityOrigin.h"
#include "third_party/WebKit/public/platform/WebString.h"
+#include "third_party/WebKit/public/platform/modules/permissions/permission_status.mojom.h"
#include "third_party/WebKit/public/web/modules/notifications/WebNotificationPermissionCallback.h"
using blink::WebNotificationPermissionCallback;
@@ -37,8 +37,7 @@
// base::Unretained is safe here because the Mojo channel, with associated
// callbacks, will be deleted before the "this" instance is deleted.
permission_service_->RequestPermission(
- permissions::mojom::PermissionName::NOTIFICATIONS,
- origin.toString().utf8(),
+ blink::mojom::PermissionName::NOTIFICATIONS, origin.toString().utf8(),
base::Bind(&NotificationPermissionDispatcher::OnPermissionRequestComplete,
base::Unretained(this),
base::Passed(std::move(owned_callback))));
@@ -46,7 +45,7 @@
void NotificationPermissionDispatcher::OnPermissionRequestComplete(
std::unique_ptr<WebNotificationPermissionCallback> callback,
- permissions::mojom::PermissionStatus status) {
+ blink::mojom::PermissionStatus status) {
DCHECK(callback);
callback->permissionRequestComplete(status);
« no previous file with comments | « content/renderer/notification_permission_dispatcher.h ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698