| Index: ui/views/controls/button/checkbox.cc
|
| diff --git a/ui/views/controls/button/checkbox.cc b/ui/views/controls/button/checkbox.cc
|
| index e54616aac0bddc6998a55030ff71caf8a4272d68..495dd0cea929d2a8e2be3c70d2ff1f6a18f28758 100644
|
| --- a/ui/views/controls/button/checkbox.cc
|
| +++ b/ui/views/controls/button/checkbox.cc
|
| @@ -17,15 +17,20 @@ namespace views {
|
| const char Checkbox::kViewClassName[] = "Checkbox";
|
|
|
| Checkbox::Checkbox(const base::string16& label)
|
| - : LabelButton(NULL, label),
|
| - checked_(false) {
|
| + : LabelButton(nullptr), checked_(false) {
|
| SetHorizontalAlignment(gfx::ALIGN_LEFT);
|
| - scoped_ptr<LabelButtonBorder> button_border(new LabelButtonBorder(style()));
|
| + scoped_ptr<LabelButtonBorder> button_border(
|
| + new LabelButtonBorder(STYLE_TEXTBUTTON));
|
| button_border->SetPainter(false, STATE_HOVERED, NULL);
|
| button_border->SetPainter(false, STATE_PRESSED, NULL);
|
| // Inset the trailing side by a couple pixels for the focus border.
|
| button_border->set_insets(gfx::Insets(0, 0, 0, 2));
|
| SetBorder(button_border.Pass());
|
| +
|
| + // TODO(tapted): Remove this. Checkbox has subclasses and Init() may call
|
| + // virtual methods.
|
| + InitAsTextbutton(label);
|
| +
|
| SetFocusable(true);
|
|
|
| ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
|
|
|