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

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

 // 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_PASSWORD_MANAGER_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_PASSWORD_MANAGER_HANDLER_H_
 
 #include <string>
 #include <vector>
 
 #include "base/prefs/pref_member.h"
-#include "chrome/browser/ui/password/password_ui_view.h"
+#include "chrome/browser/ui/passwords/password_manager_presenter.h"
+#include "chrome/browser/ui/passwords/password_ui_view.h"
 #include "chrome/browser/ui/webui/options/options_ui.h"
-#include "chrome/browser/ui/webui/options/password_manager_presenter.h"
 
 namespace options {
 
 // The WebUI based PasswordUIView. Displays passwords in the web ui.
 class PasswordManagerHandler : public OptionsPageUIHandler,
-                               public passwords_ui::PasswordUIView {
+                               public PasswordUIView {
  public:
   PasswordManagerHandler();
   virtual ~PasswordManagerHandler();
 
   // OptionsPageUIHandler implementation.
   virtual void GetLocalizedValues(DictionaryValue* localized_strings) OVERRIDE;
   virtual void InitializeHandler() OVERRIDE;
   virtual void RegisterMessages() OVERRIDE;
 
   // PasswordUIView implementation.
@@ skipping 21 matching lines @@
   void HandleRemovePasswordException(const ListValue* args);
 
   // Requests the plain text password for an entry to be revealed.
   // |index| The index of the entry.
   void HandleRequestShowPassword(const ListValue* args);
 
   // User pref for storing accept languages.
   std::string languages_;
 
   // The PasswordManagerPresenter object owned by the this view.
-  options::PasswordManagerPresenter password_manager_presenter_;
+  PasswordManagerPresenter password_manager_presenter_;
 
   DISALLOW_COPY_AND_ASSIGN(PasswordManagerHandler);
 };
 
 }  // namespace options
 
 #endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_PASSWORD_MANAGER_HANDLER_H_