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

chore: modernize ListValue usage in permission manager (#34662)

Browse source
This commit is contained in:
Jeremy Rose 2022-06-29 10:09:48 -07:00 • committed by GitHub
parent 4ddd03b1b3
commit 0d4e417594
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 54 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

52
shell/browser/electron_permission_manager.cc
View file

@ -137,8 +137,7 @@ void ElectronPermissionManager::RequestPermission(
bool user_gesture,
StatusCallback response_callback) {
RequestPermissionWithDetails(permission, render_frame_host, requesting_origin,
user_gesture, nullptr,
std::move(response_callback));
user_gesture, {}, std::move(response_callback));
}
void ElectronPermissionManager::RequestPermissionWithDetails(
@ -146,11 +145,11 @@ void ElectronPermissionManager::RequestPermissionWithDetails(
content::RenderFrameHost* render_frame_host,
const GURL& requesting_origin,
bool user_gesture,
const base::DictionaryValue* details,
base::Value::Dict details,
StatusCallback response_callback) {
RequestPermissionsWithDetails(
std::vector<blink::PermissionType>(1, permission), render_frame_host,
user_gesture, details,
user_gesture, std::move(details),
base::BindOnce(PermissionRequestResponseCallbackWrapper,
std::move(response_callback)));
}
@ -162,14 +161,14 @@ void ElectronPermissionManager::RequestPermissions(
bool user_gesture,
StatusesCallback response_callback) {
RequestPermissionsWithDetails(permissions, render_frame_host, user_gesture,
nullptr, std::move(response_callback));
{}, std::move(response_callback));
}
void ElectronPermissionManager::RequestPermissionsWithDetails(
const std::vector<blink::PermissionType>& permissions,
content::RenderFrameHost* render_frame_host,
bool user_gesture,
const base::DictionaryValue* details,
base::Value::Dict details,
StatusesCallback response_callback) {
if (permissions.empty()) {
std::move(response_callback).Run({});
@ -204,13 +203,11 @@ void ElectronPermissionManager::RequestPermissionsWithDetails(
const auto callback =
base::BindRepeating(&ElectronPermissionManager::OnPermissionResponse,
base::Unretained(this), request_id, i);
auto mutable_details =
details == nullptr ? base::DictionaryValue() : details->Clone();
mutable_details.SetStringKey(
"requestingUrl", render_frame_host->GetLastCommittedURL().spec());
mutable_details.SetBoolKey("isMainFrame",
render_frame_host->GetParent() == nullptr);
request_handler_.Run(web_contents, permission, callback, mutable_details);
details.Set("requestingUrl",
render_frame_host->GetLastCommittedURL().spec());
details.Set("isMainFrame", render_frame_host->GetParent() == nullptr);
request_handler_.Run(web_contents, permission, callback,
base::Value(std::move(details)));
}
}
@ -241,17 +238,17 @@ void ElectronPermissionManager::RequestPermissionsFromCurrentDocument(
base::OnceCallback<void(const std::vector<blink::mojom::PermissionStatus>&)>
callback) {
RequestPermissionsWithDetails(permissions, render_frame_host, user_gesture,
nullptr, std::move(callback));
{}, std::move(callback));
}
blink::mojom::PermissionStatus ElectronPermissionManager::GetPermissionStatus(
blink::PermissionType permission,
const GURL& requesting_origin,
const GURL& embedding_origin) {
base::DictionaryValue details;
details.SetString("embeddingOrigin", embedding_origin.spec());
bool granted = CheckPermissionWithDetails(permission, nullptr,
requesting_origin, &details);
base::Value::Dict details;
details.Set("embeddingOrigin", embedding_origin.spec());
bool granted = CheckPermissionWithDetails(permission, {}, requesting_origin,
std::move(details));
return granted ? blink::mojom::PermissionStatus::GRANTED
: blink::mojom::PermissionStatus::DENIED;
}
@ -273,7 +270,7 @@ bool ElectronPermissionManager::CheckPermissionWithDetails(
blink::PermissionType permission,
content::RenderFrameHost* render_frame_host,
const GURL& requesting_origin,
const base::DictionaryValue* details) const {
base::Value::Dict details) const {
if (check_handler_.is_null()) {
return true;
}
@ -281,27 +278,24 @@ bool ElectronPermissionManager::CheckPermissionWithDetails(
render_frame_host
? content::WebContents::FromRenderFrameHost(render_frame_host)
: nullptr;
auto mutable_details =
details == nullptr ? base::DictionaryValue() : details->Clone();
if (render_frame_host) {
mutable_details.SetStringKey(
"requestingUrl", render_frame_host->GetLastCommittedURL().spec());
details.Set("requestingUrl",
render_frame_host->GetLastCommittedURL().spec());
}
mutable_details.SetBoolKey(
"isMainFrame",
render_frame_host && render_frame_host->GetParent() == nullptr);
details.Set("isMainFrame",
render_frame_host && render_frame_host->GetParent() == nullptr);
switch (permission) {
case blink::PermissionType::AUDIO_CAPTURE:
mutable_details.SetStringKey("mediaType", "audio");
details.Set("mediaType", "audio");
break;
case blink::PermissionType::VIDEO_CAPTURE:
mutable_details.SetStringKey("mediaType", "video");
details.Set("mediaType", "video");
break;
default:
break;
}
return check_handler_.Run(web_contents, permission, requesting_origin,
mutable_details);
base::Value(std::move(details)));
}
bool ElectronPermissionManager::CheckDevicePermission(