Skip to content

Commit

Permalink
Remove string with no content from generated_resources.grd.
Browse files Browse the repository at this point in the history
This removes IDS_EXTENSION_PROMPT_WARNING_USB_DEVICE_LIST_ITEM, which
contained no content besides a placeholder tag. This string wasn't
translatable, but showed up as "untranslated" string in internal tools
because of its strange state.

Review URL: https://codereview.chromium.org/1438293003

Cr-Commit-Position: refs/heads/master@{#359586}
  • Loading branch information
newt authored and Commit bot committed Nov 13, 2015
1 parent 978ec8a commit 0b323cc
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 9 deletions.
3 changes: 0 additions & 3 deletions chrome/app/generated_resources.grd
Original file line number Diff line number Diff line change
Expand Up @@ -4100,9 +4100,6 @@ Even if you have downloaded files from this website before, the website might ha
<message name="IDS_EXTENSION_PROMPT_WARNING_USB_DEVICE_LIST" desc="Permission string for access to a list of USB devices.">
Access any of these USB devices
</message>
<message name="IDS_EXTENSION_PROMPT_WARNING_USB_DEVICE_LIST_ITEM" desc="Line item for a USB device listed under IDS_EXTENSION_PROMPT_WARNING_USB_DEVICE_LIST.">
<ph name="DEVICE_NAME_AND_VENDOR">$1<ex>SoundKnob from Griffin Technology</ex></ph>
</message>
<message name="IDS_EXTENSION_PROMPT_WARNING_USB_DEVICE_LIST_ITEM_UNKNOWN_PRODUCT" desc="Line item for a USB device listed under IDS_EXTENSION_PROMPT_WARNING_USB_DEVICE_LIST that has an unknown product ID.">
unknown devices from <ph name="VENDOR_NAME">$1<ex>Griffin Technology</ex></ph>
</message>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -217,14 +217,9 @@ class USBDevicesFormatter : public ChromePermissionMessageFormatter {
const PermissionIDSet& permissions) const {
DCHECK(permissions.size() > 1);
// Put all the individual items into submessages.
std::vector<base::string16> submessages;
std::vector<base::string16> devices =
std::vector<base::string16> submessages =
permissions.GetAllPermissionsWithID(APIPermission::kUsbDevice)
.GetAllPermissionParameters();
for (const base::string16& device : devices) {
submessages.push_back(l10n_util::GetStringFUTF16(
IDS_EXTENSION_PROMPT_WARNING_USB_DEVICE_LIST_ITEM, device));
}
std::vector<base::string16> vendors =
permissions.GetAllPermissionsWithID(
APIPermission::kUsbDeviceUnknownProduct)
Expand Down

0 comments on commit 0b323cc

Please sign in to comment.