Revert of views: Move MenuButton from TextButton to LabelButton.

ui/views/controls/button/label_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_LABEL_BUTTON_H_
 #define UI_VIEWS_CONTROLS_BUTTON_LABEL_BUTTON_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "third_party/skia/include/core/SkColor.h"
@@ skipping 20 matching lines @@
   LabelButton(ButtonListener* listener, const base::string16& text);
   virtual ~LabelButton();
 
   // Get or set the image shown for the specified button state.
   // GetImage returns the image for STATE_NORMAL if the state's image is empty.
   virtual const gfx::ImageSkia& GetImage(ButtonState for_state);
   void SetImage(ButtonState for_state, const gfx::ImageSkia& image);
 
   // Get or set the text shown on the button.
   const base::string16& GetText() const;
-  virtual void SetText(const base::string16& text);
+  void SetText(const base::string16& text);
 
   // Set the text color shown for the specified button state.
   void SetTextColor(ButtonState for_state, SkColor color);
 
-  // Sets a halo color on the label.
-  void SetHaloColor(SkColor color);
-
   // Get or set the text's multi-line property to break on '\n', etc.
   bool GetTextMultiLine() const;
   void SetTextMultiLine(bool text_multi_line);
 
   // Get or set the font list used by this button.
   const gfx::FontList& GetFontList() const;
   void SetFontList(const gfx::FontList& font_list);
 
   // Set the elide behavior of this button.
   void SetElideBehavior(gfx::ElideBehavior elide_behavior);
 
   // Get or set the horizontal alignment used for the button; reversed in RTL.
   // The optional image will lead the text, unless the button is right-aligned.
   gfx::HorizontalAlignment GetHorizontalAlignment() const;
   void SetHorizontalAlignment(gfx::HorizontalAlignment alignment);
 
   // Call set_min_size(gfx::Size()) to clear the monotonically increasing size.
   void set_min_size(const gfx::Size& min_size) { min_size_ = min_size; }
   void set_max_size(const gfx::Size& max_size) { max_size_ = max_size; }
 
   // Get or set the option to handle the return key; false by default.
   bool is_default() const { return is_default_; }
   void SetIsDefault(bool is_default);
 
   // Get or set the button's overall style; the default is |STYLE_TEXTBUTTON|.
   ButtonStyle style() const { return style_; }
   void SetStyle(ButtonStyle style);
 
   void SetFocusPainter(scoped_ptr<Painter> focus_painter);
-  Painter* focus_painter() { return focus_painter_.get(); }
 
   // View:
   virtual void SetBorder(scoped_ptr<Border> border) OVERRIDE;
   virtual gfx::Size GetPreferredSize() const OVERRIDE;
   virtual void Layout() OVERRIDE;
   virtual const char* GetClassName() const OVERRIDE;
 
  protected:
   ImageView* image() const { return image_; }
   Label* label() const { return label_; }
 
-  // Returns the available area for the label and image. Subclasses can change
-  // these bounds if they need room to do manual painting.
-  virtual gfx::Rect GetChildAreaBounds();
-
   // View:
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
   virtual void OnFocus() OVERRIDE;
   virtual void OnBlur() OVERRIDE;
   virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) OVERRIDE;
 
   // Fill |params| with information about the button.
   virtual void GetExtraParams(ui::NativeTheme::ExtraParams* params) const;
 
   // Resets colors from the NativeTheme, explicitly set colors are unchanged.
@@ skipping 68 matching lines @@
   bool border_is_themed_border_;
 
   scoped_ptr<Painter> focus_painter_;
 
   DISALLOW_COPY_AND_ASSIGN(LabelButton);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_BUTTON_LABEL_BUTTON_H_