Chromium Code Reviews| 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; |
| 11 var ClearBrowserDataOverlay = options.ClearBrowserDataOverlay; | 11 var ClearBrowserDataOverlay = options.ClearBrowserDataOverlay; |
| 12 var ConfirmDialog = options.ConfirmDialog; | 12 var ConfirmDialog = options.ConfirmDialog; |
| 13 var ContentSettings = options.ContentSettings; | |
| 14 var ContentSettingsExceptionsArea = | 13 var ContentSettingsExceptionsArea = |
| 15 options.contentSettings.ContentSettingsExceptionsArea; | 14 options.contentSettings.ContentSettingsExceptionsArea; |
| 15 var ContentSettings = options.ContentSettings; | |
| 16 var CookiesViewApp = options.CookiesViewApp; | |
| 16 var CookiesView = options.CookiesView; | 17 var CookiesView = options.CookiesView; |
| 17 var CookiesViewApp = options.CookiesViewApp; | 18 var EditDictionaryOverlay = options.EditDictionaryOverlay; |
| 18 var FactoryResetOverlay = options.FactoryResetOverlay; | 19 var FactoryResetOverlay = options.FactoryResetOverlay; |
| 19 var FontSettings = options.FontSettings; | 20 var FontSettings = options.FontSettings; |
| 20 var HandlerOptions = options.HandlerOptions; | 21 var HandlerOptions = options.HandlerOptions; |
| 21 var HomePageOverlay = options.HomePageOverlay; | 22 var HomePageOverlay = options.HomePageOverlay; |
| 22 var ImportDataOverlay = options.ImportDataOverlay; | 23 var ImportDataOverlay = options.ImportDataOverlay; |
| 23 var LanguageOptions = options.LanguageOptions; | 24 var LanguageOptions = options.LanguageOptions; |
| 25 var ManageProfileOverlay = options.ManageProfileOverlay; | |
| 24 var MediaGalleriesManager = options.MediaGalleriesManager; | 26 var MediaGalleriesManager = options.MediaGalleriesManager; |
| 25 var OptionsFocusManager = options.OptionsFocusManager; | 27 var OptionsFocusManager = options.OptionsFocusManager; |
| 26 var OptionsPage = options.OptionsPage; | 28 var OptionsPage = options.OptionsPage; |
| 27 var PasswordManager = options.PasswordManager; | 29 var PasswordManager = options.PasswordManager; |
| 28 var Preferences = options.Preferences; | 30 var Preferences = options.Preferences; |
| 29 var PreferredNetworks = options.PreferredNetworks; | 31 var PreferredNetworks = options.PreferredNetworks; |
| 30 var ManageProfileOverlay = options.ManageProfileOverlay; | |
| 31 var SearchEngineManager = options.SearchEngineManager; | 32 var SearchEngineManager = options.SearchEngineManager; |
| 32 var SearchPage = options.SearchPage; | 33 var SearchPage = options.SearchPage; |
| 33 var StartupOverlay = options.StartupOverlay; | 34 var StartupOverlay = options.StartupOverlay; |
| 34 var SyncSetupOverlay = options.SyncSetupOverlay; | 35 var SyncSetupOverlay = options.SyncSetupOverlay; |
| 35 | 36 |
| 36 /** | 37 /** |
| 37 * DOMContentLoaded handler, sets up the page. | 38 * DOMContentLoaded handler, sets up the page. |
| 38 */ | 39 */ |
| 39 function load() { | 40 function load() { |
| 40 // Decorate the existing elements in the document. | 41 // Decorate the existing elements in the document. |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 112 [$('privacyContentSettingsButton')]); | 113 [$('privacyContentSettingsButton')]); |
| 113 OptionsPage.registerOverlay(ContentSettingsExceptionsArea.getInstance(), | 114 OptionsPage.registerOverlay(ContentSettingsExceptionsArea.getInstance(), |
| 114 ContentSettings.getInstance()); | 115 ContentSettings.getInstance()); |
| 115 OptionsPage.registerOverlay(CookiesView.getInstance(), | 116 OptionsPage.registerOverlay(CookiesView.getInstance(), |
| 116 ContentSettings.getInstance(), | 117 ContentSettings.getInstance(), |
| 117 [$('privacyContentSettingsButton'), | 118 [$('privacyContentSettingsButton'), |
| 118 $('show-cookies-button')]); | 119 $('show-cookies-button')]); |
| 119 OptionsPage.registerOverlay(CookiesViewApp.getInstance(), | 120 OptionsPage.registerOverlay(CookiesViewApp.getInstance(), |
| 120 ContentSettings.getInstance(), | 121 ContentSettings.getInstance(), |
| 121 [$('privacyContentSettingsButton')]); | 122 [$('privacyContentSettingsButton')]); |
| 123 OptionsPage.registerOverlay(EditDictionaryOverlay.getInstance(), | |
| 124 LanguageOptions.getInstance()); | |
|
csilv
2012/11/14 20:01:52
this should be associated with the edit-dictionary
please use gerrit instead
2012/11/14 22:54:46
Done.
| |
| 122 OptionsPage.registerOverlay(FontSettings.getInstance(), | 125 OptionsPage.registerOverlay(FontSettings.getInstance(), |
| 123 BrowserOptions.getInstance(), | 126 BrowserOptions.getInstance(), |
| 124 [$('fontSettingsCustomizeFontsButton')]); | 127 [$('fontSettingsCustomizeFontsButton')]); |
| 125 if (HandlerOptions && $('manage-handlers-button')) { | 128 if (HandlerOptions && $('manage-handlers-button')) { |
| 126 OptionsPage.registerOverlay(HandlerOptions.getInstance(), | 129 OptionsPage.registerOverlay(HandlerOptions.getInstance(), |
| 127 ContentSettings.getInstance(), | 130 ContentSettings.getInstance(), |
| 128 [$('manage-handlers-button')]); | 131 [$('manage-handlers-button')]); |
| 129 } | 132 } |
| 130 OptionsPage.registerOverlay(HomePageOverlay.getInstance(), | 133 OptionsPage.registerOverlay(HomePageOverlay.getInstance(), |
| 131 BrowserOptions.getInstance(), | 134 BrowserOptions.getInstance(), |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 253 options.OptionsPage.willClose(); | 256 options.OptionsPage.willClose(); |
| 254 }; | 257 }; |
| 255 | 258 |
| 256 /** | 259 /** |
| 257 * Listener for the |popstate| event. | 260 * Listener for the |popstate| event. |
| 258 * @param {Event} e The |popstate| event. | 261 * @param {Event} e The |popstate| event. |
| 259 */ | 262 */ |
| 260 window.onpopstate = function(e) { | 263 window.onpopstate = function(e) { |
| 261 options.OptionsPage.setState(e.state); | 264 options.OptionsPage.setState(e.state); |
| 262 }; | 265 }; |
| OLD | NEW |