extensions/browser/api/usb/usb_device_resource.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: extensions/browser/api/usb/usb_device_resource.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: extensions/browser/api/usb/usb_device_resource.cc

diff --git a/extensions/browser/api/usb/usb_device_resource.cc b/extensions/browser/api/usb/usb_device_resource.cc

index 030de7b700f1d93f18d086d85c870a7b14875f35..347a1a75ca73841683a198d82f963b3d7cc7078c 100644

--- a/extensions/browser/api/usb/usb_device_resource.cc

+++ b/extensions/browser/api/usb/usb_device_resource.cc

@@ -10,13 +10,13 @@

#include "base/bind.h"

#include "base/bind_helpers.h"

#include "base/synchronization/lock.h"

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

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

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

#include "extensions/browser/api/api_resource.h"

#include "extensions/common/api/usb.h"

using content::BrowserThread;

-using usb_service::UsbDeviceHandle;

+using device::UsbDeviceHandle;

namespace extensions {