| 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 "extensions/browser/api/serial/serial_api.h" | 5 #include "extensions/browser/api/serial/serial_api.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/values.h" | 10 #include "base/values.h" |
| 11 #include "build/build_config.h" |
| 11 #include "content/public/browser/browser_thread.h" | 12 #include "content/public/browser/browser_thread.h" |
| 12 #include "device/serial/serial_device_enumerator.h" | 13 #include "device/serial/serial_device_enumerator.h" |
| 13 #include "extensions/browser/api/serial/serial_connection.h" | 14 #include "extensions/browser/api/serial/serial_connection.h" |
| 14 #include "extensions/browser/api/serial/serial_event_dispatcher.h" | 15 #include "extensions/browser/api/serial/serial_event_dispatcher.h" |
| 15 #include "extensions/common/api/serial.h" | 16 #include "extensions/common/api/serial.h" |
| 16 | 17 |
| 17 using content::BrowserThread; | 18 using content::BrowserThread; |
| 18 | 19 |
| 19 namespace extensions { | 20 namespace extensions { |
| 20 | 21 |
| (...skipping 468 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 489 if (device->has_vendor_id) | 490 if (device->has_vendor_id) |
| 490 info->vendor_id.reset(new int(static_cast<int>(device->vendor_id))); | 491 info->vendor_id.reset(new int(static_cast<int>(device->vendor_id))); |
| 491 if (device->has_product_id) | 492 if (device->has_product_id) |
| 492 info->product_id.reset(new int(static_cast<int>(device->product_id))); | 493 info->product_id.reset(new int(static_cast<int>(device->product_id))); |
| 493 if (device->display_name) | 494 if (device->display_name) |
| 494 info->display_name.reset(new std::string(device->display_name)); | 495 info->display_name.reset(new std::string(device->display_name)); |
| 495 return info; | 496 return info; |
| 496 } | 497 } |
| 497 | 498 |
| 498 } // namespace mojo | 499 } // namespace mojo |
| OLD | NEW |