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

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

Issue 2236213002: Add quick unlock Settings in options page (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: incorporate comments from jdufault@ Created 4 years, 4 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 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 BrowserOptions.getInstance(), 224 BrowserOptions.getInstance(),
225 [$('pointer-settings-button')]); 225 [$('pointer-settings-button')]);
226 PageManager.registerOverlay(PreferredNetworks.getInstance(), 226 PageManager.registerOverlay(PreferredNetworks.getInstance(),
227 BrowserOptions.getInstance()); 227 BrowserOptions.getInstance());
228 PageManager.registerOverlay(NoteOverlay.getInstance(), 228 PageManager.registerOverlay(NoteOverlay.getInstance(),
229 BrowserOptions.getInstance(), 229 BrowserOptions.getInstance(),
230 [$('note-settings-link')]); 230 [$('note-settings-link')]);
231 PageManager.registerOverlay(PowerOverlay.getInstance(), 231 PageManager.registerOverlay(PowerOverlay.getInstance(),
232 BrowserOptions.getInstance(), 232 BrowserOptions.getInstance(),
233 [$('power-settings-link')]); 233 [$('power-settings-link')]);
234 PageManager.registerOverlay(QuickUnlockConfigureOverlay.getInstance(),
235 BrowserOptions.getInstance(),
236 [$('manage-screenlock')]);
234 PageManager.registerOverlay(StorageManager.getInstance(), 237 PageManager.registerOverlay(StorageManager.getInstance(),
235 BrowserOptions.getInstance(), 238 BrowserOptions.getInstance(),
236 [$('storage-manager-button')]); 239 [$('storage-manager-button')]);
237 PageManager.registerOverlay(ThirdPartyImeConfirmOverlay.getInstance(), 240 PageManager.registerOverlay(ThirdPartyImeConfirmOverlay.getInstance(),
238 LanguageOptions.getInstance()); 241 LanguageOptions.getInstance());
239 PageManager.registerOverlay( 242 PageManager.registerOverlay(
240 new ConfirmDialog( 243 new ConfirmDialog(
241 'arcOptOutConfirm', 244 'arcOptOutConfirm',
242 loadTimeData.getString('arcOptOutConfirmOverlayTabTitle'), 245 loadTimeData.getString('arcOptOutConfirmOverlayTabTitle'),
243 'arc-opt-out-confirm-overlay', 246 'arc-opt-out-confirm-overlay',
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
304 }; 307 };
305 308
306 /** 309 /**
307 * Listener for the |popstate| event. 310 * Listener for the |popstate| event.
308 * @param {Event} e The |popstate| event. 311 * @param {Event} e The |popstate| event.
309 */ 312 */
310 window.onpopstate = function(e) { 313 window.onpopstate = function(e) {
311 var pageName = PageManager.getPageNameFromPath(); 314 var pageName = PageManager.getPageNameFromPath();
312 PageManager.setState(pageName, location.hash, e.state); 315 PageManager.setState(pageName, location.hash, e.state);
313 }; 316 };
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698