Merge 53847 - Add "pushed" as a state a TextButton can show (alongside "norma...

views/controls/button/text_button.h

 // Copyright (c) 2010 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 VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_
 #define VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_
 
 #include "gfx/font.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColor.h"
@@ skipping 87 matching lines @@
     ALIGN_CENTER,
     ALIGN_RIGHT
   };
 
   void set_alignment(TextAlignment alignment) { alignment_ = alignment; }
 
   void set_prefix_type(PrefixType type) { prefix_type_ = type; }
 
   // Sets the icon.
   void SetIcon(const SkBitmap& icon);
-  SkBitmap icon() const { return icon_; }
   void SetHoverIcon(const SkBitmap& icon);
-  SkBitmap icon_hover() const { return icon_hover_; }
+  void SetPushedIcon(const SkBitmap& icon);
+
+  bool HasIcon() const { return !icon_.empty(); }
 
   // Meanings are reversed for right-to-left layouts.
   enum IconPlacement {
     ICON_ON_LEFT,
     ICON_ON_RIGHT
   };
 
   IconPlacement icon_placement() { return icon_placement_; }
   void set_icon_placement(IconPlacement icon_placement) {
     icon_placement_ = icon_placement;
   }
 
   // TextButton remembers the maximum display size of the text passed to
   // SetText. This method resets the cached maximum display size to the
   // current size.
   void ClearMaxTextSize();
 
   void set_max_width(int max_width) { max_width_ = max_width; }
   void SetFont(const gfx::Font& font);
   void SetEnabledColor(SkColor color);
   void SetDisabledColor(SkColor color);
   void SetHighlightColor(SkColor color);
   void SetHoverColor(SkColor color);
   void SetNormalHasBorder(bool normal_has_border);
-  // Sets whether or not to show the highlighed (i.e. hot) state. Default true.
-  void SetShowHighlighted(bool show_highlighted);
+  // Sets whether or not to show the hot and pushed states for the button icon
+  // (if present) in addition to the normal state.  Defaults to true.
+  void SetShowMultipleIconStates(bool show_multiple_icon_states);
 
   // Paint the button into the specified canvas. If |for_drag| is true, the
   // function paints a drag image representation into the canvas.
   virtual void Paint(gfx::Canvas* canvas, bool for_drag);
 
   // Overridden from View:
   virtual gfx::Size GetPreferredSize();
   virtual gfx::Size GetMinimumSize();
   virtual void SetEnabled(bool enabled);
 
   // Text colors.
   static const SkColor kEnabledColor;
   static const SkColor kHighlightColor;
   static const SkColor kDisabledColor;
   static const SkColor kHoverColor;
 
  protected:
+  SkBitmap icon() const { return icon_; }
+
   virtual void Paint(gfx::Canvas* canvas);
 
   // Called when enabled or disabled state changes, or the colors for those
   // states change.
   virtual void UpdateColor();
 
  private:
   // Updates text_size_ and max_text_size_ from the current text/font. This is
   // invoked when the font or text changes.
   void UpdateTextSize();
@@ skipping 26 matching lines @@
   SkColor color_highlight_;
   SkColor color_hover_;
 
   // An icon displayed with the text.
   SkBitmap icon_;
 
   // An optional different version of the icon for hover state.
   SkBitmap icon_hover_;
   bool has_hover_icon_;
 
+  // An optional different version of the icon for pushed state.
+  SkBitmap icon_pushed_;
+  bool has_pushed_icon_;
+
   // The width of the button will never be larger than this value. A value <= 0
   // indicates the width is not constrained.
   int max_width_;
 
   // This is true if normal state has a border frame; default is false.
   bool normal_has_border_;
 
-  // Whether or not to show the highlighted (i.e. hot) state.
-  bool show_highlighted_;
+  // Whether or not to show the hot and pushed icon states.
+  bool show_multiple_icon_states_;
 
   PrefixType prefix_type_;
 
   DISALLOW_COPY_AND_ASSIGN(TextButton);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_