| 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 da12bdb8f7e1a4b07f3bbaa81d33a4586db9b382..7d242e9db2ab772169ef8727568f4a4226488bfb 100644
|
| --- a/content/shell/browser/shell_permission_manager.cc
|
| +++ b/content/shell/browser/shell_permission_manager.cc
|
| @@ -27,11 +27,23 @@ int ShellPermissionManager::RequestPermission(
|
| return kNoPendingOperation;
|
| }
|
|
|
| -void ShellPermissionManager::CancelPermissionRequest(
|
| - PermissionType permission,
|
| - RenderFrameHost* render_frame_host,
|
| - int request_id,
|
| - const GURL& requesting_origin) {
|
| +int ShellPermissionManager::RequestPermissions(
|
| + const std::vector<PermissionType>& permissions,
|
| + content::RenderFrameHost* render_frame_host,
|
| + const GURL& requesting_origin,
|
| + bool user_gesture,
|
| + const base::Callback<void(
|
| + const std::vector<PermissionStatus>&)>& callback) {
|
| + std::vector<PermissionStatus> result;
|
| + for (const auto& permission : permissions) {
|
| + result.push_back(permission == PermissionType::GEOLOCATION
|
| + ? PERMISSION_STATUS_GRANTED : PERMISSION_STATUS_DENIED);
|
| + }
|
| + callback.Run(result);
|
| + return kNoPendingOperation;
|
| +}
|
| +
|
| +void ShellPermissionManager::CancelPermissionRequest(int request_id) {
|
| }
|
|
|
| void ShellPermissionManager::ResetPermission(
|
|
|