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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2939273002: DO NOT SUBMIT: what chrome/browser/resources/ could eventually look like with clang-format (Closed)
Patch Set: Created 3 years, 6 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
« no previous file with comments | « chrome/browser/resources/options/manage_profile_overlay.js ('k') | chrome/browser/resources/options/options_bundle.js » ('j') | chrome/browser/resources/settings/device_page/stylus.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/options/options.js
diff --git a/chrome/browser/resources/options/options.js b/chrome/browser/resources/options/options.js
index cdfb732b1ad120f5f64b3ef652d3ae1d1bb7ecc2..f43b11ca347f33f4f7da48a1e0cb1889dd59b913 100644
--- a/chrome/browser/resources/options/options.js
+++ b/chrome/browser/resources/options/options.js
@@ -61,31 +61,34 @@ function load() {
cr.ui.decorate('input[pref][type=text]', options.PrefTextField);
cr.ui.decorate('input[pref][type=url]', options.PrefTextField);
cr.ui.decorate('button[pref]', options.PrefButton);
- cr.ui.decorate('#content-settings-page input[type=radio]:not(.handler-radio)',
+ cr.ui.decorate(
+ '#content-settings-page input[type=radio]:not(.handler-radio)',
options.ContentSettingsRadio);
- cr.ui.decorate('#content-settings-page input[type=radio].handler-radio',
+ cr.ui.decorate(
+ '#content-settings-page input[type=radio].handler-radio',
options.HandlersEnabledRadio);
- cr.ui.decorate('span.controlled-setting-indicator',
- options.ControlledSettingIndicator);
+ cr.ui.decorate(
+ 'span.controlled-setting-indicator', options.ControlledSettingIndicator);
// Top level pages.
PageManager.register(SearchPage.getInstance());
PageManager.register(BrowserOptions.getInstance());
// Overlays.
- PageManager.registerOverlay(AddLanguageOverlay.getInstance(),
- LanguageOptions.getInstance());
+ PageManager.registerOverlay(
+ AddLanguageOverlay.getInstance(), LanguageOptions.getInstance());
PageManager.registerOverlay(AlertOverlay.getInstance());
- PageManager.registerOverlay(AutofillEditAddressOverlay.getInstance(),
- AutofillOptions.getInstance());
- PageManager.registerOverlay(AutofillEditCreditCardOverlay.getInstance(),
- AutofillOptions.getInstance());
- PageManager.registerOverlay(AutofillOptions.getInstance(),
- BrowserOptions.getInstance(),
- [$('autofill-settings')]);
- PageManager.registerOverlay(ClearBrowserDataOverlay.getInstance(),
- BrowserOptions.getInstance(),
- [$('privacyClearDataButton')]);
+ PageManager.registerOverlay(
+ AutofillEditAddressOverlay.getInstance(), AutofillOptions.getInstance());
+ PageManager.registerOverlay(
+ AutofillEditCreditCardOverlay.getInstance(),
+ AutofillOptions.getInstance());
+ PageManager.registerOverlay(
+ AutofillOptions.getInstance(), BrowserOptions.getInstance(),
+ [$('autofill-settings')]);
+ PageManager.registerOverlay(
+ ClearBrowserDataOverlay.getInstance(), BrowserOptions.getInstance(),
+ [$('privacyClearDataButton')]);
PageManager.registerOverlay(
ClearBrowserDataHistoryNotice.getInstance(),
ClearBrowserDataOverlay.getInstance());
@@ -94,8 +97,8 @@ function load() {
'doNotTrackConfirm',
loadTimeData.getString('doNotTrackConfirmOverlayTabTitle'),
'do-not-track-confirm-overlay',
- /** @type {HTMLButtonElement} */($('do-not-track-confirm-ok')),
- /** @type {HTMLButtonElement} */($('do-not-track-confirm-cancel')),
+ /** @type {HTMLButtonElement} */ ($('do-not-track-confirm-ok')),
+ /** @type {HTMLButtonElement} */ ($('do-not-track-confirm-cancel')),
$('do-not-track-enabled')['pref'],
$('do-not-track-enabled')['metric']),
BrowserOptions.getInstance());
@@ -104,164 +107,168 @@ function load() {
'spellingConfirm',
loadTimeData.getString('spellingConfirmOverlayTabTitle'),
'spelling-confirm-overlay',
- /** @type {HTMLButtonElement} */($('spelling-confirm-ok')),
- /** @type {HTMLButtonElement} */($('spelling-confirm-cancel')),
+ /** @type {HTMLButtonElement} */ ($('spelling-confirm-ok')),
+ /** @type {HTMLButtonElement} */ ($('spelling-confirm-cancel')),
$('spelling-enabled-control')['pref'],
$('spelling-enabled-control')['metric']),
BrowserOptions.getInstance());
- PageManager.registerOverlay(new HotwordConfirmDialog(),
- BrowserOptions.getInstance());
- PageManager.registerOverlay(ContentSettings.getInstance(),
- BrowserOptions.getInstance(),
- [$('privacyContentSettingsButton')]);
- PageManager.registerOverlay(ContentSettingsExceptionsArea.getInstance(),
- ContentSettings.getInstance());
- PageManager.registerOverlay(CookiesView.getInstance(),
- ContentSettings.getInstance(),
- [$('privacyContentSettingsButton'),
- $('show-cookies-button')]);
- PageManager.registerOverlay(CreateProfileOverlay.getInstance(),
- BrowserOptions.getInstance());
- PageManager.registerOverlay(DisconnectAccountOverlay.getInstance(),
- BrowserOptions.getInstance());
- PageManager.registerOverlay(EasyUnlockTurnOffOverlay.getInstance(),
- BrowserOptions.getInstance(),
- [$('easy-unlock-turn-off-button')]);
+ PageManager.registerOverlay(
+ new HotwordConfirmDialog(), BrowserOptions.getInstance());
+ PageManager.registerOverlay(
+ ContentSettings.getInstance(), BrowserOptions.getInstance(),
+ [$('privacyContentSettingsButton')]);
+ PageManager.registerOverlay(
+ ContentSettingsExceptionsArea.getInstance(),
+ ContentSettings.getInstance());
+ PageManager.registerOverlay(
+ CookiesView.getInstance(), ContentSettings.getInstance(),
+ [$('privacyContentSettingsButton'), $('show-cookies-button')]);
+ PageManager.registerOverlay(
+ CreateProfileOverlay.getInstance(), BrowserOptions.getInstance());
+ PageManager.registerOverlay(
+ DisconnectAccountOverlay.getInstance(), BrowserOptions.getInstance());
+ PageManager.registerOverlay(
+ EasyUnlockTurnOffOverlay.getInstance(), BrowserOptions.getInstance(),
+ [$('easy-unlock-turn-off-button')]);
if (!cr.isMac) {
- PageManager.registerOverlay(EditDictionaryOverlay.getInstance(),
- LanguageOptions.getInstance(),
- [$('edit-custom-dictionary-button')]);
+ PageManager.registerOverlay(
+ EditDictionaryOverlay.getInstance(), LanguageOptions.getInstance(),
+ [$('edit-custom-dictionary-button')]);
}
- PageManager.registerOverlay(FontSettings.getInstance(),
- BrowserOptions.getInstance(),
- [$('fontSettingsCustomizeFontsButton')]);
+ PageManager.registerOverlay(
+ FontSettings.getInstance(), BrowserOptions.getInstance(),
+ [$('fontSettingsCustomizeFontsButton')]);
if (HandlerOptions && $('manage-handlers-button')) {
- PageManager.registerOverlay(HandlerOptions.getInstance(),
- ContentSettings.getInstance(),
- [$('manage-handlers-button')]);
+ PageManager.registerOverlay(
+ HandlerOptions.getInstance(), ContentSettings.getInstance(),
+ [$('manage-handlers-button')]);
}
- PageManager.registerOverlay(HomePageOverlay.getInstance(),
- BrowserOptions.getInstance(),
- [$('change-home-page')]);
- PageManager.registerOverlay(ImportDataOverlay.getInstance(),
- BrowserOptions.getInstance());
- PageManager.registerOverlay(LanguageOptions.getInstance(),
- BrowserOptions.getInstance(),
- [$('language-button'),
- $('manage-languages')]);
- PageManager.registerOverlay(ManageProfileOverlay.getInstance(),
- BrowserOptions.getInstance());
+ PageManager.registerOverlay(
+ HomePageOverlay.getInstance(), BrowserOptions.getInstance(),
+ [$('change-home-page')]);
+ PageManager.registerOverlay(
+ ImportDataOverlay.getInstance(), BrowserOptions.getInstance());
+ PageManager.registerOverlay(
+ LanguageOptions.getInstance(), BrowserOptions.getInstance(),
+ [$('language-button'), $('manage-languages')]);
+ PageManager.registerOverlay(
+ ManageProfileOverlay.getInstance(), BrowserOptions.getInstance());
if (!cr.isChromeOS) {
- PageManager.registerOverlay(SupervisedUserCreateConfirmOverlay.
- getInstance(),
- BrowserOptions.getInstance());
- PageManager.registerOverlay(SupervisedUserImportOverlay.getInstance(),
- CreateProfileOverlay.getInstance());
- PageManager.registerOverlay(SupervisedUserLearnMoreOverlay.getInstance(),
- CreateProfileOverlay.getInstance());
+ PageManager.registerOverlay(
+ SupervisedUserCreateConfirmOverlay.getInstance(),
+ BrowserOptions.getInstance());
+ PageManager.registerOverlay(
+ SupervisedUserImportOverlay.getInstance(),
+ CreateProfileOverlay.getInstance());
+ PageManager.registerOverlay(
+ SupervisedUserLearnMoreOverlay.getInstance(),
+ CreateProfileOverlay.getInstance());
}
- PageManager.registerOverlay(PasswordManager.getInstance(),
- BrowserOptions.getInstance(),
- [$('manage-passwords')]);
+ PageManager.registerOverlay(
+ PasswordManager.getInstance(), BrowserOptions.getInstance(),
+ [$('manage-passwords')]);
PageManager.registerOverlay(
new ResetProfileSettingsOverlay(false /* isTriggered */),
- BrowserOptions.getInstance(),
- [$('reset-profile-settings')]);
- PageManager.registerOverlay(SearchEngineManager.getInstance(),
- BrowserOptions.getInstance(),
- [$('manage-default-search-engines')]);
- PageManager.registerOverlay(StartupOverlay.getInstance(),
- BrowserOptions.getInstance());
- PageManager.registerOverlay(SyncSetupOverlay.getInstance(),
- BrowserOptions.getInstance(),
- [$('customize-sync')]);
+ BrowserOptions.getInstance(), [$('reset-profile-settings')]);
+ PageManager.registerOverlay(
+ SearchEngineManager.getInstance(), BrowserOptions.getInstance(),
+ [$('manage-default-search-engines')]);
+ PageManager.registerOverlay(
+ StartupOverlay.getInstance(), BrowserOptions.getInstance());
+ PageManager.registerOverlay(
+ SyncSetupOverlay.getInstance(), BrowserOptions.getInstance(),
+ [$('customize-sync')]);
-// <if expr="is_win">
+ // <if expr="is_win">
PageManager.registerOverlay(
new ResetProfileSettingsOverlay(true /* isTriggered */),
BrowserOptions.getInstance());
-// </if>
+ // </if>
if (loadTimeData.valueExists('aboutOverlayTabTitle')) {
- PageManager.registerOverlay(help.HelpPage.getInstance(),
- BrowserOptions.getInstance());
+ PageManager.registerOverlay(
+ help.HelpPage.getInstance(), BrowserOptions.getInstance());
if (help.ChannelChangePage) {
- PageManager.registerOverlay(help.ChannelChangePage.getInstance(),
- help.HelpPage.getInstance());
+ PageManager.registerOverlay(
+ help.ChannelChangePage.getInstance(), help.HelpPage.getInstance());
}
}
if (cr.isChromeOS) {
- PageManager.registerOverlay(AccountsOptions.getInstance(),
- BrowserOptions.getInstance(),
- [$('manage-accounts-button')]);
- PageManager.registerOverlay(BluetoothOptions.getInstance(),
- BrowserOptions.getInstance(),
- [$('bluetooth-add-device')]);
- PageManager.registerOverlay(BluetoothPairing.getInstance(),
- BrowserOptions.getInstance());
- PageManager.registerOverlay(FactoryResetOverlay.getInstance(),
- BrowserOptions.getInstance(),
- [$('factory-reset-restart')]);
- PageManager.registerOverlay(ChangePictureOptions.getInstance(),
- BrowserOptions.getInstance(),
- [$('account-picture')]);
- PageManager.registerOverlay(StorageClearDriveCacheOverlay.getInstance(),
- StorageManager.getInstance());
- PageManager.registerOverlay(DetailsInternetPage.getInstance(),
- BrowserOptions.getInstance());
- PageManager.registerOverlay(DisplayOptions.getInstance(),
- BrowserOptions.getInstance(),
- [$('display-options')]);
- PageManager.registerOverlay(DisplayOverscan.getInstance(),
- DisplayOptions.getInstance());
- PageManager.registerOverlay(KeyboardOverlay.getInstance(),
- BrowserOptions.getInstance(),
- [$('keyboard-settings-button')]);
- PageManager.registerOverlay(PointerOverlay.getInstance(),
- BrowserOptions.getInstance(),
- [$('pointer-settings-button')]);
- PageManager.registerOverlay(PreferredNetworks.getInstance(),
- BrowserOptions.getInstance());
- PageManager.registerOverlay(StylusOverlay.getInstance(),
- BrowserOptions.getInstance(),
- [$('stylus-settings-link')]);
- PageManager.registerOverlay(PowerOverlay.getInstance(),
- BrowserOptions.getInstance(),
- [$('power-settings-link')]);
- PageManager.registerOverlay(QuickUnlockConfigureOverlay.getInstance(),
- BrowserOptions.getInstance(),
- [$('manage-screenlock')]);
- PageManager.registerOverlay(StorageManager.getInstance(),
- BrowserOptions.getInstance(),
- [$('storage-manager-button')]);
- PageManager.registerOverlay(ThirdPartyImeConfirmOverlay.getInstance(),
- LanguageOptions.getInstance());
+ PageManager.registerOverlay(
+ AccountsOptions.getInstance(), BrowserOptions.getInstance(),
+ [$('manage-accounts-button')]);
+ PageManager.registerOverlay(
+ BluetoothOptions.getInstance(), BrowserOptions.getInstance(),
+ [$('bluetooth-add-device')]);
+ PageManager.registerOverlay(
+ BluetoothPairing.getInstance(), BrowserOptions.getInstance());
+ PageManager.registerOverlay(
+ FactoryResetOverlay.getInstance(), BrowserOptions.getInstance(),
+ [$('factory-reset-restart')]);
+ PageManager.registerOverlay(
+ ChangePictureOptions.getInstance(), BrowserOptions.getInstance(),
+ [$('account-picture')]);
+ PageManager.registerOverlay(
+ StorageClearDriveCacheOverlay.getInstance(),
+ StorageManager.getInstance());
+ PageManager.registerOverlay(
+ DetailsInternetPage.getInstance(), BrowserOptions.getInstance());
+ PageManager.registerOverlay(
+ DisplayOptions.getInstance(), BrowserOptions.getInstance(),
+ [$('display-options')]);
+ PageManager.registerOverlay(
+ DisplayOverscan.getInstance(), DisplayOptions.getInstance());
+ PageManager.registerOverlay(
+ KeyboardOverlay.getInstance(), BrowserOptions.getInstance(),
+ [$('keyboard-settings-button')]);
+ PageManager.registerOverlay(
+ PointerOverlay.getInstance(), BrowserOptions.getInstance(),
+ [$('pointer-settings-button')]);
+ PageManager.registerOverlay(
+ PreferredNetworks.getInstance(), BrowserOptions.getInstance());
+ PageManager.registerOverlay(
+ StylusOverlay.getInstance(), BrowserOptions.getInstance(),
+ [$('stylus-settings-link')]);
+ PageManager.registerOverlay(
+ PowerOverlay.getInstance(), BrowserOptions.getInstance(),
+ [$('power-settings-link')]);
+ PageManager.registerOverlay(
+ QuickUnlockConfigureOverlay.getInstance(), BrowserOptions.getInstance(),
+ [$('manage-screenlock')]);
+ PageManager.registerOverlay(
+ StorageManager.getInstance(), BrowserOptions.getInstance(),
+ [$('storage-manager-button')]);
+ PageManager.registerOverlay(
+ ThirdPartyImeConfirmOverlay.getInstance(),
+ LanguageOptions.getInstance());
PageManager.registerOverlay(
new ConfirmDialog(
'arcOptOutConfirm',
loadTimeData.getString('arcOptOutConfirmOverlayTabTitle'),
'arc-opt-out-confirm-overlay',
- /** @type {HTMLButtonElement} */($('arc-opt-out-confirm-ok')),
- /** @type {HTMLButtonElement} */($('arc-opt-out-confirm-cancel')),
+ /** @type {HTMLButtonElement} */ ($('arc-opt-out-confirm-ok')),
+ /** @type {HTMLButtonElement} */ ($('arc-opt-out-confirm-cancel')),
$('android-apps-enabled')['pref'],
- $('android-apps-enabled')['metric'],
- undefined,
- false),
+ $('android-apps-enabled')['metric'], undefined, false),
BrowserOptions.getInstance());
}
if (!cr.isWindows && !cr.isMac) {
- PageManager.registerOverlay(CertificateBackupOverlay.getInstance(),
- CertificateManager.getInstance());
- PageManager.registerOverlay(CertificateEditCaTrustOverlay.getInstance(),
- CertificateManager.getInstance());
- PageManager.registerOverlay(CertificateImportErrorOverlay.getInstance(),
- CertificateManager.getInstance());
- PageManager.registerOverlay(CertificateManager.getInstance(),
- BrowserOptions.getInstance(),
- [$('certificatesManageButton')]);
- PageManager.registerOverlay(CertificateRestoreOverlay.getInstance(),
- CertificateManager.getInstance());
+ PageManager.registerOverlay(
+ CertificateBackupOverlay.getInstance(),
+ CertificateManager.getInstance());
+ PageManager.registerOverlay(
+ CertificateEditCaTrustOverlay.getInstance(),
+ CertificateManager.getInstance());
+ PageManager.registerOverlay(
+ CertificateImportErrorOverlay.getInstance(),
+ CertificateManager.getInstance());
+ PageManager.registerOverlay(
+ CertificateManager.getInstance(), BrowserOptions.getInstance(),
+ [$('certificatesManageButton')]);
+ PageManager.registerOverlay(
+ CertificateRestoreOverlay.getInstance(),
+ CertificateManager.getInstance());
}
OptionsFocusManager.getInstance().initialize();
@@ -277,8 +284,8 @@ function load() {
// appropriately to chrome://settings/. If the URL matches, updateHistory_
// will avoid the extra replaceState.
var updateHistory = true;
- PageManager.showPageByName(pageName, updateHistory,
- {replaceState: true, hash: location.hash});
+ PageManager.showPageByName(
+ pageName, updateHistory, {replaceState: true, hash: location.hash});
var subpagesNavTabs = document.querySelectorAll('.subpages-nav-tabs');
for (var i = 0; i < subpagesNavTabs.length; i++) {
« no previous file with comments | « chrome/browser/resources/options/manage_profile_overlay.js ('k') | chrome/browser/resources/options/options_bundle.js » ('j') | chrome/browser/resources/settings/device_page/stylus.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698