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

Side by Side Diff: device/usb/usb_service_impl.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 | « device/usb/usb_service_impl.h ('k') | device/usb/usb_service_linux.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 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 "device/usb/usb_service_impl.h" 5 #include "device/usb/usb_service_impl.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <list> 9 #include <list>
10 #include <memory> 10 #include <memory>
(...skipping 15 matching lines...) Expand all
26 #include "device/usb/usb_error.h" 26 #include "device/usb/usb_error.h"
27 #include "device/usb/webusb_descriptors.h" 27 #include "device/usb/webusb_descriptors.h"
28 #include "net/base/io_buffer.h" 28 #include "net/base/io_buffer.h"
29 #include "third_party/libusb/src/libusb/libusb.h" 29 #include "third_party/libusb/src/libusb/libusb.h"
30 30
31 #if defined(OS_WIN) 31 #if defined(OS_WIN)
32 #include <setupapi.h> 32 #include <setupapi.h>
33 #include <usbiodef.h> 33 #include <usbiodef.h>
34 34
35 #include "base/strings/string_util.h" 35 #include "base/strings/string_util.h"
36 #include "device/core/device_info_query_win.h" 36 #include "device/base/device_info_query_win.h"
37 #endif // OS_WIN 37 #endif // OS_WIN
38 38
39 using net::IOBufferWithSize; 39 using net::IOBufferWithSize;
40 40
41 namespace device { 41 namespace device {
42 42
43 namespace { 43 namespace {
44 44
45 // Standard USB requests and descriptor types: 45 // Standard USB requests and descriptor types:
46 const uint16_t kUsbVersion2_1 = 0x0210; 46 const uint16_t kUsbVersion2_1 = 0x0210;
(...skipping 488 matching lines...) Expand 10 before | Expand all | Expand 10 after
535 } 535 }
536 536
537 void UsbServiceImpl::EnumerationFailed(PlatformUsbDevice platform_device, 537 void UsbServiceImpl::EnumerationFailed(PlatformUsbDevice platform_device,
538 const base::Closure& refresh_complete) { 538 const base::Closure& refresh_complete) {
539 libusb_ref_device(platform_device); 539 libusb_ref_device(platform_device);
540 ignored_devices_.insert(platform_device); 540 ignored_devices_.insert(platform_device);
541 refresh_complete.Run(); 541 refresh_complete.Run();
542 } 542 }
543 543
544 } // namespace device 544 } // namespace device
OLDNEW
« no previous file with comments | « device/usb/usb_service_impl.h ('k') | device/usb/usb_service_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698