chrome/browser/resources/options/options.js - Issue 14066003: Don't allow elevation for CHROME_OS.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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:

Index: chrome/browser/resources/options/options.js

diff --git a/chrome/browser/resources/options/options.js b/chrome/browser/resources/options/options.js

index d62526bed08617d930629dcf8cc9ec88c467fb03..599b07c1df8a9c7a80a590a2bd707e508f008325 100644

--- a/chrome/browser/resources/options/options.js

+++ b/chrome/browser/resources/options/options.js

@@ -149,9 +149,11 @@ function load() {

if (loadTimeData.getBoolean('managedUsersEnabled')) {

OptionsPage.registerOverlay(ManagedUserSettingsExceptionsArea.getInstance(),

ManagedUserSettings.getInstance());

- OptionsPage.registerOverlay(ManagedUserSetPassphraseOverlay.getInstance(),

- ManagedUserSettings.getInstance(),

- [$('set-passphrase')]);

+ if (!cr.isChromeOS) {

+ OptionsPage.registerOverlay(ManagedUserSetPassphraseOverlay.getInstance(),

+ ManagedUserSettings.getInstance(),

+ [$('set-passphrase')]);

+ }

OptionsPage.registerOverlay(ManagedUserSettings.getInstance(),

BrowserOptions.getInstance(),

[$('managed-user-settings-button')]);