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

Unified Diff: third_party/WebKit/Source/modules/notifications/Notification.cpp

Issue 1942353002: (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, 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
Index: third_party/WebKit/Source/modules/notifications/Notification.cpp
diff --git a/third_party/WebKit/Source/modules/notifications/Notification.cpp b/third_party/WebKit/Source/modules/notifications/Notification.cpp
index a874cbe0ba0267b670cf4caeeafb4d89d670ea9b..b71091875d0ebf6b2ca81361d9a4db073ad5a67b 100644
--- a/third_party/WebKit/Source/modules/notifications/Notification.cpp
+++ b/third_party/WebKit/Source/modules/notifications/Notification.cpp
@@ -144,7 +144,7 @@ void Notification::schedulePrepareShow()
void Notification::prepareShow()
{
ASSERT(m_state == NotificationStateIdle);
- if (Notification::checkPermission(getExecutionContext()) != mojom::PermissionStatus::GRANTED) {
+ if (Notification::checkPermission(getExecutionContext()) != permissions::mojom::PermissionStatus::GRANTED) {
dispatchErrorEvent();
return;
}
@@ -333,14 +333,14 @@ HeapVector<NotificationAction> Notification::actions() const
return actions;
}
-String Notification::permissionString(mojom::PermissionStatus permission)
+String Notification::permissionString(permissions::mojom::PermissionStatus permission)
{
switch (permission) {
- case mojom::PermissionStatus::GRANTED:
+ case permissions::mojom::PermissionStatus::GRANTED:
return "granted";
- case mojom::PermissionStatus::DENIED:
+ case permissions::mojom::PermissionStatus::DENIED:
return "denied";
- case mojom::PermissionStatus::ASK:
+ case permissions::mojom::PermissionStatus::ASK:
return "default";
}
@@ -353,7 +353,7 @@ String Notification::permission(ExecutionContext* context)
return permissionString(checkPermission(context));
}
-mojom::PermissionStatus Notification::checkPermission(ExecutionContext* context)
+permissions::mojom::PermissionStatus Notification::checkPermission(ExecutionContext* context)
{
SecurityOrigin* origin = context->getSecurityOrigin();
ASSERT(origin);

Powered by Google App Engine
This is Rietveld 408576698