views: Switch Checkbox over to LabelButton.

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 b96c7854de60267627dded24aee36ae42f83620f..3f339f786dd52af9905040ae2e01bcad408a970f 100644
--- a/ui/views/controls/button/label_button.h
+++ b/ui/views/controls/button/label_button.h
@@ -27,8 +27,10 @@ class VIEWS_EXPORT LabelButton : public CustomButton,
 
   // 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.
-  const gfx::ImageSkia& GetImage(ButtonState for_state);
+  virtual const gfx::ImageSkia& GetImage(ButtonState for_state);
+  const gfx::ImageSkia& GetFocusedImage(ButtonState for_state);

[msw, 2013/05/18 19:42:09]

remove

[tfarina, 2013/05/18 21:10:33]

Done.

   void SetImage(ButtonState for_state, const gfx::ImageSkia& image);
+  void SetFocusedImage(ButtonState for_state, const gfx::ImageSkia& image);
 
   // Get or set the text shown on the button.
   const string16& GetText() const;
@@ -66,6 +68,13 @@ class VIEWS_EXPORT LabelButton : public CustomButton,
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual const char* GetClassName() const OVERRIDE;
 
+ protected:
+  // Fill |params| with information about the button.
+  virtual void GetExtraParams(ui::NativeTheme::ExtraParams* params) const;
+
+  // The image shown in the button.
+  ImageView* image_;
+
  private:
   FRIEND_TEST_ALL_PREFIXES(LabelButtonTest, Init);
   FRIEND_TEST_ALL_PREFIXES(LabelButtonTest, Label);
@@ -95,15 +104,11 @@ class VIEWS_EXPORT LabelButton : public CustomButton,
   virtual ui::NativeTheme::State GetForegroundThemeState(
       ui::NativeTheme::ExtraParams* params) const OVERRIDE;
 
-  // Fill |params| with information about the button.
-  virtual void GetExtraParams(ui::NativeTheme::ExtraParams* params) const;
-
-  // The image and label shown in the button.
-  ImageView* image_;
+  // The label shown in the button.
   Label* label_;
 
   // The images and colors for each button state.
-  gfx::ImageSkia button_state_images_[STATE_COUNT];
+  gfx::ImageSkia button_state_images_[2][STATE_COUNT];
   SkColor button_state_colors_[STATE_COUNT];
 
   // Used to track whether SetTextColor() has been invoked.