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

Unified Diff: chrome/browser/services/gcm/push_messaging_service_impl.cc

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
Index: chrome/browser/services/gcm/push_messaging_service_impl.cc
diff --git a/chrome/browser/services/gcm/push_messaging_service_impl.cc b/chrome/browser/services/gcm/push_messaging_service_impl.cc
index 49b36d0d6ccda564f872888fecc1f16b29b6d8a4..b0cc76d2dfc9e7047f48987da0260ccbc6276968 100644
--- a/chrome/browser/services/gcm/push_messaging_service_impl.cc
+++ b/chrome/browser/services/gcm/push_messaging_service_impl.cc
@@ -606,8 +606,8 @@ void PushMessagingServiceImpl::DidRequestPermission(
const PushMessagingApplicationId& application_id,
const std::string& sender_id,
const content::PushMessagingService::RegisterCallback& register_callback,
- bool allow) {
- if (!allow) {
+ ContentSetting content_setting) {
+ if (content_setting != CONTENT_SETTING_ALLOW) {
RegisterEnd(register_callback,
std::string(),
content::PUSH_REGISTRATION_STATUS_PERMISSION_DENIED);

Powered by Google App Engine
This is Rietveld 408576698