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

Unified Diff: chrome/browser/extensions/api/serial/serial_api.cc

Issue 363583002: Convert SerialIoHandler to use Mojo types. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove "default" case Created 6 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/serial/serial_api.cc
diff --git a/chrome/browser/extensions/api/serial/serial_api.cc b/chrome/browser/extensions/api/serial/serial_api.cc
index 9fcd01591136ef326c5946ba930bcc9c9053bbbe..128c03cba2d4d98aed5baf66cf4761943f816b46 100644
--- a/chrome/browser/extensions/api/serial/serial_api.cc
+++ b/chrome/browser/extensions/api/serial/serial_api.cc
@@ -87,7 +87,7 @@ void SerialGetDevicesFunction::Work() {
scoped_ptr<device::SerialDeviceEnumerator> enumerator =
device::SerialDeviceEnumerator::Create();
- mojo::Array<device::SerialDeviceInfoPtr> devices = enumerator->GetDevices();
+ mojo::Array<device::serial::DeviceInfoPtr> devices = enumerator->GetDevices();
results_ = serial::GetDevices::Results::Create(
devices.To<std::vector<linked_ptr<serial::DeviceInfo> > >());
}
@@ -411,9 +411,9 @@ namespace mojo {
// static
linked_ptr<extensions::api::serial::DeviceInfo>
-TypeConverter<device::SerialDeviceInfoPtr,
+TypeConverter<device::serial::DeviceInfoPtr,
linked_ptr<extensions::api::serial::DeviceInfo> >::
- ConvertTo(const device::SerialDeviceInfoPtr& device) {
+ ConvertTo(const device::serial::DeviceInfoPtr& device) {
linked_ptr<extensions::api::serial::DeviceInfo> info(
new extensions::api::serial::DeviceInfo);
info->path = device->path;
« no previous file with comments | « chrome/browser/extensions/api/serial/serial_api.h ('k') | chrome/browser/extensions/api/serial/serial_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698