Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(74)

Side by Side Diff: chrome/browser/resources/options2/options.js

Issue 8949006: [uber page] Remove extensions sub-page from options2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 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 = 14 var ContentSettingsExceptionsArea =
15 options.contentSettings.ContentSettingsExceptionsArea; 15 options.contentSettings.ContentSettingsExceptionsArea;
16 var CookiesView = options.CookiesView; 16 var CookiesView = options.CookiesView;
17 var ExtensionSettings = options.ExtensionSettings;
18 var FontSettings = options.FontSettings; 17 var FontSettings = options.FontSettings;
19 var HandlerOptions = options.HandlerOptions; 18 var HandlerOptions = options.HandlerOptions;
20 var ImportDataOverlay = options.ImportDataOverlay; 19 var ImportDataOverlay = options.ImportDataOverlay;
21 var IntentsView = options.IntentsView; 20 var IntentsView = options.IntentsView;
22 var InstantConfirmOverlay = options.InstantConfirmOverlay; 21 var InstantConfirmOverlay = options.InstantConfirmOverlay;
23 var LanguageOptions = options.LanguageOptions; 22 var LanguageOptions = options.LanguageOptions;
24 var OptionsPage = options.OptionsPage; 23 var OptionsPage = options.OptionsPage;
25 var PackExtensionOverlay = options.PackExtensionOverlay;
26 var PasswordManager = options.PasswordManager; 24 var PasswordManager = options.PasswordManager;
27 var PersonalOptions = options.PersonalOptions; 25 var PersonalOptions = options.PersonalOptions;
28 var Preferences = options.Preferences; 26 var Preferences = options.Preferences;
29 var ManageProfileOverlay = options.ManageProfileOverlay; 27 var ManageProfileOverlay = options.ManageProfileOverlay;
30 var ProxyOptions = options.ProxyOptions; 28 var ProxyOptions = options.ProxyOptions;
31 var SearchEngineManager = options.SearchEngineManager; 29 var SearchEngineManager = options.SearchEngineManager;
32 var SearchPage = options.SearchPage; 30 var SearchPage = options.SearchPage;
33 var SyncSetupOverlay = options.SyncSetupOverlay; 31 var SyncSetupOverlay = options.SyncSetupOverlay;
34 var VirtualKeyboardManager = options.VirtualKeyboardManager; 32 var VirtualKeyboardManager = options.VirtualKeyboardManager;
35 33
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 [$('privacyClearDataButton')]); 164 [$('privacyClearDataButton')]);
167 OptionsPage.registerOverlay(ImportDataOverlay.getInstance(), 165 OptionsPage.registerOverlay(ImportDataOverlay.getInstance(),
168 PersonalOptions.getInstance()); 166 PersonalOptions.getInstance());
169 OptionsPage.registerOverlay(InstantConfirmOverlay.getInstance(), 167 OptionsPage.registerOverlay(InstantConfirmOverlay.getInstance(),
170 BrowserOptions.getInstance()); 168 BrowserOptions.getInstance());
171 OptionsPage.registerOverlay(SyncSetupOverlay.getInstance(), 169 OptionsPage.registerOverlay(SyncSetupOverlay.getInstance(),
172 PersonalOptions.getInstance()); 170 PersonalOptions.getInstance());
173 OptionsPage.registerOverlay(ManageProfileOverlay.getInstance(), 171 OptionsPage.registerOverlay(ManageProfileOverlay.getInstance(),
174 PersonalOptions.getInstance()); 172 PersonalOptions.getInstance());
175 173
176 OptionsPage.register(ExtensionSettings.getInstance());
177 OptionsPage.registerOverlay(PackExtensionOverlay.getInstance(),
178 ExtensionSettings.getInstance());
179
180 if (cr.isChromeOS) { 174 if (cr.isChromeOS) {
181 OptionsPage.register(AccountsOptions.getInstance()); 175 OptionsPage.register(AccountsOptions.getInstance());
182 OptionsPage.registerSubPage(ProxyOptions.getInstance(), 176 OptionsPage.registerSubPage(ProxyOptions.getInstance(),
183 InternetOptions.getInstance()); 177 InternetOptions.getInstance());
184 OptionsPage.registerSubPage(ChangePictureOptions.getInstance(), 178 OptionsPage.registerSubPage(ChangePictureOptions.getInstance(),
185 PersonalOptions.getInstance(), 179 PersonalOptions.getInstance(),
186 [$('change-picture-button')]); 180 [$('change-picture-button')]);
187 OptionsPage.registerOverlay(DetailsInternetPage.getInstance(), 181 OptionsPage.registerOverlay(DetailsInternetPage.getInstance(),
188 InternetOptions.getInstance()); 182 InternetOptions.getInstance());
189 183
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 232
239 document.addEventListener('DOMContentLoaded', load); 233 document.addEventListener('DOMContentLoaded', load);
240 234
241 window.onpopstate = function(e) { 235 window.onpopstate = function(e) {
242 options.OptionsPage.setState(e.state); 236 options.OptionsPage.setState(e.state);
243 }; 237 };
244 238
245 window.onbeforeunload = function() { 239 window.onbeforeunload = function() {
246 options.OptionsPage.willClose(); 240 options.OptionsPage.willClose();
247 }; 241 };
OLDNEW
« no previous file with comments | « chrome/browser/resources/options2/options.html ('k') | chrome/browser/resources/options2/options_bundle.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698