![trop[bot]](/assets/img/avatar_default.png)
* chore: bump chromium in DEPS to 139.0.7242.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: update render_widget_host_view_mac.patch no code changes; just updating patch context Do a cleanup pass on the history swiper code |6604367
Co-authored-by: Charles Kerr <charles@charleskerr.com> * chore: update mas_avoid_private_macos_api_usage.patch.patch no code changes; just updating patch context [tracing] Delete base/trace_event/base_tracing.h |6624012
Co-authored-by: Charles Kerr <charles@charleskerr.com> * chore: update chore_provide_iswebcontentscreationoverridden_with_full_params.patch no manual changes; just updating patch context [ActorFramework] Refactor Actor Task Management |6618684
Co-authored-by: Charles Kerr <charles@charleskerr.com> * chore: update fix_move_autopipsettingshelper_behind_branding_buildflag.patch [pip] Tuck picture-in-picture windows when a file dialog is open |6449682
Reland "[document pip] Restrict the size that a website can request" |6372104
Co-authored-by: Charles Kerr <charles@charleskerr.com> * chore: update feat_corner_smoothing_css_rule_and_blink_painting.patch Xref: corner-shape: constraint radii based on opposite corner overlap |6592572
Co-authored-by: Charles Kerr <charles@charleskerr.com> * chore: update revert_code_health_clean_up_stale_macwebcontentsocclusion.patch no manual changes; just updating patch context Co-authored-by: Charles Kerr <charles@charleskerr.com> * chore: update fix_rename_sqlite_win32_exports_to_avoid_conflicts_with_node_js.patch no code changes; just updating patch context Co-authored-by: Charles Kerr <charles@charleskerr.com> * chore: e patches all Co-authored-by: Charles Kerr <charles@charleskerr.com> * Plumb Verify2QwacBinding and hook it up in QwacWebContentsObserver6624719
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * Remove host delegate OnMainFrameCreatedForBackgroundPage6631123
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * Extensions: Rename GetResourceURL to ResolveExtensionURL6625053
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * Consolidate NativeFrameViewMac6614239
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * ICWYU Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * Remove dead code WidgetAXTreeIDMap6619701
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * Reland "extensions: Add `WillPrepareForEvaluation` to setup MojoJS"6630056
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * NavigationThrottleRunner2: Remove MaybeAddThrottle6628079
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * Tuck picture-in-picture windows when a file dialog is open6449682
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * build: fix snapshot_blob.bin build error xref: https://issues.chromium.org/issues/416540976 Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * chore: e patches all Co-authored-by: Charles Kerr <charles@charleskerr.com> * build: freeup disk space on macos Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * chore: bump chromium in DEPS to 139.0.7244.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: update printing.patch no manual changes; just updating patch context Co-authored-by: Charles Kerr <charles@charleskerr.com> * chore: remove upstreamed ignore_parse_errors_for_resolveshortcutproperties.patch Prevent Windows crash on unexpected shortcut type |6633298
Co-authored-by: Charles Kerr <charles@charleskerr.com> * chore: e patches all Co-authored-by: Charles Kerr <charles@charleskerr.com> * Revert "Reland "extensions: Add `WillPrepareForEvaluation` to setup MojoJS"" This reverts commit 77c4f967a637f7e8970114f91311f9fddede0f7c. Revert CL for the high confidence crash culprit for http://crash/28f897bb9743dfe0 |6641819
Co-authored-by: Charles Kerr <charles@charleskerr.com> * Fix spec's expected base64-encoded PNG strings to match upstream changes. [rust png] Enable by default. |6085801
Co-authored-by: Charles Kerr <charles@charleskerr.com> * chore: bump chromium in DEPS to 139.0.7246.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: e patches all Co-authored-by: Charles Kerr <charles@charleskerr.com> * chore: bump chromium in DEPS to 139.0.7248.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: update patches Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * siso: Enable Siso by default for non-Google builds6638830
Disabling for now until we are ready to build siso on all platforms. Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * Revert "revert Don't use static variable for UseExternalPopupMenus" This reverts commit e91e3894e6c34cc0ffe69ed45417c0ebec882fb1. Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * Update mac_sdk_min to match minimum required SDK version6493969
(cherry picked from commit 3e7cbe912d8fe1062d68ed06968aaee22013985f) Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * Use default window styling on Mac6648665
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * Reland "Force the unintentional renderer process creation check by default"6626905
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * fixup: Reland "Force the unintentional renderer process creation check by default6626905
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * chore: bump chromium in DEPS to 139.0.7249.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * fixup: Reland "Force the unintentional renderer process creation check by default6626905
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * chore: update patches Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * chore: bump chromium in DEPS to 139.0.7250.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: bump chromium in DEPS to 139.0.7252.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: bump chromium in DEPS to 139.0.7254.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * 6638187: browser level TOCTOU check for coordinate target6638187
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: fixup patch indices Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: add missing base/notimplemented includes Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6652910: [Frame Cleanup] Push down/hide implementation-specific API6652910
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: bump chromium in DEPS to 139.0.7256.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: fix lint Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * fixup! 6652910: [Frame Cleanup] Push down/hide implementation-specific API Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * fix: move HandleScope location Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: bump chromium in DEPS to 139.0.7258.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * fixup! [NonClientFrameView] Consolidate NativeFrameViewMac Co-authored-by: deepak1556 <hop2deep@gmail.com> * Revert "chore: bump chromium in DEPS to 139.0.7258.0" This reverts commit 264b2e934f4b2705c47d9761010052b95d9dd5de. Co-authored-by: deepak1556 <hop2deep@gmail.com> * chore: update patches --------- Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: patchup[bot] <73610968+patchup[bot]@users.noreply.github.com>
211 lines
6.7 KiB
C++
211 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/notimplemented.h"
|
|
#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
|