Revert of views: Move MenuButton from TextButton to LabelButton.

ui/views/controls/button/menu_button.h

 // Copyright (c) 2012 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 UI_VIEWS_CONTROLS_BUTTON_MENU_BUTTON_H_
 #define UI_VIEWS_CONTROLS_BUTTON_MENU_BUTTON_H_
 
 #include <string>
 
 #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 {
 
 class MenuButtonListener;
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // MenuButton
 //
 //  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[];
 
   // How much padding to put on the left and right of the menu marker.
   static const int kMenuMarkerPaddingLeft;
   static const int kMenuMarkerPaddingRight;
 
   // Create a Button.
   MenuButton(ButtonListener* listener,
              const base::string16& text,
              MenuButtonListener* menu_button_listener,
              bool show_menu_marker);
   virtual ~MenuButton();
 
   bool show_menu_marker() const { return show_menu_marker_; }
   void set_menu_marker(const gfx::ImageSkia* menu_marker) {
     menu_marker_ = menu_marker;
   }
   const gfx::ImageSkia* menu_marker() const { return menu_marker_; }
 
   const gfx::Point& menu_offset() const { return menu_offset_; }
   void set_menu_offset(int x, int y) { menu_offset_.SetPoint(x, y); }
 
   // 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;
   virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
   virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE;
   virtual bool OnKeyReleased(const ui::KeyEvent& event) OVERRIDE;
   virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
 
  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_;
 
   // Offset of the associated menu position.
   gfx::Point menu_offset_;
 
  private:
   friend class TextButtonBackground;
 
   // Compute the maximum X coordinate for the current screen. MenuButtons
@@ skipping 21 matching lines @@
   // If non-null the destuctor sets this to true. This is set while the menu is
   // showing and used to detect if the menu was deleted while running.
   bool* destroyed_flag_;
 
   DISALLOW_COPY_AND_ASSIGN(MenuButton);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_BUTTON_MENU_BUTTON_H_