views: Switch Checkbox over to LabelButton.

ui/views/controls/button/label_button_border.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/label_button_border.h"
 
 #include "base/logging.h"
 #include "grit/ui_resources.h"
 #include "ui/base/animation/animation.h"
 #include "ui/gfx/canvas.h"
@@ skipping 12 matching lines @@
 const int kPressedImages[] = IMAGE_GRID(IDR_BUTTON_PRESSED);
 const int kFocusedNormalImages[] = IMAGE_GRID(IDR_BUTTON_FOCUSED_NORMAL);
 const int kFocusedHoveredImages[] = IMAGE_GRID(IDR_BUTTON_FOCUSED_HOVER);
 const int kFocusedPressedImages[] = IMAGE_GRID(IDR_BUTTON_FOCUSED_PRESSED);
 
 // The text-button hot and pushed image IDs; normal is unadorned by default.
 const int kTextHoveredImages[] = IMAGE_GRID(IDR_TEXTBUTTON_HOVER);
 const int kTextPressedImages[] = IMAGE_GRID(IDR_TEXTBUTTON_PRESSED);
 
 Button::ButtonState GetButtonState(ui::NativeTheme::State state) {
-  switch(state) {
+  switch (state) {
     case ui::NativeTheme::kDisabled: return Button::STATE_DISABLED;
     case ui::NativeTheme::kHovered:  return Button::STATE_HOVERED;
     case ui::NativeTheme::kNormal:   return Button::STATE_NORMAL;
     case ui::NativeTheme::kPressed:  return Button::STATE_PRESSED;
     case ui::NativeTheme::kMaxState: NOTREACHED() << "Unknown state: " << state;
   }
   return Button::STATE_NORMAL;
 }
 
 // A helper function to paint the native theme or images as appropriate.
@@ skipping 42 matching lines @@
     SetPainter(false, Button::STATE_HOVERED,
                Painter::CreateImageGridPainter(kTextHoveredImages));
     SetPainter(false, Button::STATE_PRESSED,
                Painter::CreateImageGridPainter(kTextPressedImages));
   }
 }
 
 LabelButtonBorder::~LabelButtonBorder() {}
 
 void LabelButtonBorder::Paint(const View& view, gfx::Canvas* canvas) {
-  DCHECK(!strcmp(view.GetClassName(), LabelButton::kViewClassName));
   const NativeThemeDelegate* native_theme_delegate =
       static_cast<const LabelButton*>(&view);
   ui::NativeTheme::Part part = native_theme_delegate->GetThemePart();
   gfx::Rect rect(native_theme_delegate->GetThemePaintRect());
   ui::NativeTheme::ExtraParams extra;
   const ui::NativeTheme* theme = view.GetNativeTheme();
   const ui::Animation* animation = native_theme_delegate->GetThemeAnimation();
   ui::NativeTheme::State state = native_theme_delegate->GetThemeState(&extra);
 
   if (animation && animation->is_animating()) {
@@ skipping 18 matching lines @@
   }
 
   // Draw the Views focus border for the native theme style.
   if (style() == Button::STYLE_NATIVE_TEXTBUTTON &&
       view.focus_border() && extra.button.is_focused)
     view.focus_border()->Paint(view, canvas);
 }
 
 gfx::Insets LabelButtonBorder::GetInsets() const {
   // Return the style-specific insets between button contents and edges.
-  if (style() == Button::STYLE_BUTTON)
-    return gfx::Insets(9, 13, 9, 13);
-  if (style() == Button::STYLE_TEXTBUTTON)
-    return gfx::Insets(5, 6, 5, 6);
-  if (style() == Button::STYLE_NATIVE_TEXTBUTTON)
-    return gfx::Insets(5, 12, 5, 12);
+  switch (style()) {
+    case Button::STYLE_BUTTON:
+      return gfx::Insets(9, 13, 9, 13);
+    case Button::STYLE_BUTTON:

[msw, 2013/05/18 01:04:56]

Remove this duplicated case for STYLE_BUTTON.

[tfarina, 2013/05/18 02:30:49]

Done.

+    case Button::STYLE_TEXTBUTTON:
+      return gfx::Insets(5, 6, 5, 6);
+    case Button::STYLE_NATIVE_TEXTBUTTON:
+      return gfx::Insets(5, 12, 5, 12);
+    case Button::STYLE_CHECKBOX:
+    case Button::STYLE_RADIO:
+      return gfx::Insets(5, 12, 5, 12);
+    default:

[msw, 2013/05/18 01:04:56]

Make this a STYLE_COUNT case, and don't offer a default.

[tfarina, 2013/05/18 02:30:49]

Done.

+      NOTREACHED();
+      return gfx::Insets();
+  }
   NOTREACHED();

[msw, 2013/05/18 01:04:56]

Can you remove this NOTREACHED and the extra return below?
(if you can't remove this return, that's okay)

[tfarina, 2013/05/18 02:30:49]

Done.

   return gfx::Insets();
 }
 
 Painter* LabelButtonBorder::GetPainter(bool focused,
                                        Button::ButtonState state) {
   return painters_[focused ? 1 : 0][state].get();
 }
 
 void LabelButtonBorder::SetPainter(bool focused,
                                    Button::ButtonState state,
                                    Painter* painter) {
   painters_[focused ? 1 : 0][state].reset(painter);
 }
 
 }  // namespace views