chrome/android/shell/res/xml/chrome_shell_main_preferences.xml - Issue 850813002: Upstream Site Settings.

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/shell/res/xml/chrome_shell_main_preferences.xml

Issue 850813002: Upstream Site Settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@location_settings_singleton

Patch Set: use findbugs annotations; fix test Created 5 years, 11 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:

Index: chrome/android/shell/res/xml/chrome_shell_main_preferences.xml

diff --git a/chrome/android/shell/res/xml/chrome_shell_main_preferences.xml b/chrome/android/shell/res/xml/chrome_shell_main_preferences.xml

index 6822cdf7bf3b9b6a553d65b57d7dccc92a28a150..0579649c99255777d853985fe5448f2b748e9b02 100644

--- a/chrome/android/shell/res/xml/chrome_shell_main_preferences.xml

+++ b/chrome/android/shell/res/xml/chrome_shell_main_preferences.xml

@@ -17,6 +17,9 @@

android:fragment="org.chromium.chrome.browser.preferences.AccessibilityPreferences"

android:title="@string/prefs_accessibility" />

<Preference

+ android:fragment="org.chromium.chrome.browser.preferences.website.ContentPreferences"

+ android:title="@string/prefs_content_settings" />

+ <Preference

android:fragment="org.chromium.chrome.browser.preferences.AboutChromePreferences"

android:title="@string/prefs_about_chrome" />

</PreferenceScreen>