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

chrome/browser/ui/passwords/password_manager_presenter.h

Index: chrome/browser/ui/passwords/password_manager_presenter.h
diff --git a/chrome/browser/ui/webui/options/password_manager_presenter.h b/chrome/browser/ui/passwords/password_manager_presenter.h
similarity index 88%
rename from chrome/browser/ui/webui/options/password_manager_presenter.h
rename to chrome/browser/ui/passwords/password_manager_presenter.h
index 3fcf164175b124bc61b67c710c57415d5062a102..a582ed24b53a14a9c967193cbf893569558da85c 100644
--- a/chrome/browser/ui/webui/options/password_manager_presenter.h
+++ b/chrome/browser/ui/passwords/password_manager_presenter.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_PASSWORD_MANAGER_PRESENTER_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS_PASSWORD_MANAGER_PRESENTER_H_
+#ifndef CHROME_BROWSER_UI_PASSWORDS_PASSWORD_MANAGER_PRESENTER_H_
+#define CHROME_BROWSER_UI_PASSWORDS_PASSWORD_MANAGER_PRESENTER_H_
 
 #include <string>
 #include <vector>
@@ -12,28 +12,22 @@
 #include "base/prefs/pref_member.h"
 #include "chrome/browser/password_manager/password_store.h"
 #include "chrome/browser/password_manager/password_store_consumer.h"
-#include "chrome/browser/ui/webui/options/options_ui.h"
 
 namespace autofill {
 struct PasswordForm;
 }
 
-namespace passwords_ui {
 class PasswordUIView;
-}
 
 class Profile;
 
-namespace options {
-
 // Contains the common logic used by a PasswordUIView to
 // interact with PasswordStore. It provides completion callbacks for
 // PasswordStore operations and updates the view on PasswordStore changes.
 class PasswordManagerPresenter : public PasswordStore::Observer {
  public:
   // |password_view| the UI view that owns this presenter, must not be NULL.
-  explicit PasswordManagerPresenter(
-      passwords_ui::PasswordUIView* password_view);
+  explicit PasswordManagerPresenter(PasswordUIView* password_view);
   virtual ~PasswordManagerPresenter();
 
   // PasswordStore::Observer implementation.
@@ -52,15 +46,15 @@ class PasswordManagerPresenter : public PasswordStore::Observer {
 
   // Removes the saved password entry at |index|.
   // |index| the entry index to be removed.
-  void HandleRemoveSavedPassword(size_t index);
+  void RemoveSavedPassword(size_t index);
 
   // Removes the saved password exception entry at |index|.
   // |index| the entry index to be removed.
-  void HandleRemovePasswordException(size_t index);
+  void RemovePasswordException(size_t index);
 
   // Requests the plain text password for entry at |index| to be revealed.
   // |index| The index of the entry.
-  void HandleRequestShowPassword(size_t index);
+  void RequestShowPassword(size_t index);
 
  private:
   friend class PasswordManagerPresenterTest;
@@ -141,11 +135,9 @@ class PasswordManagerPresenter : public PasswordStore::Observer {
   base::TimeTicks last_authentication_time_;
 
   // UI view that owns this presenter.
-  passwords_ui::PasswordUIView* password_view_;
+  PasswordUIView* password_view_;
 
   DISALLOW_COPY_AND_ASSIGN(PasswordManagerPresenter);
 };
 
-}  // namespace options
-
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_PASSWORD_MANAGER_PRESENTER_H_
+#endif  // CHROME_BROWSER_UI_PASSWORDS_PASSWORD_MANAGER_PRESENTER_H_