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

Unified Diff: chrome/browser/push_messaging/push_messaging_service_impl.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
Index: chrome/browser/push_messaging/push_messaging_service_impl.cc
diff --git a/chrome/browser/push_messaging/push_messaging_service_impl.cc b/chrome/browser/push_messaging/push_messaging_service_impl.cc
index 3c7345c8c3dc0aa0efc020f068718c9334974fb0..988cccadd939412a1583541fd4f12de67c7cd5d2 100644
--- a/chrome/browser/push_messaging/push_messaging_service_impl.cc
+++ b/chrome/browser/push_messaging/push_messaging_service_impl.cc
@@ -69,13 +69,13 @@
}
blink::WebPushPermissionStatus ToPushPermission(
- permissions::mojom::PermissionStatus permission_status) {
+ blink::mojom::PermissionStatus permission_status) {
switch (permission_status) {
- case permissions::mojom::PermissionStatus::GRANTED:
+ case blink::mojom::PermissionStatus::GRANTED:
return blink::WebPushPermissionStatusGranted;
- case permissions::mojom::PermissionStatus::DENIED:
+ case blink::mojom::PermissionStatus::DENIED:
return blink::WebPushPermissionStatusDenied;
- case permissions::mojom::PermissionStatus::ASK:
+ case blink::mojom::PermissionStatus::ASK:
return blink::WebPushPermissionStatusPrompt;
default:
NOTREACHED();
@@ -519,8 +519,8 @@
const PushMessagingAppIdentifier& app_identifier,
const content::PushSubscriptionOptions& options,
const content::PushMessagingService::RegisterCallback& register_callback,
- permissions::mojom::PermissionStatus permission_status) {
- if (permission_status != permissions::mojom::PermissionStatus::GRANTED) {
+ blink::mojom::PermissionStatus permission_status) {
+ if (permission_status != blink::mojom::PermissionStatus::GRANTED) {
SubscribeEndWithError(register_callback,
content::PUSH_REGISTRATION_STATUS_PERMISSION_DENIED);
return;
« no previous file with comments | « chrome/browser/push_messaging/push_messaging_service_impl.h ('k') | chromecast/browser/cast_permission_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698