| 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 e8e3e71fc72247e3fbebfc35cf9f9e4949dd0c65..fbd0a2017d0284eadb86c542247a209c1d2a167f 100644
|
| --- a/content/shell/browser/shell_permission_manager.cc
|
| +++ b/content/shell/browser/shell_permission_manager.cc
|
| @@ -24,9 +24,10 @@ int ShellPermissionManager::RequestPermission(
|
| RenderFrameHost* render_frame_host,
|
| const GURL& requesting_origin,
|
| bool user_gesture,
|
| - const base::Callback<void(PermissionStatus)>& callback) {
|
| + const base::Callback<void(permission::Status)>& callback) {
|
| callback.Run(permission == PermissionType::GEOLOCATION
|
| - ? PERMISSION_STATUS_GRANTED : PERMISSION_STATUS_DENIED);
|
| + ? permission::STATUS_GRANTED
|
| + : permission::STATUS_DENIED);
|
| return kNoPendingOperation;
|
| }
|
|
|
| @@ -39,7 +40,7 @@ void ShellPermissionManager::ResetPermission(
|
| const GURL& embedding_origin) {
|
| }
|
|
|
| -PermissionStatus ShellPermissionManager::GetPermissionStatus(
|
| +permission::Status ShellPermissionManager::GetPermissionStatus(
|
| PermissionType permission,
|
| const GURL& requesting_origin,
|
| const GURL& embedding_origin) {
|
| @@ -48,9 +49,9 @@ PermissionStatus ShellPermissionManager::GetPermissionStatus(
|
| permission == PermissionType::VIDEO_CAPTURE) &&
|
| command_line->HasSwitch(switches::kUseFakeDeviceForMediaStream) &&
|
| command_line->HasSwitch(switches::kUseFakeUIForMediaStream)) {
|
| - return PERMISSION_STATUS_GRANTED;
|
| + return permission::STATUS_GRANTED;
|
| }
|
| - return PERMISSION_STATUS_DENIED;
|
| + return permission::STATUS_DENIED;
|
| }
|
|
|
| void ShellPermissionManager::RegisterPermissionUsage(
|
| @@ -63,7 +64,7 @@ int ShellPermissionManager::SubscribePermissionStatusChange(
|
| PermissionType permission,
|
| const GURL& requesting_origin,
|
| const GURL& embedding_origin,
|
| - const base::Callback<void(PermissionStatus)>& callback) {
|
| + const base::Callback<void(permission::Status)>& callback) {
|
| return kNoPendingOperation;
|
| }
|
|
|
|
|