chrome/browser/resources/options/options.js - Issue 11783008: Add a lock to the managed user settings page and require authentication for unlocking.

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 11783008: Add a lock to the managed user settings page and require authentication for unlocking. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Add a check if the passphrase is set before closing the settings. Created 7 years, 11 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/resources/managed_user_passphrase_dialog.html ('K') | « chrome/browser/resources/options/options.html ('k') | chrome/browser/resources/options/options_bundle.js » ('j') | chrome/browser/ui/webui/options/managed_user_passphrase_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 3ab6a92bc4eb323abd249c1ad5b2704cb5530ec4..18d7c74883dfc1f09af53e633a8fb8ac2d5991a4 100644

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

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

@@ -17,6 +17,7 @@ var CookiesView = options.CookiesView;

var CreateProfileOverlay = options.CreateProfileOverlay;

var EditDictionaryOverlay = cr.IsMac ? null : options.EditDictionaryOverlay;

var FactoryResetOverlay = options.FactoryResetOverlay;

+var ManagedUserSetPassphraseOverlay = options.ManagedUserSetPassphraseOverlay;

var ManagedUserSettings = options.ManagedUserSettings;

var FontSettings = options.FontSettings;

var HandlerOptions = options.HandlerOptions;

@@ -144,9 +145,12 @@ function load() {

OptionsPage.registerOverlay(ManageProfileOverlay.getInstance(),

BrowserOptions.getInstance());

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

+ OptionsPage.registerOverlay(ManagedUserSetPassphraseOverlay.getInstance(),

+ ManagedUserSettings.getInstance(),

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

OptionsPage.registerOverlay(ManagedUserSettings.getInstance(),

BrowserOptions.getInstance(),

- []);

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

}

OptionsPage.registerOverlay(MediaGalleriesManager.getInstance(),

ContentSettings.getInstance(),