OLD | NEW |
---|---|
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 #ifndef CHROME_BROWSER_DEVTOOLS_DEVICE_USB_ANDROID_USB_DEVICE_H_ | 5 #ifndef CHROME_BROWSER_DEVTOOLS_DEVICE_USB_ANDROID_USB_DEVICE_H_ |
6 #define CHROME_BROWSER_DEVTOOLS_DEVICE_USB_ANDROID_USB_DEVICE_H_ | 6 #define CHROME_BROWSER_DEVTOOLS_DEVICE_USB_ANDROID_USB_DEVICE_H_ |
7 | 7 |
8 #include <stddef.h> | 8 #include <stddef.h> |
9 #include <stdint.h> | 9 #include <stdint.h> |
10 | 10 |
11 #include <map> | 11 #include <map> |
12 #include <memory> | 12 #include <memory> |
13 #include <queue> | 13 #include <queue> |
14 #include <vector> | 14 #include <vector> |
15 | 15 |
16 #include "base/macros.h" | 16 #include "base/macros.h" |
17 #include "base/memory/ref_counted.h" | 17 #include "base/memory/ref_counted.h" |
18 #include "base/memory/scoped_vector.h" | |
19 #include "base/memory/weak_ptr.h" | 18 #include "base/memory/weak_ptr.h" |
20 #include "device/usb/usb_device_handle.h" | 19 #include "device/usb/usb_device_handle.h" |
21 | 20 |
22 namespace base { | 21 namespace base { |
23 class SingleThreadTaskRunner; | 22 class SingleThreadTaskRunner; |
24 } | 23 } |
25 | 24 |
26 namespace crypto { | 25 namespace crypto { |
27 class RSAPrivateKey; | 26 class RSAPrivateKey; |
28 } | 27 } |
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
154 // Created sockets info | 153 // Created sockets info |
155 uint32_t last_socket_id_; | 154 uint32_t last_socket_id_; |
156 typedef std::map<uint32_t, AndroidUsbSocket*> AndroidUsbSockets; | 155 typedef std::map<uint32_t, AndroidUsbSocket*> AndroidUsbSockets; |
157 AndroidUsbSockets sockets_; | 156 AndroidUsbSockets sockets_; |
158 | 157 |
159 // Outgoing bulk queue | 158 // Outgoing bulk queue |
160 typedef scoped_refptr<net::IOBufferWithSize> BulkMessage; | 159 typedef scoped_refptr<net::IOBufferWithSize> BulkMessage; |
161 std::queue<BulkMessage> outgoing_queue_; | 160 std::queue<BulkMessage> outgoing_queue_; |
162 | 161 |
163 // Outgoing messages pending connect | 162 // Outgoing messages pending connect |
164 typedef ScopedVector<AdbMessage> PendingMessages; | 163 typedef std::vector<std::unique_ptr<AdbMessage>> PendingMessages; |
Lei Zhang
2017/03/23 02:59:26
Convert to using PendingMessages = std::vector<std
leonhsl(Using Gerrit)
2017/03/23 15:03:17
Done.
| |
165 PendingMessages pending_messages_; | 164 PendingMessages pending_messages_; |
166 | 165 |
167 base::WeakPtrFactory<AndroidUsbDevice> weak_factory_; | 166 base::WeakPtrFactory<AndroidUsbDevice> weak_factory_; |
168 | 167 |
169 DISALLOW_COPY_AND_ASSIGN(AndroidUsbDevice); | 168 DISALLOW_COPY_AND_ASSIGN(AndroidUsbDevice); |
170 }; | 169 }; |
171 | 170 |
172 #endif // CHROME_BROWSER_DEVTOOLS_DEVICE_USB_ANDROID_USB_DEVICE_H_ | 171 #endif // CHROME_BROWSER_DEVTOOLS_DEVICE_USB_ANDROID_USB_DEVICE_H_ |
OLD | NEW |