Location chooser

chrome/browser/guest_view/web_view/web_view_permission_helper.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/guest_view/web_view/web_view_permission_helper.h"
 
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/geolocation/geolocation_permission_context.h"
 #include "chrome/browser/geolocation/geolocation_permission_context_factory.h"
 #include "chrome/browser/guest_view/web_view/web_view_constants.h"
@@ skipping 332 matching lines @@
     const base::Callback<void(bool)>& callback,
     bool allow,
     const std::string& user_input) {
   callback.Run(allow && web_view_guest_->attached());
 }
 
 void WebViewPermissionHelper::RequestGeolocationPermission(
     int bridge_id,
     const GURL& requesting_frame,
     bool user_gesture,
-    const base::Callback<void(bool)>& callback) {
+    const base::Callback<void(int, bool)>& callback) {
   base::DictionaryValue request_info;
   request_info.SetString(guestview::kUrl, requesting_frame.spec());
   request_info.SetBoolean(guestview::kUserGesture, user_gesture);
 
   // It is safe to hold an unretained pointer to WebViewPermissionHelper because
   // this callback is called from WebViewPermissionHelper::SetPermission.
   const PermissionResponseCallback permission_callback =
       base::Bind(
           &WebViewPermissionHelper::OnGeolocationPermissionResponse,
           base::Unretained(this),
           bridge_id,
           user_gesture,
           callback);
   int request_id = RequestPermission(
       WEB_VIEW_PERMISSION_TYPE_GEOLOCATION,
       request_info,
       permission_callback,
       false /* allowed_by_default */);
   bridge_id_to_request_id_map_[bridge_id] = request_id;
 }
 
 void WebViewPermissionHelper::OnGeolocationPermissionResponse(
     int bridge_id,
     bool user_gesture,
-    const base::Callback<void(bool)>& callback,
+    const base::Callback<void(int, bool)>& callback,
     bool allow,
     const std::string& user_input) {
   // The <webview> embedder has allowed the permission. We now need to make sure
   // that the embedder has geolocation permission.
   RemoveBridgeID(bridge_id);
 
   if (!allow || !web_view_guest_->attached()) {
-    callback.Run(false);
+    callback.Run(false, -1);
     return;
   }
 
   Profile* profile = Profile::FromBrowserContext(
       web_view_guest_->browser_context());
   GeolocationPermissionContextFactory::GetForProfile(profile)->
       RequestGeolocationPermission(
           web_view_guest_->embedder_web_contents(),
           // The geolocation permission request here is not initiated
           // through WebGeolocationPermissionRequest. We are only interested
@@ skipping 193 matching lines @@
     const PermissionResponseCallback& callback,
     WebViewPermissionType permission_type,
     bool allowed_by_default)
     : callback(callback),
       permission_type(permission_type),
       allowed_by_default(allowed_by_default) {
 }
 
 WebViewPermissionHelper::PermissionResponseInfo::~PermissionResponseInfo() {
 }