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

Side by Side Diff: chrome/browser/devtools/device/usb/android_usb_device.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
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 "chrome/browser/devtools/device/usb/android_usb_device.h" 5 #include "chrome/browser/devtools/device/usb/android_usb_device.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/barrier_closure.h" 10 #include "base/barrier_closure.h"
11 #include "base/base64.h" 11 #include "base/base64.h"
12 #include "base/lazy_instance.h" 12 #include "base/lazy_instance.h"
13 #include "base/memory/ptr_util.h" 13 #include "base/memory/ptr_util.h"
14 #include "base/single_thread_task_runner.h" 14 #include "base/single_thread_task_runner.h"
15 #include "base/stl_util.h" 15 #include "base/stl_util.h"
16 #include "base/strings/string_util.h" 16 #include "base/strings/string_util.h"
17 #include "base/strings/stringprintf.h" 17 #include "base/strings/stringprintf.h"
18 #include "base/strings/utf_string_conversions.h" 18 #include "base/strings/utf_string_conversions.h"
19 #include "base/threading/thread_task_runner_handle.h" 19 #include "base/threading/thread_task_runner_handle.h"
20 #include "chrome/browser/devtools/device/usb/android_rsa.h" 20 #include "chrome/browser/devtools/device/usb/android_rsa.h"
21 #include "chrome/browser/devtools/device/usb/android_usb_socket.h" 21 #include "chrome/browser/devtools/device/usb/android_usb_socket.h"
22 #include "content/public/browser/browser_thread.h" 22 #include "content/public/browser/browser_thread.h"
23 #include "crypto/rsa_private_key.h" 23 #include "crypto/rsa_private_key.h"
24 #include "device/core/device_client.h" 24 #include "device/base/device_client.h"
25 #include "device/usb/usb_descriptors.h" 25 #include "device/usb/usb_descriptors.h"
26 #include "device/usb/usb_device.h" 26 #include "device/usb/usb_device.h"
27 #include "device/usb/usb_service.h" 27 #include "device/usb/usb_service.h"
28 #include "net/base/io_buffer.h" 28 #include "net/base/io_buffer.h"
29 #include "net/base/ip_endpoint.h" 29 #include "net/base/ip_endpoint.h"
30 #include "net/base/net_errors.h" 30 #include "net/base/net_errors.h"
31 #include "net/socket/stream_socket.h" 31 #include "net/socket/stream_socket.h"
32 32
33 using device::UsbConfigDescriptor; 33 using device::UsbConfigDescriptor;
34 using device::UsbDevice; 34 using device::UsbDevice;
(...skipping 630 matching lines...) Expand 10 before | Expand all | Expand 10 after
665 BrowserThread::PostTask( 665 BrowserThread::PostTask(
666 BrowserThread::UI, FROM_HERE, 666 BrowserThread::UI, FROM_HERE,
667 base::Bind(&ReleaseInterface, usb_handle, interface_id_)); 667 base::Bind(&ReleaseInterface, usb_handle, interface_id_));
668 } 668 }
669 669
670 void AndroidUsbDevice::SocketDeleted(uint32_t socket_id) { 670 void AndroidUsbDevice::SocketDeleted(uint32_t socket_id) {
671 DCHECK(task_runner_->BelongsToCurrentThread()); 671 DCHECK(task_runner_->BelongsToCurrentThread());
672 672
673 sockets_.erase(socket_id); 673 sockets_.erase(socket_id);
674 } 674 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698