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

Unified Diff: chrome/browser/resources/options.html

Issue 2901008: Add the rest of the content settings tabs. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: git try -b mac 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:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/options.html
diff --git a/chrome/browser/resources/options.html b/chrome/browser/resources/options.html
index 2c6a3b066544e166f154a140bb08765d8ab2000c..83d9e7bd05d91c2649083e60b6b143270f29580b 100644
--- a/chrome/browser/resources/options.html
+++ b/chrome/browser/resources/options.html
@@ -36,10 +36,12 @@ function load() {
if (cr.isChromeOS) {
OptionsPage.register(SystemOptions.getInstance());
}
+
OptionsPage.register(BrowserOptions.getInstance());
OptionsPage.register(PersonalOptions.getInstance());
OptionsPage.register(AdvancedOptions.getInstance());
- OptionsPage.register(ContentSettings.getInstance());
+ OptionsPage.registerSubPage(ContentSettings.getInstance());
+
if (cr.isChromeOS) {
var labsOptions = new OptionsPage('labs',
localStrings.getString('labsPage'),
« no previous file with comments | « chrome/browser/dom_ui/content_settings_handler.cc ('k') | chrome/browser/resources/options/advanced_options.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698