ContentBrowserClient::RequestPermission replies with PermissionStatus instead of bool.

chrome/browser/notifications/desktop_notification_service.cc

 // Copyright (c) 2012 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/notifications/desktop_notification_service.h"
 
 #include "base/bind.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/prefs/scoped_user_pref_update.h"
@@ skipping 78 matching lines @@
 }
 
 DesktopNotificationService::~DesktopNotificationService() {
 }
 
 void DesktopNotificationService::RequestNotificationPermission(
     content::WebContents* web_contents,
     const PermissionRequestID& request_id,
     const GURL& requesting_origin,
     bool user_gesture,
-    const base::Callback<void(bool)>& result_callback) {
+    const BrowserPermissionCallback& result_callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
 #if defined(ENABLE_EXTENSIONS)
   extensions::InfoMap* extension_info_map =
       extensions::ExtensionSystem::Get(profile_)->info_map();
   const extensions::Extension* extension = NULL;
   if (extension_info_map) {
     extensions::ExtensionSet extensions;
     extension_info_map->GetExtensionsWithAPIPermissionForSecurityOrigin(
         requesting_origin,
         request_id.render_process_id(),
         extensions::APIPermission::kNotifications,
         &extensions);
     for (extensions::ExtensionSet::const_iterator iter = extensions.begin();
          iter != extensions.end(); ++iter) {
       if (IsNotifierEnabled(NotifierId(
               NotifierId::APPLICATION, (*iter)->id()))) {
         extension = iter->get();
         break;
       }
     }
   }
   if (IsExtensionWithPermissionOrSuggestInConsole(
           extensions::APIPermission::kNotifications,
           extension,
           web_contents->GetRenderViewHost())) {
-    result_callback.Run(true);
+    result_callback.Run(CONTENT_SETTING_ALLOW);
     return;
   }
 #endif
 
   // Track whether the requesting and embedding origins are different when
   // permission to display Web Notifications is being requested.
   UMA_HISTOGRAM_BOOLEAN("Notifications.DifferentRequestingEmbeddingOrigins",
                         requesting_origin.GetOrigin() !=
                             web_contents->GetLastCommittedURL().GetOrigin());
 
@@ skipping 101 matching lines @@
 #endif
 
 // Unlike other permission types, granting a notification for a given origin
 // will not take into account the |embedder_origin|, it will only be based
 // on the requesting iframe origin.
 // TODO(mukai) Consider why notifications behave differently than
 // other permissions. crbug.com/416894
 void DesktopNotificationService::UpdateContentSetting(
     const GURL& requesting_origin,
     const GURL& embedder_origin,
-    bool allowed) {
-  if (allowed) {
+    ContentSetting content_setting) {
+  DCHECK(content_setting == CONTENT_SETTING_ALLOW ||
+         content_setting == CONTENT_SETTING_BLOCK);
+
+  if (content_setting == CONTENT_SETTING_ALLOW) {
     DesktopNotificationProfileUtil::GrantPermission(
         profile_, requesting_origin);
   } else {
     DesktopNotificationProfileUtil::DenyPermission(profile_, requesting_origin);
   }
 }
 
 void DesktopNotificationService::FirePermissionLevelChangedEvent(
     const NotifierId& notifier_id, bool enabled) {
 #if defined(ENABLE_EXTENSIONS)
@@ skipping 13 matching lines @@
   // Tell the IO thread that this extension's permission for notifications
   // has changed.
   extensions::InfoMap* extension_info_map =
       extensions::ExtensionSystem::Get(profile_)->info_map();
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&extensions::InfoMap::SetNotificationsDisabled,
                  extension_info_map, notifier_id.id, !enabled));
 #endif
 }