chrome/browser/push_messaging/push_messaging_service_impl.h - Issue 1373883003: Move geolocation and permission mojoms into 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 1373883003: Move geolocation and permission mojoms into components. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 2 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/permissions/permission_manager_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 f0b75fd47a4f5d56b6d39af2c1077be189fe2c47..a8afae9fc7e38ea23806029871d254f7ca8a8168 100644

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

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

@@ -19,8 +19,8 @@

#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/permission/public/interfaces/permission_status.mojom.h"

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

-#include "content/public/common/permission_status.mojom.h"

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

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

@@ -160,7 +160,7 @@ class PushMessagingServiceImpl : public content::PushMessagingService,

const PushMessagingAppIdentifier& app_identifier,

const std::string& sender_id,

const content::PushMessagingService::RegisterCallback& callback,

- content::PermissionStatus permission_status);

+ permission::Status permission_status);

// GetPublicEncryptionKey method ---------------------------------------------