* chore: bump chromium in DEPS to 121.0.6154.0 * chore: bump chromium in DEPS to 121.0.6155.0 * fix patches * chore: update patches * patch out reference to GetOcclusionTracker * un-flag PIPOcclusionTracker * chore: bump chromium in DEPS to 121.0.6157.0 * fix conflicts https://chromium-review.googlesource.com/c/chromium/src/+/5038807 * add PIP occlusion tracker sources to chromium_src * 5037591: Replace feature_list's Initialize* methods with Init*. https://chromium-review.googlesource.com/c/chromium/src/+/5037591 * 4811903: Move //content/browser/renderer_host/input/synthetic_gesture_controller to //content/common/input https://chromium-review.googlesource.com/c/chromium/src/+/4811903 * 4917953: usb: Add usb-unrestricted to permission policy https://chromium-review.googlesource.com/c/chromium/src/+/4917953 * 5072395: Remove unused `creation_context` parameter from blink/public APIs https://chromium-review.googlesource.com/c/chromium/src/+/5072395 * 5052035: [X11] Change AtomCache from a singleton to owned by Connection https://chromium-review.googlesource.com/c/chromium/src/+/5052035 * fix v8/.patches * node script/gen-libc++-filenames.js * 5035771: Remove the SetImage method of ImageButton https://chromium-review.googlesource.com/c/chromium/src/+/5035771 * fixup! 5052035: [X11] Change AtomCache from a singleton to owned by Connection * fixup! 5035771: Remove the SetImage method of ImageButton * chore: bump chromium in DEPS to 121.0.6159.0 * 4505903: [Extensions] Add lastAccessed property to chrome.tabs.Tab https://chromium-review.googlesource.com/c/chromium/src/+/4505903 * update patches * don't duplicate tabs API types this causes weird memory bugs if the two get out of sync * fix UAF in TrayIconCocoa not sure why this is popping up just now ... this has been broken for ages afaict * Revert "don't duplicate tabs API types" This reverts commit 80dff2efaa1297e5c191b2c69648099d6665dbff. This is failing tests with extensions API schema check failures, so revert for now. we'll fix it later. * revert v8 change causing node crashes * chore: reduce diffs in revert_api_dcheck-fail_when_we_reenter_v8_while_terminating.patch --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Jeremy Rose <jeremya@chromium.org> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: clavin <clavin@electronjs.org> Co-authored-by: Charles Kerr <charles@charleskerr.com>
		
			
				
	
	
		
			117 lines
		
	
	
	
		
			4.6 KiB
			
		
	
	
	
		
			C++
		
	
	
	
	
	
			
		
		
	
	
			117 lines
		
	
	
	
		
			4.6 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.
 | 
						|
 | 
						|
#ifndef ELECTRON_SHELL_BROWSER_USB_ELECTRON_USB_DELEGATE_H_
 | 
						|
#define ELECTRON_SHELL_BROWSER_USB_ELECTRON_USB_DELEGATE_H_
 | 
						|
 | 
						|
#include <memory>
 | 
						|
#include <string>
 | 
						|
#include <unordered_map>
 | 
						|
#include <vector>
 | 
						|
 | 
						|
#include "base/containers/span.h"
 | 
						|
#include "base/memory/weak_ptr.h"
 | 
						|
#include "content/public/browser/usb_chooser.h"
 | 
						|
#include "content/public/browser/usb_delegate.h"
 | 
						|
#include "mojo/public/cpp/bindings/pending_receiver.h"
 | 
						|
#include "mojo/public/cpp/bindings/pending_remote.h"
 | 
						|
#include "services/device/public/mojom/usb_device.mojom-forward.h"
 | 
						|
#include "services/device/public/mojom/usb_enumeration_options.mojom-forward.h"
 | 
						|
#include "services/device/public/mojom/usb_manager.mojom-forward.h"
 | 
						|
#include "third_party/blink/public/mojom/usb/web_usb_service.mojom.h"
 | 
						|
#include "url/origin.h"
 | 
						|
 | 
						|
namespace content {
 | 
						|
class BrowserContext;
 | 
						|
class RenderFrameHost;
 | 
						|
}  // namespace content
 | 
						|
 | 
						|
namespace electron {
 | 
						|
 | 
						|
class UsbChooserController;
 | 
						|
 | 
						|
class ElectronUsbDelegate : public content::UsbDelegate {
 | 
						|
 public:
 | 
						|
  ElectronUsbDelegate();
 | 
						|
  ElectronUsbDelegate(ElectronUsbDelegate&&) = delete;
 | 
						|
  ElectronUsbDelegate& operator=(ElectronUsbDelegate&) = delete;
 | 
						|
  ~ElectronUsbDelegate() override;
 | 
						|
 | 
						|
  // content::UsbDelegate:
 | 
						|
  void AdjustProtectedInterfaceClasses(content::BrowserContext* browser_context,
 | 
						|
                                       const url::Origin& origin,
 | 
						|
                                       content::RenderFrameHost* frame,
 | 
						|
                                       std::vector<uint8_t>& classes) override;
 | 
						|
  std::unique_ptr<content::UsbChooser> RunChooser(
 | 
						|
      content::RenderFrameHost& frame,
 | 
						|
      blink::mojom::WebUsbRequestDeviceOptionsPtr options,
 | 
						|
      blink::mojom::WebUsbService::GetPermissionCallback callback) override;
 | 
						|
  bool CanRequestDevicePermission(content::BrowserContext* browser_context,
 | 
						|
                                  const url::Origin& origin) override;
 | 
						|
  void RevokeDevicePermissionWebInitiated(
 | 
						|
      content::BrowserContext* browser_context,
 | 
						|
      const url::Origin& origin,
 | 
						|
      const device::mojom::UsbDeviceInfo& device) override;
 | 
						|
  const device::mojom::UsbDeviceInfo* GetDeviceInfo(
 | 
						|
      content::BrowserContext* browser_context,
 | 
						|
      const std::string& guid) override;
 | 
						|
  bool HasDevicePermission(content::BrowserContext* browser_context,
 | 
						|
                           content::RenderFrameHost* frame,
 | 
						|
                           const url::Origin& origin,
 | 
						|
                           const device::mojom::UsbDeviceInfo& device) override;
 | 
						|
  void GetDevices(
 | 
						|
      content::BrowserContext* browser_context,
 | 
						|
      blink::mojom::WebUsbService::GetDevicesCallback callback) override;
 | 
						|
  void GetDevice(
 | 
						|
      content::BrowserContext* browser_context,
 | 
						|
      const std::string& guid,
 | 
						|
      base::span<const uint8_t> blocked_interface_classes,
 | 
						|
      mojo::PendingReceiver<device::mojom::UsbDevice> device_receiver,
 | 
						|
      mojo::PendingRemote<device::mojom::UsbDeviceClient> device_client)
 | 
						|
      override;
 | 
						|
  void AddObserver(content::BrowserContext* browser_context,
 | 
						|
                   Observer* observer) override;
 | 
						|
  void RemoveObserver(content::BrowserContext* browser_context,
 | 
						|
                      Observer* observer) override;
 | 
						|
 | 
						|
  // TODO: See if we can separate these from Profiles upstream.
 | 
						|
  void IncrementConnectionCount(content::BrowserContext* browser_context,
 | 
						|
                                const url::Origin& origin) override {}
 | 
						|
 | 
						|
  void DecrementConnectionCount(content::BrowserContext* browser_context,
 | 
						|
                                const url::Origin& origin) override {}
 | 
						|
 | 
						|
  bool IsServiceWorkerAllowedForOrigin(const url::Origin& origin) override;
 | 
						|
 | 
						|
  void DeleteControllerForFrame(content::RenderFrameHost* render_frame_host);
 | 
						|
 | 
						|
  bool PageMayUseUsb(content::Page& page) override;
 | 
						|
 | 
						|
 private:
 | 
						|
  UsbChooserController* ControllerForFrame(
 | 
						|
      content::RenderFrameHost* render_frame_host);
 | 
						|
 | 
						|
  UsbChooserController* AddControllerForFrame(
 | 
						|
      content::RenderFrameHost* render_frame_host,
 | 
						|
      blink::mojom::WebUsbRequestDeviceOptionsPtr options,
 | 
						|
      blink::mojom::WebUsbService::GetPermissionCallback callback);
 | 
						|
 | 
						|
  class ContextObservation;
 | 
						|
 | 
						|
  ContextObservation* GetContextObserver(
 | 
						|
      content::BrowserContext* browser_context);
 | 
						|
 | 
						|
  base::flat_map<content::BrowserContext*, std::unique_ptr<ContextObservation>>
 | 
						|
      observations_;
 | 
						|
 | 
						|
  std::unordered_map<content::RenderFrameHost*,
 | 
						|
                     std::unique_ptr<UsbChooserController>>
 | 
						|
      controller_map_;
 | 
						|
 | 
						|
  base::WeakPtrFactory<ElectronUsbDelegate> weak_factory_{this};
 | 
						|
};
 | 
						|
 | 
						|
}  // namespace electron
 | 
						|
 | 
						|
#endif  // ELECTRON_SHELL_BROWSER_USB_ELECTRON_USB_DELEGATE_H_
 |