mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
* chore: bump chromium in DEPS to 82.0.4076.1 * update patches * chore: bump chromium in DEPS to 82.0.4077.1 * update v8 patches * Remove deprecated wasm module type check https://chromium-review.googlesource.com/c/v8/v8/+/2033170 * chore: bump chromium in DEPS to 82.0.4078.0 * chore: bump chromium in DEPS to 82.0.4079.0 * chore: bump chromium in DEPS to 82.0.4080.0 * chore: bump chromium in DEPS to 82.0.4080.1 * chore: bump chromium in DEPS to 82.0.4081.2 * Update patches * chore: bump chromium in DEPS to 82.0.4082.1 * Remove cursor_types.h in favor of cursor_type.mojom https://chromium-review.googlesource.com/c/chromium/src/+/2052103 (cherry picked from commit3b6e4d4a1a) * Refactor extensions report in management disclosure page https://chromium-review.googlesource.com/c/chromium/src/+/2038774 (cherry picked from commitb2ae06307d) * Rename an old referrer policy value https://chromium-review.googlesource.com/c/chromium/src/+/2082856 (cherry picked from commit3cb8af2515) * Fixup compiler errors * Move GLHelper to gpu:: https://chromium-review.googlesource.com/c/chromium/src/+/2023282 (cherry picked from commitea8e347088) * [api] Remove deprecated wasm module type check https://chromium-review.googlesource.com/c/v8/v8/+/2033170 (cherry picked from commit937988e6ce) * Replace blink::WebCursorInfo with ui::Cursor https://chromium-review.googlesource.com/c/chromium/src/+/1997138 (cherry picked from commit3e348c4d59) * DownloadURLParameters: Remove NetworkIsolationKey parameter. https://chromium-review.googlesource.com/c/chromium/src/+/2050987 (cherry picked from commit9b4aae745e) * Convert FrameHostMsg_UpdateFaviconURL to mojo https://chromium-review.googlesource.com/c/chromium/src/+/2043181 (cherry picked from commit11b9c27eee) * Merge ui::ContextFactoryPrivate with ui::ContextFactory https://chromium-review.googlesource.com/c/chromium/src/+/2047728 (cherry picked from commit176876f243) * fix pdf viewer tests by binding more mojo things (cherry picked from commit74def418df) * chore: bump chromium in DEPS to 82.0.4083.1 * Update electron_swiftshader_binaries deps https://chromium-review.googlesource.com/c/chromium/src/+/2056931 (cherry picked from commit312f11129f) * Update patches * Use Promise with RequestPointerLock calls https://chromium-review.googlesource.com/c/chromium/src/+/2069199 (cherry picked from commit34350db4bd) * chore: bump chromium in DEPS to 82.0.4084.1 * Replace content::CursorInfo with ui::Cursor https://chromium-review.googlesource.com/c/chromium/src/+/1999201 (cherry picked from commit6b3b850692) * Convert MaterialDesignController to a true singleton. https://chromium-review.googlesource.com/c/chromium/src/+/2090877 (cherry picked from commit21ced9206d) * Drop WebContentsView::RenderViewCreated hook https://chromium-review.googlesource.com/c/chromium/src/+/2093535 (cherry picked from commit9ff4e65053) * Update patches * Splitting context_menu_params.h into separate browser VS common parts. https://chromium-review.googlesource.com/c/chromium/src/+/2097468 * Fix DCHECK on OnThemeChanged() https://chromium-review.googlesource.com/c/chromium/src/+/2090713 (cherry picked from commitfcec5f74d1) * chore: bump chromium in DEPS to 82.0.4085.1 * chore: bump chromium in DEPS to 82.0.4085.5 * chore: bump chromium in DEPS to 82.0.4085.7 * chore: bump chromium in DEPS to 82.0.4085.9 * Add debugging for TAB tests * update patches * fix: add patch to fix linux arm build (#22523) (cherry picked from commit479354e721) * chore: bump chromium in DEPS to 82.0.4085.10 * Check PointerLock requests for new options and update accordingly https://chromium-review.googlesource.com/c/chromium/src/+/2071788 * Update for changes from master roller review * FIXME: skip Menu.setApplicationMenu(null) test (cherry picked from commit305f167889) * Revert "Add debugging for TAB tests" This reverts commitaf393c1b0b. Co-authored-by: Jeremy Apthorp <jeremya@chromium.org> Co-authored-by: John Kleinschmidt <jkleinsc@github.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: Jeremy Apthorp <nornagon@nornagon.net> Co-authored-by: Cheng Zhao <zcbenz@gmail.com>
166 lines
5.8 KiB
C++
166 lines
5.8 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 <memory>
|
|
#include <string>
|
|
#include <utility>
|
|
|
|
#include "content/public/browser/browser_context.h"
|
|
#include "content/public/browser/render_process_host.h"
|
|
#include "shell/browser/electron_permission_manager.h"
|
|
#include "shell/browser/media/media_stream_devices_controller.h"
|
|
|
|
namespace {
|
|
|
|
std::string MediaStreamTypeToString(blink::mojom::MediaStreamType type) {
|
|
switch (type) {
|
|
case blink::mojom::MediaStreamType::DEVICE_AUDIO_CAPTURE:
|
|
return "audio";
|
|
case blink::mojom::MediaStreamType::DEVICE_VIDEO_CAPTURE:
|
|
return "video";
|
|
default:
|
|
return "unknown";
|
|
}
|
|
}
|
|
|
|
} // namespace
|
|
|
|
namespace electron {
|
|
|
|
namespace {
|
|
|
|
void MediaAccessAllowed(const content::MediaStreamRequest& request,
|
|
content::MediaResponseCallback callback,
|
|
bool allowed) {
|
|
MediaStreamDevicesController controller(request, std::move(callback));
|
|
if (allowed)
|
|
controller.TakeAction();
|
|
else
|
|
controller.Deny(blink::mojom::MediaStreamRequestResult::PERMISSION_DENIED);
|
|
}
|
|
|
|
void OnPointerLockResponse(content::WebContents* web_contents, bool allowed) {
|
|
if (web_contents) {
|
|
if (allowed)
|
|
web_contents->GotResponseToLockMouseRequest(
|
|
blink::mojom::PointerLockResult::kSuccess);
|
|
else
|
|
web_contents->GotResponseToLockMouseRequest(
|
|
blink::mojom::PointerLockResult::kPermissionDenied);
|
|
}
|
|
}
|
|
|
|
void OnPermissionResponse(base::OnceCallback<void(bool)> callback,
|
|
blink::mojom::PermissionStatus status) {
|
|
if (status == blink::mojom::PermissionStatus::GRANTED)
|
|
std::move(callback).Run(true);
|
|
else
|
|
std::move(callback).Run(false);
|
|
}
|
|
|
|
} // namespace
|
|
|
|
WebContentsPermissionHelper::WebContentsPermissionHelper(
|
|
content::WebContents* web_contents)
|
|
: web_contents_(web_contents) {}
|
|
|
|
WebContentsPermissionHelper::~WebContentsPermissionHelper() = default;
|
|
|
|
void WebContentsPermissionHelper::RequestPermission(
|
|
content::PermissionType permission,
|
|
base::OnceCallback<void(bool)> callback,
|
|
bool user_gesture,
|
|
const base::DictionaryValue* details) {
|
|
auto* rfh = web_contents_->GetMainFrame();
|
|
auto* permission_manager = static_cast<ElectronPermissionManager*>(
|
|
web_contents_->GetBrowserContext()->GetPermissionControllerDelegate());
|
|
auto origin = web_contents_->GetLastCommittedURL();
|
|
permission_manager->RequestPermissionWithDetails(
|
|
permission, rfh, origin, false, details,
|
|
base::BindOnce(&OnPermissionResponse, std::move(callback)));
|
|
}
|
|
|
|
bool WebContentsPermissionHelper::CheckPermission(
|
|
content::PermissionType permission,
|
|
const base::DictionaryValue* details) const {
|
|
auto* rfh = web_contents_->GetMainFrame();
|
|
auto* permission_manager = static_cast<ElectronPermissionManager*>(
|
|
web_contents_->GetBrowserContext()->GetPermissionControllerDelegate());
|
|
auto origin = web_contents_->GetLastCommittedURL();
|
|
return permission_manager->CheckPermissionWithDetails(permission, rfh, origin,
|
|
details);
|
|
}
|
|
|
|
void WebContentsPermissionHelper::RequestFullscreenPermission(
|
|
base::OnceCallback<void(bool)> callback) {
|
|
RequestPermission(
|
|
static_cast<content::PermissionType>(PermissionType::FULLSCREEN),
|
|
std::move(callback));
|
|
}
|
|
|
|
void WebContentsPermissionHelper::RequestMediaAccessPermission(
|
|
const content::MediaStreamRequest& request,
|
|
content::MediaResponseCallback response_callback) {
|
|
auto callback = base::AdaptCallbackForRepeating(base::BindOnce(
|
|
&MediaAccessAllowed, request, std::move(response_callback)));
|
|
|
|
base::DictionaryValue details;
|
|
std::unique_ptr<base::ListValue> media_types(new base::ListValue);
|
|
if (request.audio_type ==
|
|
blink::mojom::MediaStreamType::DEVICE_AUDIO_CAPTURE) {
|
|
media_types->AppendString("audio");
|
|
}
|
|
if (request.video_type ==
|
|
blink::mojom::MediaStreamType::DEVICE_VIDEO_CAPTURE) {
|
|
media_types->AppendString("video");
|
|
}
|
|
details.SetList("mediaTypes", std::move(media_types));
|
|
|
|
// The permission type doesn't matter here, AUDIO_CAPTURE/VIDEO_CAPTURE
|
|
// are presented as same type in content_converter.h.
|
|
RequestPermission(content::PermissionType::AUDIO_CAPTURE, std::move(callback),
|
|
false, &details);
|
|
}
|
|
|
|
void WebContentsPermissionHelper::RequestWebNotificationPermission(
|
|
base::OnceCallback<void(bool)> callback) {
|
|
RequestPermission(content::PermissionType::NOTIFICATIONS,
|
|
std::move(callback));
|
|
}
|
|
|
|
void WebContentsPermissionHelper::RequestPointerLockPermission(
|
|
bool user_gesture) {
|
|
RequestPermission(
|
|
static_cast<content::PermissionType>(PermissionType::POINTER_LOCK),
|
|
base::BindOnce(&OnPointerLockResponse, web_contents_), user_gesture);
|
|
}
|
|
|
|
void WebContentsPermissionHelper::RequestOpenExternalPermission(
|
|
base::OnceCallback<void(bool)> callback,
|
|
bool user_gesture,
|
|
const GURL& url) {
|
|
base::DictionaryValue details;
|
|
details.SetString("externalURL", url.spec());
|
|
RequestPermission(
|
|
static_cast<content::PermissionType>(PermissionType::OPEN_EXTERNAL),
|
|
std::move(callback), user_gesture, &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));
|
|
// The permission type doesn't matter here, AUDIO_CAPTURE/VIDEO_CAPTURE
|
|
// are presented as same type in content_converter.h.
|
|
return CheckPermission(content::PermissionType::AUDIO_CAPTURE, &details);
|
|
}
|
|
|
|
WEB_CONTENTS_USER_DATA_KEY_IMPL(WebContentsPermissionHelper)
|
|
|
|
} // namespace electron
|