| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 var AddLanguageOverlay = options.AddLanguageOverlay; | 5 var AddLanguageOverlay = options.AddLanguageOverlay; |
| 6 var AlertOverlay = options.AlertOverlay; | 6 var AlertOverlay = options.AlertOverlay; |
| 7 var AutofillEditAddressOverlay = options.AutofillEditAddressOverlay; | 7 var AutofillEditAddressOverlay = options.AutofillEditAddressOverlay; |
| 8 var AutofillEditCreditCardOverlay = options.AutofillEditCreditCardOverlay; | 8 var AutofillEditCreditCardOverlay = options.AutofillEditCreditCardOverlay; |
| 9 var AutofillOptions = options.AutofillOptions; | 9 var AutofillOptions = options.AutofillOptions; |
| 10 var BrowserOptions = options.BrowserOptions; | 10 var BrowserOptions = options.BrowserOptions; |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 157 'languagePinyinPage'), | 157 'languagePinyinPage'), |
| 158 LanguageOptions.getInstance()); | 158 LanguageOptions.getInstance()); |
| 159 // Only use the VirtualKeyboardManager if the keyboard DOM elements (which | 159 // Only use the VirtualKeyboardManager if the keyboard DOM elements (which |
| 160 // it will assume exists) are present (i.e. if we were built with | 160 // it will assume exists) are present (i.e. if we were built with |
| 161 // use_virtual_keyboard=1). | 161 // use_virtual_keyboard=1). |
| 162 if ($('language-options-virtual-keyboard')) { | 162 if ($('language-options-virtual-keyboard')) { |
| 163 OptionsPage.registerOverlay(VirtualKeyboardManager.getInstance(), | 163 OptionsPage.registerOverlay(VirtualKeyboardManager.getInstance(), |
| 164 LanguageOptions.getInstance()); | 164 LanguageOptions.getInstance()); |
| 165 } | 165 } |
| 166 } | 166 } |
| 167 |
| 168 if (SetWallpaperOptions) { |
| 169 OptionsPage.registerOverlay(SetWallpaperOptions.getInstance(), |
| 170 BrowserOptions.getInstance(), |
| 171 [$('set-wallpaper')]); |
| 172 } |
| 173 |
| 167 if (!cr.isWindows && !cr.isMac) { | 174 if (!cr.isWindows && !cr.isMac) { |
| 168 OptionsPage.registerOverlay(CertificateBackupOverlay.getInstance(), | 175 OptionsPage.registerOverlay(CertificateBackupOverlay.getInstance(), |
| 169 CertificateManager.getInstance()); | 176 CertificateManager.getInstance()); |
| 170 OptionsPage.registerOverlay(CertificateEditCaTrustOverlay.getInstance(), | 177 OptionsPage.registerOverlay(CertificateEditCaTrustOverlay.getInstance(), |
| 171 CertificateManager.getInstance()); | 178 CertificateManager.getInstance()); |
| 172 OptionsPage.registerOverlay(CertificateImportErrorOverlay.getInstance(), | 179 OptionsPage.registerOverlay(CertificateImportErrorOverlay.getInstance(), |
| 173 CertificateManager.getInstance()); | 180 CertificateManager.getInstance()); |
| 174 OptionsPage.registerOverlay(CertificateManager.getInstance(), | 181 OptionsPage.registerOverlay(CertificateManager.getInstance(), |
| 175 BrowserOptions.getInstance(), | 182 BrowserOptions.getInstance(), |
| 176 [$('certificatesManageButton')]); | 183 [$('certificatesManageButton')]); |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 226 options.OptionsPage.willClose(); | 233 options.OptionsPage.willClose(); |
| 227 }; | 234 }; |
| 228 | 235 |
| 229 /** | 236 /** |
| 230 * Listener for the |popstate| event. | 237 * Listener for the |popstate| event. |
| 231 * @param {Event} e The |popstate| event. | 238 * @param {Event} e The |popstate| event. |
| 232 */ | 239 */ |
| 233 window.onpopstate = function(e) { | 240 window.onpopstate = function(e) { |
| 234 options.OptionsPage.setState(e.state); | 241 options.OptionsPage.setState(e.state); |
| 235 }; | 242 }; |
| OLD | NEW |