| OLD | NEW |
| 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/common/permissions/usb_device_permission.h" | 5 #include "extensions/common/permissions/usb_device_permission.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 | 21 |
| 22 UsbDevicePermission::UsbDevicePermission(const APIPermissionInfo* info) | 22 UsbDevicePermission::UsbDevicePermission(const APIPermissionInfo* info) |
| 23 : SetDisjunctionPermission<UsbDevicePermissionData, UsbDevicePermission>( | 23 : SetDisjunctionPermission<UsbDevicePermissionData, UsbDevicePermission>( |
| 24 info) {} | 24 info) {} |
| 25 | 25 |
| 26 UsbDevicePermission::~UsbDevicePermission() {} | 26 UsbDevicePermission::~UsbDevicePermission() {} |
| 27 | 27 |
| 28 PermissionIDSet UsbDevicePermission::GetPermissions() const { | 28 PermissionIDSet UsbDevicePermission::GetPermissions() const { |
| 29 PermissionIDSet ids; | 29 PermissionIDSet ids; |
| 30 | 30 |
| 31 std::set<uint16> unknown_product_vendors; | 31 std::set<uint16_t> unknown_product_vendors; |
| 32 bool found_unknown_vendor = false; | 32 bool found_unknown_vendor = false; |
| 33 | 33 |
| 34 for (const UsbDevicePermissionData& data : data_set_) { | 34 for (const UsbDevicePermissionData& data : data_set_) { |
| 35 const char* vendor = device::UsbIds::GetVendorName(data.vendor_id()); | 35 const char* vendor = device::UsbIds::GetVendorName(data.vendor_id()); |
| 36 if (vendor) { | 36 if (vendor) { |
| 37 const char* product = | 37 const char* product = |
| 38 device::UsbIds::GetProductName(data.vendor_id(), data.product_id()); | 38 device::UsbIds::GetProductName(data.vendor_id(), data.product_id()); |
| 39 if (product) { | 39 if (product) { |
| 40 base::string16 product_name_and_vendor = l10n_util::GetStringFUTF16( | 40 base::string16 product_name_and_vendor = l10n_util::GetStringFUTF16( |
| 41 IDS_EXTENSION_USB_DEVICE_PRODUCT_NAME_AND_VENDOR, | 41 IDS_EXTENSION_USB_DEVICE_PRODUCT_NAME_AND_VENDOR, |
| 42 base::UTF8ToUTF16(product), base::UTF8ToUTF16(vendor)); | 42 base::UTF8ToUTF16(product), base::UTF8ToUTF16(vendor)); |
| 43 ids.insert(APIPermission::kUsbDevice, product_name_and_vendor); | 43 ids.insert(APIPermission::kUsbDevice, product_name_and_vendor); |
| 44 } else { | 44 } else { |
| 45 unknown_product_vendors.insert(data.vendor_id()); | 45 unknown_product_vendors.insert(data.vendor_id()); |
| 46 } | 46 } |
| 47 } else { | 47 } else { |
| 48 found_unknown_vendor = true; | 48 found_unknown_vendor = true; |
| 49 } | 49 } |
| 50 } | 50 } |
| 51 | 51 |
| 52 for (uint16 vendor_id : unknown_product_vendors) { | 52 for (uint16_t vendor_id : unknown_product_vendors) { |
| 53 const char* vendor = device::UsbIds::GetVendorName(vendor_id); | 53 const char* vendor = device::UsbIds::GetVendorName(vendor_id); |
| 54 DCHECK(vendor); | 54 DCHECK(vendor); |
| 55 ids.insert(APIPermission::kUsbDeviceUnknownProduct, | 55 ids.insert(APIPermission::kUsbDeviceUnknownProduct, |
| 56 base::UTF8ToUTF16(vendor)); | 56 base::UTF8ToUTF16(vendor)); |
| 57 } | 57 } |
| 58 | 58 |
| 59 if (found_unknown_vendor) | 59 if (found_unknown_vendor) |
| 60 ids.insert(APIPermission::kUsbDeviceUnknownVendor); | 60 ids.insert(APIPermission::kUsbDeviceUnknownVendor); |
| 61 | 61 |
| 62 return ids; | 62 return ids; |
| 63 } | 63 } |
| 64 | 64 |
| 65 } // namespace extensions | 65 } // namespace extensions |
| OLD | NEW |