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

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

Issue 1311043003: Update mojo sdk to rev c02a28868825edfa57ab77947b8cb15e741c5598 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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_device_impl.h
diff --git a/content/renderer/usb/web_usb_device_impl.h b/content/renderer/usb/web_usb_device_impl.h
index 7f01d8d758a2d89fedf3801c8272bdc841ebea9e..3f6eab52b1ef55a603a2abc0a82bf71c357b45fc 100644
--- a/content/renderer/usb/web_usb_device_impl.h
+++ b/content/renderer/usb/web_usb_device_impl.h
@@ -14,7 +14,6 @@
#include "third_party/WebKit/public/platform/modules/webusb/WebUSBDevice.h"
#include "third_party/WebKit/public/platform/modules/webusb/WebUSBDeviceInfo.h"
#include "third_party/WebKit/public/platform/modules/webusb/WebUSBError.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/error_handler.h"
namespace mojo {
class Shell;
@@ -22,7 +21,7 @@ class Shell;
namespace content {
-class WebUSBDeviceImpl : public blink::WebUSBDevice, public mojo::ErrorHandler {
+class WebUSBDeviceImpl : public blink::WebUSBDevice {
public:
WebUSBDeviceImpl(device::usb::DeviceManagerPtr device_manager,
const blink::WebUSBDeviceInfo& device_info);
@@ -62,9 +61,6 @@ class WebUSBDeviceImpl : public blink::WebUSBDevice, public mojo::ErrorHandler {
blink::WebUSBDeviceBulkTransferCallbacks* callbacks) override;
void reset(blink::WebUSBDeviceResetCallbacks* callbacks) override;
- // mojo::ErrorHandler implementation:
- void OnConnectionError() override;
-
device::usb::DeviceManagerPtr device_manager_;
blink::WebUSBDeviceInfo device_info_;

Powered by Google App Engine
This is Rietveld 408576698