Chromium Code Reviews| Index: extensions/common/api/printer_provider/usb_printer_manifest_data.cc |
| diff --git a/extensions/common/api/printer_provider/usb_printer_manifest_data.cc b/extensions/common/api/printer_provider/usb_printer_manifest_data.cc |
| index 35f21651da86f12cb7f2ae314d90bba424c60b62..96c82e1bc11851922e6e6e466f61c2435842bacd 100644 |
| --- a/extensions/common/api/printer_provider/usb_printer_manifest_data.cc |
| +++ b/extensions/common/api/printer_provider/usb_printer_manifest_data.cc |
| @@ -4,6 +4,7 @@ |
| #include "extensions/common/api/printer_provider/usb_printer_manifest_data.h" |
| +#include "base/memory/ptr_util.h" |
| #include "base/strings/utf_string_conversions.h" |
| #include "device/usb/usb_device.h" |
| #include "device/usb/usb_device_filter.h" |
| @@ -37,25 +38,23 @@ std::unique_ptr<UsbPrinterManifestData> UsbPrinterManifestData::FromValue( |
| return nullptr; |
| } |
| - std::unique_ptr<UsbPrinterManifestData> result(new UsbPrinterManifestData()); |
| + auto result = base::MakeUnique<UsbPrinterManifestData>(); |
| for (const auto& input : usb_printers->filters) { |
| UsbDeviceFilter output; |
| - output.SetVendorId(input.vendor_id); |
| + output.vendor_id = input.vendor_id; |
| if (input.product_id && input.interface_class) { |
| *error = base::ASCIIToUTF16( |
| "Only one of productId or interfaceClass may be specified."); |
| return nullptr; |
| } |
| - if (input.product_id) { |
| - output.SetProductId(*input.product_id); |
| - } |
| + if (input.product_id) |
|
juncai
2017/01/12 00:50:23
nit: maybe use:
"else if (input.product_id)
...
Reilly Grant (use Gerrit)
2017/01/12 02:18:44
I think the coding style says not to put else if a
|
| + output.product_id = *input.product_id; |
| if (input.interface_class) { |
| - output.SetInterfaceClass(*input.interface_class); |
| + output.interface_class = *input.interface_class; |
| if (input.interface_subclass) { |
| - output.SetInterfaceSubclass(*input.interface_subclass); |
| - if (input.interface_protocol) { |
| - output.SetInterfaceProtocol(*input.interface_protocol); |
| - } |
| + output.interface_subclass = *input.interface_subclass; |
| + if (input.interface_protocol) |
| + output.interface_protocol = *input.interface_protocol; |
| } |
| } |
| result->filters_.push_back(output); |