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

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

Issue 2653223005: Move views vector icons from source_set to part of views target. (Closed)
Patch Set: rebase Created 3 years, 11 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
« no previous file with comments | « ui/views/controls/button/checkbox.cc ('k') | ui/views/controls/menu/menu_image_util.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "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/resources/grit/ui_resources.h" 13 #include "ui/resources/grit/ui_resources.h"
14 #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" 15 #include "ui/views/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 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 const gfx::VectorIcon& RadioButton::GetVectorIcon() const { 155 const gfx::VectorIcon& RadioButton::GetVectorIcon() const {
156 return checked() ? kRadioButtonActiveIcon : kRadioButtonNormalIcon; 156 return checked() ? kRadioButtonActiveIcon : kRadioButtonNormalIcon;
157 } 157 }
158 158
159 } // namespace views 159 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/controls/button/checkbox.cc ('k') | ui/views/controls/menu/menu_image_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698