OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 AddStartupPageOverlay = options.AddStartupPageOverlay; | 5 var AddStartupPageOverlay = options.AddStartupPageOverlay; |
6 var AdvancedOptions = options.AdvancedOptions; | 6 var AdvancedOptions = options.AdvancedOptions; |
7 var AlertOverlay = options.AlertOverlay; | 7 var AlertOverlay = options.AlertOverlay; |
8 var AutoFillEditAddressOverlay = options.AutoFillEditAddressOverlay; | 8 var AutoFillEditAddressOverlay = options.AutoFillEditAddressOverlay; |
9 var AutoFillEditCreditCardOverlay = options.AutoFillEditCreditCardOverlay; | 9 var AutoFillEditCreditCardOverlay = options.AutoFillEditCreditCardOverlay; |
10 var AutoFillOptions = options.AutoFillOptions; | 10 var AutoFillOptions = options.AutoFillOptions; |
11 var BrowserOptions = options.BrowserOptions; | 11 var BrowserOptions = options.BrowserOptions; |
12 var ClearBrowserDataOverlay = options.ClearBrowserDataOverlay; | 12 var ClearBrowserDataOverlay = options.ClearBrowserDataOverlay; |
13 var ContentSettings = options.ContentSettings; | 13 var ContentSettings = options.ContentSettings; |
| 14 var ContentSettingsExceptionsArea = |
| 15 options.contentSettings.ContentSettingsExceptionsArea; |
14 var CookiesView = options.CookiesView; | 16 var CookiesView = options.CookiesView; |
15 var EditSearchEngineOverlay = options.EditSearchEngineOverlay; | 17 var EditSearchEngineOverlay = options.EditSearchEngineOverlay; |
16 var FontSettings = options.FontSettings; | 18 var FontSettings = options.FontSettings; |
17 var ImportDataOverlay = options.ImportDataOverlay; | 19 var ImportDataOverlay = options.ImportDataOverlay; |
18 var InstantConfirmOverlay = options.InstantConfirmOverlay; | 20 var InstantConfirmOverlay = options.InstantConfirmOverlay; |
19 var OptionsPage = options.OptionsPage; | 21 var OptionsPage = options.OptionsPage; |
20 var PasswordManager = options.PasswordManager; | 22 var PasswordManager = options.PasswordManager; |
21 var PersonalOptions = options.PersonalOptions; | 23 var PersonalOptions = options.PersonalOptions; |
22 var Preferences = options.Preferences; | 24 var Preferences = options.Preferences; |
23 var ProxyOptions = options.ProxyOptions; | 25 var ProxyOptions = options.ProxyOptions; |
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
84 OptionsPage.registerSubPage( | 86 OptionsPage.registerSubPage( |
85 new OptionsPage('languagePinyin', | 87 new OptionsPage('languagePinyin', |
86 localStrings.getString('languagePinyinPage'), | 88 localStrings.getString('languagePinyinPage'), |
87 'languagePinyinPage'), | 89 'languagePinyinPage'), |
88 SystemOptions.getInstance()); | 90 SystemOptions.getInstance()); |
89 OptionsPage.register(InternetOptions.getInstance()); | 91 OptionsPage.register(InternetOptions.getInstance()); |
90 } | 92 } |
91 OptionsPage.register(AdvancedOptions.getInstance()); | 93 OptionsPage.register(AdvancedOptions.getInstance()); |
92 OptionsPage.registerSubPage(ContentSettings.getInstance(), | 94 OptionsPage.registerSubPage(ContentSettings.getInstance(), |
93 AdvancedOptions.getInstance()); | 95 AdvancedOptions.getInstance()); |
| 96 OptionsPage.registerSubPage(ContentSettingsExceptionsArea.getInstance(), |
| 97 ContentSettings.getInstance()); |
94 OptionsPage.registerSubPage(CookiesView.getInstance(), | 98 OptionsPage.registerSubPage(CookiesView.getInstance(), |
95 ContentSettings.getInstance()); | 99 ContentSettings.getInstance()); |
96 OptionsPage.registerSubPage(FontSettings.getInstance(), | 100 OptionsPage.registerSubPage(FontSettings.getInstance(), |
97 AdvancedOptions.getInstance()); | 101 AdvancedOptions.getInstance()); |
98 if (!cr.isWindows && !cr.isMac) { | 102 if (!cr.isWindows && !cr.isMac) { |
99 OptionsPage.registerSubPage(CertificateManager.getInstance(), | 103 OptionsPage.registerSubPage(CertificateManager.getInstance(), |
100 AdvancedOptions.getInstance()); | 104 AdvancedOptions.getInstance()); |
101 OptionsPage.registerOverlay(CertificateRestoreOverlay.getInstance()); | 105 OptionsPage.registerOverlay(CertificateRestoreOverlay.getInstance()); |
102 OptionsPage.registerOverlay(CertificateBackupOverlay.getInstance()); | 106 OptionsPage.registerOverlay(CertificateBackupOverlay.getInstance()); |
103 OptionsPage.registerOverlay(CertificateEditCaTrustOverlay.getInstance()); | 107 OptionsPage.registerOverlay(CertificateEditCaTrustOverlay.getInstance()); |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
156 document.documentElement.setAttribute('os', 'mac'); | 160 document.documentElement.setAttribute('os', 'mac'); |
157 if (cr.isViews) | 161 if (cr.isViews) |
158 document.documentElement.setAttribute('toolkit', 'views'); | 162 document.documentElement.setAttribute('toolkit', 'views'); |
159 } | 163 } |
160 | 164 |
161 document.addEventListener('DOMContentLoaded', load); | 165 document.addEventListener('DOMContentLoaded', load); |
162 | 166 |
163 window.onpopstate = function(e) { | 167 window.onpopstate = function(e) { |
164 options.OptionsPage.setState(e.state); | 168 options.OptionsPage.setState(e.state); |
165 }; | 169 }; |
OLD | NEW |