d62097e067
* chore: bump chromium in DEPS to 130.0.6673.0 * chore: bump chromium in DEPS to 130.0.6675.0 * chore: bump chromium in DEPS to 130.0.6677.2 * chore: bump chromium in DEPS to 130.0.6679.1 * chore: bump chromium in DEPS to 130.0.6681.1 * chore: bump chromium in DEPS to 130.0.6683.2 * chore: bump chromium in DEPS to 130.0.6685.0 * chore: bump chromium in DEPS to 130.0.6687.0 * chore: bump chromium in DEPS to 130.0.6689.0 * chore: bump chromium in DEPS to 130.0.6691.1 * chore: bump chromium in DEPS to 130.0.6693.1 * chore: bump chromium in DEPS to 130.0.6695.1 * chore: bump chromium in DEPS to 130.0.6697.1 * chore: bump chromium in DEPS to 130.0.6699.1 * chore: bump chromium in DEPS to 130.0.6701.1 * chore: bump chromium in DEPS to 130.0.6703.1 * chore: bump chromium in DEPS to 130.0.6705.1 * chore: bump chromium in DEPS to 130.0.6707.1 * chore: bump chromium in DEPS to 130.0.6709.1 * chore: bump chromium in DEPS to 130.0.6711.1 * chore: bump chromium in DEPS to 130.0.6713.1 * chore: bump chromium in DEPS to 130.0.6715.2 * chore: bump chromium in DEPS to 130.0.6717.0 * chore: bump chromium in DEPS to 130.0.6719.1 * chore: bump chromium in DEPS to 130.0.6720.1 * chore: bump chromium in DEPS to 130.0.6723.1 * chore: bump chromium in DEPS to 130.0.6723.4 * chore: bump chromium in DEPS to 130.0.6723.6 * chore: bump chromium to 130.0.6695.0 (main) (#43454) * chore: bump chromium in DEPS to 130.0.6673.0 * chore: bump chromium in DEPS to 130.0.6675.0 * chore: bump chromium in DEPS to 130.0.6677.2 * chore: bump chromium in DEPS to 130.0.6679.0 * 5802981: [Partitioned Popins] UKM https://chromium-review.googlesource.com/c/chromium/src/+/5802981 * 5799275: ash: Create //chrome/browser/ui/ash/web_view https://chromium-review.googlesource.com/c/chromium/src/+/5799275 * 5791853: [PWA] Allow WebContentsImpl::CreateNewWindow() to use new web contents for loading url https://chromium-review.googlesource.com/c/chromium/src/+/5791853 * 5805208: Move third_party/jacoco to a cipd/ subdirectory. https://chromium-review.googlesource.com/c/chromium/src/+/5805208 * chore: fixup patch indices * 5771091: Introduce InputManager class for handling input in Viz. https://chromium-review.googlesource.com/c/chromium/src/+/5771091 * 5498921: [Permission] Remove SubscribeToPermissionStatusChange from PermissionManager https://chromium-review.googlesource.com/c/chromium/src/+/5498921 * 5791853: [PWA] Allow WebContentsImpl::CreateNewWindow() to use new web contents for loading url https://chromium-review.googlesource.com/c/chromium/src/+/5791853 * 5801311: Don't use int for bindings https://chromium-review.googlesource.com/c/chromium/src/+/5801311 * 5548827: [Web Install] Define the web-app-installation PermissionPolicy https://chromium-review.googlesource.com/c/chromium/src/+/5548827 * 5786325: Add Infrastructure for Hand tracking permission https://chromium-review.googlesource.com/c/chromium/src/+/5786325 * chore: fixup patch indices * chore: bump chromium in DEPS to 130.0.6681.0 * [Views AX] Move BrowserAccessibility* to //ui/accessibility/platform Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5520052 * chore: e patches all * Don't have default arguments on virtual functions in render_frame_host.h https://chromium-review.googlesource.com/c/chromium/src/+/5809399 * test: log if loadURL fails in base url test * chore: bump chromium in DEPS to 130.0.6683.2 * chore: fix support_mixed_sandbox_with_zygote.patch content: restore old DisableJit behavior https://chromium-review.googlesource.com/c/chromium/src/+/5804255 * chore: update patch indices * chore: bump chromium in DEPS to 130.0.6685.0 * Parallel process launching Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5015584 * chore: update feat_expose_documentloader_setdefersloading_on_webdocumentloader.patch No manual changes; patch applied with fuzz 1 * chore: e patches all * chore: bump chromium in DEPS to 130.0.6687.0 * chore: bump chromium in DEPS to 130.0.6689.0 * chore: bump chromium in DEPS to 130.0.6691.0 * chore: bump chromium in DEPS to 130.0.6693.0 * chore: update patches * chore: bump chromium in DEPS to 130.0.6695.0 * chore: free up macos disk space as soon as possible * 5824143: Use checked in source lists for third_party/boringssl https://chromium-review.googlesource.com/c/chromium/src/+/5824143 * chore: update patches * 5824122: Extensions: Add a new view type enum for developer tools contexts https://chromium-review.googlesource.com/c/chromium/src/+/5824122 * 5806109: Option for JavaScriptExecuteRequestForTests() to ignore content settings https://chromium-review.googlesource.com/c/chromium/src/+/5806109 * build: free up disk space on gn check too * 5799369: [Refactoring] Make allow_http1_for_streaming_upload flags false. https://chromium-review.googlesource.com/c/chromium/src/+/5799369 * fixup! 5015584: Parallel process launching | https://chromium-review.googlesource.com/c/chromium/src/+/5015584 * Disable failing test for short-term See: https://github.com/electron/electron/issues/43730 * oops --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: clavin <clavin@electronjs.org> (cherry picked from commit4bcbc955dd
) * build: update appveyor image to latest version (#43772) Co-authored-by: electron-appveyor-updater[bot] <161660339+electron-appveyor-updater[bot]@users.noreply.github.com> (cherry picked from commit02fd8bbcc1
) * chore: fixup patches * chore: fixup patch * chore: bump chromium in DEPS to 130.0.6723.6 * chore: update filenames.libcxx.gni * test: re-enable disabled test * 5844369: controlledframe: Disable Web Bluetooth for <webview> & <controlledframe> https://chromium-review.googlesource.com/c/chromium/src/+/5844369 (cherry picked from commit 0ac4852763f0dce3468d30907620211f34c4104b) * (multiple CLs): Use an opaque type for FrameTreeNode IDs 5807683: Use an opaque type for FrameTreeNode IDs, part 1 | https://chromium-review.googlesource.com/c/chromium/src/+/5807683 5829746: Use an opaque type for FrameTreeNode IDs, part 2 | https://chromium-review.googlesource.com/c/chromium/src/+/5829746 5836903: Use an opaque type for FrameTreeNode IDs, part 7 | https://chromium-review.googlesource.com/c/chromium/src/+/5836903 5837249: Use an opaque type for FrameTreeNode IDs, part 8 | https://chromium-review.googlesource.com/c/chromium/src/+/5837249 5836564: Use an opaque type for FrameTreeNode IDs, part 12 | https://chromium-review.googlesource.com/c/chromium/src/+/5836564 5837180: Use an opaque type for FrameTreeNode IDs, part 15 | https://chromium-review.googlesource.com/c/chromium/src/+/5837180 (cherry picked from commit 1dd67f5241a3a24ea5a20f11efefdd2afc520a26) * 5822889: [task] Make GetForegroundTaskRunner non-virtual https://chromium-review.googlesource.com/c/v8/v8/+/5822889 (cherry picked from commit ae1e7232a35260cce8c4303d5f9809aa166bf19b) * 5833297: Remove unused inner WebContents attach params https://chromium-review.googlesource.com/c/chromium/src/+/5833297 (cherry picked from commit 390bb42e39eba66cd86221461d2822bbd85012df) * 5806403: Shift PowerMonitor to non static https://chromium-review.googlesource.com/c/chromium/src/+/5806403 (cherry picked from commit 128e3826e13768e89c7f5117de451ebd2b3ec9a4) * 5666874: [3/N] Remove old OnPowerChange in PowerObserver https://chromium-review.googlesource.com/c/chromium/src/+/5666874 (cherry picked from commit 6ea6ea14ae23ced6465b94fd753f8c80ced4b13b) * 5829085: [v8] Differentiate between UserVisible and BestEffort task runners https://chromium-review.googlesource.com/c/chromium/src/+/5829085 (cherry picked from commit 1db28ee4a51fb2593e4c11bcaa538a6524abe48c) * 5791112: [webrtc] Use `c/b/permissions/system` for system permissions https://chromium-review.googlesource.com/c/chromium/src/+/5791112 (cherry picked from commit 50d4a71923ca99653bf5733145bdc6e21f783b2d) * fixup! (multiple CLs): Use an opaque type for FrameTreeNode IDs (cherry picked from commit 9271130e160d479b3d286d295045b9d4acd2005c) * fixup! 5791112: [webrtc] Use `c/b/permissions/system` for system permissions https://chromium-review.googlesource.com/c/chromium/src/+/5791112 (cherry picked from commit db2c8c69d0c7bdee881997847dfc3c8abf32197c) * 5825636: [Extensions] Create WebContentsObservers with ExtensionsBrowserClient https://chromium-review.googlesource.com/c/chromium/src/+/5825636 (cherry picked from commit f2c3d09ccd141dbe2f4b62957b72f98bf8a010ae) * 5854811: Use kNotAllowedError instead of kSecurityError for Web MIDI https://chromium-review.googlesource.com/c/chromium/src/+/5854811 * test: fix should support base url for data urls test Caused by https://chromium-review.googlesource.com/c/chromium/src/+/5802682 * test: fixup extensions can cancel http requests * chore: document custom protocol handling on Windows change due to Non-Special Scheme URLs shipping https://chromium-review.googlesource.com/c/chromium/src/+/5802682 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: electron-appveyor-updater[bot] <161660339+electron-appveyor-updater[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: clavin <clavin@electronjs.org>
210 lines
6.7 KiB
C++
210 lines
6.7 KiB
C++
// Copyright (c) 2020 Microsoft, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/bluetooth/electron_bluetooth_delegate.h"
|
|
|
|
#include <memory>
|
|
#include <utility>
|
|
|
|
#include "base/strings/string_util.h"
|
|
#include "base/strings/utf_string_conversions.h"
|
|
#include "content/public/browser/browser_context.h"
|
|
#include "content/public/browser/render_frame_host.h"
|
|
#include "content/public/browser/web_contents.h"
|
|
#include "device/bluetooth/bluetooth_device.h"
|
|
#include "device/bluetooth/public/cpp/bluetooth_uuid.h"
|
|
#include "shell/browser/api/electron_api_web_contents.h"
|
|
#include "shell/browser/electron_permission_manager.h"
|
|
#include "shell/browser/lib/bluetooth_chooser.h"
|
|
#include "shell/common/gin_converters/frame_converter.h"
|
|
#include "shell/common/gin_helper/dictionary.h"
|
|
#include "third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h"
|
|
#include "third_party/blink/public/mojom/bluetooth/web_bluetooth.mojom.h"
|
|
|
|
using blink::WebBluetoothDeviceId;
|
|
using content::RenderFrameHost;
|
|
using content::WebContents;
|
|
using device::BluetoothUUID;
|
|
|
|
namespace gin {
|
|
|
|
template <>
|
|
struct Converter<content::BluetoothDelegate::PairingKind> {
|
|
static v8::Local<v8::Value> ToV8(
|
|
v8::Isolate* isolate,
|
|
content::BluetoothDelegate::PairingKind pairing_kind) {
|
|
switch (pairing_kind) {
|
|
case content::BluetoothDelegate::PairingKind::kConfirmOnly:
|
|
return StringToV8(isolate, "confirm");
|
|
case content::BluetoothDelegate::PairingKind::kConfirmPinMatch:
|
|
return StringToV8(isolate, "confirmPin");
|
|
case content::BluetoothDelegate::PairingKind::kProvidePin:
|
|
return StringToV8(isolate, "providePin");
|
|
default:
|
|
return StringToV8(isolate, "unknown");
|
|
}
|
|
}
|
|
};
|
|
|
|
} // namespace gin
|
|
|
|
namespace electron {
|
|
|
|
ElectronBluetoothDelegate::ElectronBluetoothDelegate() = default;
|
|
|
|
ElectronBluetoothDelegate::~ElectronBluetoothDelegate() = default;
|
|
|
|
std::unique_ptr<content::BluetoothChooser>
|
|
ElectronBluetoothDelegate::RunBluetoothChooser(
|
|
content::RenderFrameHost* frame,
|
|
const content::BluetoothChooser::EventHandler& event_handler) {
|
|
auto* api_web_contents =
|
|
api::WebContents::From(content::WebContents::FromRenderFrameHost(frame));
|
|
return std::make_unique<BluetoothChooser>(api_web_contents, event_handler);
|
|
}
|
|
|
|
// The following methods are not currently called in Electron.
|
|
std::unique_ptr<content::BluetoothScanningPrompt>
|
|
ElectronBluetoothDelegate::ShowBluetoothScanningPrompt(
|
|
content::RenderFrameHost* frame,
|
|
const content::BluetoothScanningPrompt::EventHandler& event_handler) {
|
|
NOTIMPLEMENTED();
|
|
return nullptr;
|
|
}
|
|
|
|
WebBluetoothDeviceId ElectronBluetoothDelegate::GetWebBluetoothDeviceId(
|
|
RenderFrameHost* frame,
|
|
const std::string& device_address) {
|
|
NOTIMPLEMENTED();
|
|
return WebBluetoothDeviceId::Create();
|
|
}
|
|
|
|
std::string ElectronBluetoothDelegate::GetDeviceAddress(
|
|
RenderFrameHost* frame,
|
|
const WebBluetoothDeviceId& device_id) {
|
|
NOTIMPLEMENTED();
|
|
return "";
|
|
}
|
|
|
|
WebBluetoothDeviceId ElectronBluetoothDelegate::AddScannedDevice(
|
|
RenderFrameHost* frame,
|
|
const std::string& device_address) {
|
|
NOTIMPLEMENTED();
|
|
return WebBluetoothDeviceId::Create();
|
|
}
|
|
|
|
WebBluetoothDeviceId ElectronBluetoothDelegate::GrantServiceAccessPermission(
|
|
RenderFrameHost* frame,
|
|
const device::BluetoothDevice* device,
|
|
const blink::mojom::WebBluetoothRequestDeviceOptions* options) {
|
|
NOTIMPLEMENTED();
|
|
return WebBluetoothDeviceId::Create();
|
|
}
|
|
|
|
bool ElectronBluetoothDelegate::HasDevicePermission(
|
|
RenderFrameHost* frame,
|
|
const WebBluetoothDeviceId& device_id) {
|
|
NOTIMPLEMENTED();
|
|
return true;
|
|
}
|
|
|
|
void ElectronBluetoothDelegate::RevokeDevicePermissionWebInitiated(
|
|
RenderFrameHost* frame,
|
|
const WebBluetoothDeviceId& device_id) {
|
|
NOTIMPLEMENTED();
|
|
}
|
|
|
|
bool ElectronBluetoothDelegate::MayUseBluetooth(RenderFrameHost* frame) {
|
|
return true;
|
|
}
|
|
|
|
bool ElectronBluetoothDelegate::IsAllowedToAccessService(
|
|
RenderFrameHost* frame,
|
|
const WebBluetoothDeviceId& device_id,
|
|
const BluetoothUUID& service) {
|
|
NOTIMPLEMENTED();
|
|
return true;
|
|
}
|
|
|
|
bool ElectronBluetoothDelegate::IsAllowedToAccessAtLeastOneService(
|
|
RenderFrameHost* frame,
|
|
const WebBluetoothDeviceId& device_id) {
|
|
NOTIMPLEMENTED();
|
|
return true;
|
|
}
|
|
|
|
bool ElectronBluetoothDelegate::IsAllowedToAccessManufacturerData(
|
|
RenderFrameHost* frame,
|
|
const WebBluetoothDeviceId& device_id,
|
|
uint16_t manufacturer_code) {
|
|
NOTIMPLEMENTED();
|
|
return true;
|
|
}
|
|
|
|
void ElectronBluetoothDelegate::AddFramePermissionObserver(
|
|
FramePermissionObserver* observer) {
|
|
NOTIMPLEMENTED();
|
|
}
|
|
|
|
void ElectronBluetoothDelegate::RemoveFramePermissionObserver(
|
|
FramePermissionObserver* observer) {
|
|
NOTIMPLEMENTED();
|
|
}
|
|
|
|
std::vector<blink::mojom::WebBluetoothDevicePtr>
|
|
ElectronBluetoothDelegate::GetPermittedDevices(
|
|
content::RenderFrameHost* frame) {
|
|
std::vector<blink::mojom::WebBluetoothDevicePtr> permitted_devices;
|
|
NOTIMPLEMENTED();
|
|
return permitted_devices;
|
|
}
|
|
|
|
void ElectronBluetoothDelegate::ShowDevicePairPrompt(
|
|
content::RenderFrameHost* frame,
|
|
const std::u16string& device_identifier,
|
|
PairPromptCallback callback,
|
|
PairingKind pairing_kind,
|
|
const std::optional<std::u16string>& pin) {
|
|
auto* web_contents = content::WebContents::FromRenderFrameHost(frame);
|
|
if (web_contents) {
|
|
auto* permission_manager = static_cast<ElectronPermissionManager*>(
|
|
web_contents->GetBrowserContext()->GetPermissionControllerDelegate());
|
|
|
|
v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
|
|
v8::HandleScope scope(isolate);
|
|
auto details = gin_helper::Dictionary::CreateEmpty(isolate);
|
|
details.Set("deviceId", device_identifier);
|
|
details.Set("pairingKind", pairing_kind);
|
|
details.SetGetter("frame", frame);
|
|
if (pin.has_value()) {
|
|
details.Set("pin", pin.value());
|
|
}
|
|
|
|
permission_manager->CheckBluetoothDevicePair(
|
|
details,
|
|
base::BindOnce(&ElectronBluetoothDelegate::OnDevicePairPromptResponse,
|
|
weak_factory_.GetWeakPtr(), std::move(callback)));
|
|
}
|
|
}
|
|
|
|
void ElectronBluetoothDelegate::OnDevicePairPromptResponse(
|
|
PairPromptCallback callback,
|
|
base::Value::Dict response) {
|
|
BluetoothDelegate::PairPromptResult result;
|
|
if (response.FindBool("confirmed").value_or(false)) {
|
|
result.result_code = BluetoothDelegate::PairPromptStatus::kSuccess;
|
|
} else {
|
|
result.result_code = BluetoothDelegate::PairPromptStatus::kCancelled;
|
|
}
|
|
|
|
const std::string* pin = response.FindString("pin");
|
|
if (pin) {
|
|
std::u16string trimmed_input = base::UTF8ToUTF16(*pin);
|
|
base::TrimWhitespace(trimmed_input, base::TRIM_ALL, &trimmed_input);
|
|
result.pin = base::UTF16ToUTF8(trimmed_input);
|
|
}
|
|
std::move(callback).Run(result);
|
|
}
|
|
|
|
} // namespace electron
|