chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentSettingsResources.java - Issue 2785913002: [subresource_filter] Add the Content Settings UI for Android

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2785913002: [subresource_filter] Add the Content Settings UI for Android (Closed)

Patch Set: first review: finnur Created 3 years, 9 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 | « chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java » ('j') | chrome/android/java/strings/android_chrome_strings.grd » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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 6c148ea209088a8629119f8e7f37e456c0c162ee..cdec1189435cbc0ad8f6d2176bb494e0a7303e18 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

@@ -148,6 +148,13 @@ public class ContentSettingsResources {

org.chromium.chrome.R.string.protected_content,

ContentSetting.ASK, ContentSetting.BLOCK, 0, 0));

+ // TODO(csharrison): These are placeholder strings and icons. Use the real deal once

+ // they are ready.

Finnur 2017/03/31 13:47:23 You might end up using these exact strings and thi

Charlie Harrison 2017/03/31 14:56:46 Done.

+ localMap.put(ContentSettingsType.CONTENT_SETTINGS_TYPE_SUBRESOURCE_FILTER,

+ new ResourceItem(R.drawable.permission_popups,

+ R.string.subresource_filter_permission_title,

+ R.string.subresource_filter_permission_title, ContentSetting.ALLOW,

+ 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));