Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(170)

Side by Side Diff: device/usb/usb_service_impl.h

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 | « device/usb/mojo/device_manager_impl_unittest.cc ('k') | device/usb/usb_service_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "device/usb/usb_service.h" 5 #include "device/usb/usb_service.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <map> 9 #include <map>
10 #include <queue> 10 #include <queue>
11 #include <set> 11 #include <set>
12 12
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "base/memory/weak_ptr.h" 14 #include "base/memory/weak_ptr.h"
15 #include "build/build_config.h" 15 #include "build/build_config.h"
16 #include "device/usb/usb_context.h" 16 #include "device/usb/usb_context.h"
17 #include "device/usb/usb_device_impl.h" 17 #include "device/usb/usb_device_impl.h"
18 #include "third_party/libusb/src/libusb/libusb.h" 18 #include "third_party/libusb/src/libusb/libusb.h"
19 19
20 #if defined(OS_WIN) 20 #if defined(OS_WIN)
21 #include "base/scoped_observer.h" 21 #include "base/scoped_observer.h"
22 #include "device/core/device_monitor_win.h" 22 #include "device/base/device_monitor_win.h"
23 #endif // OS_WIN 23 #endif // OS_WIN
24 24
25 struct libusb_device; 25 struct libusb_device;
26 struct libusb_context; 26 struct libusb_context;
27 27
28 namespace base { 28 namespace base {
29 class SequencedTaskRunner; 29 class SequencedTaskRunner;
30 class SingleThreadTaskRunner; 30 class SingleThreadTaskRunner;
31 } 31 }
32 32
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 #if defined(OS_WIN) 114 #if defined(OS_WIN)
115 ScopedObserver<DeviceMonitorWin, DeviceMonitorWin::Observer> device_observer_; 115 ScopedObserver<DeviceMonitorWin, DeviceMonitorWin::Observer> device_observer_;
116 #endif // OS_WIN 116 #endif // OS_WIN
117 117
118 base::WeakPtrFactory<UsbServiceImpl> weak_factory_; 118 base::WeakPtrFactory<UsbServiceImpl> weak_factory_;
119 119
120 DISALLOW_COPY_AND_ASSIGN(UsbServiceImpl); 120 DISALLOW_COPY_AND_ASSIGN(UsbServiceImpl);
121 }; 121 };
122 122
123 } // namespace device 123 } // namespace device
OLDNEW
« no previous file with comments | « device/usb/mojo/device_manager_impl_unittest.cc ('k') | device/usb/usb_service_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698