30fbeec036
* chore: bump chromium in DEPS to 130.0.6723.4 * chore: bump chromium in DEPS to 131.0.6724.0 * chore: update patches * chore: update libc++ filenames * 5844369: controlledframe: Disable Web Bluetooth for <webview> & <controlledframe> https://chromium-review.googlesource.com/c/chromium/src/+/5844369 * (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 * 5822889: [task] Make GetForegroundTaskRunner non-virtual https://chromium-review.googlesource.com/c/v8/v8/+/5822889 * 5833297: Remove unused inner WebContents attach params https://chromium-review.googlesource.com/c/chromium/src/+/5833297 * 5806403: Shift PowerMonitor to non static https://chromium-review.googlesource.com/c/chromium/src/+/5806403 * 5666874: [3/N] Remove old OnPowerChange in PowerObserver https://chromium-review.googlesource.com/c/chromium/src/+/5666874 * 5829085: [v8] Differentiate between UserVisible and BestEffort task runners https://chromium-review.googlesource.com/c/chromium/src/+/5829085 * 5791112: [webrtc] Use `c/b/permissions/system` for system permissions https://chromium-review.googlesource.com/c/chromium/src/+/5791112 * 5825636: [Extensions] Create WebContentsObservers with ExtensionsBrowserClient https://chromium-review.googlesource.com/c/chromium/src/+/5825636 * fixup! (multiple CLs): Use an opaque type for FrameTreeNode IDs * fixup! 5791112: [webrtc] Use `c/b/permissions/system` for system permissions https://chromium-review.googlesource.com/c/chromium/src/+/5791112 * chore: bump chromium in DEPS to 131.0.6726.0 * chore: update patches * chore: update libc++ filenames * 5858119: Declutter: Allow opening to a specific feature https://chromium-review.googlesource.com/c/chromium/src/+/5858119 * fix: macOS SDK 15 error Not sure exactly what changed in the upgrade to macOS SDK 15, but it triggered a new error: ``` electron/shell/browser/ui/message_box_mac.mm:84:7: error: multiple methods named 'highlight:' found with mismatched result, parameter type or attributes ``` The `highlight:` selector a few lines down was ambiguous because the object type of the `NSArray` was not specified. Specifying `NSButton` as the element type makes the selector unambiguous for type checking. * 5854143: [File Download Access Prevention] Obfuscate download file for enterprise deep scan https://chromium-review.googlesource.com/c/chromium/src/+/5854143 * 5854811: Use kNotAllowedError instead of kSecurityError for Web MIDI https://chromium-review.googlesource.com/c/chromium/src/+/5854811 * chore: bump chromium in DEPS to 131.0.6728.0 * chore: update patches * disable invalid test * chore: bump chromium in DEPS to 131.0.6730.0 * chore: update patches * update build tools target commit for new macOS SDK * chore: update libc++ file names * chore: bump chromium in DEPS to 131.0.6732.0 * chore: bump chromium in DEPS to 131.0.6734.0 * 5856527: [UI] Use mojo enum for `WindowShowState` in ui/ https://chromium-review.googlesource.com/c/chromium/src/+/5856527 * chore: update build-tools sha to include macOD 15.0 SDK --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: clavin <clavin@electronjs.org> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: alice <alice@makenotion.com>
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
|