mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

PermissionStatus constant update

Browse source
This commit is contained in:
Brian R. Bondy 2016-04-27 14:40:02 -04:00 • committed by Cheng Zhao
parent 82f3bb26ce
commit 8a2aebd03f
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
atom/browser/atom_permission_manager.cc
View file

@ -40,7 +40,7 @@ void AtomPermissionManager::SetPermissionRequestHandler(
if (handler.is_null() && !pending_requests_.empty()) { if (handler.is_null() && !pending_requests_.empty()) {
for (const auto& request : pending_requests_) { for (const auto& request : pending_requests_) {
if (!WebContentsDestroyed(request.second.render_process_id)) 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(); pending_requests_.clear();
} }
@ -74,7 +74,7 @@ int AtomPermissionManager::RequestPermission(
return request_id_; return request_id_;
} }
response_callback.Run(content::PERMISSION_STATUS_GRANTED); response_callback.Run(content::PermissionStatus::GRANTED);
return kNoPendingOperation; return kNoPendingOperation;
} }
@ -92,7 +92,7 @@ int AtomPermissionManager::RequestPermissions(
content::ChildProcessSecurityPolicy::GetInstance()-> content::ChildProcessSecurityPolicy::GetInstance()->
GrantSendMidiSysExMessage(render_frame_host->GetProcess()->GetID()); GrantSendMidiSysExMessage(render_frame_host->GetProcess()->GetID());
} }
permissionStatuses.push_back(content::PERMISSION_STATUS_GRANTED); permissionStatuses.push_back(content::PermissionStatus::GRANTED);
} }
callback.Run(permissionStatuses); callback.Run(permissionStatuses);
return kNoPendingOperation; return kNoPendingOperation;
@ -115,7 +115,7 @@ void AtomPermissionManager::CancelPermissionRequest(int request_id) {
auto request = pending_requests_.find(request_id); auto request = pending_requests_.find(request_id);
if (request != pending_requests_.end()) { if (request != pending_requests_.end()) {
if (!WebContentsDestroyed(request->second.render_process_id)) 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); pending_requests_.erase(request);
} }
} }
@ -130,7 +130,7 @@ content::PermissionStatus AtomPermissionManager::GetPermissionStatus(
content::PermissionType permission, content::PermissionType permission,
const GURL& requesting_origin, const GURL& requesting_origin,
const GURL& embedding_origin) { const GURL& embedding_origin) {
return content::PERMISSION_STATUS_GRANTED; return content::PermissionStatus::GRANTED;
} }
void AtomPermissionManager::RegisterPermissionUsage( void AtomPermissionManager::RegisterPermissionUsage(

2
atom/browser/web_contents_permission_helper.cc
View file

@ -35,7 +35,7 @@ void OnPointerLockResponse(content::WebContents* web_contents, bool allowed) {
void OnPermissionResponse(const base::Callback<void(bool)>& callback, void OnPermissionResponse(const base::Callback<void(bool)>& callback,
content::PermissionStatus status) { content::PermissionStatus status) {
if (status == content::PERMISSION_STATUS_GRANTED) if (status == content::PermissionStatus::GRANTED)
callback.Run(true); callback.Run(true);
else else
callback.Run(false); callback.Run(false);

4
atom/common/native_mate_converters/content_converter.cc
View file

@ -130,9 +130,9 @@ bool Converter<content::PermissionStatus>::FromV8(
return false; return false;
if (result) if (result)
*out = content::PERMISSION_STATUS_GRANTED; *out = content::PermissionStatus::GRANTED;
else else
*out = content::PERMISSION_STATUS_DENIED; *out = content::PermissionStatus::DENIED;
return true; return true;
} }