diff options
| author | treib <treib@chromium.org> | 2015-09-10 04:29:34 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-10 11:30:21 +0000 |
| commit | eeeee88fed2a662a0355d4e4f48cfea7228cc695 (patch) | |
| tree | 37e19b8ccc4e3884efa965fe526f1de116cd1b84 /extensions/common/permissions | |
| parent | 36aa8be4eb53b3ea75b84a9646e0204725f3bc43 (diff) | |
| download | chromium_src-eeeee88fed2a662a0355d4e4f48cfea7228cc695.zip chromium_src-eeeee88fed2a662a0355d4e4f48cfea7228cc695.tar.gz chromium_src-eeeee88fed2a662a0355d4e4f48cfea7228cc695.tar.bz2 | |
Permission messages: Move strings from extensions_strings.grd to generated_resources.grd
This CL moves most IDS_EXTENSION_PROMPT_WARNING_* strings out of extensions_strings.grd. A few have to remain for now, see TODO in extensions/common/permissions/permission_message_util.cc.
Also wraps the strings into an
<if expr="enable_extensions">
so they won't be included when we don't have extensions (e.g. on Android).
BUG=None
Review URL: https://codereview.chromium.org/1321363002
Cr-Commit-Position: refs/heads/master@{#348137}
Diffstat (limited to 'extensions/common/permissions')
| -rw-r--r-- | extensions/common/permissions/usb_device_permission.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extensions/common/permissions/usb_device_permission.cc b/extensions/common/permissions/usb_device_permission.cc index a79d47f..ab9a936 100644 --- a/extensions/common/permissions/usb_device_permission.cc +++ b/extensions/common/permissions/usb_device_permission.cc @@ -38,7 +38,7 @@ PermissionIDSet UsbDevicePermission::GetPermissions() const { device::UsbIds::GetProductName(data.vendor_id(), data.product_id()); if (product) { base::string16 product_name_and_vendor = l10n_util::GetStringFUTF16( - IDS_EXTENSION_PROMPT_WARNING_USB_DEVICE_PRODUCT_NAME_AND_VENDOR, + IDS_EXTENSION_USB_DEVICE_PRODUCT_NAME_AND_VENDOR, base::UTF8ToUTF16(product), base::UTF8ToUTF16(vendor)); ids.insert(APIPermission::kUsbDevice, product_name_and_vendor); } else { |