ContentBrowserClient::RequestPermission replies with PermissionStatus instead of bool.

chrome/browser/services/gcm/push_messaging_permission_context.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/services/gcm/push_messaging_permission_context.h"
 
 #include "chrome/browser/content_settings/permission_context_uma_util.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 68 matching lines @@
     content::WebContents* web_contents,
     const PermissionRequestID& id,
     const GURL& requesting_origin,
     const GURL& embedding_origin,
     bool user_gesture,
     const BrowserPermissionCallback& callback) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 #if defined(ENABLE_NOTIFICATIONS)
   if (requesting_origin != embedding_origin) {
     NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
-                        false /* persist */, false /* granted */);
+                        false /* persist */, CONTENT_SETTING_BLOCK);
     return;
   }
   DesktopNotificationService* notification_service =
       DesktopNotificationServiceFactory::GetForProfile(profile_);
   DCHECK(notification_service);
 
   notification_service->RequestPermission(
       web_contents, id, requesting_origin, user_gesture,
       base::Bind(&PushMessagingPermissionContext::DecidePushPermission,
                  weak_factory_ui_thread_.GetWeakPtr(), id, requesting_origin,
                  embedding_origin, callback));
 #else
   NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
-                      false /* persist */, false /* granted */);
+                      false /* persist */, CONTENT_SETTING_BLOCK);
 #endif
 }
 
 void PushMessagingPermissionContext::DecidePushPermission(
     const PermissionRequestID& id,
     const GURL& requesting_origin,
     const GURL& embedding_origin,
     const BrowserPermissionCallback& callback,
-    bool notifications_permission_granted) {
+    ContentSetting notification_content_setting) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   ContentSetting push_content_setting =
       profile_->GetHostContentSettingsMap()
           ->GetContentSettingAndMaybeUpdateLastUsage(
               requesting_origin, embedding_origin, kPushSettingType,
               std::string());
 
   if (push_content_setting == CONTENT_SETTING_BLOCK) {
     DVLOG(1) << "Push permission was explicitly blocked.";
     PermissionContextUmaUtil::PermissionDenied(kPushSettingType,
                                                requesting_origin);
     NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
-                        true /* persist */, false /* granted */);
+                        true /* persist */, CONTENT_SETTING_BLOCK);
     return;
   }
 
-  if (!notifications_permission_granted) {
+  if (notification_content_setting != CONTENT_SETTING_ALLOW) {
     DVLOG(1) << "Notification permission has not been granted.";
     NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
-                        false /* persist */, false /* granted */);
+                        false /* persist */, notification_content_setting);
     return;
   }
 
   PermissionContextUmaUtil::PermissionGranted(kPushSettingType,
                                               requesting_origin);
   NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
-                      true /* persist */, true /* granted */);
+                      true /* persist */, CONTENT_SETTING_ALLOW);
 }
 }  // namespace gcm