Clean up ManagePasswordsBubbleView and ManagePasswordItemView.

chrome/browser/ui/views/passwords/manage_password_item_view.h

Index: chrome/browser/ui/views/passwords/manage_password_item_view.h
diff --git a/chrome/browser/ui/views/passwords/manage_password_item_view.h b/chrome/browser/ui/views/passwords/manage_password_item_view.h
index 9cc96af2e9bd236178a80114445e1ea84a9e40e0..0b856dbc17daaf721348fc65cd12270b7f4ee32e 100644
--- a/chrome/browser/ui/views/passwords/manage_password_item_view.h
+++ b/chrome/browser/ui/views/passwords/manage_password_item_view.h
@@ -5,17 +5,12 @@
 #ifndef CHROME_BROWSER_UI_VIEWS_PASSWORDS_MANAGE_PASSWORD_ITEM_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_PASSWORDS_MANAGE_PASSWORD_ITEM_VIEW_H_
 
-#include "chrome/browser/ui/views/passwords/manage_passwords_bubble_view.h"
 #include "components/autofill/core/common/password_form.h"
 #include "components/password_manager/core/common/password_manager_ui.h"
+#include "ui/views/view.h"
 
 class ManagePasswordsBubbleModel;
 
-namespace views {
-class GridLayout;
-class ImageButton;
-}
-
 // A custom view for credentials which allows the management of the specific
 // credentials. The view has three distinct states:
 //
@@ -27,53 +22,16 @@ class ImageButton;
 // representing one of these states.
 class ManagePasswordItemView : public views::View {
  public:
-  // Render credentials in two columns: username and password.
-  class PendingView : public views::View {
-   public:
-    explicit PendingView(ManagePasswordItemView* parent);
-
-   private:
-    virtual ~PendingView();
-  };
-
-  // Render credentials in three columns: username, password, and delete.
-  class ManageView : public views::View, public views::ButtonListener {
-   public:
-    explicit ManageView(ManagePasswordItemView* parent);
-
-   private:
-    virtual ~ManageView();
-
-    // views::ButtonListener:
-    virtual void ButtonPressed(views::Button* sender,
-                               const ui::Event& event) OVERRIDE;
-
-    views::ImageButton* delete_button_;
-    ManagePasswordItemView* parent_;
-  };
-
-  // Render a notification to the user that a password has been removed, and
-  // offer an undo link.
-  class UndoView : public views::View, public views::LinkListener {
-   public:
-    explicit UndoView(ManagePasswordItemView* parent);
-
-   private:
-    virtual ~UndoView();
-
-    // views::LinkListener:
-    virtual void LinkClicked(views::Link* source, int event_flags) OVERRIDE;
-
-    views::Link* undo_link_;
-    ManagePasswordItemView* parent_;
-  };
-
   ManagePasswordItemView(
       ManagePasswordsBubbleModel* manage_passwords_bubble_model,
       autofill::PasswordForm password_form,
       password_manager::ui::PasswordItemPosition position);
 
  private:
+  class ManageView;
+  class PendingView;
+  class UndoView;
+
   virtual ~ManagePasswordItemView();
 
   void NotifyClickedDelete();