chrome/browser/resources/options.html - Issue 2804039: First cut at the tabbed content settings page.

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/browser/resources/options.html

Issue 2804039: First cut at the tabbed content settings page. (Closed) Base URL: http://src.chromium.org/git/chromium.git

Patch Set: no change Created 10 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:

Index: chrome/browser/resources/options.html

diff --git a/chrome/browser/resources/options.html b/chrome/browser/resources/options.html

index 9bf0a0a69a1169d178eabdfe22394e82fc136d92..12b4c2acc969382da784ecdb52af635af459f3ab 100644

--- a/chrome/browser/resources/options.html

+++ b/chrome/browser/resources/options.html

@@ -22,6 +22,8 @@

+<script src="options/content_settings_ui.js"></script>

+<script src="options/content_settings.js"></script>

///////////////////////////////////////////////////////////////////////////////

@@ -37,6 +39,7 @@ function load() {

OptionsPage.register(BrowserOptions.getInstance());

OptionsPage.register(PersonalOptions.getInstance());

OptionsPage.register(AdvancedOptions.getInstance());

+ OptionsPage.register(ContentSettings.getInstance());

if (cr.isChromeOS) {

var labsOptions = new OptionsPage('labs',

localStrings.getString('labsPage'),

@@ -69,6 +72,7 @@ window.onpopstate = function(e) {

</script>

+<link rel="stylesheet" href="options/content_settings_page.css">

</head>

@@ -96,10 +100,11 @@ window.onpopstate = function(e) {

- </if>

+ </if>

+ <include src="options/content_settings.html">

</div>

@@ -107,6 +112,7 @@ window.onpopstate = function(e) {

cr.ui.decorate('input[pref][type=checkbox]', PrefCheckbox);

cr.ui.decorate('input[pref][type=range]', PrefRange);

cr.ui.decorate('select[pref]', PrefSelect);

+cr.ui.decorate('#contentSettingsPage input[type=radio]', ContentSettingsRadio);

// TODO(zelidrag) add other elements here when we implement them

</script>

</body>