chrome/browser/resources/options/options.js - Issue 403343002: Rename "managed (mode|user)" to "supervised user" (part 8)

Unified Diff: chrome/browser/resources/options/options.js

Issue 403343002: Rename "managed (mode|user)" to "supervised user" (part 8) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix2 Created 6 years, 5 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/options/browser_options_profile_list.js ('K') | « chrome/browser/resources/options/options.html ('k') | chrome/browser/resources/options/options_bundle.js » ('j') | chrome/browser/resources/options/supervised_user_import.html » ('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 e4d156a68c24ff618029b43248ddd02f309d58ea..5ba7a3426dc59c8932492c806c39186f0eeff782 100644

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

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

@@ -28,9 +28,6 @@ var HotwordConfirmDialog = options.HotwordConfirmDialog;

var ImportDataOverlay = options.ImportDataOverlay;

var LanguageOptions = options.LanguageOptions;

var ManageProfileOverlay = options.ManageProfileOverlay;

-var ManagedUserCreateConfirmOverlay = options.ManagedUserCreateConfirmOverlay;

-var ManagedUserImportOverlay = options.ManagedUserImportOverlay;

-var ManagedUserLearnMoreOverlay = options.ManagedUserLearnMoreOverlay;

var OptionsFocusManager = options.OptionsFocusManager;

var OptionsPage = options.OptionsPage;

var PasswordManager = options.PasswordManager;

@@ -41,6 +38,10 @@ var ResetProfileSettingsOverlay = options.ResetProfileSettingsOverlay;

var SearchEngineManager = options.SearchEngineManager;

var SearchPage = options.SearchPage;

var StartupOverlay = options.StartupOverlay;

+var SupervisedUserCreateConfirmOverlay =

+ options.SupervisedUserCreateConfirmOverlay;

Pam (message me for reviews) 2014/07/23 21:13:39 4-space indent

Marc Treib 2014/07/24 12:11:54 Done.

+var SupervisedUserImportOverlay = options.SupervisedUserImportOverlay;

+var SupervisedUserLearnMoreOverlay = options.SupervisedUserLearnMoreOverlay;

var SyncSetupOverlay = options.SyncSetupOverlay;

var WebsiteSettingsManager = options.WebsiteSettingsManager;

var ThirdPartyImeConfirmOverlay = options.ThirdPartyImeConfirmOverlay;

@@ -148,11 +149,12 @@ function load() {

OptionsPage.registerOverlay(ManageProfileOverlay.getInstance(),

BrowserOptions.getInstance());

if (!cr.isChromeOS) {

- OptionsPage.registerOverlay(ManagedUserCreateConfirmOverlay.getInstance(),

+ OptionsPage.registerOverlay(SupervisedUserCreateConfirmOverlay.

+ getInstance(),

BrowserOptions.getInstance());

- OptionsPage.registerOverlay(ManagedUserImportOverlay.getInstance(),

+ OptionsPage.registerOverlay(SupervisedUserImportOverlay.getInstance(),

CreateProfileOverlay.getInstance());

- OptionsPage.registerOverlay(ManagedUserLearnMoreOverlay.getInstance(),

+ OptionsPage.registerOverlay(SupervisedUserLearnMoreOverlay.getInstance(),

CreateProfileOverlay.getInstance());

}

OptionsPage.registerOverlay(PasswordManager.getInstance(),