chrome/browser/services/gcm/push_messaging_service_impl.h - Issue 955383003: ContentBrowserClient::RequestPermission replies with PermissionStatus instead of bool.

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/services/gcm/push_messaging_service_impl.h

Issue 955383003: ContentBrowserClient::RequestPermission replies with PermissionStatus instead of bool. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix android geolocation breakage Created 5 years, 10 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

« chrome/browser/content_settings/permission_context_base.cc ('K') | « chrome/browser/services/gcm/push_messaging_permission_context_unittest.cc ('k') | chrome/browser/services/gcm/push_messaging_service_impl.cc » ('j') | content/public/browser/content_browser_client.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/services/gcm/push_messaging_service_impl.h

diff --git a/chrome/browser/services/gcm/push_messaging_service_impl.h b/chrome/browser/services/gcm/push_messaging_service_impl.h

index c5cb50083d31a23c4397fea7c483c163cf44f839..fecf540ec8d7131da494773aea478378fed9a77d 100644

--- a/chrome/browser/services/gcm/push_messaging_service_impl.h

+++ b/chrome/browser/services/gcm/push_messaging_service_impl.h

@@ -8,6 +8,7 @@

#include "base/compiler_specific.h"

#include "base/memory/weak_ptr.h"

#include "components/content_settings/core/browser/content_settings_observer.h"

+#include "components/content_settings/core/common/content_settings.h"

#include "components/gcm_driver/gcm_app_handler.h"

#include "components/gcm_driver/gcm_client.h"

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

@@ -129,7 +130,7 @@ class PushMessagingServiceImpl : public content::PushMessagingService,

const PushMessagingApplicationId& application_id,

const std::string& sender_id,

const content::PushMessagingService::RegisterCallback& callback,

- bool allow);

+ ContentSetting content_setting);

// Unregister methods --------------------------------------------------------