OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/extensions/api/serial/serial_api.h" | 5 #include "chrome/browser/extensions/api/serial/serial_api.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/values.h" | 9 #include "base/values.h" |
10 #include "chrome/browser/extensions/api/serial/serial_connection.h" | 10 #include "chrome/browser/extensions/api/serial/serial_connection.h" |
11 #include "chrome/browser/extensions/api/serial/serial_event_dispatcher.h" | 11 #include "chrome/browser/extensions/api/serial/serial_event_dispatcher.h" |
12 #include "chrome/browser/extensions/api/serial/serial_port_enumerator.h" | |
13 #include "chrome/common/extensions/api/serial.h" | 12 #include "chrome/common/extensions/api/serial.h" |
14 #include "content/public/browser/browser_thread.h" | 13 #include "content/public/browser/browser_thread.h" |
| 14 #include "device/serial/serial_device_enumerator.h" |
15 #include "extensions/browser/extension_system.h" | 15 #include "extensions/browser/extension_system.h" |
16 | 16 |
17 using content::BrowserThread; | 17 using content::BrowserThread; |
18 | 18 |
19 namespace extensions { | 19 namespace extensions { |
20 | 20 |
21 namespace api { | 21 namespace api { |
22 | 22 |
23 namespace { | 23 namespace { |
24 | 24 |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
77 SerialGetDevicesFunction::SerialGetDevicesFunction() {} | 77 SerialGetDevicesFunction::SerialGetDevicesFunction() {} |
78 | 78 |
79 bool SerialGetDevicesFunction::Prepare() { | 79 bool SerialGetDevicesFunction::Prepare() { |
80 set_work_thread_id(BrowserThread::FILE); | 80 set_work_thread_id(BrowserThread::FILE); |
81 return true; | 81 return true; |
82 } | 82 } |
83 | 83 |
84 void SerialGetDevicesFunction::Work() { | 84 void SerialGetDevicesFunction::Work() { |
85 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); | 85 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); |
86 | 86 |
87 std::vector<linked_ptr<serial::DeviceInfo> > devices; | 87 std::vector<device::SerialDeviceInfo> devices; |
88 SerialPortEnumerator::StringSet port_names = | 88 scoped_ptr<device::SerialDeviceEnumerator> enumerator = |
89 SerialPortEnumerator::GenerateValidSerialPortNames(); | 89 device::SerialDeviceEnumerator::Create(); |
90 for (SerialPortEnumerator::StringSet::const_iterator iter = | 90 enumerator->GetDevices(&devices); |
91 port_names.begin(); | 91 |
92 iter != port_names.end(); | 92 std::vector<linked_ptr<serial::DeviceInfo> > out_devices; |
93 ++iter) { | 93 std::vector<device::SerialDeviceInfo>::const_iterator iter = devices.begin(); |
| 94 for (; iter != devices.end(); ++iter) { |
94 linked_ptr<serial::DeviceInfo> info(new serial::DeviceInfo); | 95 linked_ptr<serial::DeviceInfo> info(new serial::DeviceInfo); |
95 info->path = *iter; | 96 info->path = iter->path; |
96 devices.push_back(info); | 97 info->vendor_id = iter->vendor_id; |
| 98 info->product_id = iter->product_id; |
| 99 info->display_name = iter->display_name; |
| 100 out_devices.push_back(info); |
97 } | 101 } |
98 results_ = serial::GetDevices::Results::Create(devices); | 102 |
| 103 results_ = serial::GetDevices::Results::Create(out_devices); |
99 } | 104 } |
100 | 105 |
101 SerialConnectFunction::SerialConnectFunction() {} | 106 SerialConnectFunction::SerialConnectFunction() {} |
102 | 107 |
103 SerialConnectFunction::~SerialConnectFunction() {} | 108 SerialConnectFunction::~SerialConnectFunction() {} |
104 | 109 |
105 bool SerialConnectFunction::Prepare() { | 110 bool SerialConnectFunction::Prepare() { |
106 params_ = serial::Connect::Params::Create(*args_); | 111 params_ = serial::Connect::Params::Create(*args_); |
107 EXTENSION_FUNCTION_VALIDATE(params_.get()); | 112 EXTENSION_FUNCTION_VALIDATE(params_.get()); |
108 | 113 |
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
408 return; | 413 return; |
409 } | 414 } |
410 | 415 |
411 bool success = connection->SetControlSignals(params_->signals); | 416 bool success = connection->SetControlSignals(params_->signals); |
412 results_ = serial::SetControlSignals::Results::Create(success); | 417 results_ = serial::SetControlSignals::Results::Create(success); |
413 } | 418 } |
414 | 419 |
415 } // namespace api | 420 } // namespace api |
416 | 421 |
417 } // namespace extensions | 422 } // namespace extensions |
OLD | NEW |