views: Switch Checkbox over to LabelButton.

ui/views/controls/button/button.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_VIEWS_CONTROLS_BUTTON_BUTTON_H_
 #define UI_VIEWS_CONTROLS_BUTTON_BUTTON_H_
 
 #include "ui/views/view.h"
 
 namespace views {
@@ skipping 11 matching lines @@
   virtual ~ButtonListener() {}
 };
 
 // A View representing a button. Depending on the specific type, the button
 // could be implemented by a native control or custom rendered.
 class VIEWS_EXPORT Button : public View {
  public:
   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,
     STATE_PRESSED,
     STATE_DISABLED,
     STATE_COUNT,
   };
 
   // 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,
   };
 
   void SetTooltipText(const string16& tooltip_text);
 
   int tag() const { return tag_; }
   void set_tag(int tag) { tag_ = tag; }
 
   void SetAccessibleName(const string16& name);
 
@@ skipping 24 matching lines @@
   // The id tag associated with this button. Used to disambiguate buttons in
   // the ButtonListener implementation.
   int tag_;
 
   DISALLOW_COPY_AND_ASSIGN(Button);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_BUTTON_BUTTON_H_