Index: chrome/browser/resources/options.html |
diff --git a/chrome/browser/resources/options.html b/chrome/browser/resources/options.html |
index 47873b3277710531816b63908d90bf8aea4995e8..5876b0573ba35a8c45c91d533ffd4b639573fefe 100644 |
--- a/chrome/browser/resources/options.html |
+++ b/chrome/browser/resources/options.html |
@@ -164,6 +164,17 @@ function load() { |
localStrings = new LocalStrings(); |
+ OptionsPage.register(SearchPage.getInstance()); |
+ OptionsPage.register(BrowserOptions.getInstance()); |
+ OptionsPage.registerSubPage(SearchEngineManager.getInstance(), |
+ BrowserOptions.getInstance()); |
+ OptionsPage.register(PersonalOptions.getInstance()); |
+ OptionsPage.registerSubPage(AutoFillOptions.getInstance(), |
+ PersonalOptions.getInstance()); |
+ OptionsPage.registerSubPage(PasswordsExceptions.getInstance(), |
+ PersonalOptions.getInstance()); |
+ OptionsPage.registerSubPage(SyncOptions.getInstance(), |
+ PersonalOptions.getInstance()); |
if (cr.isChromeOS) { |
OptionsPage.register(SystemOptions.getInstance()); |
OptionsPage.registerSubPage(AboutPage.getInstance(), |
@@ -192,18 +203,6 @@ function load() { |
SystemOptions.getInstance()); |
OptionsPage.register(InternetOptions.getInstance()); |
} |
- |
- OptionsPage.register(SearchPage.getInstance()); |
- OptionsPage.register(BrowserOptions.getInstance()); |
- OptionsPage.registerSubPage(SearchEngineManager.getInstance(), |
- BrowserOptions.getInstance()); |
- OptionsPage.register(PersonalOptions.getInstance()); |
- OptionsPage.registerSubPage(AutoFillOptions.getInstance(), |
- PersonalOptions.getInstance()); |
- OptionsPage.registerSubPage(PasswordsExceptions.getInstance(), |
- PersonalOptions.getInstance()); |
- OptionsPage.registerSubPage(SyncOptions.getInstance(), |
- PersonalOptions.getInstance()); |
OptionsPage.register(AdvancedOptions.getInstance()); |
OptionsPage.registerSubPage(ContentSettings.getInstance(), |
AdvancedOptions.getInstance()); |
@@ -257,11 +256,7 @@ function load() { |
OptionsPage.handleHashForPage(pageName, hash.slice(1)); |
} else { |
// TODO(csilv): Save/restore last selected page. |
- if (cr.isChromeOS) { |
- OptionsPage.showPageByName(SystemOptions.getInstance().name); |
- } else { |
- OptionsPage.showPageByName(BrowserOptions.getInstance().name); |
- } |
+ OptionsPage.showPageByName(BrowserOptions.getInstance().name); |
} |
var subpagesNavTabs = document.querySelectorAll('.subpages-nav-tabs'); |