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

Unified Diff: device/usb/mojo/type_converters.h

Issue 2234443002: Mojo C++ binding: make device/usb mojom targets use STD string/vector types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix android build. Created 4 years, 4 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: device/usb/mojo/type_converters.h
diff --git a/device/usb/mojo/type_converters.h b/device/usb/mojo/type_converters.h
index d9031e2e06f76f9a86bfc5958e05b132be376637..630b57b531b5d0ec3adc4a0d49eb4adabfc4f87a 100644
--- a/device/usb/mojo/type_converters.h
+++ b/device/usb/mojo/type_converters.h
@@ -12,7 +12,6 @@
#include "device/usb/usb_descriptors.h"
#include "device/usb/usb_device_filter.h"
#include "device/usb/usb_device_handle.h"
-#include "mojo/public/cpp/bindings/array.h"
#include "mojo/public/cpp/bindings/type_converter.h"
// Type converters to translate between internal device/usb data types and
@@ -82,9 +81,9 @@ struct TypeConverter<device::usb::AlternateInterfaceInfoPtr,
// settings, whereas InterfaceInfos contain their own sets of alternates with
// a different structure type.
template <>
-struct TypeConverter<mojo::Array<device::usb::InterfaceInfoPtr>,
+struct TypeConverter<std::vector<device::usb::InterfaceInfoPtr>,
std::vector<device::UsbInterfaceDescriptor>> {
- static mojo::Array<device::usb::InterfaceInfoPtr> Convert(
+ static std::vector<device::usb::InterfaceInfoPtr> Convert(
const std::vector<device::UsbInterfaceDescriptor>& interfaces);
};

Powered by Google App Engine
This is Rietveld 408576698