| 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 AutomaticSettingsResetBanner = options.AutomaticSettingsResetBanner; | 10 var AutomaticSettingsResetBanner = options.AutomaticSettingsResetBanner; |
| (...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 211 PageManager.registerOverlay(DisplayOverscan.getInstance(), | 211 PageManager.registerOverlay(DisplayOverscan.getInstance(), |
| 212 DisplayOptions.getInstance()); | 212 DisplayOptions.getInstance()); |
| 213 PageManager.registerOverlay(KeyboardOverlay.getInstance(), | 213 PageManager.registerOverlay(KeyboardOverlay.getInstance(), |
| 214 BrowserOptions.getInstance(), | 214 BrowserOptions.getInstance(), |
| 215 [$('keyboard-settings-button')]); | 215 [$('keyboard-settings-button')]); |
| 216 PageManager.registerOverlay(PointerOverlay.getInstance(), | 216 PageManager.registerOverlay(PointerOverlay.getInstance(), |
| 217 BrowserOptions.getInstance(), | 217 BrowserOptions.getInstance(), |
| 218 [$('pointer-settings-button')]); | 218 [$('pointer-settings-button')]); |
| 219 PageManager.registerOverlay(PreferredNetworks.getInstance(), | 219 PageManager.registerOverlay(PreferredNetworks.getInstance(), |
| 220 BrowserOptions.getInstance()); | 220 BrowserOptions.getInstance()); |
| 221 PageManager.registerOverlay(PowerOverlay.getInstance(), |
| 222 BrowserOptions.getInstance(), |
| 223 [$('power-settings-button')]); |
| 221 PageManager.registerOverlay(ThirdPartyImeConfirmOverlay.getInstance(), | 224 PageManager.registerOverlay(ThirdPartyImeConfirmOverlay.getInstance(), |
| 222 LanguageOptions.getInstance()); | 225 LanguageOptions.getInstance()); |
| 223 } | 226 } |
| 224 | 227 |
| 225 if (!cr.isWindows && !cr.isMac) { | 228 if (!cr.isWindows && !cr.isMac) { |
| 226 PageManager.registerOverlay(CertificateBackupOverlay.getInstance(), | 229 PageManager.registerOverlay(CertificateBackupOverlay.getInstance(), |
| 227 CertificateManager.getInstance()); | 230 CertificateManager.getInstance()); |
| 228 PageManager.registerOverlay(CertificateEditCaTrustOverlay.getInstance(), | 231 PageManager.registerOverlay(CertificateEditCaTrustOverlay.getInstance(), |
| 229 CertificateManager.getInstance()); | 232 CertificateManager.getInstance()); |
| 230 PageManager.registerOverlay(CertificateImportErrorOverlay.getInstance(), | 233 PageManager.registerOverlay(CertificateImportErrorOverlay.getInstance(), |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 278 }; | 281 }; |
| 279 | 282 |
| 280 /** | 283 /** |
| 281 * Listener for the |popstate| event. | 284 * Listener for the |popstate| event. |
| 282 * @param {Event} e The |popstate| event. | 285 * @param {Event} e The |popstate| event. |
| 283 */ | 286 */ |
| 284 window.onpopstate = function(e) { | 287 window.onpopstate = function(e) { |
| 285 var pageName = PageManager.getPageNameFromPath(); | 288 var pageName = PageManager.getPageNameFromPath(); |
| 286 PageManager.setState(pageName, location.hash, e.state); | 289 PageManager.setState(pageName, location.hash, e.state); |
| 287 }; | 290 }; |
| OLD | NEW |