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

Unified Diff: ui/views/controls/button/radio_button.cc

Issue 2627353002: Create vector icon directory for resources used by controls in ui/views. (Closed)
Patch Set: fix win? 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/controls/button/radio_button.h ('k') | ui/views/controls/menu/menu_image_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/button/radio_button.cc
diff --git a/ui/views/controls/button/radio_button.cc b/ui/views/controls/button/radio_button.cc
index c350b85101d3b36cdddec590df6539483a38750a..583634922f8dc04b5755ccc53903e74b57e40139 100644
--- a/ui/views/controls/button/radio_button.cc
+++ b/ui/views/controls/button/radio_button.cc
@@ -10,9 +10,9 @@
#include "ui/events/event_utils.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/paint_vector_icon.h"
-#include "ui/gfx/vector_icons_public.h"
#include "ui/resources/grit/ui_resources.h"
#include "ui/views/resources/grit/views_resources.h"
+#include "ui/views/resources/vector_icons/vector_icons.h"
#include "ui/views/widget/widget.h"
namespace views {
@@ -152,9 +152,8 @@ void RadioButton::PaintFocusRing(gfx::Canvas* canvas, const SkPaint& paint) {
image()->width() / 2, paint);
}
-gfx::VectorIconId RadioButton::GetVectorIconId() const {
- return checked() ? gfx::VectorIconId::RADIO_BUTTON_ACTIVE
- : gfx::VectorIconId::RADIO_BUTTON_NORMAL;
+const gfx::VectorIcon& RadioButton::GetVectorIcon() const {
+ return checked() ? kRadioButtonActiveIcon : kRadioButtonNormalIcon;
}
} // namespace views
« no previous file with comments | « ui/views/controls/button/radio_button.h ('k') | ui/views/controls/menu/menu_image_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698