| 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 fb537b027b828c08dbaed6c7a00d346d58914de9..5d666467bba1392d2a7972b044887a84d09e8201 100644
|
| --- a/content/shell/browser/shell_permission_manager.cc
|
| +++ b/content/shell/browser/shell_permission_manager.cc
|
| @@ -26,7 +26,8 @@ int ShellPermissionManager::RequestPermission(
|
| bool user_gesture,
|
| const base::Callback<void(PermissionStatus)>& callback) {
|
| callback.Run(permission == PermissionType::GEOLOCATION
|
| - ? PERMISSION_STATUS_GRANTED : PERMISSION_STATUS_DENIED);
|
| + ? PermissionStatus::GRANTED
|
| + : PermissionStatus::DENIED);
|
| return kNoPendingOperation;
|
| }
|
|
|
| @@ -40,7 +41,8 @@ int ShellPermissionManager::RequestPermissions(
|
| std::vector<PermissionStatus> result(permissions.size());
|
| for (const auto& permission : permissions) {
|
| result.push_back(permission == PermissionType::GEOLOCATION
|
| - ? PERMISSION_STATUS_GRANTED : PERMISSION_STATUS_DENIED);
|
| + ? PermissionStatus::GRANTED
|
| + : PermissionStatus::DENIED);
|
| }
|
| callback.Run(result);
|
| return kNoPendingOperation;
|
| @@ -64,9 +66,9 @@ PermissionStatus ShellPermissionManager::GetPermissionStatus(
|
| permission == PermissionType::VIDEO_CAPTURE) &&
|
| command_line->HasSwitch(switches::kUseFakeDeviceForMediaStream) &&
|
| command_line->HasSwitch(switches::kUseFakeUIForMediaStream)) {
|
| - return PERMISSION_STATUS_GRANTED;
|
| + return PermissionStatus::GRANTED;
|
| }
|
| - return PERMISSION_STATUS_DENIED;
|
| + return PermissionStatus::DENIED;
|
| }
|
|
|
| void ShellPermissionManager::RegisterPermissionUsage(
|
|
|