| OLD | NEW |
| 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/type_converters.h" | 5 #include "device/devices_app/usb/type_converters.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| 11 #include "base/strings/utf_string_conversions.h" | 11 #include "base/strings/utf_string_conversions.h" |
| 12 #include "device/usb/usb_device.h" | 12 #include "device/usb/usb_device.h" |
| 13 #include "third_party/mojo/src/mojo/public/cpp/bindings/array.h" | 13 #include "third_party/mojo/src/mojo/public/cpp/bindings/array.h" |
| 14 | 14 |
| 15 namespace mojo { | 15 namespace mojo { |
| (...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 211 info->guid = device.guid(); | 211 info->guid = device.guid(); |
| 212 info->vendor_id = device.vendor_id(); | 212 info->vendor_id = device.vendor_id(); |
| 213 info->product_id = device.product_id(); | 213 info->product_id = device.product_id(); |
| 214 info->manufacturer = base::UTF16ToUTF8(device.manufacturer_string()); | 214 info->manufacturer = base::UTF16ToUTF8(device.manufacturer_string()); |
| 215 info->product = base::UTF16ToUTF8(device.product_string()); | 215 info->product = base::UTF16ToUTF8(device.product_string()); |
| 216 info->serial_number = base::UTF16ToUTF8(device.serial_number()); | 216 info->serial_number = base::UTF16ToUTF8(device.serial_number()); |
| 217 return info.Pass(); | 217 return info.Pass(); |
| 218 } | 218 } |
| 219 | 219 |
| 220 } // namespace mojo | 220 } // namespace mojo |
| OLD | NEW |