DOMUI: Implement new-style password manager.

chrome/browser/dom_ui/options/password_manager_handler.cc

 // Copyright (c) 2010 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/dom_ui/options/password_manager_handler.h"
 
 #include "app/l10n_util.h"
 #include "base/callback.h"
 #include "base/stl_util-inl.h"
 #include "base/string_number_conversions.h"
@@ skipping 12 matching lines @@
       ALLOW_THIS_IN_INITIALIZER_LIST(exception_populater_(this)) {
 }
 
 PasswordManagerHandler::~PasswordManagerHandler() {
 }
 
 void PasswordManagerHandler::GetLocalizedValues(
     DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
 
+  localized_strings->SetString("passwordsTitle",
+      l10n_util::GetStringUTF16(IDS_PASSWORDS_EXCEPTIONS_WINDOW_TITLE));
   localized_strings->SetString("savedPasswordsTitle",
-      l10n_util::GetStringUTF16(IDS_PASSWORDS_EXCEPTIONS_WINDOW_TITLE));
-  localized_strings->SetString("passwordsTabTitle",
       l10n_util::GetStringUTF16(IDS_PASSWORDS_SHOW_PASSWORDS_TAB_TITLE));
-  localized_strings->SetString("passwordExceptionsTabTitle",
+  localized_strings->SetString("passwordExceptionsTitle",
       l10n_util::GetStringUTF16(IDS_PASSWORDS_EXCEPTIONS_TAB_TITLE));
   localized_strings->SetString("passwordsSiteColumn",
       l10n_util::GetStringUTF16(IDS_PASSWORDS_PAGE_VIEW_SITE_COLUMN));
   localized_strings->SetString("passwordsUsernameColumn",
       l10n_util::GetStringUTF16(IDS_PASSWORDS_PAGE_VIEW_USERNAME_COLUMN));
   localized_strings->SetString("passwordsRemoveButton",
       l10n_util::GetStringUTF16(IDS_PASSWORDS_PAGE_VIEW_REMOVE_BUTTON));
   localized_strings->SetString("passwordsRemoveAllButton",
       l10n_util::GetStringUTF16(IDS_PASSWORDS_PAGE_VIEW_REMOVE_ALL_BUTTON));
   localized_strings->SetString("passwordsShowButton",
       l10n_util::GetStringUTF16(IDS_PASSWORDS_PAGE_VIEW_SHOW_BUTTON));
   localized_strings->SetString("passwordsHideButton",
       l10n_util::GetStringUTF16(IDS_PASSWORDS_PAGE_VIEW_HIDE_BUTTON));
   localized_strings->SetString("passwordsRemoveAllTitle",
       l10n_util::GetStringUTF16(
           IDS_PASSWORDS_PAGE_VIEW_CAPTION_DELETE_ALL_PASSWORDS));
   localized_strings->SetString("passwordsRemoveAllWarning",
       l10n_util::GetStringUTF16(
           IDS_PASSWORDS_PAGE_VIEW_TEXT_DELETE_ALL_PASSWORDS));
 }
 
 void PasswordManagerHandler::Initialize() {
   // We should not cache dom_ui_->GetProfile(). See crosbug.com/6304.
 }
 
 void PasswordManagerHandler::RegisterMessages() {
   DCHECK(dom_ui_);
 
-  dom_ui_->RegisterMessageCallback("loadLists",
-      NewCallback(this, &PasswordManagerHandler::LoadLists));
+  dom_ui_->RegisterMessageCallback("updatePasswordLists",
+      NewCallback(this, &PasswordManagerHandler::UpdatePasswordLists));
   dom_ui_->RegisterMessageCallback("removeSavedPassword",
       NewCallback(this, &PasswordManagerHandler::RemoveSavedPassword));
   dom_ui_->RegisterMessageCallback("removePasswordException",
       NewCallback(this, &PasswordManagerHandler::RemovePasswordException));
   dom_ui_->RegisterMessageCallback("removeAllSavedPasswords",
       NewCallback(this, &PasswordManagerHandler::RemoveAllSavedPasswords));
   dom_ui_->RegisterMessageCallback("removeAllPasswordExceptions", NewCallback(
       this, &PasswordManagerHandler::RemoveAllPasswordExceptions));
-  dom_ui_->RegisterMessageCallback("showSelectedPassword",
-      NewCallback(this, &PasswordManagerHandler::ShowSelectedPassword));
 }
 
 PasswordStore* PasswordManagerHandler::GetPasswordStore() {
   return dom_ui_->GetProfile()->GetPasswordStore(Profile::EXPLICIT_ACCESS);
 }
 
-void PasswordManagerHandler::LoadLists(const ListValue* args) {
+void PasswordManagerHandler::UpdatePasswordLists(const ListValue* args) {
   languages_ =
       dom_ui_->GetProfile()->GetPrefs()->GetString(prefs::kAcceptLanguages);
   populater_.Populate();
   exception_populater_.Populate();
 }
 
 void PasswordManagerHandler::RemoveSavedPassword(const ListValue* args) {
   std::string string_value = WideToUTF8(ExtractStringValue(args));
   int index;
   base::StringToInt(string_value, &index);
@@ skipping 27 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]);
   STLDeleteElements(&password_exception_list_);
   SetPasswordExceptionList();
 }
 
-void PasswordManagerHandler::ShowSelectedPassword(const ListValue* args) {
-  std::string string_value = WideToUTF8(ExtractStringValue(args));
-  int index;
-  base::StringToInt(string_value, &index);
-
-  std::string pass = UTF16ToUTF8(password_list_[index]->password_value);
-  scoped_ptr<Value> password_string(Value::CreateStringValue(pass));
-  dom_ui_->CallJavascriptFunction(
-      L"PasswordManager.selectedPasswordCallback", *password_string.get());
-}
-
 void PasswordManagerHandler::SetPasswordList() {
   ListValue entries;
   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));
     entries.Append(entry);
   }
 
   dom_ui_->CallJavascriptFunction(
       L"PasswordManager.setSavedPasswordsList", entries);
 }
 
 void PasswordManagerHandler::SetPasswordExceptionList() {
   ListValue entries;
   for (size_t i = 0; i < password_exception_list_.size(); ++i) {
@@ skipping 33 matching lines @@
 }
 
 void PasswordManagerHandler::PasswordExceptionListPopulater::
     OnPasswordStoreRequestDone(int handle,
     const std::vector<webkit_glue::PasswordForm*>& result) {
   DCHECK_EQ(pending_login_query_, handle);
   pending_login_query_ = 0;
   page_->password_exception_list_ = result;
   page_->SetPasswordExceptionList();
 }