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

Unified Diff: ui/views/controls/menu/menu_image_util.cc

Issue 1637973002: Vectorize menu radio buttons. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
Index: ui/views/controls/menu/menu_image_util.cc
diff --git a/ui/views/controls/menu/menu_image_util.cc b/ui/views/controls/menu/menu_image_util.cc
index ae77030a4697d496f0bc1bdb76a76a10f31807f3..55f6e551c2f485bdd38f6ed63fc01196f21726c7 100644
--- a/ui/views/controls/menu/menu_image_util.cc
+++ b/ui/views/controls/menu/menu_image_util.cc
@@ -5,10 +5,9 @@
#include "ui/views/controls/menu/menu_image_util.h"
#include "ui/base/material_design/material_design_controller.h"
-#include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/color_palette.h"
#include "ui/gfx/paint_vector_icon.h"
#include "ui/gfx/vector_icons_public.h"
-#include "ui/views/resources/grit/views_resources.h"
namespace views {
@@ -17,10 +16,14 @@ gfx::ImageSkia GetMenuCheckImage(SkColor icon_color) {
icon_color);
}
-gfx::ImageSkia GetRadioButtonImage(bool selected) {
- int image_id = selected ? IDR_MENU_RADIO_SELECTED : IDR_MENU_RADIO_EMPTY;
- return ui::ResourceBundle::GetSharedInstance().GetImageNamed(image_id).
- AsImageSkia();
+gfx::ImageSkia GetRadioButtonImage(bool toggled,
+ bool hovered,
+ SkColor default_icon_color) {
+ gfx::VectorIconId id = toggled ? gfx::VectorIconId::MENU_RADIO_SELECTED
+ : gfx::VectorIconId::MENU_RADIO_EMPTY;
+ SkColor color =
+ toggled && !hovered ? gfx::kGoogleBlue500 : default_icon_color;
+ return gfx::CreateVectorIcon(id, kMenuCheckSize, color);
}
gfx::ImageSkia GetSubmenuArrowImage(SkColor icon_color) {

Powered by Google App Engine
This is Rietveld 408576698