extensions/browser/api/usb/usb_event_router.cc - Issue 2417043002: Move device/core files to device/base directory.

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

Issue 2417043002: Move device/core files to device/base directory. (Closed)

Patch Set: Fix ChromeOS build Created 4 years, 2 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:

View unified diff | Download patch

« no previous file with comments | « extensions/browser/api/usb/usb_apitest.cc ('k') | extensions/browser/api/usb/usb_guid_map.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 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 "extensions/browser/api/usb/usb_event_router.h"	5 #include "extensions/browser/api/usb/usb_event_router.h"

6	6

7 #include <utility>	7 #include <utility>

8	8

9 #include "device/core/device_client.h"	9 #include "device/base/device_client.h"

10 #include "device/usb/usb_device.h"	10 #include "device/usb/usb_device.h"

11 #include "extensions/browser/api/device_permissions_manager.h"	11 #include "extensions/browser/api/device_permissions_manager.h"

12 #include "extensions/browser/api/usb/usb_guid_map.h"	12 #include "extensions/browser/api/usb/usb_guid_map.h"

13 #include "extensions/browser/event_router_factory.h"	13 #include "extensions/browser/event_router_factory.h"

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

15 #include "extensions/common/permissions/permissions_data.h"	15 #include "extensions/common/permissions/permissions_data.h"

16 #include "extensions/common/permissions/usb_device_permission.h"	16 #include "extensions/common/permissions/usb_device_permission.h"

17	17

18 namespace usb = extensions::api::usb;	18 namespace usb = extensions::api::usb;

19	19

(...skipping 105 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
125	125

126 template <>	126 template <>

127 void BrowserContextKeyedAPIFactory<	127 void BrowserContextKeyedAPIFactory<

128 UsbEventRouter>::DeclareFactoryDependencies() {	128 UsbEventRouter>::DeclareFactoryDependencies() {

129 DependsOn(DevicePermissionsManagerFactory::GetInstance());	129 DependsOn(DevicePermissionsManagerFactory::GetInstance());

130 DependsOn(EventRouterFactory::GetInstance());	130 DependsOn(EventRouterFactory::GetInstance());

131 DependsOn(UsbGuidMap::GetFactoryInstance());	131 DependsOn(UsbGuidMap::GetFactoryInstance());

132 }	132 }

133	133

134 } // extensions	134 } // extensions

OLD	NEW