Merge browser/ui/password and browser/ui/passwords.

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

 // Copyright 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/password_manager_handler.h"
 
 #include "base/bind.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 72 matching lines @@
 }
 
 void PasswordManagerHandler::InitializeHandler() {
   password_manager_presenter_.Initialize();
 }
 
 void PasswordManagerHandler::HandleRemoveSavedPassword(const ListValue* args) {
   std::string string_value = UTF16ToUTF8(ExtractStringValue(args));
   int index;
   if (base::StringToInt(string_value, &index) && index >= 0) {
-    password_manager_presenter_.HandleRemoveSavedPassword(
-        static_cast<size_t>(index));
+    password_manager_presenter_.RemoveSavedPassword(static_cast<size_t>(index));
   }
 }
 
 void PasswordManagerHandler::HandleRemovePasswordException(
     const ListValue* args) {
   std::string string_value = UTF16ToUTF8(ExtractStringValue(args));
   int index;
   if (base::StringToInt(string_value, &index) && index >= 0) {
-    password_manager_presenter_.HandleRemovePasswordException(
+    password_manager_presenter_.RemovePasswordException(
         static_cast<size_t>(index));
   }
 }
 
 void PasswordManagerHandler::HandleRequestShowPassword(const ListValue* args) {
   int index;
   if (!ExtractIntegerValue(args, &index))
     NOTREACHED();
 
-  password_manager_presenter_.HandleRequestShowPassword(
-      static_cast<size_t>(index));
+  password_manager_presenter_.RequestShowPassword(static_cast<size_t>(index));
 }
 
 void PasswordManagerHandler::ShowPassword(size_t index,
                                           const string16& password_value) {
   // Call back the front end to reveal the password.
   web_ui()->CallJavascriptFunction(
       "PasswordManager.showPassword",
       base::FundamentalValue(static_cast<int>(index)),
       StringValue(password_value));
 }
@@ skipping 33 matching lines @@
   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",
                                    entries);
 }
 
 }  // namespace options