| Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsCategory.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsCategory.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsCategory.java
|
| index 8f880eb36a5148403dd148b31c6b6b3c8a0b502f..b4c31a7ed082a73a182a4baa91948a6dc123f258 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsCategory.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsCategory.java
|
| @@ -45,6 +45,7 @@ public class SiteSettingsCategory {
|
| public static final String CATEGORY_POPUPS = "popups";
|
| public static final String CATEGORY_PROTECTED_MEDIA = "protected_content";
|
| public static final String CATEGORY_USE_STORAGE = "use_storage";
|
| + public static final String CATEGORY_USB = "usb";
|
|
|
| // The id of this category.
|
| private String mCategory;
|
| @@ -131,6 +132,10 @@ public class SiteSettingsCategory {
|
| if (CATEGORY_USE_STORAGE.equals(category)) {
|
| return new SiteSettingsCategory(CATEGORY_USE_STORAGE, "", -1);
|
| }
|
| + if (CATEGORY_USB.equals(category)) {
|
| + return new SiteSettingsCategory(
|
| + CATEGORY_USB, "", ContentSettingsType.CONTENT_SETTINGS_TYPE_USB_CHOOSER_DATA);
|
| + }
|
|
|
| return null;
|
| }
|
| @@ -175,6 +180,9 @@ public class SiteSettingsCategory {
|
| == ContentSettingsType.CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER) {
|
| return fromString(CATEGORY_PROTECTED_MEDIA);
|
| }
|
| + if (contentSettingsType == ContentSettingsType.CONTENT_SETTINGS_TYPE_USB_CHOOSER_DATA) {
|
| + return fromString(CATEGORY_USB);
|
| + }
|
|
|
| return null;
|
| }
|
| @@ -281,6 +289,13 @@ public class SiteSettingsCategory {
|
| }
|
|
|
| /**
|
| + * Returns whether this category is the USB category.
|
| + */
|
| + public boolean showUsbDevices() {
|
| + return mContentSettingsType == ContentSettingsType.CONTENT_SETTINGS_TYPE_USB_CHOOSER_DATA;
|
| + }
|
| +
|
| + /**
|
| * Returns whether the current category is managed either by enterprise policy or by the
|
| * custodian of a supervised account.
|
| */
|
|
|