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

Unified Diff: ui/views/controls/menu/menu_image_util.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.cc ('k') | ui/views/resources/vector_icons/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 7f342ac6dc11ca2719c219f1e9187066329207ef..55bc8f5bbe3d39e9efaf994a7af0f271acbb8705 100644
--- a/ui/views/controls/menu/menu_image_util.cc
+++ b/ui/views/controls/menu/menu_image_util.cc
@@ -7,26 +7,27 @@
#include "ui/base/material_design/material_design_controller.h"
#include "ui/gfx/color_palette.h"
#include "ui/gfx/paint_vector_icon.h"
-#include "ui/gfx/vector_icons_public.h"
+#include "ui/gfx/vector_icon_types.h"
+#include "ui/views/resources/vector_icons/vector_icons.h"
namespace views {
gfx::ImageSkia GetMenuCheckImage(SkColor icon_color) {
- return gfx::CreateVectorIcon(gfx::VectorIconId::MENU_CHECK, icon_color);
+ return gfx::CreateVectorIcon(kMenuCheckIcon, icon_color);
}
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;
+ const gfx::VectorIcon& icon =
+ toggled ? kMenuRadioSelectedIcon : kMenuRadioEmptyIcon;
SkColor color =
toggled && !hovered ? gfx::kGoogleBlue500 : default_icon_color;
- return gfx::CreateVectorIcon(id, kMenuCheckSize, color);
+ return gfx::CreateVectorIcon(icon, kMenuCheckSize, color);
}
gfx::ImageSkia GetSubmenuArrowImage(SkColor icon_color) {
- return gfx::CreateVectorIcon(gfx::VectorIconId::SUBMENU_ARROW, icon_color);
+ return gfx::CreateVectorIcon(kSubmenuArrowIcon, icon_color);
}
} // namespace views
« no previous file with comments | « ui/views/controls/button/radio_button.cc ('k') | ui/views/resources/vector_icons/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698