Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(109)

Unified Diff: ui/views/controls/button/label_button_border.cc

Issue 15061006: views: Switch Checkbox over to LabelButton. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: SetCustomImage() Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/views/controls/button/label_button_border.cc
diff --git a/ui/views/controls/button/label_button_border.cc b/ui/views/controls/button/label_button_border.cc
index 9b7b13afb69827301f0a9148f75507d726546737..84f004f2e5a11ba32d0773163471d83fbe79395d 100644
--- a/ui/views/controls/button/label_button_border.cc
+++ b/ui/views/controls/button/label_button_border.cc
@@ -30,7 +30,7 @@ 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;
@@ -93,7 +93,6 @@ LabelButtonBorder::LabelButtonBorder(Button::ButtonStyle style)
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();
@@ -132,14 +131,20 @@ void LabelButtonBorder::Paint(const View& view, gfx::Canvas* 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);
- NOTREACHED();
- return gfx::Insets();
+ switch (style()) {
+ case Button::STYLE_BUTTON:
+ return gfx::Insets(9, 13, 9, 13);
+ 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(7, 6, 5, 7);
+ case Button::STYLE_COUNT:
+ NOTREACHED();
+ return gfx::Insets();
+ }
}
Painter* LabelButtonBorder::GetPainter(bool focused,

Powered by Google App Engine
This is Rietveld 408576698