[Toolbar] Base toolbar button class with background images for button states

ui/views/controls/button/label_button.h

Index: ui/views/controls/button/label_button.h
diff --git a/ui/views/controls/button/label_button.h b/ui/views/controls/button/label_button.h
index c69ea037b1068db7934a1ab1528d7cc6c529a191..e92cab0fe54bfb7aa75cfddf024834a5f545f128 100644
--- a/ui/views/controls/button/label_button.h
+++ b/ui/views/controls/button/label_button.h
@@ -65,12 +65,13 @@ class VIEWS_EXPORT LabelButton : public CustomButton,
   ButtonStyle style() const { return style_; }
   void SetStyle(ButtonStyle style);
 
-  // Overridden from View:
+  // View:

[sadrul, 2013/12/02 17:34:55]

Mind keeping this consistent with the rest of the file (i.e. remove this change,
and add 'Overridden from ' in line 87)?

[Peter Kasting, 2013/12/02 17:38:53]

Don't do that; rather, remove "Overridden from" in the other comments if
touching them at all.

Though, because this class doesn't directly inherit from View, these comments
should refer to the relevant direct parent, e.g. CustomButton in this case.

[sadrul, 2013/12/02 17:41:48]

As long as these are consistent in the same file, I don't have a particular
preference. Removing 'Overridden from' from the rest of the places sgtm.

[Greg Billock, 2013/12/02 18:40:37]

Done.

   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual void Layout() OVERRIDE;
   virtual const char* GetClassName() const OVERRIDE;
 
  protected:
+   ImageView* image() const { return image_; }
    Label* label() const { return label_; }
 
   // Fill |params| with information about the button.
@@ -82,6 +83,9 @@ class VIEWS_EXPORT LabelButton : public CustomButton,
   // Updates the image view to contain the appropriate button state image.
   void UpdateImage();
 
+  // NativeThemeDelegate:
+  virtual gfx::Rect GetThemePaintRect() const OVERRIDE;
+
  private:
   FRIEND_TEST_ALL_PREFIXES(LabelButtonTest, Init);
   FRIEND_TEST_ALL_PREFIXES(LabelButtonTest, Label);
@@ -98,7 +102,6 @@ class VIEWS_EXPORT LabelButton : public CustomButton,
 
   // Overridden from NativeThemeDelegate:
   virtual ui::NativeTheme::Part GetThemePart() const OVERRIDE;
-  virtual gfx::Rect GetThemePaintRect() const OVERRIDE;
   virtual ui::NativeTheme::State GetThemeState(
       ui::NativeTheme::ExtraParams* params) const OVERRIDE;
   virtual const gfx::Animation* GetThemeAnimation() const OVERRIDE;