Revert 207802 "bookmarks: Convert "Remove" link into a LabelButton."

trunk/src/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h

Index: trunk/src/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h
===================================================================
--- trunk/src/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h	(revision 207803)
+++ trunk/src/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h	(working copy)
@@ -13,6 +13,7 @@
 #include "ui/views/bubble/bubble_delegate.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/combobox/combobox_listener.h"
+#include "ui/views/controls/link_listener.h"
 
 class BookmarkBubbleViewObserver;
 class Profile;
@@ -27,6 +28,7 @@
 // bookmark it is created with. Don't create a BookmarkBubbleView directly,
 // instead use the static Show method.
 class BookmarkBubbleView : public views::BubbleDelegateView,
+                           public views::LinkListener,
                            public views::ButtonListener,
                            public views::ComboboxListener {
  public:
@@ -66,10 +68,10 @@
   // Returns the title to display.
   string16 GetTitle();
 
-  // Overridden from views::View:
-  virtual gfx::Size GetMinimumSize() OVERRIDE;
-  virtual void ViewHierarchyChanged(
-      const ViewHierarchyChangedDetails& details) OVERRIDE;
+  // Overridden from views::LinkListener:
+  // Either unstars the item or shows the bookmark editor (depending upon which
+  // link was clicked).
+  virtual void LinkClicked(views::Link* source, int event_flags) OVERRIDE;
 
   // Overridden from views::ButtonListener:
   // Closes the bubble or opens the edit dialog.
@@ -105,8 +107,8 @@
 
   RecentlyUsedFoldersComboModel parent_model_;
 
-  // Button for removing the bookmark.
-  views::LabelButton* remove_button_;
+  // Link for removing/unstarring the bookmark.
+  views::Link* remove_link_;
 
   // Button to bring up the editor.
   views::LabelButton* edit_button_;