mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
* chore: bump chromium in DEPS to 146.0.7653.0 * chore: bump chromium in DEPS to 146.0.7653.1 * chore: bump chromium in DEPS to 146.0.7655.0 * chore: bump chromium in DEPS to 146.0.7657.1 * chore: bump chromium in DEPS to 146.0.7659.0 * chore: bump chromium in DEPS to 146.0.7661.0 * chore: bump chromium in DEPS to 146.0.7663.1 * chore: bump chromium in DEPS to 146.0.7665.1 * chore: bump chromium in DEPS to 146.0.7667.1 * chore: bump chromium in DEPS to 146.0.7668.2 * chore: bump chromium in DEPS to 146.0.7670.0 * chore: bump chromium in DEPS to 146.0.7672.1 * chore: bump chromium in DEPS to 146.0.7674.1 * chore: bump chromium in DEPS to 146.0.7676.1 * chore: bump chromium in DEPS to 146.0.7678.1 * chore: bump chromium in DEPS to 146.0.7680.1 * chore: bump chromium in DEPS to 146.0.7680.4 * chore: bump chromium in DEPS to 146.0.7680.0 * chore: bump chromium to 146.0.7666.0 (main) (#49528) * chore: bump chromium in DEPS to 146.0.7652.0 * fix(patch-conflict): update mas_avoid_private_macos_api_usage context for constrainFrameRect method The upstream CL added a new constrainFrameRect:toScreen: method override to NativeWidgetMacNSWindow as part of headless mode window zoom implementation. The MAS patch's #endif for frameViewClassForStyleMask now correctly appears after that method, since constrainFrameRect is a public API override that doesn't need to be guarded. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7487666 * fix(patch-conflict): update printing.patch for base::DictValue rename Updated printing.patch to use the new base::DictValue type name instead of base::Value::Dict following Chromium's type renaming change. This affects CompleteUpdatePrintSettings() signature and related code. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7509820 * fix(patch-conflict): update accessibility_ui patch for base::DictValue/ListValue rename Updated adjust_accessibility_ui_for_electron.patch to use the new base::DictValue and base::ListValue type names instead of base::Value::Dict and base::Value::List following Chromium's type renaming change. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7509820 * chore: update patches * 6625736: Rename DURABLE_STORAGE to PERSISTENT_STORAGE for consistency | https://chromium-review.googlesource.com/c/chromium/src/+/6625736 * chore: bump chromium in DEPS to 146.0.7653.0 * chore: update patches * 7000847: add type tag to v8::External for gin_helper function templates The upstream gin function templates now use v8::ExternalPointerTypeTag for type safety when using v8::External. Updated Electron's forked gin_helper function template to use the same kGinInternalCallbackHolderBaseTag that Chromium's gin uses. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7000847 * fix(patch-update): extend V8 Object API deprecation patch for Node.js Extended the existing patch to cover additional files that use GetAlignedPointerFromInternalField and SetAlignedPointerInInternalField: - src/stream_base-inl.h - src/udp_wrap.cc - src/js_udp_wrap.cc - src/node_process_methods.cc - src/node_snapshotable.cc - src/base_object.cc These APIs now require an EmbedderDataTypeTag parameter. Ref: https://chromium-review.googlesource.com/c/v8/v8/+/7087956 * 7000847: add type tag to v8::External calls in shared_texture Updated v8::External::New and v8::External::Value calls to use the kExternalPointerTypeTagDefault tag as required by the V8 API change that deprecates the tagless versions. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7000847 * 7508687: use ChildProcessId for file permission APIs The ChildProcessSecurityPolicy::CanReadFile and GrantReadFile APIs now require ChildProcessId instead of int. Updated to use GetID() instead of GetDeprecatedID() for these specific calls. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7508687 * 7000847: add type tag to v8::External calls in callback and osr_converter The v8::External API now requires an EmbedderPointerTypeTag parameter for both New() and Value() methods to improve V8 sandbox type safety. Updated calls in: - callback.cc: TranslatorHolder constructor and CallTranslator - osr_converter.cc: OffscreenSharedTextureValue converter Ref: https://chromium-review.googlesource.com/c/v8/v8/+/7000847 * fixup! 7087956: [api] Promote deprecation of v8::Context and v8::Object API methods Extended the Node.js patch to cover histogram.cc which also uses SetAlignedPointerInInternalField and GetAlignedPointerFromInternalField APIs that now require the EmbedderDataTypeTag parameter. Ref: https://chromium-review.googlesource.com/c/v8/v8/+/7087956 * chore: bump chromium in DEPS to 146.0.7655.0 * chore: update patches * 7509043: update WebSpellingMarker type for API change The upstream Chromium API changed - WebSpellingMarker was moved from a nested type within WebTextCheckClient to a standalone type in the blink namespace. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7509043 * 7498491: update process_id to use OriginatingProcess type The upstream Chromium API changed - URLLoaderFactoryParams::process_id was changed from an integer to a union type network::OriginatingProcess that distinguishes between browser and renderer processes. - For browser process requests, use OriginatingProcess::browser() - For renderer process lookups, check !is_browser() and use renderer_process().value() to get the child_id Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7498491 * 5710330: Add crash keys to debug NativeWidgetMacNSWindowBorderlessFrame exception | https://chromium-review.googlesource.com/c/chromium/src/+/5710330 5710330 added a new NSNextStepFrame interface extension and implementations for NativeWidgetMacNSWindowTitledFrame and NativeWidgetMacNSWindowBorderlessFrame. These use private macOS APIs that are not available in Mac App Store builds. * chore: update patches * chore: bump chromium in DEPS to 146.0.7661.0 * chore: bump chromium in DEPS to 146.0.7663.0 * fix(patch-conflict): update accessibility_ui for string_view API change Upstream removed redundant std::string(default_api_type) conversion as part of a string_view optimization cleanup. Updated patch context to match. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7514107 * fix(patch-conflict): update service process launch options for sandbox API refactor Upstream removed content/common/sandbox_init_win.cc and content/public/common/sandbox_init_win.h, moving the functionality directly into ChildProcessLauncherHelper. Updated patch to call sandbox::policy::SandboxWin::StartSandboxedProcess directly with the LaunchOptions pointer instead of going through the removed helper. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7528253 * fix(patch-conflict): update MAS safestorage for keychain API refactor Upstream refactored KeychainPassword::GetPassword() to use a new GetPasswordImpl() helper function with improved error tracking via base::expected<std::string, OSStatus>. Adapted patch to use the new GetPasswordImpl with the suffixed account name and handle migration from legacy accounts through the new API. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7516438 * chore: update patches * chore: bump chromium in DEPS to 146.0.7663.0 * fix: base::Value::Dict -> base::DictValue https://chromium-review.googlesource.com/c/chromium/src/+/7513889 * fix: include new cookie exclusion reason https://chromium-review.googlesource.com/c/chromium/src/+/7486527 * fix: enable libc++ ABI flag for trivially copyable std::vector<bool> Required for changes introduced in the following CL https://chromium-review.googlesource.com/c/chromium/src/+/7513653 * fixup! fix: base::Value::Dict -> base::DictValue https://chromium-review.googlesource.com/c/chromium/src/+/7513889 * fix: spellcheck not working in tests https://chromium-review.googlesource.com/c/chromium/src/+/7452579 * fix: cookie test failing due to multiple rejection reasons https://chromium-review.googlesource.com/c/chromium/src/+/7506629 * fix: macos sizing unmaximized window incorrectly https://chromium-review.googlesource.com/c/chromium/src/+/7487666 Changes to headless mode caused the unmaximized window to subtract the height of the menubar. * fix: skip tests for incompatible BoringSSL ML-DSA crypto https://boringssl-review.googlesource.com/c/boringssl/+/84929 * test: fix pseudonymization registration in utility process on Linux Ref: 7486913: Pass pseudonymization salt via shared memory at process launch | https://chromium-review.googlesource.com/c/chromium/src/+/7486913 * fix: restore MAS patch-outs Restores some `#if !IS_MAS_BUILD()` gates dropped in773054ad59* fixup! 7508687: use ChildProcessId for file permission APIs * fixup! fix(patch-conflict): update MAS safestorage for keychain API refactor * chore: add note about parallel upstream change * fixup! Merge remote-tracking branch 'origin/main' into roller/chromium/main * Revert "fixup! 7508687: use ChildProcessId for file permission APIs" This reverts commit05c43e4e5d. The _impl version has the signature, but not the public interface. :oof: * fixup! fix(patch-conflict): update MAS safestorage for keychain API refactor --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: Samuel Maddock <samuelmaddock@electronjs.org> Co-authored-by: clavin <clavin@electronjs.org> (cherry picked from commita65cfed500) * chore: update patches after rebase --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: Samuel Maddock <samuelmaddock@electronjs.org> Co-authored-by: clavin <clavin@electronjs.org> Co-authored-by: John Kleinschmidt <kleinschmidtorama@gmail.com>
337 lines
14 KiB
C++
337 lines
14 KiB
C++
// Copyright (c) 2016 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/web_contents_permission_helper.h"
|
|
|
|
#include <string_view>
|
|
#include <utility>
|
|
|
|
#include "components/content_settings/core/common/content_settings.h"
|
|
#include "components/webrtc/media_stream_devices_controller.h"
|
|
#include "content/public/browser/browser_context.h"
|
|
#include "content/public/browser/permission_descriptor_util.h"
|
|
#include "content/public/browser/render_process_host.h"
|
|
#include "content/public/browser/web_contents_user_data.h"
|
|
#include "shell/browser/electron_browser_context.h"
|
|
#include "shell/browser/electron_permission_manager.h"
|
|
#include "shell/browser/media/media_capture_devices_dispatcher.h"
|
|
#include "third_party/blink/public/common/mediastream/media_stream_request.h"
|
|
#include "third_party/blink/public/mojom/mediastream/media_stream.mojom.h"
|
|
|
|
#if BUILDFLAG(IS_MAC)
|
|
#include "chrome/browser/media/webrtc/system_media_capture_permissions_mac.h"
|
|
#endif
|
|
|
|
using blink::mojom::MediaStreamRequestResult;
|
|
using blink::mojom::MediaStreamType;
|
|
|
|
namespace {
|
|
|
|
constexpr std::string_view MediaStreamTypeToString(
|
|
blink::mojom::MediaStreamType type) {
|
|
switch (type) {
|
|
case MediaStreamType::DEVICE_AUDIO_CAPTURE:
|
|
return "audio";
|
|
case MediaStreamType::DEVICE_VIDEO_CAPTURE:
|
|
return "video";
|
|
default:
|
|
return "unknown";
|
|
}
|
|
}
|
|
|
|
} // namespace
|
|
|
|
namespace electron {
|
|
|
|
namespace {
|
|
|
|
[[nodiscard]] content::DesktopMediaID GetScreenId(
|
|
const std::vector<std::string>& requested_video_device_ids) {
|
|
if (!requested_video_device_ids.empty() &&
|
|
!requested_video_device_ids.front().empty())
|
|
return content::DesktopMediaID::Parse(requested_video_device_ids.front());
|
|
|
|
// If the device id wasn't specified then this is a screen capture request
|
|
// (i.e. chooseDesktopMedia() API wasn't used to generate device id).
|
|
return {content::DesktopMediaID::TYPE_SCREEN, -1 /* kFullDesktopScreenId */};
|
|
}
|
|
|
|
#if BUILDFLAG(IS_MAC)
|
|
bool SystemMediaPermissionDenied(const content::MediaStreamRequest& request) {
|
|
if (request.audio_type == MediaStreamType::DEVICE_AUDIO_CAPTURE) {
|
|
const auto system_audio_permission =
|
|
system_permission_settings::CheckSystemAudioCapturePermission();
|
|
return system_audio_permission ==
|
|
system_permission_settings::SystemPermission::kRestricted ||
|
|
system_audio_permission ==
|
|
system_permission_settings::SystemPermission::kDenied;
|
|
}
|
|
if (request.video_type == MediaStreamType::DEVICE_VIDEO_CAPTURE) {
|
|
const auto system_video_permission =
|
|
system_permission_settings::CheckSystemVideoCapturePermission();
|
|
return system_video_permission ==
|
|
system_permission_settings::SystemPermission::kRestricted ||
|
|
system_video_permission ==
|
|
system_permission_settings::SystemPermission::kDenied;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
#endif
|
|
|
|
// Handles requests for legacy-style `navigator.getUserMedia(...)` calls.
|
|
// This includes desktop capture through the chromeMediaSource /
|
|
// chromeMediaSourceId constraints.
|
|
void HandleUserMediaRequest(const content::MediaStreamRequest& request,
|
|
content::MediaResponseCallback callback) {
|
|
auto stream_devices_set = blink::mojom::StreamDevicesSet::New();
|
|
auto devices = blink::mojom::StreamDevices::New();
|
|
stream_devices_set->stream_devices.emplace_back(std::move(devices));
|
|
auto& devices_ref = *stream_devices_set->stream_devices[0];
|
|
|
|
if (request.audio_type == MediaStreamType::GUM_TAB_AUDIO_CAPTURE ||
|
|
request.audio_type == MediaStreamType::GUM_DESKTOP_AUDIO_CAPTURE) {
|
|
devices_ref.audio_device = blink::MediaStreamDevice(
|
|
request.audio_type,
|
|
request.audio_type == MediaStreamType::GUM_DESKTOP_AUDIO_CAPTURE
|
|
? "loopback"
|
|
: "",
|
|
request.audio_type == MediaStreamType::GUM_DESKTOP_AUDIO_CAPTURE
|
|
? "System Audio"
|
|
: "");
|
|
}
|
|
|
|
if (request.video_type == MediaStreamType::GUM_TAB_VIDEO_CAPTURE) {
|
|
devices_ref.video_device =
|
|
blink::MediaStreamDevice(request.video_type, "", "");
|
|
} else if (request.video_type == MediaStreamType::GUM_DESKTOP_VIDEO_CAPTURE) {
|
|
// If the DesktopMediaID can't be successfully parsed, throw an
|
|
// Invalid state error to match upstream.
|
|
auto dm_id = GetScreenId(request.requested_video_device_ids);
|
|
if (dm_id.is_null()) {
|
|
std::move(callback).Run(blink::mojom::StreamDevicesSet(),
|
|
MediaStreamRequestResult::INVALID_STATE, nullptr);
|
|
return;
|
|
}
|
|
devices_ref.video_device = blink::MediaStreamDevice(
|
|
request.video_type, dm_id.ToString(), "Screen");
|
|
}
|
|
|
|
bool empty = !devices_ref.audio_device.has_value() &&
|
|
!devices_ref.video_device.has_value();
|
|
std::move(callback).Run(*stream_devices_set,
|
|
empty ? MediaStreamRequestResult::NO_HARDWARE
|
|
: MediaStreamRequestResult::OK,
|
|
nullptr);
|
|
}
|
|
|
|
void OnMediaStreamRequestResponse(
|
|
content::MediaResponseCallback callback,
|
|
const blink::mojom::StreamDevicesSet& stream_devices_set,
|
|
MediaStreamRequestResult result,
|
|
bool blocked_by_permissions_policy,
|
|
ContentSetting audio_setting,
|
|
ContentSetting video_setting) {
|
|
std::move(callback).Run(stream_devices_set, result, nullptr);
|
|
}
|
|
|
|
void MediaAccessAllowed(const content::MediaStreamRequest& request,
|
|
content::MediaResponseCallback callback,
|
|
bool allowed) {
|
|
if (allowed) {
|
|
#if BUILDFLAG(IS_MAC)
|
|
// If the request was approved, ask for system permissions if needed.
|
|
// See
|
|
// chrome/browser/media/webrtc/permission_bubble_media_access_handler.cc.
|
|
if (SystemMediaPermissionDenied(request)) {
|
|
std::move(callback).Run(blink::mojom::StreamDevicesSet(),
|
|
MediaStreamRequestResult::PERMISSION_DENIED,
|
|
nullptr);
|
|
return;
|
|
}
|
|
#endif
|
|
if (request.video_type == MediaStreamType::GUM_DESKTOP_VIDEO_CAPTURE ||
|
|
request.audio_type == MediaStreamType::GUM_DESKTOP_AUDIO_CAPTURE ||
|
|
request.video_type == MediaStreamType::GUM_TAB_VIDEO_CAPTURE ||
|
|
request.audio_type == MediaStreamType::GUM_TAB_AUDIO_CAPTURE) {
|
|
HandleUserMediaRequest(request, std::move(callback));
|
|
} else if (request.video_type == MediaStreamType::DEVICE_VIDEO_CAPTURE ||
|
|
request.audio_type == MediaStreamType::DEVICE_AUDIO_CAPTURE) {
|
|
webrtc::MediaStreamDevicesController::RequestPermissions(
|
|
request, MediaCaptureDevicesDispatcher::GetInstance(),
|
|
base::BindOnce(&OnMediaStreamRequestResponse, std::move(callback)),
|
|
allowed);
|
|
} else if (request.video_type == MediaStreamType::DISPLAY_VIDEO_CAPTURE ||
|
|
request.video_type ==
|
|
MediaStreamType::DISPLAY_VIDEO_CAPTURE_THIS_TAB ||
|
|
request.video_type ==
|
|
MediaStreamType::DISPLAY_VIDEO_CAPTURE_SET ||
|
|
request.audio_type == MediaStreamType::DISPLAY_AUDIO_CAPTURE) {
|
|
content::RenderFrameHost* rfh = content::RenderFrameHost::FromID(
|
|
request.render_process_id, request.render_frame_id);
|
|
if (!rfh)
|
|
return;
|
|
|
|
content::BrowserContext* browser_context = rfh->GetBrowserContext();
|
|
ElectronBrowserContext* electron_browser_context =
|
|
static_cast<ElectronBrowserContext*>(browser_context);
|
|
auto split_callback = base::SplitOnceCallback(std::move(callback));
|
|
if (electron_browser_context->ChooseDisplayMediaDevice(
|
|
request, std::move(split_callback.second)))
|
|
return;
|
|
std::move(split_callback.first)
|
|
.Run(blink::mojom::StreamDevicesSet(),
|
|
MediaStreamRequestResult::NOT_SUPPORTED, nullptr);
|
|
} else {
|
|
std::move(callback).Run(blink::mojom::StreamDevicesSet(),
|
|
MediaStreamRequestResult::NOT_SUPPORTED, nullptr);
|
|
}
|
|
} else {
|
|
std::move(callback).Run(blink::mojom::StreamDevicesSet(),
|
|
MediaStreamRequestResult::PERMISSION_DENIED,
|
|
nullptr);
|
|
}
|
|
}
|
|
|
|
void OnPermissionResponse(base::OnceCallback<void(bool)> callback,
|
|
content::PermissionResult result) {
|
|
if (result.status == blink::mojom::PermissionStatus::GRANTED)
|
|
std::move(callback).Run(true);
|
|
else
|
|
std::move(callback).Run(false);
|
|
}
|
|
|
|
} // namespace
|
|
|
|
WebContentsPermissionHelper::WebContentsPermissionHelper(
|
|
content::WebContents* web_contents)
|
|
: content::WebContentsUserData<WebContentsPermissionHelper>(*web_contents),
|
|
web_contents_(web_contents) {}
|
|
|
|
WebContentsPermissionHelper::~WebContentsPermissionHelper() = default;
|
|
|
|
void WebContentsPermissionHelper::RequestPermission(
|
|
content::RenderFrameHost* requesting_frame,
|
|
blink::PermissionType permission,
|
|
base::OnceCallback<void(bool)> callback,
|
|
bool user_gesture,
|
|
base::DictValue details) {
|
|
auto* permission_manager = static_cast<ElectronPermissionManager*>(
|
|
web_contents_->GetBrowserContext()->GetPermissionControllerDelegate());
|
|
auto origin = web_contents_->GetLastCommittedURL();
|
|
permission_manager->RequestPermissionWithDetails(
|
|
content::PermissionDescriptorUtil::
|
|
CreatePermissionDescriptorForPermissionType(permission),
|
|
requesting_frame, origin, false, std::move(details),
|
|
base::BindOnce(&OnPermissionResponse, std::move(callback)));
|
|
}
|
|
|
|
bool WebContentsPermissionHelper::CheckPermission(
|
|
blink::PermissionType permission,
|
|
base::DictValue 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,
|
|
std::move(details));
|
|
}
|
|
|
|
void WebContentsPermissionHelper::RequestFullscreenPermission(
|
|
content::RenderFrameHost* requesting_frame,
|
|
base::OnceCallback<void(bool)> callback) {
|
|
RequestPermission(requesting_frame,
|
|
blink::PermissionType::ELECTRON_FULLSCREEN,
|
|
std::move(callback));
|
|
}
|
|
|
|
void WebContentsPermissionHelper::RequestMediaAccessPermission(
|
|
const content::MediaStreamRequest& request,
|
|
content::MediaResponseCallback response_callback) {
|
|
auto callback = base::BindOnce(&MediaAccessAllowed, request,
|
|
std::move(response_callback));
|
|
|
|
base::DictValue details;
|
|
base::ListValue media_types;
|
|
if (request.audio_type ==
|
|
blink::mojom::MediaStreamType::DEVICE_AUDIO_CAPTURE) {
|
|
media_types.Append("audio");
|
|
}
|
|
if (request.video_type ==
|
|
blink::mojom::MediaStreamType::DEVICE_VIDEO_CAPTURE) {
|
|
media_types.Append("video");
|
|
}
|
|
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(content::RenderFrameHost::FromID(request.render_process_id,
|
|
request.render_frame_id),
|
|
blink::PermissionType::AUDIO_CAPTURE, std::move(callback),
|
|
false, std::move(details));
|
|
}
|
|
|
|
void WebContentsPermissionHelper::RequestWebNotificationPermission(
|
|
content::RenderFrameHost* requesting_frame,
|
|
base::OnceCallback<void(bool)> callback) {
|
|
RequestPermission(requesting_frame, blink::PermissionType::NOTIFICATIONS,
|
|
std::move(callback));
|
|
}
|
|
|
|
void WebContentsPermissionHelper::RequestPointerLockPermission(
|
|
bool user_gesture,
|
|
bool last_unlocked_by_target,
|
|
base::OnceCallback<void(content::WebContents*, bool, bool, bool)>
|
|
callback) {
|
|
RequestPermission(web_contents_->GetPrimaryMainFrame(),
|
|
blink::PermissionType::POINTER_LOCK,
|
|
base::BindOnce(std::move(callback), web_contents_,
|
|
user_gesture, last_unlocked_by_target),
|
|
user_gesture);
|
|
}
|
|
|
|
void WebContentsPermissionHelper::RequestKeyboardLockPermission(
|
|
bool esc_key_locked,
|
|
base::OnceCallback<void(content::WebContents*, bool, bool)> callback) {
|
|
RequestPermission(
|
|
web_contents_->GetPrimaryMainFrame(),
|
|
blink::PermissionType::KEYBOARD_LOCK,
|
|
base::BindOnce(std::move(callback), web_contents_, esc_key_locked));
|
|
}
|
|
|
|
void WebContentsPermissionHelper::RequestOpenExternalPermission(
|
|
content::RenderFrameHost* requesting_frame,
|
|
base::OnceCallback<void(bool)> callback,
|
|
bool user_gesture,
|
|
const GURL& url) {
|
|
base::DictValue details;
|
|
details.Set("externalURL", url.spec());
|
|
RequestPermission(requesting_frame, blink::PermissionType::OPEN_EXTERNAL,
|
|
std::move(callback), user_gesture, std::move(details));
|
|
}
|
|
|
|
bool WebContentsPermissionHelper::CheckMediaAccessPermission(
|
|
const url::Origin& security_origin,
|
|
blink::mojom::MediaStreamType type) const {
|
|
base::DictValue details;
|
|
details.Set("securityOrigin", security_origin.GetURL().spec());
|
|
details.Set("mediaType", MediaStreamTypeToString(type));
|
|
auto blink_type = type == blink::mojom::MediaStreamType::DEVICE_AUDIO_CAPTURE
|
|
? blink::PermissionType::AUDIO_CAPTURE
|
|
: blink::PermissionType::VIDEO_CAPTURE;
|
|
return CheckPermission(blink_type, std::move(details));
|
|
}
|
|
|
|
bool WebContentsPermissionHelper::CheckSerialAccessPermission(
|
|
const url::Origin& embedding_origin) const {
|
|
base::DictValue details;
|
|
details.Set("securityOrigin", embedding_origin.GetURL().spec());
|
|
return CheckPermission(blink::PermissionType::SERIAL, std::move(details));
|
|
}
|
|
|
|
WEB_CONTENTS_USER_DATA_KEY_IMPL(WebContentsPermissionHelper);
|
|
|
|
} // namespace electron
|