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..84373ed8bcddb4b87329d31b0a6249c48e87ecb2 100644
--- a/ui/views/controls/button/label_button.h
+++ b/ui/views/controls/button/label_button.h
@@ -27,7 +27,7 @@ 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);
   void SetImage(ButtonState for_state, const gfx::ImageSkia& image);
 
   // Get or set the text shown on the button.
@@ -66,6 +66,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_;

[msw, 2013/05/21 02:24:11]

nit: revert this change to expose |image_|, I think SetCustomImage should work
okay during initialization without explicitly resetting |image_|'s content.

+
  private:
   FRIEND_TEST_ALL_PREFIXES(LabelButtonTest, Init);
   FRIEND_TEST_ALL_PREFIXES(LabelButtonTest, Label);
@@ -95,11 +102,7 @@ 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.