Revert of views: Move MenuButton from TextButton to LabelButton.

ui/views/controls/button/menu_button.h

Index: ui/views/controls/button/menu_button.h
diff --git a/ui/views/controls/button/menu_button.h b/ui/views/controls/button/menu_button.h
index 257d2f62ea98ff1f1d5ef7d9dc4d8e6c1952bd8d..1ca6de07936d7f9709a9f52a31bcb5e6eb2b0127 100644
--- a/ui/views/controls/button/menu_button.h
+++ b/ui/views/controls/button/menu_button.h
@@ -10,7 +10,7 @@
 #include "base/strings/string16.h"
 #include "base/time/time.h"
 #include "ui/views/background.h"
-#include "ui/views/controls/button/label_button.h"
+#include "ui/views/controls/button/text_button.h"
 
 namespace views {
 
@@ -23,7 +23,7 @@
 //  A button that shows a menu when the left mouse button is pushed
 //
 ////////////////////////////////////////////////////////////////////////////////
-class VIEWS_EXPORT MenuButton : public LabelButton {
+class VIEWS_EXPORT MenuButton : public TextButton {
  public:
   static const char kViewClassName[];
 
@@ -50,10 +50,12 @@
   // Activate the button (called when the button is pressed).
   virtual bool Activate();
 
+  // Overridden from TextButton for the potential use of a drop marker.
+  virtual void PaintButton(gfx::Canvas* canvas, PaintButtonMode mode) OVERRIDE;
+
   // Overridden from View:
   virtual gfx::Size GetPreferredSize() const OVERRIDE;
   virtual const char* GetClassName() const OVERRIDE;
-  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
   virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE;
   virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE;
   virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE;
@@ -65,9 +67,6 @@
  protected:
   // Paint the menu marker image.
   void PaintMenuMarker(gfx::Canvas* canvas);
-
-  // Overridden from LabelButton:
-  virtual gfx::Rect GetChildAreaBounds() OVERRIDE;
 
   // True if the menu is currently visible.
   bool menu_visible_;