views: Switch Checkbox over to LabelButton.

ui/views/controls/button/button.h

Index: ui/views/controls/button/button.h
diff --git a/ui/views/controls/button/button.h b/ui/views/controls/button/button.h
index 8164be2a23836e4ba6c6fe36d1b772447796a32f..6b702a86a1137ccd5c3632632b9d3e2f7cf5c2e1 100644
--- a/ui/views/controls/button/button.h
+++ b/ui/views/controls/button/button.h
@@ -29,7 +29,6 @@ class VIEWS_EXPORT Button : public View {
   virtual ~Button();
 
   // Button states for various button sub-types.
-  // TODO(msw): Add toggled state for checkboxes, radio buttons, etc.
   enum ButtonState {
     STATE_NORMAL = 0,
     STATE_HOVERED,
@@ -39,11 +38,13 @@ class VIEWS_EXPORT Button : public View {
   };
 
   // Button styles with associated images and border painters.
-  // TODO(msw): Add "Blue Button", Checkbox, Radio, Menu, ComboBox, etc.
+  // TODO(msw): Add "Blue Button", Menu, ComboBox, etc.
   enum ButtonStyle {
     STYLE_BUTTON = 0,
     STYLE_TEXTBUTTON,
     STYLE_NATIVE_TEXTBUTTON,
+    STYLE_CHECKBOX,

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

Sorry for the reversal here, but remove these styles and their use from
LabelButtonBorder::GetInsets(), instead add a LabelButtonBorder::insets_ and
SetInsets(), and make LabelButtonBorder::GetInsets() return |insets_| before the
switch if they're not empty().

Then make Checkbox cast border() to a LabelButtonBorder and call SetInsets()
with the proper values. RadioButton will just inherit the correct insets from
Checkbox.

[tfarina, 2013/05/21 02:50:53]

Done.

+    STYLE_RADIO,
     STYLE_COUNT,
   };