device/test/usb_test_gadget.h - Issue 497363004: Merge components/usb_service into device/usb.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: device/test/usb_test_gadget.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:

Index: device/test/usb_test_gadget.h

diff --git a/device/test/usb_test_gadget.h b/device/test/usb_test_gadget.h

index 1c835e2ec4f2f33a837063895e8b1187f1eea81c..1433bf8f2a82e983b17dbc60382f6d3af2e22f74 100644

--- a/device/test/usb_test_gadget.h

+++ b/device/test/usb_test_gadget.h

@@ -10,12 +10,10 @@

#include "base/macros.h"

#include "base/memory/scoped_ptr.h"

-namespace usb_service {

-class UsbDevice;

-} // namespace usb_service

namespace device {

+class UsbDevice;

class UsbTestGadget {

public:

enum Type {

@@ -35,7 +33,7 @@ class UsbTestGadget {

virtual bool Reconnect() = 0;

virtual bool SetType(Type type) = 0;

- virtual usb_service::UsbDevice* GetDevice() const = 0;

+ virtual UsbDevice* GetDevice() const = 0;

virtual std::string GetSerial() const = 0;

protected:

« no previous file with comments | « device/test/DEPS ('k') | device/test/usb_test_gadget_impl.cc » ('j') | no next file with comments »