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

Unified Diff: extensions/shell/browser/shell_device_client.h

Issue 497363004: Merge components/usb_service into device/usb. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased. Created 6 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
« no previous file with comments | « extensions/shell/browser/DEPS ('k') | extensions/shell/browser/shell_device_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/shell/browser/shell_device_client.h
diff --git a/extensions/shell/browser/shell_device_client.h b/extensions/shell/browser/shell_device_client.h
index d34e3ca4cccc83de428057a5c0a12dc4323467a2..862d60991d00c93e939989d911d4a737cf938699 100644
--- a/extensions/shell/browser/shell_device_client.h
+++ b/extensions/shell/browser/shell_device_client.h
@@ -20,7 +20,7 @@ class ShellDeviceClient : device::DeviceClient {
virtual ~ShellDeviceClient();
// device::DeviceClient implementation
- virtual usb_service::UsbService* GetUsbService() OVERRIDE;
+ virtual device::UsbService* GetUsbService() OVERRIDE;
private:
DISALLOW_COPY_AND_ASSIGN(ShellDeviceClient);
« no previous file with comments | « extensions/shell/browser/DEPS ('k') | extensions/shell/browser/shell_device_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698