View should store a ViewTargeter instead of an EventTargeter

ui/views/view_targeter_unittest.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_targeter.h"
 #include "ui/events/event_utils.h"
 #include "ui/views/test/views_test_base.h"
+#include "ui/views/view_targeter.h"
 #include "ui/views/widget/root_view.h"
 
 namespace views {
 
 // A derived class of View used for testing purposes.
 class TestingView : public View {
  public:
   TestingView() : can_process_events_within_subtree_(true) {}
   virtual ~TestingView() {}
 
@@ skipping 34 matching lines @@
   View* child = new View;
   View* grandchild = new View;
 
   widget.SetContentsView(content);
   content->AddChildView(child);
   child->AddChildView(grandchild);
 
   grandchild->SetFocusable(true);
   grandchild->RequestFocus();
 
-  ui::EventTargeter* targeter = new ViewTargeter();
+  ViewTargeter* view_targeter = new ViewTargeter();
+  ui::EventTargeter* targeter = view_targeter;
   internal::RootView* root_view =
       static_cast<internal::RootView*>(widget.GetRootView());
-  root_view->SetEventTargeter(make_scoped_ptr(targeter));
+  root_view->SetEventTargeter(make_scoped_ptr(view_targeter));
 
   ui::KeyEvent key_event(ui::ET_KEY_PRESSED, ui::VKEY_A, 0, true);
 
   // The focused view should be the initial target of the event.
   ui::EventTarget* current_target = targeter->FindTargetForEvent(root_view,
                                                                  &key_event);
   EXPECT_EQ(grandchild, static_cast<View*>(current_target));
 
   // Verify that FindNextBestTarget() will return the parent view of the
   // argument (and NULL if the argument has no parent view).
@@ skipping 24 matching lines @@
   content->SetBounds(0, 0, 100, 100);
   View* child = new View;
   child->SetBounds(50, 50, 20, 20);
   View* grandchild = new View;
   grandchild->SetBounds(0, 0, 5, 5);
 
   widget.SetContentsView(content);
   content->AddChildView(child);
   child->AddChildView(grandchild);
 
-  ui::EventTargeter* targeter = new ViewTargeter();
+  ViewTargeter* view_targeter = new ViewTargeter();
+  ui::EventTargeter* targeter = view_targeter;
   internal::RootView* root_view =
       static_cast<internal::RootView*>(widget.GetRootView());
-  root_view->SetEventTargeter(make_scoped_ptr(targeter));
+  root_view->SetEventTargeter(make_scoped_ptr(view_targeter));
 
   // The event falls within the bounds of |child| and |content| but not
   // |grandchild|, so |child| should be the initial target for the event.
   ui::ScrollEvent scroll(ui::ET_SCROLL,
                          gfx::Point(60, 60),
                          ui::EventTimeForNow(),
                          0,
                          0, 3,
                          0, 3,
                          2);
@@ skipping 28 matching lines @@
 
 // Tests the basic functionality of the method
 // ViewTargeter::SubtreeShouldBeExploredForEvent().
 TEST_F(ViewTargeterTest, SubtreeShouldBeExploredForEvent) {
   Widget widget;
   Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.bounds = gfx::Rect(0, 0, 650, 650);
   widget.Init(params);
 
-  ui::EventTargeter* targeter = new ViewTargeter();
+  ViewTargeter* targeter = new ViewTargeter();
   internal::RootView* root_view =
       static_cast<internal::RootView*>(widget.GetRootView());
   root_view->SetEventTargeter(make_scoped_ptr(targeter));
 
   // The coordinates used for SetBounds() are in the parent coordinate space.
   View v1, v2, v3;
   v1.SetBounds(0, 0, 300, 300);
   v2.SetBounds(100, 100, 100, 100);
   v3.SetBounds(0, 0, 10, 10);
   v3.SetVisible(false);
@@ skipping 44 matching lines @@
 // Tests that FindTargetForEvent() returns the correct target when some
 // views in the view tree return false when CanProcessEventsWithinSubtree()
 // is called on them.
 TEST_F(ViewTargeterTest, CanProcessEventsWithinSubtree) {
   Widget widget;
   Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.bounds = gfx::Rect(0, 0, 650, 650);
   widget.Init(params);
 
-  ui::EventTargeter* targeter = new ViewTargeter();
+  ViewTargeter* view_targeter = new ViewTargeter();
+  ui::EventTargeter* targeter = view_targeter;
   internal::RootView* root_view =
       static_cast<internal::RootView*>(widget.GetRootView());
-  root_view->SetEventTargeter(make_scoped_ptr(targeter));
+  root_view->SetEventTargeter(make_scoped_ptr(view_targeter));
 
   // The coordinates used for SetBounds() are in the parent coordinate space.
   TestingView v1, v2, v3;
   v1.SetBounds(0, 0, 300, 300);
   v2.SetBounds(100, 100, 100, 100);
   v3.SetBounds(0, 0, 10, 10);
   root_view->AddChildView(&v1);
   v1.AddChildView(&v2);
   v2.AddChildView(&v3);
 
@@ skipping 40 matching lines @@
   v1.set_can_process_events_within_subtree(false);
   current_target = targeter->FindTargetForEvent(root_view, &scroll);
   EXPECT_EQ(root_view, current_target);
 
   // TODO(tdanderson): We should also test that targeting works correctly
   //                   with gestures. See crbug.com/375822.
 }
 
 }  // namespace test
 }  // namespace views