Handle the PasswordManagerAllowShowPasswords preference in the options webui.

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

 // Copyright (c) 2011 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/password_manager_handler.h"
 
 #include "base/callback.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
+#include "content/common/notification_details.h"
+#include "content/common/notification_source.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "webkit/glue/password_form.h"
 
 PasswordManagerHandler::PasswordManagerHandler()
     : ALLOW_THIS_IN_INITIALIZER_LIST(populater_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(exception_populater_(this)) {
 }
@@ skipping 36 matching lines @@
   RegisterStrings(localized_strings, resources, arraysize(resources));
   RegisterTitle(localized_strings, "passwordsPage",
                 IDS_PASSWORDS_EXCEPTIONS_WINDOW_TITLE);
 
   localized_strings->SetString("passwordManagerLearnMoreURL",
       google_util::AppendGoogleLocaleParam(
           GURL(chrome::kPasswordManagerLearnMoreURL)).spec());
 }
 
 void PasswordManagerHandler::Initialize() {
+  show_passwords_.Init(prefs::kPasswordManagerAllowShowPasswords,
+                       web_ui_->GetProfile()->GetPrefs(), this);
   // We should not cache web_ui_->GetProfile(). See crosbug.com/6304.
   GetPasswordStore()->AddObserver(this);
 }
 
 void PasswordManagerHandler::RegisterMessages() {
   DCHECK(web_ui_);
 
   web_ui_->RegisterMessageCallback("updatePasswordLists",
       NewCallback(this, &PasswordManagerHandler::UpdatePasswordLists));
   web_ui_->RegisterMessageCallback("removeSavedPassword",
       NewCallback(this, &PasswordManagerHandler::RemoveSavedPassword));
   web_ui_->RegisterMessageCallback("removePasswordException",
       NewCallback(this, &PasswordManagerHandler::RemovePasswordException));
   web_ui_->RegisterMessageCallback("removeAllSavedPasswords",
       NewCallback(this, &PasswordManagerHandler::RemoveAllSavedPasswords));
   web_ui_->RegisterMessageCallback("removeAllPasswordExceptions", NewCallback(
       this, &PasswordManagerHandler::RemoveAllPasswordExceptions));
 }
 
 void PasswordManagerHandler::OnLoginsChanged() {
   UpdatePasswordLists(NULL);
 }
 
 PasswordStore* PasswordManagerHandler::GetPasswordStore() {
   return web_ui_->GetProfile()->GetPasswordStore(Profile::EXPLICIT_ACCESS);
 }
 
+void PasswordManagerHandler::Observe(NotificationType type,
+                                 const NotificationSource& source,

[stuartmorgan, 2011/03/29 15:24:58]

Alignment is wrong on the continuation lines.

[Joao da Silva, 2011/03/31 10:03:22]

Done.

+                                 const NotificationDetails& details) {
+  if (type.value == NotificationType::PREF_CHANGED) {
+    std::string* pref_name = Details<std::string>(details).ptr();
+    if (*pref_name == prefs::kPasswordManagerAllowShowPasswords) {
+      // Call UpdatePasswordLists() to update the password data model too.
+      UpdatePasswordLists(NULL);
+      return;

[stuartmorgan, 2011/03/29 15:24:58]

Why the early return?

[Joao da Silva, 2011/03/31 10:03:22]

No reason for it, removed.

+    }
+  }
+
+  OptionsPageUIHandler::Observe(type, source, details);
+}
+
 void PasswordManagerHandler::UpdatePasswordLists(const ListValue* args) {
   // Reset the current lists.
   password_list_.reset();
   password_exception_list_.reset();
 
   languages_ =
       web_ui_->GetProfile()->GetPrefs()->GetString(prefs::kAcceptLanguages);
   populater_.Populate();
   exception_populater_.Populate();
 }
@@ skipping 25 matching lines @@
 
 void PasswordManagerHandler::RemoveAllPasswordExceptions(
     const ListValue* args) {
   PasswordStore* store = GetPasswordStore();
   for (size_t i = 0; i < password_exception_list_.size(); ++i)
     store->RemoveLogin(*password_exception_list_[i]);
 }
 
 void PasswordManagerHandler::SetPasswordList() {
   ListValue entries;
+  bool show_passwords = *show_passwords_;
   for (size_t i = 0; i < password_list_.size(); ++i) {
     ListValue* entry = new ListValue();
     entry->Append(new StringValue(net::FormatUrl(password_list_[i]->origin,
                                                  languages_)));
     entry->Append(new StringValue(password_list_[i]->username_value));
-    entry->Append(new StringValue(password_list_[i]->password_value));
+    entry->Append(new StringValue(
+        show_passwords ? password_list_[i]->password_value : string16()));
     entries.Append(entry);
   }
 
+  scoped_ptr<Value> show_value(Value::CreateBooleanValue(*show_passwords_));
+
   web_ui_->CallJavascriptFunction("PasswordManager.setSavedPasswordsList",
-                                  entries);
+                                  entries, *show_value);
 }
 
 void PasswordManagerHandler::SetPasswordExceptionList() {
   ListValue entries;
   for (size_t i = 0; i < password_exception_list_.size(); ++i) {
     entries.Append(new StringValue(
         net::FormatUrl(password_exception_list_[i]->origin, languages_)));
   }
 
   web_ui_->CallJavascriptFunction("PasswordManager.setPasswordExceptionsList",
@@ skipping 58 matching lines @@
     OnPasswordStoreRequestDone(
         CancelableRequestProvider::Handle handle,
         const std::vector<webkit_glue::PasswordForm*>& result) {
   DCHECK_EQ(pending_login_query_, handle);
   pending_login_query_ = 0;
   page_->password_exception_list_.reset();
   page_->password_exception_list_.insert(page_->password_exception_list_.end(),
                                          result.begin(), result.end());
   page_->SetPasswordExceptionList();
 }