| OLD | NEW |
| 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 "ui/accessibility/ax_node_data.h" | 8 #include "ui/accessibility/ax_node_data.h" |
| 9 #include "ui/base/resource/resource_bundle.h" | 9 #include "ui/base/resource/resource_bundle.h" |
| 10 #include "ui/events/event_utils.h" | 10 #include "ui/events/event_utils.h" |
| 11 #include "ui/gfx/canvas.h" | 11 #include "ui/gfx/canvas.h" |
| 12 #include "ui/gfx/paint_vector_icon.h" | 12 #include "ui/gfx/paint_vector_icon.h" |
| 13 #include "ui/gfx/vector_icons_public.h" | |
| 14 #include "ui/resources/grit/ui_resources.h" | 13 #include "ui/resources/grit/ui_resources.h" |
| 15 #include "ui/views/resources/grit/views_resources.h" | 14 #include "ui/views/resources/grit/views_resources.h" |
| 15 #include "ui/views/resources/vector_icons/vector_icons.h" |
| 16 #include "ui/views/widget/widget.h" | 16 #include "ui/views/widget/widget.h" |
| 17 | 17 |
| 18 namespace views { | 18 namespace views { |
| 19 | 19 |
| 20 // static | 20 // static |
| 21 const char RadioButton::kViewClassName[] = "RadioButton"; | 21 const char RadioButton::kViewClassName[] = "RadioButton"; |
| 22 | 22 |
| 23 RadioButton::RadioButton(const base::string16& label, int group_id) | 23 RadioButton::RadioButton(const base::string16& label, int group_id) |
| 24 : Checkbox(label) { | 24 : Checkbox(label) { |
| 25 SetGroup(group_id); | 25 SetGroup(group_id); |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 145 } | 145 } |
| 146 } | 146 } |
| 147 Checkbox::SetChecked(checked); | 147 Checkbox::SetChecked(checked); |
| 148 } | 148 } |
| 149 | 149 |
| 150 void RadioButton::PaintFocusRing(gfx::Canvas* canvas, const SkPaint& paint) { | 150 void RadioButton::PaintFocusRing(gfx::Canvas* canvas, const SkPaint& paint) { |
| 151 canvas->DrawCircle(gfx::RectF(image()->bounds()).CenterPoint(), | 151 canvas->DrawCircle(gfx::RectF(image()->bounds()).CenterPoint(), |
| 152 image()->width() / 2, paint); | 152 image()->width() / 2, paint); |
| 153 } | 153 } |
| 154 | 154 |
| 155 gfx::VectorIconId RadioButton::GetVectorIconId() const { | 155 const gfx::VectorIcon& RadioButton::GetVectorIcon() const { |
| 156 return checked() ? gfx::VectorIconId::RADIO_BUTTON_ACTIVE | 156 return checked() ? kRadioButtonActiveIcon : kRadioButtonNormalIcon; |
| 157 : gfx::VectorIconId::RADIO_BUTTON_NORMAL; | |
| 158 } | 157 } |
| 159 | 158 |
| 160 } // namespace views | 159 } // namespace views |
| OLD | NEW |