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

Unified Diff: extensions/browser/api/usb/usb_api.cc

Issue 820673004: json_schema_compiler: Use std::vector<char> for binary values. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@simplify_json_schema
Patch Set: Fix merge error. Created 5 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 side-by-side diff with in-line comments
Download patch
Index: extensions/browser/api/usb/usb_api.cc
diff --git a/extensions/browser/api/usb/usb_api.cc b/extensions/browser/api/usb/usb_api.cc
index 3d8110e9f70be7b475c9fa83b340d504938c293d..44d6f4cd3be6df5bd7078e6a89c2c3526417f417 100644
--- a/extensions/browser/api/usb/usb_api.cc
+++ b/extensions/browser/api/usb/usb_api.cc
@@ -379,11 +379,7 @@ void ConvertEndpointDescriptor(const UsbEndpointDescriptor& input,
ConvertSynchronizationTypeToApi(input.synchronization_type);
output->usage = ConvertUsageTypeToApi(input.usage_type);
output->polling_interval.reset(new int(input.polling_interval));
- if (input.extra_data.size() > 0) {
- output->extra_data =
- std::string(reinterpret_cast<const char*>(&input.extra_data[0]),
- input.extra_data.size());
- }
+ output->extra_data.assign(input.extra_data.begin(), input.extra_data.end());
}
void ConvertInterfaceDescriptor(const UsbInterfaceDescriptor& input,
@@ -398,11 +394,7 @@ void ConvertInterfaceDescriptor(const UsbInterfaceDescriptor& input,
ConvertEndpointDescriptor(input_endpoint, endpoint.get());
output->endpoints.push_back(endpoint);
}
- if (input.extra_data.size() > 0) {
- output->extra_data =
- std::string(reinterpret_cast<const char*>(&input.extra_data[0]),
- input.extra_data.size());
- }
+ output->extra_data.assign(input.extra_data.begin(), input.extra_data.end());
}
void ConvertConfigDescriptor(const UsbConfigDescriptor& input,
@@ -416,11 +408,7 @@ void ConvertConfigDescriptor(const UsbConfigDescriptor& input,
ConvertInterfaceDescriptor(input_interface, interface.get());
output->interfaces.push_back(interface);
}
- if (input.extra_data.size() > 0) {
- output->extra_data =
- std::string(reinterpret_cast<const char*>(&input.extra_data[0]),
- input.extra_data.size());
- }
+ output->extra_data.assign(input.extra_data.begin(), input.extra_data.end());
}
void ConvertDeviceFilter(const usb::DeviceFilter& input,
« no previous file with comments | « extensions/browser/api/sockets_udp/udp_socket_event_dispatcher.cc ('k') | extensions/browser/api/vpn_provider/vpn_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698