Index: ui/views/controls/image_view.h |
diff --git a/ui/views/controls/image_view.h b/ui/views/controls/image_view.h |
index 28a8f0749331848d2b31a688479fda83b76f1406..24e76f2d1978ddc00f137131825a908355064b3c 100644 |
--- a/ui/views/controls/image_view.h |
+++ b/ui/views/controls/image_view.h |
@@ -7,11 +7,11 @@ |
#include "third_party/skia/include/core/SkColor.h" |
#include "ui/gfx/image/image_skia.h" |
-#include "ui/gfx/vector_icons_public.h" |
#include "ui/views/view.h" |
namespace gfx { |
class Canvas; |
+enum class VectorIconId; |
} |
namespace views { |
@@ -122,7 +122,7 @@ class VIEWS_EXPORT ImageView : public View { |
// The ID of the vector icon that should be drawn, or gfx::VECTOR_ICON_NONE. |
// This is drawn in addition to |image_|, but in most cases you probably want |
// one or the other and not both. |
- gfx::VectorIconId vector_id_; |
+ int vector_id_; |
Nico
2015/07/13 22:06:12
you can probably keep this a gfx::VectorIconId. Si
Evan Stade
2015/07/13 23:20:43
hmm, when I tried this before I got
error: field
|
// The color to use when drawing the vector icon. |
SkColor vector_color_; |