Clean up managed user settings dialogs.

chrome/browser/ui/webui/options/managed_user_passphrase_handler.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/options/managed_user_passphrase_handler.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "base/values.h"
@@ skipping 21 matching lines @@
 
 void ManagedUserPassphraseHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback(
       "setPassphrase",
       base::Bind(&ManagedUserPassphraseHandler::SetLocalPassphrase,
                  weak_ptr_factory_.GetWeakPtr()));
   web_ui()->RegisterMessageCallback(
       "setElevated",
       base::Bind(&ManagedUserPassphraseHandler::SetElevated,
                  weak_ptr_factory_.GetWeakPtr()));
-  web_ui()->RegisterMessageCallback(
-      "resetPassphrase",
-      base::Bind(&ManagedUserPassphraseHandler::ResetPassphrase,
-                 weak_ptr_factory_.GetWeakPtr()));
 }
 
 void ManagedUserPassphraseHandler::GetLocalizedValues(
     base::DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
 
   static OptionsStringResource resources[] = {
     { "confirmPassphrase", IDS_CONFIRM_PASSPHRASE_LABEL },
     { "enterPassphrase", IDS_ENTER_PASSPHRASE_LABEL },
     { "savePassphrase", IDS_SAVE_PASSPHRASE_BUTTON },
@@ skipping 28 matching lines @@
     ManagedModeNavigationObserver::FromWebContents(
         web_ui()->GetWebContents())->set_elevated(false);
     return;
   }
   managed_user_service->RequestAuthorization(
       web_ui()->GetWebContents(),
       base::Bind(&ManagedUserPassphraseHandler::PassphraseDialogCallback,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
-void ManagedUserPassphraseHandler::ResetPassphrase(
-    const base::ListValue* args) {
-  PrefService* pref_service = Profile::FromWebUI(web_ui())->GetPrefs();
-  pref_service->SetString(prefs::kManagedModeLocalPassphrase, std::string());
-  pref_service->SetString(prefs::kManagedModeLocalSalt, std::string());
-}
-
 void ManagedUserPassphraseHandler::SetLocalPassphrase(
     const base::ListValue* args) {
   // Only change the passphrase if the custodian is authenticated.
   if (!ManagedModeNavigationObserver::FromWebContents(
-      web_ui()->GetWebContents())->is_elevated())
+      web_ui()->GetWebContents())->is_elevated()) {
     return;
+  }
 
+  PrefService* pref_service = Profile::FromWebUI(web_ui())->GetPrefs();
   std::string passphrase;
   args->GetString(0, &passphrase);
+  if (passphrase.empty()) {
+    pref_service->SetString(prefs::kManagedModeLocalPassphrase, std::string());
+    pref_service->SetString(prefs::kManagedModeLocalSalt, std::string());
+    return;
+  }
+
   ManagedUserPassphrase passphrase_key_generator((std::string()));
   std::string encoded_passphrase_hash;
   bool success = passphrase_key_generator.GenerateHashFromPassphrase(
       passphrase,
       &encoded_passphrase_hash);
   if (success) {
-    PrefService* pref_service = Profile::FromWebUI(web_ui())->GetPrefs();
     pref_service->SetString(prefs::kManagedModeLocalPassphrase,
                             encoded_passphrase_hash);
     pref_service->SetString(prefs::kManagedModeLocalSalt,
                             passphrase_key_generator.GetSalt());
   }
   // TODO(akuegel): Give failure back to the UI.
 }
 
 }  // namespace options