Index: ui/views/controls/image_view.cc |
diff --git a/ui/views/controls/image_view.cc b/ui/views/controls/image_view.cc |
index 8ee1ad90a97ba9d6212a43d3110b6cc5988c3577..5e03cf2bb93666525430b11e8216595b4a2aaa04 100644 |
--- a/ui/views/controls/image_view.cc |
+++ b/ui/views/controls/image_view.cc |
@@ -205,11 +205,10 @@ bool ImageView::GetTooltipText(const gfx::Point& p, |
return true; |
} |
-bool ImageView::HitTestRect(const gfx::Rect& rect) const { |
- return interactive_ ? View::HitTestRect(rect) : false; |
+bool ImageView::CanAcceptEvent(const ui::Event& event) { |
+ return interactive_; |
sadrul
2014/05/21 15:44:03
Should this be 'interactive_ && View::CanAcceptEve
tdanderson
2014/05/21 21:07:49
Done.
|
} |
- |
void ImageView::OnPaintImage(gfx::Canvas* canvas) { |
last_paint_scale_ = canvas->image_scale(); |
last_painted_bitmap_pixels_ = NULL; |