ContentBrowserClient::RequestPermission replies with PermissionStatus instead of bool.

chrome/browser/geolocation/geolocation_permission_context_extensions.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/geolocation/geolocation_permission_context_extensions.h"
 
 #include "base/callback.h"
 
 #if defined(ENABLE_EXTENSIONS)
 #include "chrome/browser/profiles/profile.h"
 #include "components/content_settings/core/common/permission_request_id.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/guest_view/web_view/web_view_permission_helper.h"
 #include "extensions/browser/process_map.h"
 #include "extensions/browser/suggest_permission_util.h"
 #include "extensions/browser/view_type_utils.h"
 #include "extensions/common/extension.h"
 
 using extensions::APIPermission;
 using extensions::ExtensionRegistry;
 #endif
 
+namespace {
+
+#if ENABLE_EXTENSIONS
+void CallbackContentSettingWrapper(
+    const base::Callback<void(ContentSetting)>& callback,
+    bool allowed) {
+  callback.Run(allowed ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK);
+}
+#endif // ENABLE_EXTENSIONS
+
+}  // anonymous namespace
+
 GeolocationPermissionContextExtensions::
 GeolocationPermissionContextExtensions(Profile* profile)
     : profile_(profile) {
 }
 
 GeolocationPermissionContextExtensions::
 ~GeolocationPermissionContextExtensions() {
 }
 
 bool GeolocationPermissionContextExtensions::RequestPermission(
     content::WebContents* web_contents,
     const PermissionRequestID& request_id,
     int bridge_id,
     const GURL& requesting_frame,
     bool user_gesture,
-    base::Callback<void(bool)> callback,
+    const base::Callback<void(ContentSetting)>& callback,
     bool* permission_set,
     bool* new_permission) {
 #if defined(ENABLE_EXTENSIONS)
   GURL requesting_frame_origin = requesting_frame.GetOrigin();
 
   extensions::WebViewPermissionHelper* web_view_permission_helper =
       extensions::WebViewPermissionHelper::FromWebContents(web_contents);
   if (web_view_permission_helper) {
     web_view_permission_helper->RequestGeolocationPermission(
-        bridge_id, requesting_frame, user_gesture, callback);
+        bridge_id, requesting_frame, user_gesture,
+        base::Bind(&CallbackContentSettingWrapper, callback));
     *permission_set = false;
     *new_permission = false;
     return true;
   }
 
   ExtensionRegistry* extension_registry = ExtensionRegistry::Get(profile_);
   if (extension_registry) {
     const extensions::Extension* extension =
         extension_registry->enabled_extensions().GetExtensionOrAppByURL(
             requesting_frame_origin);
@@ skipping 35 matching lines @@
       web_contents ?
       extensions::WebViewPermissionHelper::FromWebContents(web_contents)
       : NULL;
   if (web_view_permission_helper) {
     web_view_permission_helper->CancelGeolocationPermissionRequest(bridge_id);
     return true;
   }
 #endif  // defined(ENABLE_EXTENSIONS)
   return false;
 }