Display USB devices in the site settings popup on Android.
This patch adds USB devices (and any other type of chosen object that is
defined in the future such as Bluetooth devices) to the list of
permissions displayed in the site settings popup on Android that is
displayed when the site icon is tapped.
BUG=601627
Review-Url: https://codereview.chromium.org/2185213002
Cr-Commit-Position: refs/heads/master@{#409425}
diff --git a/chrome/browser/ui/website_settings/website_settings.cc b/chrome/browser/ui/website_settings/website_settings.cc
index e992043..21a35e9 100644
--- a/chrome/browser/ui/website_settings/website_settings.cc
+++ b/chrome/browser/ui/website_settings/website_settings.cc
@@ -198,8 +198,8 @@
// Settings UI. THE ORDER OF THESE ITEMS IS IMPORTANT. To propose changing it,
// email [email protected].
WebsiteSettings::ChooserUIInfo kChooserUIInfo[] = {
- {&GetUsbChooserContext, IDR_BLOCKED_USB, IDR_ALLOWED_USB,
- IDS_WEBSITE_SETTINGS_USB_DEVICE_LABEL,
+ {CONTENT_SETTINGS_TYPE_USB_CHOOSER_DATA, &GetUsbChooserContext,
+ IDR_BLOCKED_USB, IDR_ALLOWED_USB, IDS_WEBSITE_SETTINGS_USB_DEVICE_LABEL,
IDS_WEBSITE_SETTINGS_DELETE_USB_DEVICE, "name"},
};
