chrome/browser/notifications/platform_notification_service_impl.h - Issue 1943963004: Revert of (reland) Move permission.mojom from WebKit/public/platform/ to components/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/notifications/platform_notification_service_impl.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

« no previous file with comments | « chrome/browser/notifications/notification_permission_context_unittest.cc ('k') | chrome/browser/notifications/platform_notification_service_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/notifications/platform_notification_service_impl.h

diff --git a/chrome/browser/notifications/platform_notification_service_impl.h b/chrome/browser/notifications/platform_notification_service_impl.h

index 1c2344e86a4dfde08f192cee452723cdfb952cd2..90793ee52e94607a295d0ccdc970fefbbc78c71b 100644

--- a/chrome/browser/notifications/platform_notification_service_impl.h

+++ b/chrome/browser/notifications/platform_notification_service_impl.h

@@ -19,9 +19,9 @@

#include "base/strings/string16.h"

#include "chrome/browser/notifications/notification.h"

#include "chrome/browser/profiles/profile.h"

-#include "components/permissions/permission_status.mojom.h"

#include "content/public/browser/platform_notification_service.h"

#include "content/public/common/persistent_notification_status.h"

+#include "third_party/WebKit/public/platform/modules/permissions/permission_status.mojom.h"

class NotificationDelegate;

class NotificationDisplayService;

@@ -84,11 +84,11 @@

void OpenNotificationSettings(content::BrowserContext* browser_context);

// content::PlatformNotificationService implementation.

- permissions::mojom::PermissionStatus CheckPermissionOnUIThread(

+ blink::mojom::PermissionStatus CheckPermissionOnUIThread(

content::BrowserContext* browser_context,

const GURL& origin,

int render_process_id) override;

- permissions::mojom::PermissionStatus CheckPermissionOnIOThread(

+ blink::mojom::PermissionStatus CheckPermissionOnIOThread(

content::ResourceContext* resource_context,

const GURL& origin,

int render_process_id) override;