| Index: content/shell/browser/shell_permission_manager.cc
|
| diff --git a/content/shell/browser/shell_permission_manager.cc b/content/shell/browser/shell_permission_manager.cc
|
| index fffcfa560c3baf9dd26e7e39c876492fc2650b7e..136d68ca6ed8bbb1c5ac88c218f1fb0c542d1093 100644
|
| --- a/content/shell/browser/shell_permission_manager.cc
|
| +++ b/content/shell/browser/shell_permission_manager.cc
|
| @@ -16,22 +16,20 @@ ShellPermissionManager::ShellPermissionManager()
|
| ShellPermissionManager::~ShellPermissionManager() {
|
| }
|
|
|
| -void ShellPermissionManager::RequestPermission(
|
| +int ShellPermissionManager::RequestPermission(
|
| PermissionType permission,
|
| RenderFrameHost* render_frame_host,
|
| - int request_id,
|
| const GURL& requesting_origin,
|
| bool user_gesture,
|
| const base::Callback<void(PermissionStatus)>& callback) {
|
| callback.Run(permission == PermissionType::GEOLOCATION
|
| ? PERMISSION_STATUS_GRANTED : PERMISSION_STATUS_DENIED);
|
| + return -1;
|
| }
|
|
|
| void ShellPermissionManager::CancelPermissionRequest(
|
| - PermissionType permission,
|
| RenderFrameHost* render_frame_host,
|
| - int request_id,
|
| - const GURL& requesting_origin) {
|
| + int request_id) {
|
| }
|
|
|
| void ShellPermissionManager::ResetPermission(
|
|
|