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

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

Issue 445503003: Update easy unlock settings UI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add spinner Created 6 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 | 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 AutomaticSettingsResetBanner = options.AutomaticSettingsResetBanner; 10 var AutomaticSettingsResetBanner = options.AutomaticSettingsResetBanner;
11 var BrowserOptions = options.BrowserOptions; 11 var BrowserOptions = options.BrowserOptions;
12 var ClearBrowserDataOverlay = options.ClearBrowserDataOverlay; 12 var ClearBrowserDataOverlay = options.ClearBrowserDataOverlay;
13 var ConfirmDialog = options.ConfirmDialog; 13 var ConfirmDialog = options.ConfirmDialog;
14 var ContentSettingsExceptionsArea = 14 var ContentSettingsExceptionsArea =
15 options.contentSettings.ContentSettingsExceptionsArea; 15 options.contentSettings.ContentSettingsExceptionsArea;
16 var ContentSettings = options.ContentSettings; 16 var ContentSettings = options.ContentSettings;
17 var CookiesView = options.CookiesView; 17 var CookiesView = options.CookiesView;
18 var CreateProfileOverlay = options.CreateProfileOverlay; 18 var CreateProfileOverlay = options.CreateProfileOverlay;
19 var EditDictionaryOverlay = cr.IsMac ? null : options.EditDictionaryOverlay; 19 var EditDictionaryOverlay = cr.IsMac ? null : options.EditDictionaryOverlay;
20 var EasyUnlockTurnOffOverlay = options.EasyUnlockTurnOffOverlay;
20 var FactoryResetOverlay = options.FactoryResetOverlay; 21 var FactoryResetOverlay = options.FactoryResetOverlay;
21 <if expr="enable_google_now"> 22 <if expr="enable_google_now">
22 var GeolocationOptions = options.GeolocationOptions; 23 var GeolocationOptions = options.GeolocationOptions;
23 </if> 24 </if>
24 var FontSettings = options.FontSettings; 25 var FontSettings = options.FontSettings;
25 var HandlerOptions = options.HandlerOptions; 26 var HandlerOptions = options.HandlerOptions;
26 var HomePageOverlay = options.HomePageOverlay; 27 var HomePageOverlay = options.HomePageOverlay;
27 var HotwordConfirmDialog = options.HotwordConfirmDialog; 28 var HotwordConfirmDialog = options.HotwordConfirmDialog;
28 var ImportDataOverlay = options.ImportDataOverlay; 29 var ImportDataOverlay = options.ImportDataOverlay;
29 var LanguageOptions = options.LanguageOptions; 30 var LanguageOptions = options.LanguageOptions;
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 BrowserOptions.getInstance(), 118 BrowserOptions.getInstance(),
118 [$('website-management-button')]); 119 [$('website-management-button')]);
119 PageManager.registerOverlay(ContentSettingsExceptionsArea.getInstance(), 120 PageManager.registerOverlay(ContentSettingsExceptionsArea.getInstance(),
120 ContentSettings.getInstance()); 121 ContentSettings.getInstance());
121 PageManager.registerOverlay(CookiesView.getInstance(), 122 PageManager.registerOverlay(CookiesView.getInstance(),
122 ContentSettings.getInstance(), 123 ContentSettings.getInstance(),
123 [$('privacyContentSettingsButton'), 124 [$('privacyContentSettingsButton'),
124 $('show-cookies-button')]); 125 $('show-cookies-button')]);
125 PageManager.registerOverlay(CreateProfileOverlay.getInstance(), 126 PageManager.registerOverlay(CreateProfileOverlay.getInstance(),
126 BrowserOptions.getInstance()); 127 BrowserOptions.getInstance());
128 PageManager.registerOverlay(EasyUnlockTurnOffOverlay.getInstance(),
129 BrowserOptions.getInstance(),
130 [$('easy-unlock-turn-off-button')]);
127 if (!cr.isMac) { 131 if (!cr.isMac) {
128 PageManager.registerOverlay(EditDictionaryOverlay.getInstance(), 132 PageManager.registerOverlay(EditDictionaryOverlay.getInstance(),
129 LanguageOptions.getInstance(), 133 LanguageOptions.getInstance(),
130 [$('edit-dictionary-button')]); 134 [$('edit-dictionary-button')]);
131 } 135 }
132 PageManager.registerOverlay(FontSettings.getInstance(), 136 PageManager.registerOverlay(FontSettings.getInstance(),
133 BrowserOptions.getInstance(), 137 BrowserOptions.getInstance(),
134 [$('fontSettingsCustomizeFontsButton')]); 138 [$('fontSettingsCustomizeFontsButton')]);
135 if (HandlerOptions && $('manage-handlers-button')) { 139 if (HandlerOptions && $('manage-handlers-button')) {
136 PageManager.registerOverlay(HandlerOptions.getInstance(), 140 PageManager.registerOverlay(HandlerOptions.getInstance(),
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 }; 261 };
258 262
259 /** 263 /**
260 * Listener for the |popstate| event. 264 * Listener for the |popstate| event.
261 * @param {Event} e The |popstate| event. 265 * @param {Event} e The |popstate| event.
262 */ 266 */
263 window.onpopstate = function(e) { 267 window.onpopstate = function(e) {
264 var pageName = PageManager.getPageNameFromPath(); 268 var pageName = PageManager.getPageNameFromPath();
265 PageManager.setState(pageName, e.state); 269 PageManager.setState(pageName, e.state);
266 }; 270 };
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/options.html ('k') | chrome/browser/resources/options/options_bundle.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698