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

Unified Diff: chrome/browser/push_messaging/push_messaging_permission_context.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_permission_context.cc
diff --git a/chrome/browser/push_messaging/push_messaging_permission_context.cc b/chrome/browser/push_messaging/push_messaging_permission_context.cc
index d0cb61e309eb286da2c71fb97f8f5d92b6c19caf..f5591c26faeba9bab26117e7fa51b77fbf57bd05 100644
--- a/chrome/browser/push_messaging/push_messaging_permission_context.cc
+++ b/chrome/browser/push_messaging/push_messaging_permission_context.cc
@@ -40,17 +40,16 @@
PermissionContextBase::GetPermissionStatus(requesting_origin,
embedding_origin);
- permissions::mojom::PermissionStatus notifications_permission =
+ blink::mojom::PermissionStatus notifications_permission =
PermissionManager::Get(profile_)->GetPermissionStatus(
content::PermissionType::NOTIFICATIONS, requesting_origin,
embedding_origin);
- if (notifications_permission ==
- permissions::mojom::PermissionStatus::DENIED ||
+ if (notifications_permission == blink::mojom::PermissionStatus::DENIED ||
push_content_setting == CONTENT_SETTING_BLOCK) {
return CONTENT_SETTING_BLOCK;
}
- if (notifications_permission == permissions::mojom::PermissionStatus::ASK)
+ if (notifications_permission == blink::mojom::PermissionStatus::ASK)
return CONTENT_SETTING_ASK;
DCHECK(push_content_setting == CONTENT_SETTING_ALLOW ||
@@ -106,9 +105,9 @@
const GURL& requesting_origin,
const GURL& embedding_origin,
const BrowserPermissionCallback& callback,
- permissions::mojom::PermissionStatus notification_status) {
+ blink::mojom::PermissionStatus notification_status) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
- DCHECK_NE(notification_status, permissions::mojom::PermissionStatus::ASK);
+ DCHECK_NE(notification_status, blink::mojom::PermissionStatus::ASK);
ContentSetting push_content_setting =
HostContentSettingsMapFactory::GetForProfile(profile_)
@@ -124,7 +123,7 @@
return;
}
- if (notification_status == permissions::mojom::PermissionStatus::DENIED) {
+ if (notification_status == blink::mojom::PermissionStatus::DENIED) {
DVLOG(1) << "Notification permission has not been granted.";
NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
false /* persist */, CONTENT_SETTING_BLOCK);

Powered by Google App Engine
This is Rietveld 408576698