chrome/browser/chrome_device_client.cc - Issue 497363004: Merge components/usb_service into device/usb.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side 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, 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:

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/chrome_device_client.h"	5 #include "chrome/browser/chrome_device_client.h"

6	6

7 #include "base/logging.h"	7 #include "base/logging.h"

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

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

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

10	10

11 ChromeDeviceClient::ChromeDeviceClient() {}	11 ChromeDeviceClient::ChromeDeviceClient() {}

12	12

13 ChromeDeviceClient::~ChromeDeviceClient() {}	13 ChromeDeviceClient::~ChromeDeviceClient() {}

14	14

15 usb_service::UsbService* ChromeDeviceClient::GetUsbService() {	15 device::UsbService* ChromeDeviceClient::GetUsbService() {

16 return usb_service::UsbService::GetInstance(	16 return device::UsbService::GetInstance(

17 content::BrowserThread::GetMessageLoopProxyForThread(	17 content::BrowserThread::GetMessageLoopProxyForThread(

18 content::BrowserThread::UI));	18 content::BrowserThread::UI));

19 }	19 }

OLD	NEW