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

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

Issue 10689116: Cleanup: better session restore UI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased. Created 8 years, 5 months 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) 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;
(...skipping 10 matching lines...) Expand all
21 var LanguageOptions = options.LanguageOptions; 21 var LanguageOptions = options.LanguageOptions;
22 var MediaGalleryManager = options.MediaGalleryManager; 22 var MediaGalleryManager = options.MediaGalleryManager;
23 var OptionsFocusManager = options.OptionsFocusManager; 23 var OptionsFocusManager = options.OptionsFocusManager;
24 var OptionsPage = options.OptionsPage; 24 var OptionsPage = options.OptionsPage;
25 var PasswordManager = options.PasswordManager; 25 var PasswordManager = options.PasswordManager;
26 var Preferences = options.Preferences; 26 var Preferences = options.Preferences;
27 var PreferredNetworks = options.PreferredNetworks; 27 var PreferredNetworks = options.PreferredNetworks;
28 var ManageProfileOverlay = options.ManageProfileOverlay; 28 var ManageProfileOverlay = options.ManageProfileOverlay;
29 var SearchEngineManager = options.SearchEngineManager; 29 var SearchEngineManager = options.SearchEngineManager;
30 var SearchPage = options.SearchPage; 30 var SearchPage = options.SearchPage;
31 var SessionRestoreOverlay = options.SessionRestoreOverlay;
32 var SpellingConfirmOverlay = options.SpellingConfirmOverlay; 31 var SpellingConfirmOverlay = options.SpellingConfirmOverlay;
33 var StartupOverlay = options.StartupOverlay; 32 var StartupOverlay = options.StartupOverlay;
34 var SyncSetupOverlay = options.SyncSetupOverlay; 33 var SyncSetupOverlay = options.SyncSetupOverlay;
35 34
36 /** 35 /**
37 * DOMContentLoaded handler, sets up the page. 36 * DOMContentLoaded handler, sets up the page.
38 */ 37 */
39 function load() { 38 function load() {
40 // Decorate the existing elements in the document. 39 // Decorate the existing elements in the document.
41 cr.ui.decorate('input[pref][type=checkbox]', options.PrefCheckbox); 40 cr.ui.decorate('input[pref][type=checkbox]', options.PrefCheckbox);
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 BrowserOptions.getInstance()); 101 BrowserOptions.getInstance());
103 OptionsPage.registerOverlay(MediaGalleryManager.getInstance(), 102 OptionsPage.registerOverlay(MediaGalleryManager.getInstance(),
104 ContentSettings.getInstance(), 103 ContentSettings.getInstance(),
105 [$('manage-galleries-button')]); 104 [$('manage-galleries-button')]);
106 OptionsPage.registerOverlay(PasswordManager.getInstance(), 105 OptionsPage.registerOverlay(PasswordManager.getInstance(),
107 BrowserOptions.getInstance(), 106 BrowserOptions.getInstance(),
108 [$('manage-passwords')]); 107 [$('manage-passwords')]);
109 OptionsPage.registerOverlay(SearchEngineManager.getInstance(), 108 OptionsPage.registerOverlay(SearchEngineManager.getInstance(),
110 BrowserOptions.getInstance(), 109 BrowserOptions.getInstance(),
111 [$('manage-default-search-engines')]); 110 [$('manage-default-search-engines')]);
112 OptionsPage.registerOverlay(SessionRestoreOverlay.getInstance(),
113 BrowserOptions.getInstance());
114 OptionsPage.registerOverlay(SpellingConfirmOverlay.getInstance(), 111 OptionsPage.registerOverlay(SpellingConfirmOverlay.getInstance(),
115 BrowserOptions.getInstance()); 112 BrowserOptions.getInstance());
116 OptionsPage.registerOverlay(StartupOverlay.getInstance(), 113 OptionsPage.registerOverlay(StartupOverlay.getInstance(),
117 BrowserOptions.getInstance()); 114 BrowserOptions.getInstance());
118 OptionsPage.registerOverlay(SyncSetupOverlay.getInstance(), 115 OptionsPage.registerOverlay(SyncSetupOverlay.getInstance(),
119 BrowserOptions.getInstance()); 116 BrowserOptions.getInstance());
120 if (cr.isChromeOS) { 117 if (cr.isChromeOS) {
121 OptionsPage.registerOverlay(AccountsOptions.getInstance(), 118 OptionsPage.registerOverlay(AccountsOptions.getInstance(),
122 BrowserOptions.getInstance(), 119 BrowserOptions.getInstance(),
123 [$('manage-accounts-button')]); 120 [$('manage-accounts-button')]);
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 options.OptionsPage.willClose(); 222 options.OptionsPage.willClose();
226 }; 223 };
227 224
228 /** 225 /**
229 * Listener for the |popstate| event. 226 * Listener for the |popstate| event.
230 * @param {Event} e The |popstate| event. 227 * @param {Event} e The |popstate| event.
231 */ 228 */
232 window.onpopstate = function(e) { 229 window.onpopstate = function(e) {
233 options.OptionsPage.setState(e.state); 230 options.OptionsPage.setState(e.state);
234 }; 231 };
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