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

Unified Diff: ui/views/controls/image_view.cc

Issue 1236863006: Generated header files apparently require hard_dependency (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: don't include header in header Created 5 years, 5 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/image_view.cc
diff --git a/ui/views/controls/image_view.cc b/ui/views/controls/image_view.cc
index 70dd49a8d7b76c89bdf35296ee97e38043cf7dab..08cba40959d3ac439f583cd8fa3010987897de06 100644
--- a/ui/views/controls/image_view.cc
+++ b/ui/views/controls/image_view.cc
@@ -11,6 +11,7 @@
#include "ui/gfx/canvas.h"
#include "ui/gfx/geometry/insets.h"
#include "ui/gfx/paint_vector_icon.h"
+#include "ui/gfx/vector_icons_public.h"
#include "ui/views/painter.h"
namespace views {
@@ -32,7 +33,7 @@ const char ImageView::kViewClassName[] = "ImageView";
ImageView::ImageView()
: image_size_set_(false),
- vector_id_(gfx::VectorIconId::VECTOR_ICON_NONE),
+ vector_id_(static_cast<int>(gfx::VectorIconId::VECTOR_ICON_NONE)),
vector_color_(SK_ColorGREEN),
horiz_alignment_(CENTER),
vert_alignment_(CENTER),
@@ -74,7 +75,7 @@ void ImageView::SetVectorIcon(gfx::VectorIconId id,
SkColor color,
const gfx::Size& image_size) {
SetImageSize(image_size);
- vector_id_ = id;
+ vector_id_ = static_cast<int>(id);
vector_color_ = color;
}
@@ -245,12 +246,13 @@ void ImageView::OnPaintImage(gfx::Canvas* canvas) {
}
void ImageView::OnPaintVectorIcon(gfx::Canvas* canvas) {
- if (vector_id_ == gfx::VectorIconId::VECTOR_ICON_NONE)
+ if (vector_id_ == static_cast<int>(gfx::VectorIconId::VECTOR_ICON_NONE))
return;
DCHECK(image_size_set_);
canvas->Translate(ComputeImageOrigin(image_size_).OffsetFromOrigin());
- gfx::PaintVectorIcon(canvas, vector_id_, image_size_.width(), vector_color_);
+ gfx::PaintVectorIcon(canvas, static_cast<gfx::VectorIconId>(vector_id_),
+ image_size_.width(), vector_color_);
}
} // namespace views

Powered by Google App Engine
This is Rietveld 408576698