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

Unified Diff: content/shell/browser/layout_test/layout_test_notification_manager.h

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: content/shell/browser/layout_test/layout_test_notification_manager.h
diff --git a/content/shell/browser/layout_test/layout_test_notification_manager.h b/content/shell/browser/layout_test/layout_test_notification_manager.h
index 75bd5cace14e358f0683d76258c820cd85a77f3b..8fe89fef90cf1442c8560c4043f45a07c0c1c831 100644
--- a/content/shell/browser/layout_test/layout_test_notification_manager.h
+++ b/content/shell/browser/layout_test/layout_test_notification_manager.h
@@ -12,8 +12,8 @@
#include "base/callback.h"
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
-#include "components/permissions/permission_status.mojom.h"
#include "content/public/browser/platform_notification_service.h"
+#include "third_party/WebKit/public/platform/modules/permissions/permission_status.mojom.h"
#include "url/gurl.h"
namespace content {
@@ -39,11 +39,11 @@
void SimulateClose(const std::string& title, bool by_user);
// PlatformNotificationService implementation.
- permissions::mojom::PermissionStatus CheckPermissionOnUIThread(
+ blink::mojom::PermissionStatus CheckPermissionOnUIThread(
BrowserContext* browser_context,
const GURL& origin,
int render_process_id) override;
- permissions::mojom::PermissionStatus CheckPermissionOnIOThread(
+ blink::mojom::PermissionStatus CheckPermissionOnIOThread(
ResourceContext* resource_context,
const GURL& origin,
int render_process_id) override;
@@ -86,7 +86,7 @@
// Checks if |origin| has permission to display notifications. May be called
// on both the IO and the UI threads.
- permissions::mojom::PermissionStatus CheckPermission(const GURL& origin);
+ blink::mojom::PermissionStatus CheckPermission(const GURL& origin);
std::map<std::string, DesktopNotificationDelegate*> page_notifications_;
std::map<std::string, PersistentNotification> persistent_notifications_;

Powered by Google App Engine
This is Rietveld 408576698