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

Side by Side Diff: ui/views/controls/button/radio_button.cc

Issue 15061006: views: Switch Checkbox over to LabelButton. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/views/controls/button/radio_button.h" 5 #include "ui/views/controls/button/radio_button.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "grit/ui_resources.h"
8 #include "ui/base/accessibility/accessible_view_state.h" 9 #include "ui/base/accessibility/accessible_view_state.h"
10 #include "ui/base/resource/resource_bundle.h"
9 #include "ui/views/widget/widget.h" 11 #include "ui/views/widget/widget.h"
10 12
11 namespace views { 13 namespace views {
12 14
13 // static 15 // static
14 const char RadioButton::kViewClassName[] = "views/RadioButton"; 16 const char RadioButton::kViewClassName[] = "views/RadioButton";
15 17
16 RadioButton::RadioButton(const string16& label, int group_id) 18 RadioButton::RadioButton(const string16& label, int group_id)
17 : Checkbox(label) { 19 : Checkbox(label) {
20 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
msw 2013/05/18 01:04:56 nit: move this below SetStyle (just before its use
21 SetStyle(STYLE_RADIO);
22 SetImage(STATE_NORMAL, *rb.GetImageSkiaNamed(IDR_RADIO));
23 SetImage(STATE_HOVERED, *rb.GetImageSkiaNamed(IDR_RADIO_HOVER));
24 SetImage(STATE_PRESSED, *rb.GetImageSkiaNamed(IDR_RADIO_PRESSED));
18 SetGroup(group_id); 25 SetGroup(group_id);
19 set_focusable(true); 26 set_focusable(true);
20 } 27 }
21 28
22 RadioButton::~RadioButton() { 29 RadioButton::~RadioButton() {
23 } 30 }
24 31
25 void RadioButton::SetChecked(bool checked) { 32 void RadioButton::SetChecked(bool checked) {
26 if (checked == RadioButton::checked()) 33 if (checked == RadioButton::checked())
27 return; 34 return;
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 bool RadioButton::IsGroupFocusTraversable() const { 85 bool RadioButton::IsGroupFocusTraversable() const {
79 // When focusing a radio button with tab/shift+tab, only the selected button 86 // When focusing a radio button with tab/shift+tab, only the selected button
80 // from the group should be focused. 87 // from the group should be focused.
81 return false; 88 return false;
82 } 89 }
83 90
84 void RadioButton::OnFocus() { 91 void RadioButton::OnFocus() {
85 Checkbox::OnFocus(); 92 Checkbox::OnFocus();
86 SetChecked(true); 93 SetChecked(true);
87 ui::MouseEvent event(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(), 0); 94 ui::MouseEvent event(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(), 0);
88 TextButtonBase::NotifyClick(event); 95 LabelButton::NotifyClick(event);
89 } 96 }
90 97
91 void RadioButton::NotifyClick(const ui::Event& event) { 98 void RadioButton::NotifyClick(const ui::Event& event) {
92 // Set the checked state to true only if we are unchecked, since we can't 99 // Set the checked state to true only if we are unchecked, since we can't
93 // be toggled on and off like a checkbox. 100 // be toggled on and off like a checkbox.
94 if (!checked()) 101 if (!checked())
95 SetChecked(true); 102 SetChecked(true);
96 RequestFocus(); 103 RequestFocus();
97 TextButtonBase::NotifyClick(event); 104 LabelButton::NotifyClick(event);
98 } 105 }
99 106
100 ui::NativeTheme::Part RadioButton::GetThemePart() const { 107 ui::NativeTheme::Part RadioButton::GetThemePart() const {
101 return ui::NativeTheme::kRadio; 108 return ui::NativeTheme::kRadio;
102 } 109 }
103 110
104 } // namespace views 111 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698