46f3491c7d
* chore: bump chromium in DEPS to d5c9bf9e2a18fa508201a88e5803bec1d107b1ae * chore: bump chromium in DEPS to 45f1316afae33e52c92480b34bf4f7fe4a7db898 * update patches * WillCreateURLLoaderFactory now gets a ukm_source_id Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2346803 * ink_drop_visible_opacity -> GetInkDropVisibleOpacity Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2415368 * chore: bump chromium in DEPS to ddb5b6db5e35ab1a7b5adbd9f15373af6c35ea2a * 2418471: PDF Viewer update: Add missing aria-labels to various buttons. https://chromium-review.googlesource.com/c/chromium/src/+/2418471 * update printing.patch given print settings mojoification Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2409467 * update patches * content::BluetoothChooser::Event -> content::BluetoothChooserEvent Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2387901 * set_ink_drop_base_color -> SetInkDropBaseColor Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2419388 * chore: bump chromium in DEPS to ecf7c9ee830d4d85f300b461a2fa13aa40c79a4c * update patches * gfx::ConvertPointToPixel -> gfx::ConvertPointToPixels Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2418568 * remove ContentSettingsObserver::AllowStorage() Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2401847 * service_manager::kCrashDumpSignal -> kCrashDumpSignal Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2417073 * chore: bump chromium in DEPS to abdb7ebe5f8c8328b8f435283df90d0a3ecff7bd * chore: bump chromium in DEPS to 2a7e138ab1066534ceb2622e8a9d2c8ebf574215 * chore: bump chromium in DEPS to ab1884e75ced904e4276851eb4e1ad89919ca93b * chore: bump chromium in DEPS to a12413902380dcc2a73ac74d582328280a8af686 * Fixup printing patch https://chromium-review.googlesource.com/c/chromium/src/+/2428623 * Fixup OSR patch https://chromium-review.googlesource.com/c/chromium/src/+/2415128 * Make ExtensionURLLoaderFactory always owned by its |receivers_|. https://chromium-review.googlesource.com/c/chromium/src/+/2357523 * Add deprecated_default_sources_assignment_filter variable https://chromium-review.googlesource.com/c/chromium/src/+/2416496 * Fixup patch indices * Remove several references to BrowserPlugin from content https://chromium-review.googlesource.com/c/chromium/src/+/2401031 * Remove SurfaceEmbeddingTime and LocalSurfaceIdAllocation https://chromium-review.googlesource.com/c/chromium/src/+/2415128 * Add DragOperation and AllowedDragOperations Mojo types https://chromium-review.googlesource.com/c/chromium/src/+/2196167 * chore: bump chromium in DEPS to 378450342cf6aa160663d0ce3a178a11b570c25a * Fixup patch indices * Remove SurfaceEmbeddingTime and LocalSurfaceIdAllocation https://chromium-review.googlesource.com/c/chromium/src/+/2415128 * Add DragOperation and AllowedDragOperations Mojo types https://chromium-review.googlesource.com/c/chromium/src/+/2196167 * 2426564: Remove global sources assignment filter value https://chromium-review.googlesource.com/c/chromium/src/+/2426564 * Fixup blink_local_frame.patch * [XProto] Remove a subset of ui/gfx/x/x11.h https://chromium-review.googlesource.com/c/chromium/src/+/2430328 * Fixup patch indices * Remove several references to BrowserPlugin from content https://chromium-review.googlesource.com/c/chromium/src/+/2401031 * Remove lossy ConvertSizeToPixel() methods https://chromium-review.googlesource.com/c/chromium/src/+/2419534 * serial: Use USB driver name to disambiguate ports https://chromium-review.googlesource.com/c/chromium/src/+/2413176 * Remove set_sources_filter import * Fix ModMask usage * [XProto] Remove usage of all Xlib headers https://chromium-review.googlesource.com/c/chromium/src/+/2392140 * [XProto] Remove usage of Xlib Visuals https://chromium-review.googlesource.com/c/chromium/src/+/2429933 * Skip Angle manifest file https://chromium-review.googlesource.com/c/angle/angle/+/2425197 * Add whole src\third_party\angle\.git directory This directory is needed in order to properly generate gen/angle/angle_commit.h * [libvpx] Fix HighBD config on Windows ARM64 https://chromium-review.googlesource.com/c/chromium/src/+/2437745 * update patches * fix: correct calling convention for Windows on Arm https://chromium-review.googlesource.com/c/v8/v8/+/2440717 * Add third_party/angle/.git to the archive before adding the rest of the source * fixup source caching on Windows * Fixup erroneous close paren * fixup for goma issues * This should work * chore: bump chromium roll manually https://chromium-review.googlesource.com/c/chromium/src/+/2435142 This landed the day after we paused roller-bot and may resolve the visibility test flakes that we're seeing. h/t to @jkleinsc for finding this with me. * chore: remove obsoleted cherry-pick fix for libvpx https://chromium-review.googlesource.com/c/chromium/src/+/2437745 * chore: remove obsoleted cherry-pick libvpx patch https://chromium-review.googlesource.com/c/chromium/src/+/2437745 * chore: re-export patches * chore: add tracer comment to visibility-stat-spec. The line numbers between the source and the CI runs don't seem to match up, so this temp tracer is to help track the source of that difference. * chore: bump chromium in DEPS to 7c2b8cc3b8638aee8abeb013042a6c1d15b2da6b * update patches * impl SortingLSH service Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2425327 * 2446525: [Flash] Remove some Flash APIs https://chromium-review.googlesource.com/c/chromium/src/+/2446525 * 2440974: Reland "Delete service_manager/embedder/switches.h" https://chromium-review.googlesource.com/c/chromium/src/+/2440974 * 2359402: Remove ContentBrowserClient::NonNetworkURLLoaderFactoryDeprecatedMap. https://chromium-review.googlesource.com/c/chromium/src/+/2359402 * 2250506: Implement tabs.removeCSS https://chromium-review.googlesource.com/c/chromium/src/+/2250506 * 2429143: Remove implicit-conversion-to-integer ConvertRectToPixel() methods. https://chromium-review.googlesource.com/c/chromium/src/+/2429143 * 2444430: Remove DataElementType::kBlob https://chromium-review.googlesource.com/c/chromium/src/+/2444430 * 2441964: Clean up WebView public API https://chromium-review.googlesource.com/c/chromium/src/+/2441964 * 2357523: Make ExtensionURLLoaderFactory always owned by its |receivers_|. https://chromium-review.googlesource.com/c/chromium/src/+/2357523 * 2461606: Use blink::mojom::PreferredColorScheme instead of blink::PreferredColorScheme https://chromium-review.googlesource.com/c/chromium/src/+/2461606 * 2461235: a11y inspect reorg: move PropertyFilter struct to a new location https://chromium-review.googlesource.com/c/chromium/src/+/2461235 * remove flash support * fix frame_host_manager patch * fix lint * remove flash info from docs * fix build * fix osr * chore: bump chromium in DEPS to 9269f9eb1d98d29564c2b2ab97f30c6e148c4e11 * fix visibilityState tests * 2463049: Replace all uses of web_pref::AutoplayPolicy with mojom::AutoplayPolicy https://chromium-review.googlesource.com/c/chromium/src/+/2463049 * update patches * fix tests harder * 2414921: Add Group and Ungroup functions to Tabs extension API https://chromium-review.googlesource.com/c/chromium/src/+/2414921 * more test fix * Remove all keyboard related usage of Xlib Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2436787 * fix linux build * 2453807: [XProto] Remove usage of Xlib error handling https://chromium-review.googlesource.com/c/chromium/src/+/2453807 * lint * fixup! 2453807: [XProto] Remove usage of Xlib error handling * disable CalculateNativeWinOcclusion on win ci * remove UploadBlob from docs * Update appveyor.yml Co-authored-by: Andy Locascio <andy@slack-corp.com> Co-authored-by: John Kleinschmidt <jkleinsc@github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: Jeremy Rose <nornagon@nornagon.net> Co-authored-by: Electron Bot <anonymous@electronjs.org> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com> Co-authored-by: Jeremy Rose <jeremya@chromium.org>
189 lines
5.9 KiB
C++
189 lines
5.9 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/serial/serial_chooser_controller.h"
|
|
|
|
#include <algorithm>
|
|
#include <utility>
|
|
|
|
#include "base/bind.h"
|
|
#include "base/files/file_path.h"
|
|
#include "base/strings/stringprintf.h"
|
|
#include "base/strings/utf_string_conversions.h"
|
|
#include "shell/browser/api/electron_api_session.h"
|
|
#include "shell/browser/serial/serial_chooser_context.h"
|
|
#include "shell/browser/serial/serial_chooser_context_factory.h"
|
|
#include "shell/common/gin_converters/callback_converter.h"
|
|
#include "shell/common/gin_converters/content_converter.h"
|
|
#include "shell/common/gin_helper/dictionary.h"
|
|
#include "ui/base/l10n/l10n_util.h"
|
|
|
|
namespace gin {
|
|
|
|
template <>
|
|
struct Converter<device::mojom::SerialPortInfoPtr> {
|
|
static v8::Local<v8::Value> ToV8(
|
|
v8::Isolate* isolate,
|
|
const device::mojom::SerialPortInfoPtr& port) {
|
|
gin_helper::Dictionary dict = gin::Dictionary::CreateEmpty(isolate);
|
|
dict.Set("portId", port->token.ToString());
|
|
dict.Set("portName", port->path.BaseName().LossyDisplayName());
|
|
if (port->display_name && !port->display_name->empty()) {
|
|
dict.Set("displayName", *port->display_name);
|
|
}
|
|
if (port->has_vendor_id) {
|
|
dict.Set("vendorId", base::StringPrintf("%u", port->vendor_id));
|
|
}
|
|
if (port->has_product_id) {
|
|
dict.Set("productId", base::StringPrintf("%u", port->product_id));
|
|
}
|
|
if (port->serial_number && !port->serial_number->empty()) {
|
|
dict.Set("serialNumber", *port->serial_number);
|
|
}
|
|
#if defined(OS_MAC)
|
|
if (port->usb_driver_name && !port->usb_driver_name->empty()) {
|
|
dict.Set("usbDriverName", *port->usb_driver_name);
|
|
}
|
|
#elif defined(OS_WIN)
|
|
if (!port->device_instance_id.empty()) {
|
|
dict.Set("deviceInstanceId", port->device_instance_id);
|
|
}
|
|
#endif
|
|
return gin::ConvertToV8(isolate, dict);
|
|
}
|
|
};
|
|
|
|
} // namespace gin
|
|
|
|
namespace electron {
|
|
|
|
SerialChooserController::SerialChooserController(
|
|
content::RenderFrameHost* render_frame_host,
|
|
std::vector<blink::mojom::SerialPortFilterPtr> filters,
|
|
content::SerialChooser::Callback callback,
|
|
content::WebContents* web_contents,
|
|
base::WeakPtr<ElectronSerialDelegate> serial_delegate)
|
|
: WebContentsObserver(web_contents),
|
|
filters_(std::move(filters)),
|
|
callback_(std::move(callback)),
|
|
serial_delegate_(serial_delegate) {
|
|
requesting_origin_ = render_frame_host->GetLastCommittedOrigin();
|
|
embedding_origin_ = web_contents->GetMainFrame()->GetLastCommittedOrigin();
|
|
|
|
chooser_context_ = SerialChooserContextFactory::GetForBrowserContext(
|
|
web_contents->GetBrowserContext())
|
|
->AsWeakPtr();
|
|
DCHECK(chooser_context_);
|
|
chooser_context_->GetPortManager()->GetDevices(base::BindOnce(
|
|
&SerialChooserController::OnGetDevices, weak_factory_.GetWeakPtr()));
|
|
observer_.Add(chooser_context_.get());
|
|
}
|
|
|
|
SerialChooserController::~SerialChooserController() {
|
|
RunCallback(/*port=*/nullptr);
|
|
}
|
|
|
|
api::Session* SerialChooserController::GetSession() {
|
|
if (!web_contents()) {
|
|
return nullptr;
|
|
}
|
|
return api::Session::FromBrowserContext(web_contents()->GetBrowserContext());
|
|
}
|
|
|
|
void SerialChooserController::OnPortAdded(
|
|
const device::mojom::SerialPortInfo& port) {
|
|
ports_.push_back(port.Clone());
|
|
api::Session* session = GetSession();
|
|
if (session) {
|
|
session->Emit("serial-port-added", port.Clone(), web_contents());
|
|
}
|
|
}
|
|
|
|
void SerialChooserController::OnPortRemoved(
|
|
const device::mojom::SerialPortInfo& port) {
|
|
const auto it = std::find_if(
|
|
ports_.begin(), ports_.end(),
|
|
[&port](const auto& ptr) { return ptr->token == port.token; });
|
|
if (it != ports_.end()) {
|
|
api::Session* session = GetSession();
|
|
if (session) {
|
|
session->Emit("serial-port-removed", port.Clone(), web_contents());
|
|
}
|
|
ports_.erase(it);
|
|
}
|
|
}
|
|
|
|
void SerialChooserController::OnPortManagerConnectionError() {
|
|
observer_.RemoveAll();
|
|
}
|
|
|
|
void SerialChooserController::OnDeviceChosen(const std::string& port_id) {
|
|
if (port_id.empty()) {
|
|
RunCallback(/*port=*/nullptr);
|
|
} else {
|
|
const auto it =
|
|
std::find_if(ports_.begin(), ports_.end(), [&port_id](const auto& ptr) {
|
|
return ptr->token.ToString() == port_id;
|
|
});
|
|
chooser_context_->GrantPortPermission(requesting_origin_, embedding_origin_,
|
|
*it->get());
|
|
RunCallback(it->Clone());
|
|
}
|
|
}
|
|
|
|
void SerialChooserController::OnGetDevices(
|
|
std::vector<device::mojom::SerialPortInfoPtr> ports) {
|
|
// Sort ports by file paths.
|
|
std::sort(ports.begin(), ports.end(),
|
|
[](const auto& port1, const auto& port2) {
|
|
return port1->path.BaseName() < port2->path.BaseName();
|
|
});
|
|
|
|
for (auto& port : ports) {
|
|
if (FilterMatchesAny(*port))
|
|
ports_.push_back(std::move(port));
|
|
}
|
|
|
|
bool prevent_default = false;
|
|
api::Session* session = GetSession();
|
|
if (session) {
|
|
prevent_default =
|
|
session->Emit("select-serial-port", ports_, web_contents(),
|
|
base::AdaptCallbackForRepeating(base::BindOnce(
|
|
&SerialChooserController::OnDeviceChosen,
|
|
weak_factory_.GetWeakPtr())));
|
|
}
|
|
if (!prevent_default) {
|
|
RunCallback(/*port=*/nullptr);
|
|
}
|
|
}
|
|
|
|
bool SerialChooserController::FilterMatchesAny(
|
|
const device::mojom::SerialPortInfo& port) const {
|
|
if (filters_.empty())
|
|
return true;
|
|
|
|
for (const auto& filter : filters_) {
|
|
if (filter->has_vendor_id &&
|
|
(!port.has_vendor_id || filter->vendor_id != port.vendor_id)) {
|
|
continue;
|
|
}
|
|
if (filter->has_product_id &&
|
|
(!port.has_product_id || filter->product_id != port.product_id)) {
|
|
continue;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
void SerialChooserController::RunCallback(
|
|
device::mojom::SerialPortInfoPtr port) {
|
|
if (callback_) {
|
|
std::move(callback_).Run(std::move(port));
|
|
}
|
|
}
|
|
|
|
} // namespace electron
|