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

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

Issue 143903021: Add disable flag around supervised user import code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address nit. Created 6 years, 10 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 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 BrowserOptions.getInstance()); 145 BrowserOptions.getInstance());
146 OptionsPage.registerOverlay(LanguageOptions.getInstance(), 146 OptionsPage.registerOverlay(LanguageOptions.getInstance(),
147 BrowserOptions.getInstance(), 147 BrowserOptions.getInstance(),
148 [$('language-button'), 148 [$('language-button'),
149 $('manage-languages')]); 149 $('manage-languages')]);
150 OptionsPage.registerOverlay(ManageProfileOverlay.getInstance(), 150 OptionsPage.registerOverlay(ManageProfileOverlay.getInstance(),
151 BrowserOptions.getInstance()); 151 BrowserOptions.getInstance());
152 if (!cr.isChromeOS) { 152 if (!cr.isChromeOS) {
153 OptionsPage.registerOverlay(ManagedUserCreateConfirmOverlay.getInstance(), 153 OptionsPage.registerOverlay(ManagedUserCreateConfirmOverlay.getInstance(),
154 BrowserOptions.getInstance()); 154 BrowserOptions.getInstance());
155 if (loadTimeData.getBoolean('allowCreateExistingManagedUsers')) { 155 if (!loadTimeData.getBoolean('disableCreateExistingManagedUsers')) {
156 OptionsPage.registerOverlay(ManagedUserImportOverlay.getInstance(), 156 OptionsPage.registerOverlay(ManagedUserImportOverlay.getInstance(),
157 BrowserOptions.getInstance()); 157 BrowserOptions.getInstance());
158 } 158 }
159 OptionsPage.registerOverlay(ManagedUserLearnMoreOverlay.getInstance(), 159 OptionsPage.registerOverlay(ManagedUserLearnMoreOverlay.getInstance(),
160 CreateProfileOverlay.getInstance()); 160 CreateProfileOverlay.getInstance());
161 } 161 }
162 OptionsPage.registerOverlay(MediaGalleriesManager.getInstance(), 162 OptionsPage.registerOverlay(MediaGalleriesManager.getInstance(),
163 ContentSettings.getInstance(), 163 ContentSettings.getInstance(),
164 [$('manage-galleries-button')]); 164 [$('manage-galleries-button')]);
165 OptionsPage.registerOverlay(PasswordManager.getInstance(), 165 OptionsPage.registerOverlay(PasswordManager.getInstance(),
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 options.OptionsPage.willClose(); 260 options.OptionsPage.willClose();
261 }; 261 };
262 262
263 /** 263 /**
264 * Listener for the |popstate| event. 264 * Listener for the |popstate| event.
265 * @param {Event} e The |popstate| event. 265 * @param {Event} e The |popstate| event.
266 */ 266 */
267 window.onpopstate = function(e) { 267 window.onpopstate = function(e) {
268 options.OptionsPage.setState(e.state); 268 options.OptionsPage.setState(e.state);
269 }; 269 };
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/manage_profile_overlay.js ('k') | chrome/browser/ui/webui/options/create_profile_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698