diff options
author | reillyg <reillyg@chromium.org> | 2014-11-10 16:56:08 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-11-11 00:57:14 +0000 |
commit | 400b26297782e70ed15e40d83b876e3abde7b9cc (patch) | |
tree | b80e590a0a5945295867c1efe9bb1f946a04fc24 /extensions/extensions_strings.grd | |
parent | edf95fc829884968fa65b88220c5058fb072bb8c (diff) | |
download | chromium_src-400b26297782e70ed15e40d83b876e3abde7b9cc.zip chromium_src-400b26297782e70ed15e40d83b876e3abde7b9cc.tar.gz chromium_src-400b26297782e70ed15e40d83b876e3abde7b9cc.tar.bz2 |
Collapse multiple USB device manifest permissions into a single entry.
Like the hosts permission messages an app can request access to a
single kind of USB device (identified by vendor and product ID pair)
or many different kinds of devices. In the latter case Chrome
previously listed only one of the requested devices, hiding the rest.
This patch follows the example of the hosts permission messages and
provides two different message formats; one for a single USB device
and one that indicates access to multiple devices is permitted and
includes the full list in the details string. As there may be
permissions involving devices without a known vendor and/or product ID
special strings for "devices from vendor A" and "devices from an
unknown vendor" are provided. These messages are de-duplicated as
necessary.
As it provides no additional information the general "Access your USB
devices" message associated with the "usb" permission has been removed,
following the example of there being no message associated with the
"fileSystem" permission. An app with this permission can this use the
chrome.usb.getUserSelectedDevices function to request access to a
particular device at runtime. This device will then be listed in the
app's permissions and be revocable.
BUG=400897
Review URL: https://codereview.chromium.org/714453002
Cr-Commit-Position: refs/heads/master@{#303553}
Diffstat (limited to 'extensions/extensions_strings.grd')
-rw-r--r-- | extensions/extensions_strings.grd | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/extensions/extensions_strings.grd b/extensions/extensions_strings.grd index 87505d7..0c530d2 100644 --- a/extensions/extensions_strings.grd +++ b/extensions/extensions_strings.grd @@ -346,20 +346,29 @@ <message name="IDS_EXTENSION_PROMPT_WARNING_SERIAL" desc="Permission string for access to serial devices."> Access your serial devices </message> - <message name="IDS_EXTENSION_PROMPT_WARNING_USB" desc="Permission string for access to USB devices."> - Access your USB devices - </message> <message name="IDS_EXTENSION_PROMPT_WARNING_VPN" desc="Permission string for access to VPN API."> Access your network traffic </message> <message name="IDS_EXTENSION_PROMPT_WARNING_USB_DEVICE" desc="Permission string for access to a specific USB device."> - Access the USB device <ph name="PRODUCT_NAME">$1<ex>SoundKnob</ex></ph> from <ph name="VENDOR_NAME">$2<ex>Griffin Technology</ex></ph> + Access any <ph name="PRODUCT_NAME">$1<ex>SoundKnob</ex></ph> from <ph name="VENDOR_NAME">$2<ex>Griffin Technology</ex></ph> via USB + </message> + <message name="IDS_EXTENSION_PROMPT_WARNING_USB_DEVICE_UNKNOWN_PRODUCT" desc="Permission string for access to a specific USB device with an unknown product ID."> + Access USB devices from <ph name="VENDOR_NAME">$1<ex>Griffin Technology</ex></ph> + </message> + <message name="IDS_EXTENSION_PROMPT_WARNING_USB_DEVICE_UNKNOWN_VENDOR" desc="Permission string for acceess to a specific USB device with an unknown vendor ID."> + Access USB devices from an unknown vendor + </message> + <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="PRODUCT_NAME">$1<ex>SoundKnob</ex></ph> from <ph name="VENDOR_NAME">$2<ex>Griffin Technology</ex></ph> </message> - <message name="IDS_EXTENSION_PROMPT_WARNING_USB_DEVICE_MISSING_PRODUCT" desc="Permission string for access to a specific USB device when a product name cannot be established for a USB device."> - Access the USB device from <ph name="VENDOR_NAME">$1<ex>Griffin Technology</ex></ph> + <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> - <message name="IDS_EXTENSION_PROMPT_WARNING_USB_DEVICE_MISSING_VENDOR" desc="Permission string for access to a specific USB device when a vendor name cannot be established for a USB device."> - Access the USB device + <message name="IDS_EXTENSION_PROMPT_WARNING_USB_DEVICE_LIST_ITEM_UNKNOWN_VENDOR" desc="Line item for a USB device listed under IDS_EXTENSION_PROMPT_WARNING_USB_DEVICE_LIST that has an unknown vendor ID."> + devices from an unknown vendor </message> <message name="IDS_EXTENSION_TASK_MANAGER_APPVIEW_TAG_PREFIX" desc="The prefix for a guest page loaded in an appview tag in the Task Manager"> Appview: <ph name="APPVIEW_TAG_NAME">$1<ex>Google Hangouts</ex></ph> |