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

Unified Diff: ui/views/view_targeter.cc

Issue 401933002: Move views event targeting into ViewTargeterDelegate::TargetForRect() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments addressed Created 6 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
« no previous file with comments | « ui/views/view_targeter.h ('k') | ui/views/view_targeter_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/view_targeter.cc
diff --git a/ui/views/view_targeter.cc b/ui/views/view_targeter.cc
index d8e0573b70f90800bcf3c0ab6e39fcdcfe8bedef..547c40213900106a320a6f19d077d609e8e921dc 100644
--- a/ui/views/view_targeter.cc
+++ b/ui/views/view_targeter.cc
@@ -13,16 +13,20 @@ namespace views {
ViewTargeter::ViewTargeter(ViewTargeterDelegate* delegate)
: delegate_(delegate) {
+ DCHECK(delegate_);
}
ViewTargeter::~ViewTargeter() {}
bool ViewTargeter::DoesIntersectRect(const View* target,
const gfx::Rect& rect) const {
- DCHECK(delegate_);
return delegate_->DoesIntersectRect(target, rect);
}
+View* ViewTargeter::TargetForRect(View* root, const gfx::Rect& rect) const {
+ return delegate_->TargetForRect(root, rect);
+}
+
gfx::RectF ViewTargeter::BoundsForEvent(const ui::LocatedEvent& event) const {
gfx::RectF event_bounds(event.location_f(), gfx::SizeF(1, 1));
if (event.IsGestureEvent()) {
« no previous file with comments | « ui/views/view_targeter.h ('k') | ui/views/view_targeter_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698