ccd4531bfb
* chore: bump chromium in DEPS to 117.0.5846.0 * chore: update patches * 4628901: Bump the macOS deployment target to 10.15 https://chromium-review.googlesource.com/c/chromium/src/+/4628901 * 4593350: [Private Network Access] Trigger Permission Prompt https://chromium-review.googlesource.com/c/chromium/src/+/4593350 * 4631011: Remove unlaunched "InstallReplacementAndroidApp" Platform App APIs https://chromium-review.googlesource.com/c/chromium/src/+/4631011 * chore: disable API deprecation warnings in NSKeyedArchiver * chore: update libcxx filenames * chore: bump chromium in DEPS to 117.0.5848.2 * chore: update feat_add_set_theme_source_to_allow_apps_to.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4629743 No manual changes; patch succeeded with fuzz * chore: update process_singleton.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4605398 Trivial manual patch adjustments to account for code shear. * chore: remove electron::BrowserContext::GetMediaDeviceIDSalt() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4608130 upstream tldr: - content::BrowserContext::GetMediaDeviceIDSalt() - content::ContentBrowserClient::ArePersistentMediaDeviceIDsAllowed() + content::ContentBrowserClient::GetMediaDeviceIDSalt() This commit leaves ElectronBrowserContext::GetMediaDeviceIDSalt() in place (now non-virtual, non-override). It is now called by the new function ElectronBrowserClient::GetMediaDeviceIDSalt(). As a followup, we might want to consider using the new upstream media_device_salt::MediaDeviceSaltService and removing our electron::MediaDeviceIDSalt code. CC @MarshallOfSound for 2nd opinion since he has done the most work on MediaDeviceIDSalt and may have more context. * chore: fix iwyu breakage Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4629624 electron_browser_main_parts.cc uses ui::ColorProviderManager but didn't include it. Things worked anyway because we got it indirectly from content/public/browser/web_contents.h until 4629624. * chore: remove call to base::mac::IsAtLeastOS10_14 upstream has bumped minimum version to 10.15 so this call is moot? * chore: remove obsolete API_AVAILABLE calls in IAP upstream has bumped minimum version to 10.15 so this call is moot? * chore: remove obsolete API_AVAILABLE calls in electron_application_delegate upstream has bumped minimum version to 10.15 so this call is moot? * chore: remove broken-before-macOS-10.15 patch in mas_avoid_usage_of_private_macos_apis.patch Upstream has bumped minimum to macOS 10.15 * chore: remove @available(macOS 10.14) check Upstream minimum requirement for macOS is now 10.15 * chore: update patches * chore: bump chromium in DEPS to 117.0.5850.0 * chore: update patches * chore: bump chromium in DEPS to 117.0.5852.0 * chore: update patches * Move two params from NetworkContextParams to NetworkContextFilePaths. https://chromium-review.googlesource.com/c/chromium/src/+/4615930 * WebUSB: Add exclusionFilters to USBRequestDeviceOptions https://chromium-review.googlesource.com/c/chromium/src/+/4614682 * Convert /chrome/browser/ui to use ARC https://chromium-review.googlesource.com/c/chromium/src/+/4615920 * fixup! Bump the macOS deployment target to 10.15 * fixup! Bump the macOS deployment target to 10.15 * chore: update libcxx files * win: Remove 10Glass from Windows10Glass function and var names https://chromium-review.googlesource.com/c/chromium/src/+/4641314 * chore: revert 392e5f43 from chromium * Add an ExecutionContext to ScriptState https://chromium-review.googlesource.com/c/chromium/src/+/4609446 * fixup! Add an ExecutionContext to ScriptState * chore: fix header * Revert "chore: revert 392e5f43 from chromium" This reverts commit b7f782943e4ce83cae8cd35780d8d3618cf0772c. * fix: return correct min/max sizes in WinFrameView * fixup! Revert chore: revert 392e5f43 from chromium * fixup! Add an ExecutionContext to ScriptState * Revert "fixup! Revert chore: revert 392e5f43 from chromium" This reverts commit 7e2c7281abfc4f309255339fdba073d90a9ae3eb. * Revert "fix: return correct min/max sizes in WinFrameView" This reverts commit 3f418b1ab5155686730e087ae6cabe4a21b4bb61. * Revert "Revert "chore: revert 392e5f43 from chromium"" This reverts commit 56296d8b7c434147e032e3c3b08c0e371b6c27ba. --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: PatchUp <73610968+patchup[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: deepak1556 <hop2deep@gmail.com> Co-authored-by: Cheng Zhao <zcbenz@gmail.com>
173 lines
5.8 KiB
C++
173 lines
5.8 KiB
C++
// Copyright (c) 2022 Microsoft, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/usb/usb_chooser_controller.h"
|
|
|
|
#include <stddef.h>
|
|
#include <utility>
|
|
|
|
#include "base/functional/bind.h"
|
|
#include "base/ranges/algorithm.h"
|
|
#include "base/strings/stringprintf.h"
|
|
#include "base/strings/utf_string_conversions.h"
|
|
#include "build/build_config.h"
|
|
#include "components/strings/grit/components_strings.h"
|
|
#include "content/public/browser/render_frame_host.h"
|
|
#include "content/public/browser/web_contents.h"
|
|
#include "gin/data_object_builder.h"
|
|
#include "services/device/public/cpp/usb/usb_utils.h"
|
|
#include "services/device/public/mojom/usb_enumeration_options.mojom.h"
|
|
#include "shell/browser/javascript_environment.h"
|
|
#include "shell/browser/usb/usb_chooser_context_factory.h"
|
|
#include "shell/common/gin_converters/callback_converter.h"
|
|
#include "shell/common/gin_converters/content_converter.h"
|
|
#include "shell/common/gin_converters/frame_converter.h"
|
|
#include "shell/common/gin_converters/usb_device_info_converter.h"
|
|
#include "shell/common/node_includes.h"
|
|
#include "shell/common/process_util.h"
|
|
#include "ui/base/l10n/l10n_util.h"
|
|
#include "url/gurl.h"
|
|
|
|
using content::RenderFrameHost;
|
|
using content::WebContents;
|
|
|
|
namespace electron {
|
|
|
|
UsbChooserController::UsbChooserController(
|
|
RenderFrameHost* render_frame_host,
|
|
blink::mojom::WebUsbRequestDeviceOptionsPtr options,
|
|
blink::mojom::WebUsbService::GetPermissionCallback callback,
|
|
content::WebContents* web_contents,
|
|
base::WeakPtr<ElectronUsbDelegate> usb_delegate)
|
|
: WebContentsObserver(web_contents),
|
|
options_(std::move(options)),
|
|
callback_(std::move(callback)),
|
|
origin_(render_frame_host->GetMainFrame()->GetLastCommittedOrigin()),
|
|
usb_delegate_(usb_delegate),
|
|
render_frame_host_id_(render_frame_host->GetGlobalId()) {
|
|
chooser_context_ = UsbChooserContextFactory::GetForBrowserContext(
|
|
web_contents->GetBrowserContext())
|
|
->AsWeakPtr();
|
|
DCHECK(chooser_context_);
|
|
chooser_context_->GetDevices(base::BindOnce(
|
|
&UsbChooserController::GotUsbDeviceList, weak_factory_.GetWeakPtr()));
|
|
}
|
|
|
|
UsbChooserController::~UsbChooserController() {
|
|
RunCallback(/*device_info=*/nullptr);
|
|
}
|
|
|
|
api::Session* UsbChooserController::GetSession() {
|
|
if (!web_contents()) {
|
|
return nullptr;
|
|
}
|
|
return api::Session::FromBrowserContext(web_contents()->GetBrowserContext());
|
|
}
|
|
|
|
void UsbChooserController::OnDeviceAdded(
|
|
const device::mojom::UsbDeviceInfo& device_info) {
|
|
if (DisplayDevice(device_info)) {
|
|
api::Session* session = GetSession();
|
|
if (session) {
|
|
session->Emit("usb-device-added", device_info.Clone(), web_contents());
|
|
}
|
|
}
|
|
}
|
|
|
|
void UsbChooserController::OnDeviceRemoved(
|
|
const device::mojom::UsbDeviceInfo& device_info) {
|
|
api::Session* session = GetSession();
|
|
if (session) {
|
|
session->Emit("usb-device-removed", device_info.Clone(), web_contents());
|
|
}
|
|
}
|
|
|
|
void UsbChooserController::OnDeviceChosen(gin::Arguments* args) {
|
|
std::string device_id;
|
|
if (!args->GetNext(&device_id) || device_id.empty()) {
|
|
RunCallback(/*device_info=*/nullptr);
|
|
} else {
|
|
auto* device_info = chooser_context_->GetDeviceInfo(device_id);
|
|
if (device_info) {
|
|
RunCallback(device_info->Clone());
|
|
} else {
|
|
v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
|
|
node::Environment* env = node::Environment::GetCurrent(isolate);
|
|
EmitWarning(env, "The device id " + device_id + " was not found.",
|
|
"UnknownUsbDeviceId");
|
|
RunCallback(/*device_info=*/nullptr);
|
|
}
|
|
}
|
|
}
|
|
|
|
void UsbChooserController::OnBrowserContextShutdown() {
|
|
observation_.Reset();
|
|
}
|
|
|
|
// Get a list of devices that can be shown in the chooser bubble UI for
|
|
// user to grant permsssion.
|
|
void UsbChooserController::GotUsbDeviceList(
|
|
std::vector<::device::mojom::UsbDeviceInfoPtr> devices) {
|
|
// Listen to UsbChooserContext for OnDeviceAdded/Removed events after the
|
|
// enumeration.
|
|
if (chooser_context_)
|
|
observation_.Observe(chooser_context_.get());
|
|
|
|
bool prevent_default = false;
|
|
api::Session* session = GetSession();
|
|
if (session) {
|
|
auto* rfh = content::RenderFrameHost::FromID(render_frame_host_id_);
|
|
v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
|
|
v8::HandleScope scope(isolate);
|
|
v8::Local<v8::Object> details = gin::DataObjectBuilder(isolate)
|
|
.Set("deviceList", devices)
|
|
.Set("frame", rfh)
|
|
.Build();
|
|
|
|
prevent_default =
|
|
session->Emit("select-usb-device", details,
|
|
base::BindRepeating(&UsbChooserController::OnDeviceChosen,
|
|
weak_factory_.GetWeakPtr()));
|
|
}
|
|
if (!prevent_default) {
|
|
RunCallback(/*device_info=*/nullptr);
|
|
}
|
|
}
|
|
|
|
bool UsbChooserController::DisplayDevice(
|
|
const device::mojom::UsbDeviceInfo& device_info) const {
|
|
if (!device::UsbDeviceFilterMatchesAny(options_->filters, device_info)) {
|
|
return false;
|
|
}
|
|
|
|
if (base::ranges::any_of(
|
|
options_->exclusion_filters, [&device_info](const auto& filter) {
|
|
return device::UsbDeviceFilterMatches(*filter, device_info);
|
|
})) {
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
void UsbChooserController::RenderFrameDeleted(
|
|
content::RenderFrameHost* render_frame_host) {
|
|
if (usb_delegate_) {
|
|
usb_delegate_->DeleteControllerForFrame(render_frame_host);
|
|
}
|
|
}
|
|
|
|
void UsbChooserController::RunCallback(
|
|
device::mojom::UsbDeviceInfoPtr device_info) {
|
|
if (callback_) {
|
|
if (!chooser_context_ || !device_info) {
|
|
std::move(callback_).Run(nullptr);
|
|
} else {
|
|
chooser_context_->GrantDevicePermission(origin_, *device_info);
|
|
std::move(callback_).Run(std::move(device_info));
|
|
}
|
|
}
|
|
}
|
|
|
|
} // namespace electron
|