Chromium Code Reviews| Index: chrome/browser/resources/options/options.js |
| =================================================================== |
| --- chrome/browser/resources/options/options.js (revision 70013) |
| +++ chrome/browser/resources/options/options.js (working copy) |
| @@ -54,84 +54,105 @@ |
| OptionsPage.register(BrowserOptions.getInstance()); |
| OptionsPage.registerSubPage(SearchEngineManager.getInstance(), |
| - BrowserOptions.getInstance()); |
| + BrowserOptions.getInstance(), |
| + [$('defaultSearchManageEnginesButton')]); |
| OptionsPage.registerSubPage(StartupPageManager.getInstance(), |
| - BrowserOptions.getInstance()); |
| + BrowserOptions.getInstance(), |
| + [$('startupPageManagerButton')]); |
| OptionsPage.register(PersonalOptions.getInstance()); |
| OptionsPage.registerSubPage(AutoFillOptions.getInstance(), |
| - PersonalOptions.getInstance()); |
| + PersonalOptions.getInstance(), |
| + [$('autofill-settings')]); |
| OptionsPage.registerSubPage(PasswordManager.getInstance(), |
| - PersonalOptions.getInstance()); |
| + PersonalOptions.getInstance(), |
| + [$('manage-passwords')]); |
| if (cr.isChromeOS) { |
| OptionsPage.register(SystemOptions.getInstance()); |
| OptionsPage.registerSubPage(AboutPage.getInstance(), |
| - SystemOptions.getInstance()); |
| + SystemOptions.getInstance(), |
| + null); |
|
arv (Not doing code reviews)
2010/12/23 20:38:22
can you make this param optional?
csilv
2010/12/23 21:46:07
Done here and below.
|
| OptionsPage.registerSubPage(LanguageOptions.getInstance(), |
| - SystemOptions.getInstance()); |
| + SystemOptions.getInstance(), |
| + [$('language-button')]); |
| OptionsPage.registerSubPage( |
| new OptionsPage('languageChewing', |
| localStrings.getString('languageChewingPage'), |
| 'languageChewingPage'), |
| - SystemOptions.getInstance()); |
| + SystemOptions.getInstance(), |
| + null); |
| OptionsPage.registerSubPage( |
| new OptionsPage('languageHangul', |
| localStrings.getString('languageHangulPage'), |
| 'languageHangulPage'), |
| - SystemOptions.getInstance()); |
| + SystemOptions.getInstance(), |
| + null); |
| OptionsPage.registerSubPage( |
| new OptionsPage('languageMozc', |
| localStrings.getString('languageMozcPage'), |
| 'languageMozcPage'), |
| - SystemOptions.getInstance()); |
| + SystemOptions.getInstance(), |
| + null); |
| OptionsPage.registerSubPage( |
| new OptionsPage('languagePinyin', |
| localStrings.getString('languagePinyinPage'), |
| 'languagePinyinPage'), |
| - SystemOptions.getInstance()); |
| + SystemOptions.getInstance(), |
| + null); |
| OptionsPage.register(InternetOptions.getInstance()); |
| } |
| OptionsPage.register(AdvancedOptions.getInstance()); |
| OptionsPage.registerSubPage(ContentSettings.getInstance(), |
| - AdvancedOptions.getInstance()); |
| + AdvancedOptions.getInstance(), |
| + [$('privacyContentSettingsButton')]); |
| OptionsPage.registerSubPage(ContentSettingsExceptionsArea.getInstance(), |
| - ContentSettings.getInstance()); |
| + ContentSettings.getInstance(), |
| + null); |
| OptionsPage.registerSubPage(CookiesView.getInstance(), |
| - ContentSettings.getInstance()); |
| + ContentSettings.getInstance(), |
| + [$('privacyContentSettingsButton'), |
| + $('show-cookies-button')]); |
| OptionsPage.registerSubPage(FontSettings.getInstance(), |
| - AdvancedOptions.getInstance()); |
| + AdvancedOptions.getInstance(), |
| + [$('fontSettingsCustomizeFontsButton')]); |
| if (!cr.isWindows && !cr.isMac) { |
| OptionsPage.registerSubPage(CertificateManager.getInstance(), |
| - AdvancedOptions.getInstance()); |
| - OptionsPage.registerOverlay(CertificateRestoreOverlay.getInstance()); |
| - OptionsPage.registerOverlay(CertificateBackupOverlay.getInstance()); |
| - OptionsPage.registerOverlay(CertificateEditCaTrustOverlay.getInstance()); |
| - OptionsPage.registerOverlay(CertificateImportErrorOverlay.getInstance()); |
| + AdvancedOptions.getInstance(), |
| + [$('show-cookies-button')]); |
| + OptionsPage.registerOverlay(CertificateRestoreOverlay.getInstance(), null); |
| + OptionsPage.registerOverlay(CertificateBackupOverlay.getInstance(), null); |
| + OptionsPage.registerOverlay(CertificateEditCaTrustOverlay.getInstance(), |
| + null); |
| + OptionsPage.registerOverlay(CertificateImportErrorOverlay.getInstance(), |
| + null); |
| } |
| - OptionsPage.registerOverlay(AddStartupPageOverlay.getInstance()); |
| - OptionsPage.registerOverlay(AlertOverlay.getInstance()); |
| - OptionsPage.registerOverlay(AutoFillEditAddressOverlay.getInstance()); |
| - OptionsPage.registerOverlay(AutoFillEditCreditCardOverlay.getInstance()); |
| - OptionsPage.registerOverlay(ClearBrowserDataOverlay.getInstance()); |
| - OptionsPage.registerOverlay(EditSearchEngineOverlay.getInstance()); |
| - OptionsPage.registerOverlay(ImportDataOverlay.getInstance()); |
| - OptionsPage.registerOverlay(InstantConfirmOverlay.getInstance()); |
| + OptionsPage.registerOverlay(AddStartupPageOverlay.getInstance(), null); |
| + OptionsPage.registerOverlay(AlertOverlay.getInstance(), null); |
| + OptionsPage.registerOverlay(AutoFillEditAddressOverlay.getInstance(), null); |
| + OptionsPage.registerOverlay(AutoFillEditCreditCardOverlay.getInstance(), |
| + null); |
| + OptionsPage.registerOverlay(ClearBrowserDataOverlay.getInstance(), |
| + [$('privacyClearDataButton')]); |
| + OptionsPage.registerOverlay(EditSearchEngineOverlay.getInstance(), null); |
| + OptionsPage.registerOverlay(ImportDataOverlay.getInstance(), null); |
| + OptionsPage.registerOverlay(InstantConfirmOverlay.getInstance(), null); |
| if (cr.isChromeOS) { |
| OptionsPage.register(AccountsOptions.getInstance()); |
| OptionsPage.registerSubPage(ProxyOptions.getInstance(), |
| - AdvancedOptions.getInstance()); |
| - OptionsPage.registerOverlay(new OptionsPage( |
| - 'detailsInternetPage', |
| - 'detailsInternetPage', |
| - 'detailsInternetPage')); |
| + AdvancedOptions.getInstance(), |
| + [$('proxiesConfigureButton')]); |
| + OptionsPage.registerOverlay(new OptionsPage('detailsInternetPage', |
| + 'detailsInternetPage', |
| + 'detailsInternetPage'), null); |
| + |
| + var languageModifierKeysOverlay = new OptionsPage( |
| + 'languageCustomizeModifierKeysOverlay', |
| + localStrings.getString('languageCustomizeModifierKeysOverlay'), |
| + 'languageCustomizeModifierKeysOverlay') |
| + OptionsPage.registerOverlay(languageModifierKeysOverlay, |
| + [$('modifier-keys-button')]); |
| } |
| - var languageModifierKeysOverlay = new OptionsPage( |
| - 'languageCustomizeModifierKeysOverlay', |
| - localStrings.getString('languageCustomizeModifierKeysOverlay'), |
| - 'languageCustomizeModifierKeysOverlay') |
| - OptionsPage.registerOverlay(languageModifierKeysOverlay); |
| - |
| Preferences.getInstance().initialize(); |
| OptionsPage.initialize(); |