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

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: almost working - :p 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..69f5a6aca62f705101b95d7153eb4716362a9282 100644
--- a/ui/views/controls/button/label_button_border.cc
+++ b/ui/views/controls/button/label_button_border.cc
@@ -93,7 +93,7 @@ LabelButtonBorder::LabelButtonBorder(Button::ButtonStyle style)
LabelButtonBorder::~LabelButtonBorder() {}
void LabelButtonBorder::Paint(const View& view, gfx::Canvas* canvas) {
- DCHECK(!strcmp(view.GetClassName(), LabelButton::kViewClassName));
+ //DCHECK(!strcmp(view.GetClassName(), LabelButton::kViewClassName));
const NativeThemeDelegate* native_theme_delegate =
static_cast<const LabelButton*>(&view);
ui::NativeTheme::Part part = native_theme_delegate->GetThemePart();
@@ -138,6 +138,10 @@ gfx::Insets LabelButtonBorder::GetInsets() const {
return gfx::Insets(5, 6, 5, 6);
if (style() == Button::STYLE_NATIVE_TEXTBUTTON)
return gfx::Insets(5, 12, 5, 12);
+ if (style() == Button::STYLE_CHECKBOX)
+ return gfx::Insets(5, 12, 5, 12);
+ if (style() == Button::STYLE_RADIO_BUTTON)
+ return gfx::Insets(5, 12, 5, 12);
NOTREACHED();
return gfx::Insets();
}

Powered by Google App Engine
This is Rietveld 408576698