Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2129)

Unified Diff: content/renderer/usb/web_usb_client_impl.h

Issue 1371793004: Provide the DeviceManager service to the renderer directly, no app. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@interface_permission
Patch Set: Fix header inclusion in chrome_content_browser_client.cc. Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/usb/web_usb_client_impl.h
diff --git a/content/renderer/usb/web_usb_client_impl.h b/content/renderer/usb/web_usb_client_impl.h
index dc2d1069c7b37c865b5569c0818b1b6817d37754..612f842e35cecd1fee096c6adce8a48ad4fe9b61 100644
--- a/content/renderer/usb/web_usb_client_impl.h
+++ b/content/renderer/usb/web_usb_client_impl.h
@@ -5,17 +5,17 @@
#ifndef CONTENT_RENDERER_USB_WEB_USB_CLIENT_IMPL_H_
#define CONTENT_RENDERER_USB_WEB_USB_CLIENT_IMPL_H_
-#include "base/id_map.h"
#include "base/macros.h"
#include "device/devices_app/usb/public/interfaces/device_manager.mojom.h"
-#include "mojo/application/public/interfaces/service_provider.mojom.h"
#include "third_party/WebKit/public/platform/modules/webusb/WebUSBClient.h"
namespace content {
+class ServiceRegistry;
+
class WebUSBClientImpl : public blink::WebUSBClient {
public:
- explicit WebUSBClientImpl(mojo::ServiceProviderPtr device_services);
+ explicit WebUSBClientImpl(content::ServiceRegistry* service_registry);
~WebUSBClientImpl() override;
private:
@@ -29,7 +29,6 @@ class WebUSBClientImpl : public blink::WebUSBClient {
void OnDeviceChangeNotification(
device::usb::DeviceChangeNotificationPtr notification);
- mojo::ServiceProviderPtr device_services_;
device::usb::DeviceManagerPtr device_manager_;
Observer* observer_ = nullptr;

Powered by Google App Engine
This is Rietveld 408576698