chrome/browser/chrome_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: chrome/browser/chrome_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: Hide //device/usb on mobile platforms. Created 6 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:

Index: chrome/browser/chrome_device_client.cc

diff --git a/chrome/browser/chrome_device_client.cc b/chrome/browser/chrome_device_client.cc

index 941e7771fbae2ccf7b9d8702f61c4ad238d3ed66..f36d61f60600c2ba37da868cbe51bb0c13150952 100644

--- a/chrome/browser/chrome_device_client.cc

+++ b/chrome/browser/chrome_device_client.cc

@@ -5,15 +5,15 @@

#include "chrome/browser/chrome_device_client.h"

#include "base/logging.h"

-#include "components/usb_service/usb_service.h"

#include "content/public/browser/browser_thread.h"

+#include "device/usb/usb_service.h"

ChromeDeviceClient::ChromeDeviceClient() {}

ChromeDeviceClient::~ChromeDeviceClient() {}

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

- return usb_service::UsbService::GetInstance(

+device::UsbService* ChromeDeviceClient::GetUsbService() {

+ return device::UsbService::GetInstance(

content::BrowserThread::GetMessageLoopProxyForThread(

content::BrowserThread::UI));

}