views: Switch Checkbox over to LabelButton.

ui/views/controls/button/checkbox.cc

 // Copyright (c) 2012 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.
 
 #include "ui/views/controls/button/checkbox.h"
 
 #include "base/logging.h"

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

nit: remove

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

Done.

 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/gfx/canvas.h"

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

nit: remove

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

Done.

 #include "ui/views/controls/label.h"

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

nit: remove

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

Done.

+#include "ui/base/resource/resource_bundle.h"
+#include "grit/ui_resources.h"
 
 namespace views {
 
 namespace {
 
 const int kCheckboxLabelSpacing = 4;

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

Remove this, just use the LabelButton default Image/Text spacing.

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

Done.

 
 const int kFocusBorderWidth = 1;

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

Let's try to remove this and use default LabelButton focus border, take pics.

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

Done.

 
 }  // namespace
 
 // static
 const char Checkbox::kViewClassName[] = "views/Checkbox";
 
 ////////////////////////////////////////////////////////////////////////////////
 // CheckboxNativeThemeBorder, public:
 
 gfx::Insets CheckboxNativeThemeBorder::GetInsets() const {
@@ skipping 11 matching lines @@
 }
 
 void CheckboxNativeThemeBorder::UseDefaultInsets() {
   use_custom_insets_ = false;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Checkbox, public:
 
 Checkbox::Checkbox(const string16& label)
-    : TextButtonBase(NULL, label),
+    : LabelButton(NULL, label),
       checked_(false) {
-  set_border(new CheckboxNativeThemeBorder(this));
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+  SetStyle(STYLE_CHECKBOX);
+  SetImage(STATE_NORMAL, *rb.GetImageSkiaNamed(IDR_CHECKBOX));
+  SetImage(STATE_HOVERED, *rb.GetImageSkiaNamed(IDR_CHECKBOX_HOVER));
+  SetImage(STATE_PRESSED, *rb.GetImageSkiaNamed(IDR_CHECKBOX_PRESSED));
   set_focusable(true);
 }
 
 Checkbox::~Checkbox() {
 }
 
 void Checkbox::SetChecked(bool checked) {
   checked_ = checked;
   SchedulePaint();
 }
 
-gfx::Size Checkbox::GetPreferredSize() {
-  gfx::Size prefsize(TextButtonBase::GetPreferredSize());
-  ui::NativeTheme::ExtraParams extra;
-  ui::NativeTheme::State state = GetThemeState(&extra);
-  gfx::Size size = GetNativeTheme()->GetPartSize(GetThemePart(), state, extra);
-  prefsize.Enlarge(size.width() + kCheckboxLabelSpacing + kFocusBorderWidth, 0);
-  prefsize.set_height(std::max(prefsize.height(), size.height()));
-
-  if (max_width_ > 0)
-    prefsize.set_width(std::min(max_width_, prefsize.width()));
-
-  return prefsize;
-}
-
 const char* Checkbox::GetClassName() const {
   return kViewClassName;
 }
 
 void Checkbox::GetAccessibleState(ui::AccessibleViewState* state) {
-  TextButtonBase::GetAccessibleState(state);
+  LabelButton::GetAccessibleState(state);
   state->role = ui::AccessibilityTypes::ROLE_CHECKBUTTON;
   state->state = checked() ? ui::AccessibilityTypes::STATE_CHECKED : 0;
 }
 
-void Checkbox::OnPaintFocusBorder(gfx::Canvas* canvas) {
-  if (HasFocus() && (focusable() || IsAccessibilityFocusable())) {
-    gfx::Rect bounds(GetTextBounds());
-    // Increate the bounding box by one on each side so that that focus border
-    // does not draw on top of the letters.
-    bounds.Inset(-kFocusBorderWidth,
-                 -kFocusBorderWidth,
-                 -kFocusBorderWidth,
-                 -kFocusBorderWidth);
-    canvas->DrawFocusRect(bounds);
-  }
-}
-
 void Checkbox::NotifyClick(const ui::Event& event) {
   SetChecked(!checked());
   RequestFocus();

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

nit: try to remove this.

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

Done.

-  TextButtonBase::NotifyClick(event);
-}
-
-ui::NativeTheme::Part Checkbox::GetThemePart() const {
-  return ui::NativeTheme::kCheckbox;
-}
-
-gfx::Rect Checkbox::GetThemePaintRect() const {
-  ui::NativeTheme::ExtraParams extra;
-  ui::NativeTheme::State state = GetThemeState(&extra);
-  gfx::Size size(GetNativeTheme()->GetPartSize(GetThemePart(), state, extra));
-  gfx::Insets insets = GetInsets();
-  int y_offset = (height() - size.height()) / 2;
-  gfx::Rect rect(insets.left(), y_offset, size.width(), size.height());
-  rect.set_x(GetMirroredXForRect(rect));
-  return rect;
-}
-
-void Checkbox::GetExtraParams(ui::NativeTheme::ExtraParams* params) const {
-  TextButtonBase::GetExtraParams(params);
-  params->button.checked = checked_;
-}
-
-gfx::Rect Checkbox::GetTextBounds() const {
-  gfx::Rect bounds(TextButtonBase::GetTextBounds());
-  ui::NativeTheme::ExtraParams extra;
-  ui::NativeTheme::State state = GetThemeState(&extra);
-  gfx::Size size(GetNativeTheme()->GetPartSize(GetThemePart(), state, extra));
-  bounds.Offset(size.width() + kCheckboxLabelSpacing, 0);
-  return bounds;
+  LabelButton::NotifyClick(event);
 }
 
 }  // namespace views