diff options
| author | rockot <rockot@chromium.org> | 2015-06-11 10:25:45 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-11 17:27:07 +0000 |
| commit | 0fa66a8dc57470d805c22eea20c29dfec2c4d634 (patch) | |
| tree | 37b118a681133c94b5ec9ec31c0eee04be85d509 /chrome/browser/chrome_device_client.cc | |
| parent | 85cf6b004467da8d1d50969ded4692ca9a76f053 (diff) | |
| download | chromium_src-0fa66a8dc57470d805c22eea20c29dfec2c4d634.zip chromium_src-0fa66a8dc57470d805c22eea20c29dfec2c4d634.tar.gz chromium_src-0fa66a8dc57470d805c22eea20c29dfec2c4d634.tar.bz2 | |
Reland: Introduce the devices Mojo app
It's a small Mojo app that currently only hosts USB device
services. This CL adds the app along with an apptest suite
(run manually with mojo_runner mojo:devices_apptests).
The app is hooked up to Chrome to run in the browser process,
though there are currently no production code paths which
cause the app to launch.
The original CL (https://codereview.chromium.org/1165223004/)
was reverted for breaking Win8 GN builds, because the "midi"
component target depends on //device/usb.
This is being relanded with no logic changes, just some
shuffling of sources into different targets. I've decided
to move all the USB mojo service code into devices_app,
which allows previous //device/usb dependents to remain
unaffected by the introduction of mojo support. Component
targets depending on mojo is a bad time for everyone.
BUG=498557
TBR=reillyg@chromium.org,sky@chromium.org
TBR=eroman@chromium.org - code moving from device/usb to device/devices_app/usb requires net/base in DEPS
Review URL: https://codereview.chromium.org/1183443002
Cr-Commit-Position: refs/heads/master@{#333975}
Diffstat (limited to 'chrome/browser/chrome_device_client.cc')
| -rw-r--r-- | chrome/browser/chrome_device_client.cc | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/chrome/browser/chrome_device_client.cc b/chrome/browser/chrome_device_client.cc index d0a31a6..835a4c3 100644 --- a/chrome/browser/chrome_device_client.cc +++ b/chrome/browser/chrome_device_client.cc @@ -5,34 +5,12 @@ #include "chrome/browser/chrome_device_client.h" #include "base/logging.h" -#include "base/macros.h" #include "content/public/browser/browser_thread.h" #include "device/hid/hid_service.h" -#include "device/usb/public/cpp/device_manager_delegate.h" -#include "device/usb/public/cpp/device_manager_factory.h" -#include "device/usb/public/interfaces/device.mojom.h" #include "device/usb/usb_service.h" using content::BrowserThread; -namespace { - -// DeviceManagerDelegate implementation which allows access to all devices. -class BrowserDeviceManagerDelegate : public device::usb::DeviceManagerDelegate { - public: - BrowserDeviceManagerDelegate() {} - ~BrowserDeviceManagerDelegate() override {} - - private: - bool IsDeviceAllowed(const device::usb::DeviceInfo& device) override { - return true; - } - - DISALLOW_COPY_AND_ASSIGN(BrowserDeviceManagerDelegate); -}; - -} // namespace - ChromeDeviceClient::ChromeDeviceClient() {} ChromeDeviceClient::~ChromeDeviceClient() {} @@ -43,14 +21,6 @@ device::UsbService* ChromeDeviceClient::GetUsbService() { BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE)); } -void ChromeDeviceClient::ConnectToUSBDeviceManager( - mojo::InterfaceRequest<device::usb::DeviceManager> request) { - device::usb::DeviceManagerFactory::Build( - request.Pass(), - scoped_ptr<device::usb::DeviceManagerDelegate>( - new BrowserDeviceManagerDelegate)); -} - device::HidService* ChromeDeviceClient::GetHidService() { DCHECK_CURRENTLY_ON(BrowserThread::UI); return device::HidService::GetInstance( |