diff --git a/atom/browser/atom_permission_manager.cc b/atom/browser/atom_permission_manager.cc index f7523c07ff83..144643178504 100644 --- a/atom/browser/atom_permission_manager.cc +++ b/atom/browser/atom_permission_manager.cc @@ -40,7 +40,7 @@ void AtomPermissionManager::SetPermissionRequestHandler( if (handler.is_null() && !pending_requests_.empty()) { for (const auto& request : pending_requests_) { if (!WebContentsDestroyed(request.second.render_process_id)) - request.second.callback.Run(content::PERMISSION_STATUS_DENIED); + request.second.callback.Run(content::PermissionStatus::DENIED); } pending_requests_.clear(); } @@ -74,7 +74,7 @@ int AtomPermissionManager::RequestPermission( return request_id_; } - response_callback.Run(content::PERMISSION_STATUS_GRANTED); + response_callback.Run(content::PermissionStatus::GRANTED); return kNoPendingOperation; } @@ -92,7 +92,7 @@ int AtomPermissionManager::RequestPermissions( content::ChildProcessSecurityPolicy::GetInstance()-> GrantSendMidiSysExMessage(render_frame_host->GetProcess()->GetID()); } - permissionStatuses.push_back(content::PERMISSION_STATUS_GRANTED); + permissionStatuses.push_back(content::PermissionStatus::GRANTED); } callback.Run(permissionStatuses); return kNoPendingOperation; @@ -115,7 +115,7 @@ void AtomPermissionManager::CancelPermissionRequest(int request_id) { auto request = pending_requests_.find(request_id); if (request != pending_requests_.end()) { if (!WebContentsDestroyed(request->second.render_process_id)) - request->second.callback.Run(content::PERMISSION_STATUS_DENIED); + request->second.callback.Run(content::PermissionStatus::DENIED); pending_requests_.erase(request); } } @@ -130,7 +130,7 @@ content::PermissionStatus AtomPermissionManager::GetPermissionStatus( content::PermissionType permission, const GURL& requesting_origin, const GURL& embedding_origin) { - return content::PERMISSION_STATUS_GRANTED; + return content::PermissionStatus::GRANTED; } void AtomPermissionManager::RegisterPermissionUsage( diff --git a/atom/browser/web_contents_permission_helper.cc b/atom/browser/web_contents_permission_helper.cc index 7c944832d88d..088e0b52d04b 100644 --- a/atom/browser/web_contents_permission_helper.cc +++ b/atom/browser/web_contents_permission_helper.cc @@ -35,7 +35,7 @@ void OnPointerLockResponse(content::WebContents* web_contents, bool allowed) { void OnPermissionResponse(const base::Callback& callback, content::PermissionStatus status) { - if (status == content::PERMISSION_STATUS_GRANTED) + if (status == content::PermissionStatus::GRANTED) callback.Run(true); else callback.Run(false); diff --git a/atom/common/native_mate_converters/content_converter.cc b/atom/common/native_mate_converters/content_converter.cc index 5589c5a84af2..b672f946cb6c 100644 --- a/atom/common/native_mate_converters/content_converter.cc +++ b/atom/common/native_mate_converters/content_converter.cc @@ -130,9 +130,9 @@ bool Converter::FromV8( return false; if (result) - *out = content::PERMISSION_STATUS_GRANTED; + *out = content::PermissionStatus::GRANTED; else - *out = content::PERMISSION_STATUS_DENIED; + *out = content::PermissionStatus::DENIED; return true; }