[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..4fbc55c755a6472f81a9cc975cc58907788c599e 100644
--- a/ui/views/controls/button/label_button.h
+++ b/ui/views/controls/button/label_button.h
@@ -71,6 +71,7 @@ class VIEWS_EXPORT LabelButton : public CustomButton,
   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();
 
+  // Overridden from NativeThemeDelegate:

[Peter Kasting, 2013/11/23 00:23:55]

Nit: Just "NativeThemeDelegate:" (and fix other case of this just above)

[Greg Billock, 2013/11/25 17:16:30]

Done.

+  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;