| Index: chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc
|
| diff --git a/chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc b/chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc
|
| index 4ffceff9aea10ffc9d42583cc40565286b55811c..1c663340e8b9bd2853fa326a1da62c7feece8bfb 100644
|
| --- a/chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc
|
| +++ b/chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc
|
| @@ -175,18 +175,21 @@ void ChromeWebViewPermissionHelperDelegate::OnPointerLockPermissionResponse(
|
| void ChromeWebViewPermissionHelperDelegate::RequestGeolocationPermission(
|
| int bridge_id,
|
| const GURL& requesting_frame,
|
| + bool user_gesture,
|
| const base::Callback<void(bool)>& callback) {
|
| base::DictionaryValue request_info;
|
| request_info.SetString(guest_view::kUrl, requesting_frame.spec());
|
| + request_info.SetBoolean(guest_view::kUserGesture, user_gesture);
|
|
|
| // It is safe to hold an unretained pointer to
|
| // ChromeWebViewPermissionHelperDelegate because this callback is called from
|
| // ChromeWebViewPermissionHelperDelegate::SetPermission.
|
| const WebViewPermissionHelper::PermissionResponseCallback
|
| - permission_callback = base::Bind(&ChromeWebViewPermissionHelperDelegate::
|
| - OnGeolocationPermissionResponse,
|
| - weak_factory_.GetWeakPtr(), bridge_id,
|
| - base::Bind(&CallbackWrapper, callback));
|
| + permission_callback =
|
| + base::Bind(&ChromeWebViewPermissionHelperDelegate::
|
| + OnGeolocationPermissionResponse,
|
| + weak_factory_.GetWeakPtr(), bridge_id, user_gesture,
|
| + base::Bind(&CallbackWrapper, callback));
|
| int request_id = web_view_permission_helper()->RequestPermission(
|
| WEB_VIEW_PERMISSION_TYPE_GEOLOCATION,
|
| request_info,
|
| @@ -197,6 +200,7 @@ void ChromeWebViewPermissionHelperDelegate::RequestGeolocationPermission(
|
|
|
| void ChromeWebViewPermissionHelperDelegate::OnGeolocationPermissionResponse(
|
| int bridge_id,
|
| + bool user_gesture,
|
| const base::Callback<void(blink::mojom::PermissionStatus)>& callback,
|
| bool allow,
|
| const std::string& user_input) {
|
| @@ -231,6 +235,7 @@ void ChromeWebViewPermissionHelperDelegate::OnGeolocationPermissionResponse(
|
| ->embedder_web_contents()
|
| ->GetLastCommittedURL()
|
| .GetOrigin(),
|
| + user_gesture,
|
| callback);
|
| }
|
|
|
|
|