28ada6ea8b
* chore: bump chromium in DEPS to 99.0.4819.0
* chore: update patches
* chore: bump chromium in DEPS to 99.0.4824.0
* chore: update patches
* chore: bump chromium in DEPS to 99.0.4827.0
* chore: update patches
* 3352511: PiP: Add inkdrop and pointer cursor to PiP window buttons
https://chromium-review.googlesource.com/c/chromium/src/+/3352511
* 3309164: webhid: Show FIDO devices in the chooser if allowed
https://chromium-review.googlesource.com/c/chromium/src/+/3309164
* 3297868: hid: Add experimental HIDDevice.forget()
https://chromium-review.googlesource.com/c/chromium/src/+/3297868
* 3362491: [Extensions] Move i18n API to //extensions
https://chromium-review.googlesource.com/c/chromium/src/+/3362491
* MCC Refactor step0: Allow embedders to register associated_interface binders with RenderFrameHostImpl::associated_registry_.
https://chromium-review.googlesource.com/c/chromium/src/+/3281481
* 3352616: [Gtk] Remove libgtk from the link-line
https://chromium-review.googlesource.com/c/chromium/src/+/3352616
* 3249211: Clear-Site-Data support for partitioned cookies
https://chromium-review.googlesource.com/c/chromium/src/+/3249211
* [Extensions][COIL] Use [allow|block]list in //extensions/common
https://chromium-review.googlesource.com/c/chromium/src/+/3372668
* Begin ScopedUserPrefUpdate migration to modern base::Value
https://chromium-review.googlesource.com/c/chromium/src/+/3376154
* [Code Health] Refactor PrefService GetDict + GetList to use base::Value
https://chromium-review.googlesource.com/c/chromium/src/+/3343526
* 3354997: [CodeHealth] Remove deprecated SetDictionary method
https://chromium-review.googlesource.com/c/chromium/src/+/3354997
* 3287323: Add LacrosPrefStore for lacros settings
https://chromium-review.googlesource.com/c/chromium/src/+/3287323
* 3365916: [PA] Clean up remaining lazy commit code
https://chromium-review.googlesource.com/c/chromium/src/+/3365916
* [MPArch] Target the external protocol error at the responsible frame.
https://chromium-review.googlesource.com/c/chromium/src/+/3011560
* Pass origin to RegisterNonNetworkSubresourceURLLoaderFactories
https://chromium-review.googlesource.com/c/chromium/src/+/3350608
* Linux: Send OSCrypt raw encryption key to the Network Service
https://chromium-review.googlesource.com/c/chromium/src/+/3320484
* [PlzServiceWorker] Remove remaining references to PlzServiceWorker.
https://chromium-review.googlesource.com/c/chromium/src/+/3359441
* chore: fixup for lint
* 3327621: Fix tablet mode detection for Win 11.
https://chromium-review.googlesource.com/c/chromium/src/+/3327621
* 3342428: ax_mac: move AXTextMarker conversion utils under ui umbrella
https://chromium-review.googlesource.com/c/chromium/src/+/3342428
* 3353974: Mac: Use base::Feature for overlay features
https://chromium-review.googlesource.com/c/chromium/src/+/3353974
* chore: bump chromium in DEPS to 99.0.4828.0
* chore: update patches
* chore: bump chromium in DEPS to 99.0.4837.0
* chore: update patches
* chore: update patches
* 3379142: Drop FALLTHROUGH macro
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3379142
* 3381749: C++17: Allow use of std::map::try_emplace and std::map::insert_or_assign
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3381749
* chore: bump chromium in DEPS to 99.0.4839.0
* chore: update patches
* chore: bump chromium in DEPS to 99.0.4840.0
* chore: bump chromium in DEPS to 99.0.4844.0
* 3395881: [api] Deprecate Local<v8::Context> v8::Object::CreationContext()
Ref: https://chromium-review.googlesource.com/c/v8/v8/+/3395881
* chore: update patches
* chore: bump chromium in DEPS to 100.0.4845.0
* chore: update patches
* chore: bump chromium in DEPS to 100.0.4847.0
* chore: update patches
* chore: bump chromium in DEPS to 100.0.4849.0
* chore: update patches
* chore: bump chromium in DEPS to 100.0.4851.0
* chore: bump chromium in DEPS to 100.0.4853.0
* update patches
* chore: update patches
* update patches
* 3383599: Fonts Access: Remove prototype that uses a font picker.
https://chromium-review.googlesource.com/c/chromium/src/+/3383599
* 3404768: Remove ALLOW_UNUSED macros
https://chromium-review.googlesource.com/c/chromium/src/+/3404768
* 3374762: Remove ignore_result.h
https://chromium-review.googlesource.com/c/chromium/src/+/3374762
* 3399305: [unseasoned-pdf] Apply proper frame offsets for touch selections
https://chromium-review.googlesource.com/c/chromium/src/+/3399305
* 3402210: [Extensions] Don't trigger unload event for already unloaded extension
https://chromium-review.googlesource.com/c/chromium/src/+/3402210
* 3410912: Combine URLLoaderClient OnReceiveResponse and OnStartLoadingResponseBody.
https://chromium-review.googlesource.com/c/chromium/src/+/3410912
* 3370428: Make the AuthSchemes policy support dynamic refresh
https://chromium-review.googlesource.com/c/chromium/src/+/3370428
* 3407603: Finish ScopedUserPrefUpdate migration to modern base::Value
https://chromium-review.googlesource.com/c/chromium/src/+/3407603
* 3378352: ozone/x11: move code from //ui/p/x11 to //ui/ozone/p/x11
https://chromium-review.googlesource.com/c/chromium/src/+/3378352
* 3370810: Delete chrome/service, AKA the Cloud Print service process.
https://chromium-review.googlesource.com/c/chromium/src/+/3370810
* chore: bump chromium in DEPS to 100.0.4855.0
* chore: update patches
* fixup! 3370810: Delete chrome/service, AKA the Cloud Print service process.
* revert 3348007 to fix windows build
* 3318572: [Code health] Fix gn check errors in //extensions/browser:*
https://chromium-review.googlesource.com/c/chromium/src/+/3318572
* fix printing.patch
* fix iwyu issue
* 3408515: win: Make ShorcutOperation an enum class and modernize names
https://chromium-review.googlesource.com/c/chromium/src/+/3408515
* 3388333: [UIA] Remove dead code accessibility_misc_utils.h/cc
https://chromium-review.googlesource.com/c/chromium/src/+/3388333
* fix windows build? i hope
* patch gn visibility of //ui/ozone/platform/x11
* missing include base/logging.h
* use BUILDFLAG for USE_NSS_CERTS
https://chromium-review.googlesource.com/c/chromium/src/+/3379123
* defined(OS_*) ==> BUILDFLAG(IS_*)
https://bugs.chromium.org/p/chromium/issues/detail?id=1234043
* fixup! 3404768: Remove ALLOW_UNUSED macros
* another attempt to fix windows build
* temporarily disable the custom scheme service worker test
https://github.com/electron/electron/issues/32664
* fix loading mv3 extensions
not sure what cl broke this unfort.
* fixup! 3404768: Remove ALLOW_UNUSED macros
* patch nan
https://chromium-review.googlesource.com/c/v8/v8/+/3395880
* fix node test
* fix nullptr in FindPdfFrame
* patch perfetto to fix build issue on win-ia32
bc44c3c753
* fix build for linux-x64-testing-no-run-as-node
* fix patch
* skip <webview>.capturePage() test
https://github.com/electron/electron/issues/32705
* test: fix failing tests of focus/blur events of WebContents (#32711)
* inherit stdio from app module test child processes
this prevents them from timing out due to full stdout buffers
* test to see if we can get better logs on windows ci
* try again for appveyor log things
* skip contentTracing tests on ia32
* ci: disable gpu compositing
* drop applied patch
* fix merge fail
* Revert "ci: disable gpu compositing"
This reverts commit 0344129fcb19ea3e87e06c1110d751f22eba3fec.
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@github.com>
Co-authored-by: VerteDinde <khammond@slack-corp.com>
Co-authored-by: VerteDinde <vertedinde@electronjs.org>
Co-authored-by: Jeremy Rose <jeremya@chromium.org>
Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
Co-authored-by: Cheng Zhao <zcbenz@gmail.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
191 lines
6 KiB
C++
191 lines
6 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 BUILDFLAG(IS_MAC)
|
|
if (port->usb_driver_name && !port->usb_driver_name->empty()) {
|
|
dict.Set("usbDriverName", *port->usb_driver_name);
|
|
}
|
|
#elif BUILDFLAG(IS_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),
|
|
render_frame_host_id_(render_frame_host->GetGlobalId()) {
|
|
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()));
|
|
}
|
|
|
|
SerialChooserController::~SerialChooserController() {
|
|
RunCallback(/*port=*/nullptr);
|
|
if (chooser_context_) {
|
|
chooser_context_->RemovePortObserver(this);
|
|
}
|
|
}
|
|
|
|
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::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;
|
|
});
|
|
if (it != ports_.end()) {
|
|
auto* rfh = content::RenderFrameHost::FromID(render_frame_host_id_);
|
|
chooser_context_->GrantPortPermission(origin_, *it->get(), rfh);
|
|
RunCallback(it->Clone());
|
|
} else {
|
|
RunCallback(/*port=*/nullptr);
|
|
}
|
|
}
|
|
}
|
|
|
|
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
|