Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4103)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentSettingsResources.java

Issue 2185213002: Display USB devices in the site settings popup on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Replaced code to free chosen objects. Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/android/website_settings_popup_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentSettingsResources.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentSettingsResources.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentSettingsResources.java
index 4ecf81a5ec65a42ae96ecec72ee5ab7f850cb388..6902d37cd8c5d09dc6b19cb4b9505a92c40a057c 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentSettingsResources.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentSettingsResources.java
@@ -160,6 +160,9 @@ public class ContentSettingsResources {
org.chromium.chrome.R.string.protected_content,
org.chromium.chrome.R.string.protected_content,
ContentSetting.ASK, ContentSetting.BLOCK, 0, 0));
+ localMap.put(ContentSettingsType.CONTENT_SETTINGS_TYPE_USB_CHOOSER_DATA,
+ new ResourceItem(R.drawable.settings_usb, 0, 0, ContentSetting.ASK,
+ ContentSetting.BLOCK, 0, 0));
sResourceInfo = localMap;
}
return sResourceInfo;
« no previous file with comments | « no previous file | chrome/browser/ui/android/website_settings_popup_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698