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 #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 | 8 |
9 #include "base/barrier_closure.h" | 9 #include "base/barrier_closure.h" |
10 #include "base/base64.h" | 10 #include "base/base64.h" |
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
89 zero_mask = endpointIt->maximum_packet_size - 1; | 89 zero_mask = endpointIt->maximum_packet_size - 1; |
90 } | 90 } |
91 | 91 |
92 if (inbound_address == 0 || outbound_address == 0) | 92 if (inbound_address == 0 || outbound_address == 0) |
93 return NULL; | 93 return NULL; |
94 | 94 |
95 if (!usb_handle->ClaimInterface(interface.interface_number)) | 95 if (!usb_handle->ClaimInterface(interface.interface_number)) |
96 return NULL; | 96 return NULL; |
97 | 97 |
98 base::string16 serial; | 98 base::string16 serial; |
99 if (!usb_handle->GetSerial(&serial) || serial.empty()) | 99 if (!usb_handle->GetDevice()->GetSerialNumber(&serial) || serial.empty()) |
100 return NULL; | 100 return NULL; |
101 | 101 |
102 return new AndroidUsbDevice(rsa_key, | 102 return new AndroidUsbDevice(rsa_key, |
103 usb_handle, | 103 usb_handle, |
104 base::UTF16ToASCII(serial), | 104 base::UTF16ToASCII(serial), |
105 inbound_address, | 105 inbound_address, |
106 outbound_address, | 106 outbound_address, |
107 zero_mask, | 107 zero_mask, |
108 interface.interface_number); | 108 interface.interface_number); |
109 } | 109 } |
(...skipping 536 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
646 BrowserThread::PostTask( | 646 BrowserThread::PostTask( |
647 BrowserThread::FILE, FROM_HERE, | 647 BrowserThread::FILE, FROM_HERE, |
648 base::Bind(&ReleaseInterface, usb_handle, interface_id_)); | 648 base::Bind(&ReleaseInterface, usb_handle, interface_id_)); |
649 } | 649 } |
650 | 650 |
651 void AndroidUsbDevice::SocketDeleted(uint32 socket_id) { | 651 void AndroidUsbDevice::SocketDeleted(uint32 socket_id) { |
652 DCHECK(message_loop_ == base::MessageLoop::current()); | 652 DCHECK(message_loop_ == base::MessageLoop::current()); |
653 | 653 |
654 sockets_.erase(socket_id); | 654 sockets_.erase(socket_id); |
655 } | 655 } |
OLD | NEW |