mirror of
https://github.com/electron/electron.git
synced 2026-02-19 03:14:51 -05:00
* 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>
212 lines
6.7 KiB
C++
212 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::DictValue 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
|