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

Make content::PermissionManager a delegate of PermissionController

Browse source 
1111340
This commit is contained in:
Jeremy Apthorp 2018-10-02 15:08:12 -07:00
parent eef375a428
commit 56bc636706
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/atom_permission_manager.cc
View file

@ -151,7 +151,7 @@ int AtomPermissionManager::RequestPermissionsWithDetails(
const StatusesCallback& response_callback) { const StatusesCallback& response_callback) {
if (permissions.empty()) { if (permissions.empty()) {
response_callback.Run(std::vector<blink::mojom::PermissionStatus>()); response_callback.Run(std::vector<blink::mojom::PermissionStatus>());
return kNoPendingOperation; return content::PermissionController::kNoPendingOperation;
} }
if (request_handler_.is_null()) { if (request_handler_.is_null()) {
@ -169,7 +169,7 @@ int AtomPermissionManager::RequestPermissionsWithDetails(
statuses.push_back(blink::mojom::PermissionStatus::GRANTED); statuses.push_back(blink::mojom::PermissionStatus::GRANTED);
} }
response_callback.Run(statuses); response_callback.Run(statuses);
return kNoPendingOperation; return content::PermissionController::kNoPendingOperation;
} }
auto* web_contents = auto* web_contents =