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

Unified Diff: chrome/browser/notifications/platform_notification_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/notifications/platform_notification_service_impl.cc
diff --git a/chrome/browser/notifications/platform_notification_service_impl.cc b/chrome/browser/notifications/platform_notification_service_impl.cc
index c8419c798f8407361a6f3851af8f495c7c4609d8..f8fdd5c9157c73a0c060cca3f2ddc5c8b740bd37 100644
--- a/chrome/browser/notifications/platform_notification_service_impl.cc
+++ b/chrome/browser/notifications/platform_notification_service_impl.cc
@@ -178,13 +178,13 @@
const GURL& origin,
int action_index) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
- permissions::mojom::PermissionStatus permission_status =
+ blink::mojom::PermissionStatus permission_status =
CheckPermissionOnUIThread(browser_context, origin,
kInvalidRenderProcessId);
// TODO(peter): Change this to a CHECK() when Issue 555572 is resolved.
// Also change this method to be const again.
- if (permission_status != permissions::mojom::PermissionStatus::GRANTED) {
+ if (permission_status != blink::mojom::PermissionStatus::GRANTED) {
content::RecordAction(base::UserMetricsAction(
"Notifications.Persistent.ClickedWithoutPermission"));
return;
@@ -228,7 +228,7 @@
base::Bind(&OnCloseEventDispatchComplete));
}
-permissions::mojom::PermissionStatus
+blink::mojom::PermissionStatus
PlatformNotificationServiceImpl::CheckPermissionOnUIThread(
BrowserContext* browser_context,
const GURL& origin,
@@ -262,7 +262,7 @@
NotifierId notifier_id(NotifierId::APPLICATION, extension->id());
if (notifier_state_tracker->IsNotifierEnabled(notifier_id))
- return permissions::mojom::PermissionStatus::GRANTED;
+ return blink::mojom::PermissionStatus::GRANTED;
}
}
#endif
@@ -271,14 +271,14 @@
DesktopNotificationProfileUtil::GetContentSetting(profile, origin);
if (setting == CONTENT_SETTING_ALLOW)
- return permissions::mojom::PermissionStatus::GRANTED;
+ return blink::mojom::PermissionStatus::GRANTED;
if (setting == CONTENT_SETTING_BLOCK)
- return permissions::mojom::PermissionStatus::DENIED;
-
- return permissions::mojom::PermissionStatus::ASK;
-}
-
-permissions::mojom::PermissionStatus
+ return blink::mojom::PermissionStatus::DENIED;
+
+ return blink::mojom::PermissionStatus::ASK;
+}
+
+blink::mojom::PermissionStatus
PlatformNotificationServiceImpl::CheckPermissionOnIOThread(
content::ResourceContext* resource_context,
const GURL& origin,
@@ -303,7 +303,7 @@
extensions::APIPermission::kNotifications) &&
process_map.Contains(extension->id(), render_process_id)) {
if (!extension_info_map->AreNotificationsDisabled(extension->id()))
- return permissions::mojom::PermissionStatus::GRANTED;
+ return blink::mojom::PermissionStatus::GRANTED;
}
}
#endif
@@ -318,11 +318,11 @@
content_settings::ResourceIdentifier());
if (setting == CONTENT_SETTING_ALLOW)
- return permissions::mojom::PermissionStatus::GRANTED;
+ return blink::mojom::PermissionStatus::GRANTED;
if (setting == CONTENT_SETTING_BLOCK)
- return permissions::mojom::PermissionStatus::DENIED;
-
- return permissions::mojom::PermissionStatus::ASK;
+ return blink::mojom::PermissionStatus::DENIED;
+
+ return blink::mojom::PermissionStatus::ASK;
}
void PlatformNotificationServiceImpl::DisplayNotification(

Powered by Google App Engine
This is Rietveld 408576698