Move views event targeting into ViewTargeterDelegate::TargetForRect()

ui/views/view_targeter.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/view_targeter.h"
 
 #include "ui/events/event_target.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/view.h"
 #include "ui/views/view_targeter_delegate.h"
 
 namespace views {
 
 ViewTargeter::ViewTargeter(ViewTargeterDelegate* delegate)
     : delegate_(delegate) {

[sadrul, 2014/07/18 22:17:33]

Add DCHECK(delegate_) here, and remove the dchecks in lines 22/27

[tdanderson, 2014/07/19 17:32:53]

Done.

 }
 
 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 {
+  DCHECK(delegate_);
+  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()) {
     const ui::GestureEvent& gesture = *(event.AsGestureEvent());
     event_bounds = gesture.details().bounding_box_f();
   }
 
   return event_bounds;
 }
 
@@ skipping 43 matching lines @@
   return view->HitTestRect(rect_in_view_coords);
 }
 
 View* ViewTargeter::FindTargetForKeyEvent(View* view, const ui::KeyEvent& key) {
   if (view->GetFocusManager())
     return view->GetFocusManager()->GetFocusedView();
   return NULL;
 }
 
 }  // namespace aura