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

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

Issue 296703012: Revert "Remove override of View::HitTestRect() from ImageView" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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/image_view.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/image_view.cc
diff --git a/ui/views/controls/image_view.cc b/ui/views/controls/image_view.cc
index 26293aeb51cc41684eb897ddff739c19e79a3747..8ca75365f81549217038500ffc1cd5fff87770fe 100644
--- a/ui/views/controls/image_view.cc
+++ b/ui/views/controls/image_view.cc
@@ -205,10 +205,11 @@ bool ImageView::GetTooltipText(const gfx::Point& p,
return true;
}
-bool ImageView::CanAcceptEvent(const ui::Event& event) {
- return interactive_ && View::CanAcceptEvent(event);
+bool ImageView::HitTestRect(const gfx::Rect& rect) const {
+ return interactive_ ? View::HitTestRect(rect) : false;
}
+
void ImageView::OnPaintImage(gfx::Canvas* canvas) {
last_paint_scale_ = canvas->image_scale();
last_painted_bitmap_pixels_ = NULL;
« no previous file with comments | « ui/views/controls/image_view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698