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>
175 lines
6.1 KiB
C++
175 lines
6.1 KiB
C++
// Copyright (c) 2021 Microsoft, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/hid/electron_hid_delegate.h"
|
|
|
|
#include <string>
|
|
#include <utility>
|
|
|
|
#include "base/command_line.h"
|
|
#include "content/public/browser/web_contents.h"
|
|
#include "services/device/public/cpp/hid/hid_switches.h"
|
|
#include "shell/browser/hid/hid_chooser_context.h"
|
|
#include "shell/browser/hid/hid_chooser_context_factory.h"
|
|
#include "shell/browser/hid/hid_chooser_controller.h"
|
|
#include "shell/browser/web_contents_permission_helper.h"
|
|
|
|
namespace {
|
|
|
|
electron::HidChooserContext* GetChooserContext(
|
|
content::RenderFrameHost* frame) {
|
|
auto* web_contents = content::WebContents::FromRenderFrameHost(frame);
|
|
auto* browser_context = web_contents->GetBrowserContext();
|
|
return electron::HidChooserContextFactory::GetForBrowserContext(
|
|
browser_context);
|
|
}
|
|
|
|
} // namespace
|
|
|
|
namespace electron {
|
|
|
|
ElectronHidDelegate::ElectronHidDelegate() = default;
|
|
|
|
ElectronHidDelegate::~ElectronHidDelegate() = default;
|
|
|
|
std::unique_ptr<content::HidChooser> ElectronHidDelegate::RunChooser(
|
|
content::RenderFrameHost* render_frame_host,
|
|
std::vector<blink::mojom::HidDeviceFilterPtr> filters,
|
|
content::HidChooser::Callback callback) {
|
|
electron::HidChooserContext* chooser_context =
|
|
GetChooserContext(render_frame_host);
|
|
if (!device_observation_.IsObserving())
|
|
device_observation_.Observe(chooser_context);
|
|
|
|
HidChooserController* controller = ControllerForFrame(render_frame_host);
|
|
if (controller) {
|
|
DeleteControllerForFrame(render_frame_host);
|
|
}
|
|
AddControllerForFrame(render_frame_host, std::move(filters),
|
|
std::move(callback));
|
|
|
|
// Return a nullptr because the return value isn't used for anything, eg
|
|
// there is no mechanism to cancel navigator.hid.requestDevice(). The return
|
|
// value is simply used in Chromium to cleanup the chooser UI once the serial
|
|
// service is destroyed.
|
|
return nullptr;
|
|
}
|
|
|
|
bool ElectronHidDelegate::CanRequestDevicePermission(
|
|
content::RenderFrameHost* render_frame_host) {
|
|
auto* web_contents =
|
|
content::WebContents::FromRenderFrameHost(render_frame_host);
|
|
auto* permission_helper =
|
|
WebContentsPermissionHelper::FromWebContents(web_contents);
|
|
return permission_helper->CheckHIDAccessPermission(
|
|
web_contents->GetMainFrame()->GetLastCommittedOrigin());
|
|
}
|
|
|
|
bool ElectronHidDelegate::HasDevicePermission(
|
|
content::RenderFrameHost* render_frame_host,
|
|
const device::mojom::HidDeviceInfo& device) {
|
|
auto* chooser_context = GetChooserContext(render_frame_host);
|
|
const auto& origin =
|
|
render_frame_host->GetMainFrame()->GetLastCommittedOrigin();
|
|
return chooser_context->HasDevicePermission(origin, device,
|
|
render_frame_host);
|
|
}
|
|
|
|
void ElectronHidDelegate::RevokeDevicePermission(
|
|
content::RenderFrameHost* render_frame_host,
|
|
const device::mojom::HidDeviceInfo& device) {
|
|
// TODO(jkleinsc) implement this for
|
|
// https://chromium-review.googlesource.com/c/chromium/src/+/3297868
|
|
}
|
|
|
|
device::mojom::HidManager* ElectronHidDelegate::GetHidManager(
|
|
content::RenderFrameHost* render_frame_host) {
|
|
auto* chooser_context = GetChooserContext(render_frame_host);
|
|
return chooser_context->GetHidManager();
|
|
}
|
|
|
|
void ElectronHidDelegate::AddObserver(
|
|
content::RenderFrameHost* render_frame_host,
|
|
Observer* observer) {
|
|
observer_list_.AddObserver(observer);
|
|
auto* chooser_context = GetChooserContext(render_frame_host);
|
|
if (!device_observation_.IsObserving())
|
|
device_observation_.Observe(chooser_context);
|
|
}
|
|
|
|
void ElectronHidDelegate::RemoveObserver(
|
|
content::RenderFrameHost* render_frame_host,
|
|
content::HidDelegate::Observer* observer) {
|
|
observer_list_.RemoveObserver(observer);
|
|
}
|
|
|
|
const device::mojom::HidDeviceInfo* ElectronHidDelegate::GetDeviceInfo(
|
|
content::RenderFrameHost* render_frame_host,
|
|
const std::string& guid) {
|
|
auto* chooser_context = GetChooserContext(render_frame_host);
|
|
return chooser_context->GetDeviceInfo(guid);
|
|
}
|
|
|
|
bool ElectronHidDelegate::IsFidoAllowedForOrigin(
|
|
content::RenderFrameHost* render_frame_host,
|
|
const url::Origin& origin) {
|
|
return base::CommandLine::ForCurrentProcess()->HasSwitch(
|
|
switches::kDisableHidBlocklist);
|
|
}
|
|
|
|
void ElectronHidDelegate::OnDeviceAdded(
|
|
const device::mojom::HidDeviceInfo& device_info) {
|
|
for (auto& observer : observer_list_)
|
|
observer.OnDeviceAdded(device_info);
|
|
}
|
|
|
|
void ElectronHidDelegate::OnDeviceRemoved(
|
|
const device::mojom::HidDeviceInfo& device_info) {
|
|
for (auto& observer : observer_list_)
|
|
observer.OnDeviceRemoved(device_info);
|
|
}
|
|
|
|
void ElectronHidDelegate::OnDeviceChanged(
|
|
const device::mojom::HidDeviceInfo& device_info) {
|
|
for (auto& observer : observer_list_)
|
|
observer.OnDeviceChanged(device_info);
|
|
}
|
|
|
|
void ElectronHidDelegate::OnHidManagerConnectionError() {
|
|
device_observation_.Reset();
|
|
|
|
for (auto& observer : observer_list_)
|
|
observer.OnHidManagerConnectionError();
|
|
}
|
|
|
|
void ElectronHidDelegate::OnHidChooserContextShutdown() {
|
|
device_observation_.Reset();
|
|
}
|
|
|
|
HidChooserController* ElectronHidDelegate::ControllerForFrame(
|
|
content::RenderFrameHost* render_frame_host) {
|
|
auto mapping = controller_map_.find(render_frame_host);
|
|
return mapping == controller_map_.end() ? nullptr : mapping->second.get();
|
|
}
|
|
|
|
HidChooserController* ElectronHidDelegate::AddControllerForFrame(
|
|
content::RenderFrameHost* render_frame_host,
|
|
std::vector<blink::mojom::HidDeviceFilterPtr> filters,
|
|
content::HidChooser::Callback callback) {
|
|
auto* web_contents =
|
|
content::WebContents::FromRenderFrameHost(render_frame_host);
|
|
auto controller = std::make_unique<HidChooserController>(
|
|
render_frame_host, std::move(filters), std::move(callback), web_contents,
|
|
weak_factory_.GetWeakPtr());
|
|
controller_map_.insert(
|
|
std::make_pair(render_frame_host, std::move(controller)));
|
|
return ControllerForFrame(render_frame_host);
|
|
}
|
|
|
|
void ElectronHidDelegate::DeleteControllerForFrame(
|
|
content::RenderFrameHost* render_frame_host) {
|
|
controller_map_.erase(render_frame_host);
|
|
}
|
|
|
|
} // namespace electron
|