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

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

Issue 101573006: Changes MouseEvent constructor to take changed_button_flags. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test; needs updated expectations as mouse entered wasnt sent before because of env::mouse_butto… Created 7 years 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 "grit/ui_resources.h"
9 #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" 10 #include "ui/base/resource/resource_bundle.h"
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 116
117 bool RadioButton::IsGroupFocusTraversable() const { 117 bool RadioButton::IsGroupFocusTraversable() const {
118 // When focusing a radio button with tab/shift+tab, only the selected button 118 // When focusing a radio button with tab/shift+tab, only the selected button
119 // from the group should be focused. 119 // from the group should be focused.
120 return false; 120 return false;
121 } 121 }
122 122
123 void RadioButton::OnFocus() { 123 void RadioButton::OnFocus() {
124 Checkbox::OnFocus(); 124 Checkbox::OnFocus();
125 SetChecked(true); 125 SetChecked(true);
126 ui::MouseEvent event(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(), 0); 126 ui::MouseEvent event(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(), 0, 0);
127 LabelButton::NotifyClick(event); 127 LabelButton::NotifyClick(event);
128 } 128 }
129 129
130 void RadioButton::NotifyClick(const ui::Event& event) { 130 void RadioButton::NotifyClick(const ui::Event& event) {
131 // Set the checked state to true only if we are unchecked, since we can't 131 // Set the checked state to true only if we are unchecked, since we can't
132 // be toggled on and off like a checkbox. 132 // be toggled on and off like a checkbox.
133 if (!checked()) 133 if (!checked())
134 SetChecked(true); 134 SetChecked(true);
135 RequestFocus(); 135 RequestFocus();
136 LabelButton::NotifyClick(event); 136 LabelButton::NotifyClick(event);
137 } 137 }
138 138
139 ui::NativeTheme::Part RadioButton::GetThemePart() const { 139 ui::NativeTheme::Part RadioButton::GetThemePart() const {
140 return ui::NativeTheme::kRadio; 140 return ui::NativeTheme::kRadio;
141 } 141 }
142 142
143 } // namespace views 143 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/controls/button/custom_button_unittest.cc ('k') | ui/views/controls/combobox/combobox_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698