Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(24)

Side by Side Diff: extensions/browser/api/serial/serial_api.cc

Issue 2607063002: Remove mojo::Array. (Closed)
Patch Set: rebase Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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"
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 bool SerialGetDevicesFunction::Prepare() { 81 bool SerialGetDevicesFunction::Prepare() {
82 set_work_thread_id(BrowserThread::FILE); 82 set_work_thread_id(BrowserThread::FILE);
83 return true; 83 return true;
84 } 84 }
85 85
86 void SerialGetDevicesFunction::Work() { 86 void SerialGetDevicesFunction::Work() {
87 DCHECK_CURRENTLY_ON(BrowserThread::FILE); 87 DCHECK_CURRENTLY_ON(BrowserThread::FILE);
88 88
89 std::unique_ptr<device::SerialDeviceEnumerator> enumerator = 89 std::unique_ptr<device::SerialDeviceEnumerator> enumerator =
90 device::SerialDeviceEnumerator::Create(); 90 device::SerialDeviceEnumerator::Create();
91 mojo::Array<device::serial::DeviceInfoPtr> devices = enumerator->GetDevices(); 91 std::vector<device::serial::DeviceInfoPtr> devices = enumerator->GetDevices();
92 results_ = serial::GetDevices::Results::Create( 92 results_ = serial::GetDevices::Results::Create(
93 devices.To<std::vector<serial::DeviceInfo>>()); 93 mojo::ConvertTo<std::vector<serial::DeviceInfo>>(devices));
94 } 94 }
95 95
96 SerialConnectFunction::SerialConnectFunction() { 96 SerialConnectFunction::SerialConnectFunction() {
97 } 97 }
98 98
99 SerialConnectFunction::~SerialConnectFunction() { 99 SerialConnectFunction::~SerialConnectFunction() {
100 } 100 }
101 101
102 bool SerialConnectFunction::Prepare() { 102 bool SerialConnectFunction::Prepare() {
103 params_ = serial::Connect::Params::Create(*args_); 103 params_ = serial::Connect::Params::Create(*args_);
(...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after
486 if (device->has_vendor_id) 486 if (device->has_vendor_id)
487 info.vendor_id.reset(new int(static_cast<int>(device->vendor_id))); 487 info.vendor_id.reset(new int(static_cast<int>(device->vendor_id)));
488 if (device->has_product_id) 488 if (device->has_product_id)
489 info.product_id.reset(new int(static_cast<int>(device->product_id))); 489 info.product_id.reset(new int(static_cast<int>(device->product_id)));
490 if (device->display_name) 490 if (device->display_name)
491 info.display_name.reset(new std::string(device->display_name.value())); 491 info.display_name.reset(new std::string(device->display_name.value()));
492 return info; 492 return info;
493 } 493 }
494 494
495 } // namespace mojo 495 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698