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 12 matching lines...) Expand all Loading... |
23 <if expr="enable_google_now"> | 23 <if expr="enable_google_now"> |
24 var GeolocationOptions = options.GeolocationOptions; | 24 var GeolocationOptions = options.GeolocationOptions; |
25 </if> | 25 </if> |
26 var FontSettings = options.FontSettings; | 26 var FontSettings = options.FontSettings; |
27 var HandlerOptions = options.HandlerOptions; | 27 var HandlerOptions = options.HandlerOptions; |
28 var HomePageOverlay = options.HomePageOverlay; | 28 var HomePageOverlay = options.HomePageOverlay; |
29 var HotwordConfirmDialog = options.HotwordConfirmDialog; | 29 var HotwordConfirmDialog = options.HotwordConfirmDialog; |
30 var ImportDataOverlay = options.ImportDataOverlay; | 30 var ImportDataOverlay = options.ImportDataOverlay; |
31 var LanguageOptions = options.LanguageOptions; | 31 var LanguageOptions = options.LanguageOptions; |
32 var ManageProfileOverlay = options.ManageProfileOverlay; | 32 var ManageProfileOverlay = options.ManageProfileOverlay; |
| 33 var DisconnectAccountOverlay = options.DisconnectAccountOverlay; |
33 var OptionsFocusManager = options.OptionsFocusManager; | 34 var OptionsFocusManager = options.OptionsFocusManager; |
34 var OptionsPage = options.OptionsPage; | 35 var OptionsPage = options.OptionsPage; |
35 var PageManager = cr.ui.pageManager.PageManager; | 36 var PageManager = cr.ui.pageManager.PageManager; |
36 var PasswordManager = options.PasswordManager; | 37 var PasswordManager = options.PasswordManager; |
37 var Preferences = options.Preferences; | 38 var Preferences = options.Preferences; |
38 var PreferredNetworks = options.PreferredNetworks; | 39 var PreferredNetworks = options.PreferredNetworks; |
39 var ResetProfileSettingsOverlay = options.ResetProfileSettingsOverlay; | 40 var ResetProfileSettingsOverlay = options.ResetProfileSettingsOverlay; |
40 var SearchEngineManager = options.SearchEngineManager; | 41 var SearchEngineManager = options.SearchEngineManager; |
41 var SearchPage = options.SearchPage; | 42 var SearchPage = options.SearchPage; |
42 var StartupOverlay = options.StartupOverlay; | 43 var StartupOverlay = options.StartupOverlay; |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
116 BrowserOptions.getInstance(), | 117 BrowserOptions.getInstance(), |
117 [$('privacyContentSettingsButton')]); | 118 [$('privacyContentSettingsButton')]); |
118 PageManager.registerOverlay(ContentSettingsExceptionsArea.getInstance(), | 119 PageManager.registerOverlay(ContentSettingsExceptionsArea.getInstance(), |
119 ContentSettings.getInstance()); | 120 ContentSettings.getInstance()); |
120 PageManager.registerOverlay(CookiesView.getInstance(), | 121 PageManager.registerOverlay(CookiesView.getInstance(), |
121 ContentSettings.getInstance(), | 122 ContentSettings.getInstance(), |
122 [$('privacyContentSettingsButton'), | 123 [$('privacyContentSettingsButton'), |
123 $('show-cookies-button')]); | 124 $('show-cookies-button')]); |
124 PageManager.registerOverlay(CreateProfileOverlay.getInstance(), | 125 PageManager.registerOverlay(CreateProfileOverlay.getInstance(), |
125 BrowserOptions.getInstance()); | 126 BrowserOptions.getInstance()); |
| 127 PageManager.registerOverlay(DisconnectAccountOverlay.getInstance(), |
| 128 BrowserOptions.getInstance()); |
126 PageManager.registerOverlay(EasyUnlockTurnOffOverlay.getInstance(), | 129 PageManager.registerOverlay(EasyUnlockTurnOffOverlay.getInstance(), |
127 BrowserOptions.getInstance(), | 130 BrowserOptions.getInstance(), |
128 [$('easy-unlock-turn-off-button')]); | 131 [$('easy-unlock-turn-off-button')]); |
129 if (!cr.isMac) { | 132 if (!cr.isMac) { |
130 PageManager.registerOverlay(EditDictionaryOverlay.getInstance(), | 133 PageManager.registerOverlay(EditDictionaryOverlay.getInstance(), |
131 LanguageOptions.getInstance(), | 134 LanguageOptions.getInstance(), |
132 [$('edit-custom-dictionary-button')]); | 135 [$('edit-custom-dictionary-button')]); |
133 } | 136 } |
134 PageManager.registerOverlay(FontSettings.getInstance(), | 137 PageManager.registerOverlay(FontSettings.getInstance(), |
135 BrowserOptions.getInstance(), | 138 BrowserOptions.getInstance(), |
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
298 }; | 301 }; |
299 | 302 |
300 /** | 303 /** |
301 * Listener for the |popstate| event. | 304 * Listener for the |popstate| event. |
302 * @param {Event} e The |popstate| event. | 305 * @param {Event} e The |popstate| event. |
303 */ | 306 */ |
304 window.onpopstate = function(e) { | 307 window.onpopstate = function(e) { |
305 var pageName = PageManager.getPageNameFromPath(); | 308 var pageName = PageManager.getPageNameFromPath(); |
306 PageManager.setState(pageName, location.hash, e.state); | 309 PageManager.setState(pageName, location.hash, e.state); |
307 }; | 310 }; |
OLD | NEW |