device/core/device_client.cc - 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/core/device_client.cc

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/core/device_client.cc

diff --git a/device/core/device_client.cc b/device/core/device_client.cc

index ad96b1ef24c4fe5bbdb0b1b7a12aaec8e1dec1d9..f92ec17bed5462f6ef975bd31305a486af73c8cd 100644

--- a/device/core/device_client.cc

+++ b/device/core/device_client.cc

@@ -29,7 +29,7 @@ DeviceClient* DeviceClient::Get() {

return g_instance;

}

-usb_service::UsbService* DeviceClient::GetUsbService() {

+UsbService* DeviceClient::GetUsbService() {

// This should never be called by clients which do not support the USB API.

NOTREACHED();

return NULL;

« no previous file with comments | « device/core/device_client.h ('k') | device/device_tests.gyp » ('j') | no next file with comments »