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

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

Issue 2334003006: Merges two options reset overlay classes (Closed)
Patch Set: Fix variable name. Created 4 years, 3 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
« no previous file with comments | « no previous file | chrome/browser/resources/options/options_bundle.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 AutomaticSettingsResetBanner = options.AutomaticSettingsResetBanner; 10 var AutomaticSettingsResetBanner = options.AutomaticSettingsResetBanner;
(...skipping 29 matching lines...) Expand all
40 var ResetProfileSettingsOverlay = options.ResetProfileSettingsOverlay; 40 var ResetProfileSettingsOverlay = options.ResetProfileSettingsOverlay;
41 var SearchEngineManager = options.SearchEngineManager; 41 var SearchEngineManager = options.SearchEngineManager;
42 var SearchPage = options.SearchPage; 42 var SearchPage = options.SearchPage;
43 var StartupOverlay = options.StartupOverlay; 43 var StartupOverlay = options.StartupOverlay;
44 var SupervisedUserCreateConfirmOverlay = 44 var SupervisedUserCreateConfirmOverlay =
45 options.SupervisedUserCreateConfirmOverlay; 45 options.SupervisedUserCreateConfirmOverlay;
46 var SupervisedUserImportOverlay = options.SupervisedUserImportOverlay; 46 var SupervisedUserImportOverlay = options.SupervisedUserImportOverlay;
47 var SupervisedUserLearnMoreOverlay = options.SupervisedUserLearnMoreOverlay; 47 var SupervisedUserLearnMoreOverlay = options.SupervisedUserLearnMoreOverlay;
48 var SyncSetupOverlay = options.SyncSetupOverlay; 48 var SyncSetupOverlay = options.SyncSetupOverlay;
49 var ThirdPartyImeConfirmOverlay = options.ThirdPartyImeConfirmOverlay; 49 var ThirdPartyImeConfirmOverlay = options.ThirdPartyImeConfirmOverlay;
50 var TriggeredResetProfileSettingsOverlay =
51 options.TriggeredResetProfileSettingsOverlay;
52 50
53 /** 51 /**
54 * DOMContentLoaded handler, sets up the page. 52 * DOMContentLoaded handler, sets up the page.
55 */ 53 */
56 function load() { 54 function load() {
57 // Decorate the existing elements in the document. 55 // Decorate the existing elements in the document.
58 cr.ui.decorate('input[pref][type=checkbox]', options.PrefCheckbox); 56 cr.ui.decorate('input[pref][type=checkbox]', options.PrefCheckbox);
59 cr.ui.decorate('input[pref][type=number]', options.PrefNumber); 57 cr.ui.decorate('input[pref][type=number]', options.PrefNumber);
60 cr.ui.decorate('input[pref][type=radio]', options.PrefRadio); 58 cr.ui.decorate('input[pref][type=radio]', options.PrefRadio);
61 cr.ui.decorate('input[pref][type=range]', options.PrefRange); 59 cr.ui.decorate('input[pref][type=range]', options.PrefRange);
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 getInstance(), 156 getInstance(),
159 BrowserOptions.getInstance()); 157 BrowserOptions.getInstance());
160 PageManager.registerOverlay(SupervisedUserImportOverlay.getInstance(), 158 PageManager.registerOverlay(SupervisedUserImportOverlay.getInstance(),
161 CreateProfileOverlay.getInstance()); 159 CreateProfileOverlay.getInstance());
162 PageManager.registerOverlay(SupervisedUserLearnMoreOverlay.getInstance(), 160 PageManager.registerOverlay(SupervisedUserLearnMoreOverlay.getInstance(),
163 CreateProfileOverlay.getInstance()); 161 CreateProfileOverlay.getInstance());
164 } 162 }
165 PageManager.registerOverlay(PasswordManager.getInstance(), 163 PageManager.registerOverlay(PasswordManager.getInstance(),
166 BrowserOptions.getInstance(), 164 BrowserOptions.getInstance(),
167 [$('manage-passwords')]); 165 [$('manage-passwords')]);
168 PageManager.registerOverlay(ResetProfileSettingsOverlay.getInstance(), 166 PageManager.registerOverlay(
169 BrowserOptions.getInstance(), 167 new ResetProfileSettingsOverlay(false /* isTriggered */),
170 [$('reset-profile-settings')]); 168 BrowserOptions.getInstance(),
169 [$('reset-profile-settings')]);
171 PageManager.registerOverlay(SearchEngineManager.getInstance(), 170 PageManager.registerOverlay(SearchEngineManager.getInstance(),
172 BrowserOptions.getInstance(), 171 BrowserOptions.getInstance(),
173 [$('manage-default-search-engines')]); 172 [$('manage-default-search-engines')]);
174 PageManager.registerOverlay(StartupOverlay.getInstance(), 173 PageManager.registerOverlay(StartupOverlay.getInstance(),
175 BrowserOptions.getInstance()); 174 BrowserOptions.getInstance());
176 PageManager.registerOverlay(SyncSetupOverlay.getInstance(), 175 PageManager.registerOverlay(SyncSetupOverlay.getInstance(),
177 BrowserOptions.getInstance(), 176 BrowserOptions.getInstance(),
178 [$('customize-sync')]); 177 [$('customize-sync')]);
179 178
180 <if expr="is_win"> 179 <if expr="is_win">
181 PageManager.registerOverlay( 180 PageManager.registerOverlay(
182 TriggeredResetProfileSettingsOverlay.getInstance(), 181 new ResetProfileSettingsOverlay(true /* isTriggered */),
183 BrowserOptions.getInstance()); 182 BrowserOptions.getInstance());
184 </if> 183 </if>
185 184
186 if (loadTimeData.getBoolean('showAbout')) { 185 if (loadTimeData.getBoolean('showAbout')) {
187 PageManager.registerOverlay(help.HelpPage.getInstance(), 186 PageManager.registerOverlay(help.HelpPage.getInstance(),
188 BrowserOptions.getInstance()); 187 BrowserOptions.getInstance());
189 if (help.ChannelChangePage) { 188 if (help.ChannelChangePage) {
190 PageManager.registerOverlay(help.ChannelChangePage.getInstance(), 189 PageManager.registerOverlay(help.ChannelChangePage.getInstance(),
191 help.HelpPage.getInstance()); 190 help.HelpPage.getInstance());
192 } 191 }
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
305 }; 304 };
306 305
307 /** 306 /**
308 * Listener for the |popstate| event. 307 * Listener for the |popstate| event.
309 * @param {Event} e The |popstate| event. 308 * @param {Event} e The |popstate| event.
310 */ 309 */
311 window.onpopstate = function(e) { 310 window.onpopstate = function(e) {
312 var pageName = PageManager.getPageNameFromPath(); 311 var pageName = PageManager.getPageNameFromPath();
313 PageManager.setState(pageName, location.hash, e.state); 312 PageManager.setState(pageName, location.hash, e.state);
314 }; 313 };
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/options/options_bundle.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698