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

chrome/browser/ui/passwords/password_manager_presenter.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_presenter.h"
+#include "chrome/browser/ui/passwords/password_manager_presenter.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "chrome/browser/password_manager/password_manager_util.h"
 #include "chrome/browser/password_manager/password_store_factory.h"
-#include "chrome/browser/ui/password/password_ui_view.h"
+#include "chrome/browser/ui/passwords/password_ui_view.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "components/autofill/core/common/password_form.h"
 #include "content/public/browser/user_metrics.h"
 
-namespace options {
-
 PasswordManagerPresenter::PasswordManagerPresenter(
-    passwords_ui::PasswordUIView* password_view)
+    PasswordUIView* password_view)
     : populater_(this),
       exception_populater_(this),
       password_view_(password_view) {
   DCHECK(password_view_);
   require_reauthentication_ = CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnablePasswordManagerReauthentication);
 }
 
 PasswordManagerPresenter::~PasswordManagerPresenter() {
   PasswordStore* store = GetPasswordStore();
@@ skipping 32 matching lines @@
 
 void PasswordManagerPresenter::UpdatePasswordLists() {
   // Reset the current lists.
   password_list_.clear();
   password_exception_list_.clear();
 
   populater_.Populate();
   exception_populater_.Populate();
 }
 
-void PasswordManagerPresenter::HandleRemoveSavedPassword(size_t index) {
+void PasswordManagerPresenter::RemoveSavedPassword(size_t index) {
   DCHECK_LT(index, password_list_.size());
   PasswordStore* store = GetPasswordStore();
   if (!store)
     return;
   store->RemoveLogin(*password_list_[index]);
   content::RecordAction(
-      content::UserMetricsAction("PasswordManager_HandleRemoveSavedPassword"));
+      content::UserMetricsAction("PasswordManager_RemoveSavedPassword"));
 }
 
-void PasswordManagerPresenter::HandleRemovePasswordException(size_t index) {
+void PasswordManagerPresenter::RemovePasswordException(size_t index) {
   DCHECK_LT(index, password_exception_list_.size());
   PasswordStore* store = GetPasswordStore();
   if (!store)
     return;
   store->RemoveLogin(*password_exception_list_[index]);
   content::RecordAction(
       content::UserMetricsAction(
-          "PasswordManager_HandleRemovePasswordException"));
+          "PasswordManager_RemovePasswordException"));
 }
 
-void PasswordManagerPresenter::HandleRequestShowPassword(size_t index) {
+void PasswordManagerPresenter::RequestShowPassword(size_t index) {
   DCHECK_LT(index, password_list_.size());
   if (IsAuthenticationRequired()) {
     if (password_manager_util::AuthenticateUser())
       last_authentication_time_ = base::TimeTicks::Now();
     else
       return;
   }
   // Call back the front end to reveal the password.
   password_view_->ShowPassword(index, password_list_[index]->password_value);
 }
@@ skipping 106 matching lines @@
   page_->SetPasswordExceptionList();
 }
 
 void PasswordManagerPresenter::PasswordExceptionListPopulater::
     OnGetPasswordStoreResults(
         const std::vector<autofill::PasswordForm*>& results) {
   // TODO(kaiwang): Implement when I refactor
   // PasswordStore::GetAutofillableLogins and PasswordStore::GetBlacklistLogins.
   NOTIMPLEMENTED();
 }
-
-}  // namespace options