1 files changed, 9 insertions, 36 deletions

diff --git a/chrome/browser/ui/webui/options/managed_user_settings_handler.cc b/chrome/browser/ui/webui/options/managed_user_settings_handler.cc
index 8d07789..6b420d0 100644
--- a/chrome/browser/ui/webui/options/managed_user_settings_handler.cc
+++ b/chrome/browser/ui/webui/options/managed_user_settings_handler.cc
@@ -98,30 +98,12 @@ ManagedUserSettingsHandler::ManagedUserSettingsHandler()
 ManagedUserSettingsHandler::~ManagedUserSettingsHandler() {
 }
 
-void ManagedUserSettingsHandler::InitializeHandler() {
-  pref_change_registrar_.Init(Profile::FromWebUI(web_ui())->GetPrefs());
-  pref_change_registrar_.Add(
-      prefs::kManagedModeLocalPassphrase,
-      base::Bind(&ManagedUserSettingsHandler::OnLocalPassphraseChanged,
-                 base::Unretained(this)));
-}
-
 void ManagedUserSettingsHandler::InitializePage() {
   if (!CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableManagedUsers)) {
     return;
   }
 
-#if !defined(OS_CHROMEOS)
-  PrefService* pref_service = Profile::FromWebUI(web_ui())->GetPrefs();
-  bool passphrase_empty =
-      pref_service->GetString(prefs::kManagedModeLocalPassphrase).empty();
-  base::FundamentalValue is_passphrase_set(!passphrase_empty);
-  web_ui()->CallJavascriptFunction(
-      "ManagedUserSettings.passphraseChanged",
-      is_passphrase_set);
-#endif
-
   // Populate the list.
   UpdateViewFromModel();
 }
@@ -146,7 +128,7 @@ void ManagedUserSettingsHandler::HandlePageOpened(const base::ListValue* args) {
   }
 
   if (observer->is_elevated()) {
-    web_ui()->CallJavascriptFunction("ManagedUserSettings.isAuthenticated",
+    web_ui()->CallJavascriptFunction("ManagedUserSettings.setAuthenticated",
                                      base::FundamentalValue(true));
   }
 }
@@ -180,10 +162,7 @@ void ManagedUserSettingsHandler::GetLocalizedValues(
     // Other managed user settings
     { "advancedManagedUserSettings", IDS_ADVANCED_MANAGED_USER_LABEL },
     { "enableSafeSearch", IDS_SAFE_SEARCH_ENABLED },
-    { "allowSignIn", IDS_SIGNIN_SYNC_ALLOWED },
-    { "disableHistoryDeletion", IDS_HISTORY_DELETION_DISABLED },
-    { "usePassphrase", IDS_USE_PASSPHRASE_LABEL },
-    { "setPassphrase", IDS_SET_PASSPHRASE_BUTTON }
+    { "setPassphrase", IDS_SET_PASSPHRASE_BUTTON },
   };
 
   RegisterStrings(localized_strings, resources, arraysize(resources));
@@ -206,15 +185,17 @@ void ManagedUserSettingsHandler::RegisterMessages() {
       "settingsPageOpened",
       base::Bind(&ManagedUserSettingsHandler::HandlePageOpened,
                  base::Unretained(this)));
-  web_ui()->RegisterMessageCallback("removeManualException",
+  web_ui()->RegisterMessageCallback(
+      "removeManualException",
       base::Bind(&ManagedUserSettingsHandler::RemoveManualException,
                  base::Unretained(this)));
-  web_ui()->RegisterMessageCallback("setManualException",
+  web_ui()->RegisterMessageCallback(
+      "setManualException",
       base::Bind(&ManagedUserSettingsHandler::SetManualException,
                  base::Unretained(this)));
-  web_ui()->RegisterMessageCallback("checkManualExceptionValidity",
-      base::Bind(
-      &ManagedUserSettingsHandler::CheckManualExceptionValidity,
+  web_ui()->RegisterMessageCallback(
+      "checkManualExceptionValidity",
+      base::Bind(&ManagedUserSettingsHandler::CheckManualExceptionValidity,
                  base::Unretained(this)));
 }
 
@@ -229,14 +210,6 @@ void ManagedUserSettingsHandler::SaveMetrics(const ListValue* args) {
   }
 }
 
-void ManagedUserSettingsHandler::OnLocalPassphraseChanged() {
-  PrefService* pref_service = Profile::FromWebUI(web_ui())->GetPrefs();
-  base::FundamentalValue is_passphrase_set(!pref_service->GetString(
-      prefs::kManagedModeLocalPassphrase).empty());
-  web_ui()->CallJavascriptFunction("ManagedUserSettings.passphraseChanged",
-                                   is_passphrase_set);
-}
-
 void ManagedUserSettingsHandler::RemoveManualException(
     const ListValue* args) {
   // Check if the user is authenticated.