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

44
shell/browser/web_contents_permission_helper.cc
View file

@ -64,25 +64,25 @@ void WebContentsPermissionHelper::RequestPermission(
blink::PermissionType permission,
base::OnceCallback<void(bool)> callback,
bool user_gesture,
const base::DictionaryValue* details) {
base::Value::Dict details) {
auto* rfh = web_contents_->GetPrimaryMainFrame();
auto* permission_manager = static_cast<ElectronPermissionManager*>(
web_contents_->GetBrowserContext()->GetPermissionControllerDelegate());
auto origin = web_contents_->GetLastCommittedURL();
permission_manager->RequestPermissionWithDetails(
permission, rfh, origin, false, details,
permission, rfh, origin, false, std::move(details),
base::BindOnce(&OnPermissionResponse, std::move(callback)));
}
bool WebContentsPermissionHelper::CheckPermission(
blink::PermissionType permission,
const base::DictionaryValue* details) const {
base::Value::Dict details) const {
auto* rfh = web_contents_->GetPrimaryMainFrame();
auto* permission_manager = static_cast<ElectronPermissionManager*>(
web_contents_->GetBrowserContext()->GetPermissionControllerDelegate());
auto origin = web_contents_->GetLastCommittedURL();
return permission_manager->CheckPermissionWithDetails(permission, rfh, origin,
details);
std::move(details));
}
void WebContentsPermissionHelper::RequestFullscreenPermission(
@ -98,23 +98,23 @@ void WebContentsPermissionHelper::RequestMediaAccessPermission(
auto callback = base::BindOnce(&MediaAccessAllowed, request,
std::move(response_callback));
base::DictionaryValue details;
auto media_types = std::make_unique<base::ListValue>();
base::Value::Dict details;
base::Value::List media_types;
if (request.audio_type ==
blink::mojom::MediaStreamType::DEVICE_AUDIO_CAPTURE) {
media_types->Append("audio");
media_types.Append("audio");
}
if (request.video_type ==
blink::mojom::MediaStreamType::DEVICE_VIDEO_CAPTURE) {
media_types->Append("video");
media_types.Append("video");
}
details.SetList("mediaTypes", std::move(media_types));
details.SetString("securityOrigin", request.security_origin.spec());
details.Set("mediaTypes", std::move(media_types));
details.Set("securityOrigin", request.security_origin.spec());
// The permission type doesn't matter here, AUDIO_CAPTURE/VIDEO_CAPTURE
// are presented as same type in content_converter.h.
RequestPermission(blink::PermissionType::AUDIO_CAPTURE, std::move(callback),
false, &details);
false, std::move(details));
}
void WebContentsPermissionHelper::RequestWebNotificationPermission(
@ -138,30 +138,32 @@ void WebContentsPermissionHelper::RequestOpenExternalPermission(
base::OnceCallback<void(bool)> callback,
bool user_gesture,
const GURL& url) {
base::DictionaryValue details;
details.SetString("externalURL", url.spec());
base::Value::Dict details;
details.Set("externalURL", url.spec());
RequestPermission(
static_cast<blink::PermissionType>(PermissionType::OPEN_EXTERNAL),
std::move(callback), user_gesture, &details);
std::move(callback), user_gesture, std::move(details));
}
bool WebContentsPermissionHelper::CheckMediaAccessPermission(
const GURL& security_origin,
blink::mojom::MediaStreamType type) const {
base::DictionaryValue details;
details.SetString("securityOrigin", security_origin.spec());
details.SetString("mediaType", MediaStreamTypeToString(type));
base::Value::Dict details;
details.Set("securityOrigin", security_origin.spec());
details.Set("mediaType", MediaStreamTypeToString(type));
// The permission type doesn't matter here, AUDIO_CAPTURE/VIDEO_CAPTURE
// are presented as same type in content_converter.h.
return CheckPermission(blink::PermissionType::AUDIO_CAPTURE, &details);
return CheckPermission(blink::PermissionType::AUDIO_CAPTURE,
std::move(details));
}
bool WebContentsPermissionHelper::CheckSerialAccessPermission(
const url::Origin& embedding_origin) const {
base::DictionaryValue details;
details.SetString("securityOrigin", embedding_origin.GetURL().spec());
base::Value::Dict details;
details.Set("securityOrigin", embedding_origin.GetURL().spec());
return CheckPermission(
static_cast<blink::PermissionType>(PermissionType::SERIAL), &details);
static_cast<blink::PermissionType>(PermissionType::SERIAL),
std::move(details));
}
WEB_CONTENTS_USER_DATA_KEY_IMPL(WebContentsPermissionHelper);