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

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

Issue 533183002: Revert "Eliminate all code related to the AutomaticProfileResetter." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed next set of comments from gab@. Created 6 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
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 17 matching lines...) Expand all
28 var HotwordConfirmDialog = options.HotwordConfirmDialog; 28 var HotwordConfirmDialog = options.HotwordConfirmDialog;
29 var ImportDataOverlay = options.ImportDataOverlay; 29 var ImportDataOverlay = options.ImportDataOverlay;
30 var LanguageOptions = options.LanguageOptions; 30 var LanguageOptions = options.LanguageOptions;
31 var ManageProfileOverlay = options.ManageProfileOverlay; 31 var ManageProfileOverlay = options.ManageProfileOverlay;
32 var OptionsFocusManager = options.OptionsFocusManager; 32 var OptionsFocusManager = options.OptionsFocusManager;
33 var OptionsPage = options.OptionsPage; 33 var OptionsPage = options.OptionsPage;
34 var PageManager = cr.ui.pageManager.PageManager; 34 var PageManager = cr.ui.pageManager.PageManager;
35 var PasswordManager = options.PasswordManager; 35 var PasswordManager = options.PasswordManager;
36 var Preferences = options.Preferences; 36 var Preferences = options.Preferences;
37 var PreferredNetworks = options.PreferredNetworks; 37 var PreferredNetworks = options.PreferredNetworks;
38 var ResetProfileSettingsBanner = options.ResetProfileSettingsBanner;
38 var ResetProfileSettingsOverlay = options.ResetProfileSettingsOverlay; 39 var ResetProfileSettingsOverlay = options.ResetProfileSettingsOverlay;
39 var SearchEngineManager = options.SearchEngineManager; 40 var SearchEngineManager = options.SearchEngineManager;
40 var SearchPage = options.SearchPage; 41 var SearchPage = options.SearchPage;
41 var StartupOverlay = options.StartupOverlay; 42 var StartupOverlay = options.StartupOverlay;
42 var SupervisedUserCreateConfirmOverlay = 43 var SupervisedUserCreateConfirmOverlay =
43 options.SupervisedUserCreateConfirmOverlay; 44 options.SupervisedUserCreateConfirmOverlay;
44 var SupervisedUserImportOverlay = options.SupervisedUserImportOverlay; 45 var SupervisedUserImportOverlay = options.SupervisedUserImportOverlay;
45 var SupervisedUserLearnMoreOverlay = options.SupervisedUserLearnMoreOverlay; 46 var SupervisedUserLearnMoreOverlay = options.SupervisedUserLearnMoreOverlay;
46 var SyncSetupOverlay = options.SyncSetupOverlay; 47 var SyncSetupOverlay = options.SyncSetupOverlay;
47 var WebsiteSettingsEditor = options.WebsiteSettings.WebsiteSettingsEditor; 48 var WebsiteSettingsEditor = options.WebsiteSettings.WebsiteSettingsEditor;
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 PageManager.registerOverlay(CertificateManager.getInstance(), 231 PageManager.registerOverlay(CertificateManager.getInstance(),
231 BrowserOptions.getInstance(), 232 BrowserOptions.getInstance(),
232 [$('certificatesManageButton')]); 233 [$('certificatesManageButton')]);
233 PageManager.registerOverlay(CertificateRestoreOverlay.getInstance(), 234 PageManager.registerOverlay(CertificateRestoreOverlay.getInstance(),
234 CertificateManager.getInstance()); 235 CertificateManager.getInstance());
235 } 236 }
236 237
237 cr.ui.FocusManager.disableMouseFocusOnButtons(); 238 cr.ui.FocusManager.disableMouseFocusOnButtons();
238 OptionsFocusManager.getInstance().initialize(); 239 OptionsFocusManager.getInstance().initialize();
239 Preferences.getInstance().initialize(); 240 Preferences.getInstance().initialize();
241 ResetProfileSettingsBanner.getInstance().initialize();
240 AutomaticSettingsResetBanner.getInstance().initialize(); 242 AutomaticSettingsResetBanner.getInstance().initialize();
241 OptionsPage.initialize(); 243 OptionsPage.initialize();
242 PageManager.initialize(BrowserOptions.getInstance()); 244 PageManager.initialize(BrowserOptions.getInstance());
243 PageManager.addObserver(new uber.PageManagerObserver()); 245 PageManager.addObserver(new uber.PageManagerObserver());
244 uber.onContentFrameLoaded(); 246 uber.onContentFrameLoaded();
245 247
246 var pageName = PageManager.getPageNameFromPath(); 248 var pageName = PageManager.getPageNameFromPath();
247 // Still update history so that chrome://settings/nonexistant redirects 249 // Still update history so that chrome://settings/nonexistant redirects
248 // appropriately to chrome://settings/. If the URL matches, updateHistory_ 250 // appropriately to chrome://settings/. If the URL matches, updateHistory_
249 // will avoid the extra replaceState. 251 // will avoid the extra replaceState.
(...skipping 24 matching lines...) Expand all
274 }; 276 };
275 277
276 /** 278 /**
277 * Listener for the |popstate| event. 279 * Listener for the |popstate| event.
278 * @param {Event} e The |popstate| event. 280 * @param {Event} e The |popstate| event.
279 */ 281 */
280 window.onpopstate = function(e) { 282 window.onpopstate = function(e) {
281 var pageName = PageManager.getPageNameFromPath(); 283 var pageName = PageManager.getPageNameFromPath();
282 PageManager.setState(pageName, e.state); 284 PageManager.setState(pageName, e.state);
283 }; 285 };
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698