chrome/browser/push_messaging/push_messaging_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/push_messaging/push_messaging_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/push_messaging/push_messaging_permission_context_unittest.cc ('k') | chrome/browser/push_messaging/push_messaging_service_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/push_messaging/push_messaging_service_impl.h

diff --git a/chrome/browser/push_messaging/push_messaging_service_impl.h b/chrome/browser/push_messaging/push_messaging_service_impl.h

index 495a4f6f0d90a735c2e42ff54f5a396111867c61..2b0a3b78f4c7d622c7dd3b9644ba0e7e47540bc9 100644

--- a/chrome/browser/push_messaging/push_messaging_service_impl.h

+++ b/chrome/browser/push_messaging/push_messaging_service_impl.h

@@ -23,10 +23,10 @@

#include "components/gcm_driver/gcm_app_handler.h"

#include "components/gcm_driver/gcm_client.h"

#include "components/keyed_service/core/keyed_service.h"

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

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

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

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

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

#include "third_party/WebKit/public/platform/modules/push_messaging/WebPushPermissionStatus.h"

#if defined(ENABLE_NOTIFICATIONS)

@@ -168,7 +168,7 @@

const PushMessagingAppIdentifier& app_identifier,

const content::PushSubscriptionOptions& options,

const content::PushMessagingService::RegisterCallback& callback,

- permissions::mojom::PermissionStatus permission_status);

+ blink::mojom::PermissionStatus permission_status);

// GetEncryptionInfo method --------------------------------------------------