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

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

Issue 14066003: Don't allow elevation for CHROME_OS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix bug in set_elevated function. Created 7 years, 8 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 BrowserOptions = options.BrowserOptions; 10 var BrowserOptions = options.BrowserOptions;
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 OptionsPage.registerOverlay(ImportDataOverlay.getInstance(), 142 OptionsPage.registerOverlay(ImportDataOverlay.getInstance(),
143 BrowserOptions.getInstance()); 143 BrowserOptions.getInstance());
144 OptionsPage.registerOverlay(LanguageOptions.getInstance(), 144 OptionsPage.registerOverlay(LanguageOptions.getInstance(),
145 BrowserOptions.getInstance(), 145 BrowserOptions.getInstance(),
146 [$('language-button')]); 146 [$('language-button')]);
147 OptionsPage.registerOverlay(ManageProfileOverlay.getInstance(), 147 OptionsPage.registerOverlay(ManageProfileOverlay.getInstance(),
148 BrowserOptions.getInstance()); 148 BrowserOptions.getInstance());
149 if (loadTimeData.getBoolean('managedUsersEnabled')) { 149 if (loadTimeData.getBoolean('managedUsersEnabled')) {
150 OptionsPage.registerOverlay(ManagedUserSettingsExceptionsArea.getInstance(), 150 OptionsPage.registerOverlay(ManagedUserSettingsExceptionsArea.getInstance(),
151 ManagedUserSettings.getInstance()); 151 ManagedUserSettings.getInstance());
152 OptionsPage.registerOverlay(ManagedUserSetPassphraseOverlay.getInstance(), 152 if (!cr.isChromeOS) {
153 ManagedUserSettings.getInstance(), 153 OptionsPage.registerOverlay(ManagedUserSetPassphraseOverlay.getInstance(),
154 [$('set-passphrase')]); 154 ManagedUserSettings.getInstance(),
155 [$('set-passphrase')]);
156 }
155 OptionsPage.registerOverlay(ManagedUserSettings.getInstance(), 157 OptionsPage.registerOverlay(ManagedUserSettings.getInstance(),
156 BrowserOptions.getInstance(), 158 BrowserOptions.getInstance(),
157 [$('managed-user-settings-button')]); 159 [$('managed-user-settings-button')]);
158 } 160 }
159 OptionsPage.registerOverlay(MediaGalleriesManager.getInstance(), 161 OptionsPage.registerOverlay(MediaGalleriesManager.getInstance(),
160 ContentSettings.getInstance(), 162 ContentSettings.getInstance(),
161 [$('manage-galleries-button')]); 163 [$('manage-galleries-button')]);
162 OptionsPage.registerOverlay(PasswordManager.getInstance(), 164 OptionsPage.registerOverlay(PasswordManager.getInstance(),
163 BrowserOptions.getInstance(), 165 BrowserOptions.getInstance(),
164 [$('manage-passwords')]); 166 [$('manage-passwords')]);
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 options.OptionsPage.willClose(); 282 options.OptionsPage.willClose();
281 }; 283 };
282 284
283 /** 285 /**
284 * Listener for the |popstate| event. 286 * Listener for the |popstate| event.
285 * @param {Event} e The |popstate| event. 287 * @param {Event} e The |popstate| event.
286 */ 288 */
287 window.onpopstate = function(e) { 289 window.onpopstate = function(e) {
288 options.OptionsPage.setState(e.state); 290 options.OptionsPage.setState(e.state);
289 }; 291 };
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698