Introduce RootWindowHostDelegate. The RootWindowHost performs most of its communication with RootWi…

ui/aura/root_window_unittest.cc

 // Copyright (c) 2012 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/aura/root_window.h"
 
 #include <vector>
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/client/event_client.h"
@@ skipping 94 matching lines @@
   // How many mouse events have been received?
   int num_mouse_events_;
 
   DISALLOW_COPY_AND_ASSIGN(EventCountFilter);
 };
 
 }  // namespace
 
 typedef test::AuraTestBase RootWindowTest;
 
-TEST_F(RootWindowTest, DispatchMouseEvent) {
+TEST_F(RootWindowTest, OnHostMouseEvent) {
   // Create two non-overlapping windows so we don't have to worry about which
   // is on top.
   scoped_ptr<NonClientDelegate> delegate1(new NonClientDelegate());
   scoped_ptr<NonClientDelegate> delegate2(new NonClientDelegate());
   const int kWindowWidth = 123;
   const int kWindowHeight = 45;
   gfx::Rect bounds1(100, 200, kWindowWidth, kWindowHeight);
   gfx::Rect bounds2(300, 400, kWindowWidth, kWindowHeight);
   scoped_ptr<aura::Window> window1(CreateTestWindowWithDelegate(
       delegate1.get(), -1234, bounds1, NULL));
   scoped_ptr<aura::Window> window2(CreateTestWindowWithDelegate(
       delegate2.get(), -5678, bounds2, NULL));
 
   // Send a mouse event to window1.
   gfx::Point point(101, 201);
   MouseEvent event1(
       ui::ET_MOUSE_PRESSED, point, point, ui::EF_LEFT_MOUSE_BUTTON);
-  root_window()->DispatchMouseEvent(&event1);
+  root_window()->AsRootWindowHostDelegate()->OnHostMouseEvent(&event1);
 
   // Event was tested for non-client area for the target window.
   EXPECT_EQ(1, delegate1->non_client_count());
   EXPECT_EQ(0, delegate2->non_client_count());
   // The non-client component test was in local coordinates.
   EXPECT_EQ(gfx::Point(1, 1), delegate1->non_client_location());
   // Mouse event was received by target window.
   EXPECT_EQ(1, delegate1->mouse_event_count());
   EXPECT_EQ(0, delegate2->mouse_event_count());
   // Event was in local coordinates.
   EXPECT_EQ(gfx::Point(1, 1), delegate1->mouse_event_location());
   // Non-client flag was set.
   EXPECT_TRUE(delegate1->mouse_event_flags() & ui::EF_IS_NON_CLIENT);
 }
 
 // Check that we correctly track the state of the mouse buttons in response to
 // button press and release events.
 TEST_F(RootWindowTest, MouseButtonState) {
   EXPECT_FALSE(Env::GetInstance()->is_mouse_button_down());
 
   gfx::Point location;
   scoped_ptr<MouseEvent> event;
 
   // Press the left button.
   event.reset(new MouseEvent(
       ui::ET_MOUSE_PRESSED,
       location,
       location,
       ui::EF_LEFT_MOUSE_BUTTON));
-  root_window()->DispatchMouseEvent(event.get());
+  root_window()->AsRootWindowHostDelegate()->OnHostMouseEvent(event.get());
   EXPECT_TRUE(Env::GetInstance()->is_mouse_button_down());
 
   // Additionally press the right.
   event.reset(new MouseEvent(
       ui::ET_MOUSE_PRESSED,
       location,
       location,
       ui::EF_LEFT_MOUSE_BUTTON | ui::EF_RIGHT_MOUSE_BUTTON));
-  root_window()->DispatchMouseEvent(event.get());
+  root_window()->AsRootWindowHostDelegate()->OnHostMouseEvent(event.get());
   EXPECT_TRUE(Env::GetInstance()->is_mouse_button_down());
 
   // Release the left button.
   event.reset(new MouseEvent(
       ui::ET_MOUSE_RELEASED,
       location,
       location,
       ui::EF_RIGHT_MOUSE_BUTTON));
-  root_window()->DispatchMouseEvent(event.get());
+  root_window()->AsRootWindowHostDelegate()->OnHostMouseEvent(event.get());
   EXPECT_TRUE(Env::GetInstance()->is_mouse_button_down());
 
   // Release the right button.  We should ignore the Shift-is-down flag.
   event.reset(new MouseEvent(
       ui::ET_MOUSE_RELEASED,
       location,
       location,
       ui::EF_SHIFT_DOWN));
-  root_window()->DispatchMouseEvent(event.get());
+  root_window()->AsRootWindowHostDelegate()->OnHostMouseEvent(event.get());
   EXPECT_FALSE(Env::GetInstance()->is_mouse_button_down());
 
   // Press the middle button.
   event.reset(new MouseEvent(
       ui::ET_MOUSE_PRESSED,
       location,
       location,
       ui::EF_MIDDLE_MOUSE_BUTTON));
-  root_window()->DispatchMouseEvent(event.get());
+  root_window()->AsRootWindowHostDelegate()->OnHostMouseEvent(event.get());
   EXPECT_TRUE(Env::GetInstance()->is_mouse_button_down());
 }
 
 TEST_F(RootWindowTest, TranslatedEvent) {
   scoped_ptr<Window> w1(test::CreateTestWindowWithDelegate(NULL, 1,
       gfx::Rect(50, 50, 100, 100), NULL));
 
   gfx::Point origin(100, 100);
   MouseEvent root(ui::ET_MOUSE_PRESSED, origin, origin, 0);
 
@@ skipping 117 matching lines @@
   // Prevent w3 from being deleted by the hierarchy since its delegate is owned
   // by this scope.
   w3->parent()->RemoveChild(w3.get());
 }
 
 TEST_F(RootWindowTest, IgnoreUnknownKeys) {
   EventCountFilter* filter = new EventCountFilter;
   root_window()->SetEventFilter(filter);  // passes ownership
 
   KeyEvent unknown_event(ui::ET_KEY_PRESSED, ui::VKEY_UNKNOWN, 0);
-  EXPECT_FALSE(root_window()->DispatchKeyEvent(&unknown_event));
+  EXPECT_FALSE(root_window()->AsRootWindowHostDelegate()->OnHostKeyEvent(
+      &unknown_event));
   EXPECT_EQ(0, filter->num_key_events());
 
   KeyEvent known_event(ui::ET_KEY_PRESSED, ui::VKEY_A, 0);
-  EXPECT_TRUE(root_window()->DispatchKeyEvent(&known_event));
+  EXPECT_TRUE(root_window()->AsRootWindowHostDelegate()->OnHostKeyEvent(
+      &known_event));
   EXPECT_EQ(1, filter->num_key_events());
 }
 
 namespace {
 
 // FilterFilter that tracks the types of events it's seen.
 class EventFilterRecorder : public EventFilter {
  public:
   typedef std::vector<ui::EventType> Events;
 
@@ skipping 103 matching lines @@
 TEST_F(RootWindowTest, HoldMouseMove) {
   EventFilterRecorder* filter = new EventFilterRecorder;
   root_window()->SetEventFilter(filter);  // passes ownership
 
   test::TestWindowDelegate delegate;
   scoped_ptr<aura::Window> window(CreateTestWindowWithDelegate(
       &delegate, 1, gfx::Rect(0, 0, 100, 100), NULL));
 
   MouseEvent mouse_move_event(ui::ET_MOUSE_MOVED, gfx::Point(0, 0),
                               gfx::Point(0, 0), 0);
-  root_window()->DispatchMouseEvent(&mouse_move_event);
+  root_window()->AsRootWindowHostDelegate()->OnHostMouseEvent(
+      &mouse_move_event);
   // Discard MOUSE_ENTER.
   filter->events().clear();
 
   root_window()->HoldMouseMoves();
 
   // Check that we don't immediately dispatch the MOUSE_DRAGGED event.
   MouseEvent mouse_dragged_event(ui::ET_MOUSE_DRAGGED, gfx::Point(0, 0),
                               gfx::Point(0, 0), 0);
-  root_window()->DispatchMouseEvent(&mouse_dragged_event);
+  root_window()->AsRootWindowHostDelegate()->OnHostMouseEvent(
+      &mouse_dragged_event);
   EXPECT_TRUE(filter->events().empty());
 
   // Check that we do dispatch the held MOUSE_DRAGGED event before another type
   // of event.
   MouseEvent mouse_pressed_event(ui::ET_MOUSE_PRESSED, gfx::Point(0, 0),
                                  gfx::Point(0, 0), 0);
-  root_window()->DispatchMouseEvent(&mouse_pressed_event);
+  root_window()->AsRootWindowHostDelegate()->OnHostMouseEvent(
+      &mouse_pressed_event);
   EXPECT_EQ("MOUSE_DRAGGED MOUSE_PRESSED",
             EventTypesToString(filter->events()));
   filter->events().clear();
 
   // Check that we coalesce held MOUSE_DRAGGED events.
   MouseEvent mouse_dragged_event2(ui::ET_MOUSE_DRAGGED, gfx::Point(1, 1),
                                   gfx::Point(1, 1), 0);
-  root_window()->DispatchMouseEvent(&mouse_dragged_event);
-  root_window()->DispatchMouseEvent(&mouse_dragged_event2);
+  root_window()->AsRootWindowHostDelegate()->OnHostMouseEvent(
+      &mouse_dragged_event);
+  root_window()->AsRootWindowHostDelegate()->OnHostMouseEvent(
+      &mouse_dragged_event2);
   EXPECT_TRUE(filter->events().empty());
-  root_window()->DispatchMouseEvent(&mouse_pressed_event);
+  root_window()->AsRootWindowHostDelegate()->OnHostMouseEvent(
+      &mouse_pressed_event);
   EXPECT_EQ("MOUSE_DRAGGED MOUSE_PRESSED",
             EventTypesToString(filter->events()));
   filter->events().clear();
 
   // Check that on ReleaseMouseMoves, held events are not dispatched
   // immediately, but posted instead.
-  root_window()->DispatchMouseEvent(&mouse_dragged_event);
+  root_window()->AsRootWindowHostDelegate()->OnHostMouseEvent(
+      &mouse_dragged_event);
   root_window()->ReleaseMouseMoves();
   EXPECT_TRUE(filter->events().empty());
   RunAllPendingInMessageLoop();
   EXPECT_EQ("MOUSE_DRAGGED", EventTypesToString(filter->events()));
   filter->events().clear();
 
   // However if another message comes in before the dispatch,
   // the Check that on ReleaseMouseMoves, held events are not dispatched
   // immediately, but posted instead.
   root_window()->HoldMouseMoves();
-  root_window()->DispatchMouseEvent(&mouse_dragged_event);
+  root_window()->AsRootWindowHostDelegate()->OnHostMouseEvent(
+      &mouse_dragged_event);
   root_window()->ReleaseMouseMoves();
-  root_window()->DispatchMouseEvent(&mouse_pressed_event);
+  root_window()->AsRootWindowHostDelegate()->OnHostMouseEvent(
+      &mouse_pressed_event);
   EXPECT_EQ("MOUSE_DRAGGED MOUSE_PRESSED",
             EventTypesToString(filter->events()));
   filter->events().clear();
   RunAllPendingInMessageLoop();
   EXPECT_TRUE(filter->events().empty());
 
   // Check that if the other message is another MOUSE_DRAGGED, we still coalesce
   // them.
   root_window()->HoldMouseMoves();
-  root_window()->DispatchMouseEvent(&mouse_dragged_event);
+  root_window()->AsRootWindowHostDelegate()->OnHostMouseEvent(
+      &mouse_dragged_event);
   root_window()->ReleaseMouseMoves();
-  root_window()->DispatchMouseEvent(&mouse_dragged_event2);
+  root_window()->AsRootWindowHostDelegate()->OnHostMouseEvent(
+      &mouse_dragged_event2);
   EXPECT_EQ("MOUSE_DRAGGED", EventTypesToString(filter->events()));
   filter->events().clear();
   RunAllPendingInMessageLoop();
   EXPECT_TRUE(filter->events().empty());
 }
 
 }  // namespace aura