views: Switch Checkbox over to LabelButton.

ui/views/controls/button/checkbox.h

Index: ui/views/controls/button/checkbox.h
diff --git a/ui/views/controls/button/checkbox.h b/ui/views/controls/button/checkbox.h
index 3c739306eca578aa396955bfec4275dce73fe5b0..ae1d7c8b47a3f7a9b27251d5f6fb9e58451b51c6 100644
--- a/ui/views/controls/button/checkbox.h
+++ b/ui/views/controls/button/checkbox.h
@@ -10,6 +10,7 @@
 #include "base/compiler_specific.h"
 #include "base/string16.h"
 #include "ui/views/controls/button/text_button.h"

[msw, 2013/05/13 01:37:22]

nit: try to remove this and CheckboxNativeThemeBorder

[tfarina, 2013/05/13 01:47:12]

Done.

+#include "ui/views/controls/button/label_button.h"
 
 namespace views {
 
@@ -46,7 +47,7 @@ class VIEWS_EXPORT CheckboxNativeThemeBorder
 
 // A native themed class representing a checkbox.  This class does not use
 // platform specific objects to replicate the native platforms looks and feel.
-class VIEWS_EXPORT Checkbox : public TextButtonBase {
+class VIEWS_EXPORT Checkbox : public LabelButton {
  public:
   static const char kViewClassName[];
 
@@ -63,22 +64,13 @@ class VIEWS_EXPORT Checkbox : public TextButtonBase {
 
  protected:
   // Overridden from View:
-  virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual const char* GetClassName() const OVERRIDE;
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
-  virtual void OnPaintFocusBorder(gfx::Canvas* canvas) OVERRIDE;
 
  private:
   // Overridden from Button:
   virtual void NotifyClick(const ui::Event& event) OVERRIDE;
 
-  // Overridden from TextButtonBase:
-  virtual ui::NativeTheme::Part GetThemePart() const OVERRIDE;
-  virtual gfx::Rect GetThemePaintRect() const OVERRIDE;
-  virtual void GetExtraParams(
-      ui::NativeTheme::ExtraParams* params) const OVERRIDE;
-  virtual gfx::Rect GetTextBounds() const OVERRIDE;
-
   // True if the checkbox is checked.
   bool checked_;