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

ash/wm/window_manager_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 "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_activation_delegate.h"
 #include "ash/wm/activation_controller.h"
 #include "ash/wm/cursor_manager.h"
@@ skipping 99 matching lines @@
   // Click on a sub-window (w121) to focus it.
   aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
                                        w121.get());
   generator.ClickLeftButton();
 
   aura::FocusManager* focus_manager = w121->GetFocusManager();
   EXPECT_EQ(w121.get(), focus_manager->GetFocusedWindow());
 
   // The key press should be sent to the focused sub-window.
   aura::KeyEvent keyev(ui::ET_KEY_PRESSED, ui::VKEY_E, 0);
-  root_window->DispatchKeyEvent(&keyev);
+  root_window->AsRootWindowHostDelegate()->OnHostKeyEvent(&keyev);
   EXPECT_EQ(ui::VKEY_E, w121delegate->last_key_code());
 
   // Touch on a sub-window (w122) to focus it.
   gfx::Point click_point = w122->bounds().CenterPoint();
   aura::Window::ConvertPointToWindow(w122->parent(), root_window, &click_point);
   aura::TouchEvent touchev(ui::ET_TOUCH_PRESSED, click_point, 0, getTime());
-  root_window->DispatchTouchEvent(&touchev);
+  root_window->AsRootWindowHostDelegate()->OnHostTouchEvent(&touchev);
   focus_manager = w122->GetFocusManager();
   EXPECT_EQ(w122.get(), focus_manager->GetFocusedWindow());
 
   // The key press should be sent to the focused sub-window.
-  root_window->DispatchKeyEvent(&keyev);
+  root_window->AsRootWindowHostDelegate()->OnHostKeyEvent(&keyev);
   EXPECT_EQ(ui::VKEY_E, w122delegate->last_key_code());
 
   // Hiding the focused window will set the focus to its parent if
   // it's focusable.
   w122->Hide();
   EXPECT_EQ(w12->GetFocusManager(), w122->GetFocusManager());
   EXPECT_EQ(w12.get(), w12->GetFocusManager()->GetFocusedWindow());
 
   // Sets the focus back to w122.
   w122->Show();
@@ skipping 11 matching lines @@
       test::TestActivationDelegate(false);
   w123->Focus();
   EXPECT_EQ(w123.get(), w12->GetFocusManager()->GetFocusedWindow());
   aura::client::SetActivationDelegate(w1.get(), activation_delegate);
 
   // Hiding the focused window will set the focus to NULL because
   // parent window is not focusable.
   w123->Hide();
   EXPECT_EQ(w12->GetFocusManager(), w123->GetFocusManager());
   EXPECT_EQ(NULL, w12->GetFocusManager()->GetFocusedWindow());
-  EXPECT_FALSE(root_window->DispatchKeyEvent(&keyev));
+  EXPECT_FALSE(root_window->AsRootWindowHostDelegate()->OnHostKeyEvent(&keyev));
 
   // Set the focus back to w123
   aura::client::SetActivationDelegate(w1.get(), NULL);
   w123->Show();
   w123->Focus();
   EXPECT_EQ(w123.get(), w12->GetFocusManager()->GetFocusedWindow());
   aura::client::SetActivationDelegate(w1.get(), activation_delegate);
 
   // Removing the focused window will set the focus to NULL because
   // parent window is not focusable.
   w12->RemoveChild(w123.get());
   EXPECT_EQ(NULL, w123->GetFocusManager());
-  EXPECT_FALSE(root_window->DispatchKeyEvent(&keyev));
+  EXPECT_FALSE(root_window->AsRootWindowHostDelegate()->OnHostKeyEvent(&keyev));
 }
 
 // Various assertion testing for activating windows.
 TEST_F(WindowManagerTest, ActivateOnMouse) {
   aura::RootWindow* root_window = Shell::GetPrimaryRootWindow();
 
   test::TestActivationDelegate d1;
   aura::test::TestWindowDelegate wd;
   scoped_ptr<aura::Window> w1(aura::test::CreateTestWindowWithDelegate(
       &wd, -1, gfx::Rect(10, 10, 50, 50), NULL));
@@ skipping 129 matching lines @@
   EXPECT_TRUE(wm::IsActiveWindow(w1.get()));
   EXPECT_EQ(w1.get(), focus_manager->GetFocusedWindow());
   EXPECT_EQ(1, d1.activated_count());
   EXPECT_EQ(0, d1.lost_active_count());
   d1.Clear();
 
   // Touch window2.
   gfx::Point press_point = w2->bounds().CenterPoint();
   aura::Window::ConvertPointToWindow(w2->parent(), root_window, &press_point);
   aura::TouchEvent touchev1(ui::ET_TOUCH_PRESSED, press_point, 0, getTime());
-  root_window->DispatchTouchEvent(&touchev1);
+  root_window->AsRootWindowHostDelegate()->OnHostTouchEvent(&touchev1);
 
   // Window2 should have become active.
   EXPECT_TRUE(wm::IsActiveWindow(w2.get()));
   EXPECT_EQ(w2.get(), focus_manager->GetFocusedWindow());
   EXPECT_EQ(0, d1.activated_count());
   EXPECT_EQ(1, d1.lost_active_count());
   EXPECT_EQ(1, d2.activated_count());
   EXPECT_EQ(0, d2.lost_active_count());
   d1.Clear();
   d2.Clear();
 
   // Touch window1, but set it up so w1 doesn't activate on touch.
   press_point = w1->bounds().CenterPoint();
   aura::Window::ConvertPointToWindow(w1->parent(), root_window, &press_point);
   d1.set_activate(false);
   aura::TouchEvent touchev2(ui::ET_TOUCH_PRESSED, press_point, 1, getTime());
-  root_window->DispatchTouchEvent(&touchev2);
+  root_window->AsRootWindowHostDelegate()->OnHostTouchEvent(&touchev2);
 
   // Window2 should still be active and focused.
   EXPECT_TRUE(wm::IsActiveWindow(w2.get()));
   EXPECT_EQ(w2.get(), focus_manager->GetFocusedWindow());
   EXPECT_EQ(0, d1.activated_count());
   EXPECT_EQ(0, d1.lost_active_count());
   EXPECT_EQ(0, d2.activated_count());
   EXPECT_EQ(0, d2.lost_active_count());
   d1.Clear();
   d2.Clear();
@@ skipping 32 matching lines @@
 
   gfx::Point point2(kWindowLeft + 1, kWindowTop + 1);
   aura::Window::ConvertPointToWindow(window->parent(), root_window, &point2);
   aura::MouseEvent move2(ui::ET_MOUSE_MOVED, point2, point2, 0x0);
 
   // Cursor starts as a pointer (set during Shell::Init()).
   EXPECT_EQ(ui::kCursorPointer, root_window->last_cursor().native_type());
 
   // Resize edges and corners show proper cursors.
   window_delegate.set_hittest_code(HTBOTTOM);
-  root_window->DispatchMouseEvent(&move1);
+  root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&move1);
   EXPECT_EQ(ui::kCursorSouthResize, root_window->last_cursor().native_type());
 
   window_delegate.set_hittest_code(HTBOTTOMLEFT);
-  root_window->DispatchMouseEvent(&move2);
+  root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&move2);
   EXPECT_EQ(ui::kCursorSouthWestResize,
       root_window->last_cursor().native_type());
 
   window_delegate.set_hittest_code(HTBOTTOMRIGHT);
-  root_window->DispatchMouseEvent(&move1);
+  root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&move1);
   EXPECT_EQ(ui::kCursorSouthEastResize,
       root_window->last_cursor().native_type());
 
   window_delegate.set_hittest_code(HTLEFT);
-  root_window->DispatchMouseEvent(&move2);
+  root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&move2);
   EXPECT_EQ(ui::kCursorWestResize, root_window->last_cursor().native_type());
 
   window_delegate.set_hittest_code(HTRIGHT);
-  root_window->DispatchMouseEvent(&move1);
+  root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&move1);
   EXPECT_EQ(ui::kCursorEastResize, root_window->last_cursor().native_type());
 
   window_delegate.set_hittest_code(HTTOP);
-  root_window->DispatchMouseEvent(&move2);
+  root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&move2);
   EXPECT_EQ(ui::kCursorNorthResize, root_window->last_cursor().native_type());
 
   window_delegate.set_hittest_code(HTTOPLEFT);
-  root_window->DispatchMouseEvent(&move1);
+  root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&move1);
   EXPECT_EQ(ui::kCursorNorthWestResize,
       root_window->last_cursor().native_type());
 
   window_delegate.set_hittest_code(HTTOPRIGHT);
-  root_window->DispatchMouseEvent(&move2);
+  root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&move2);
   EXPECT_EQ(ui::kCursorNorthEastResize,
       root_window->last_cursor().native_type());
 
   // Client area uses null cursor.
   window_delegate.set_hittest_code(HTCLIENT);
-  root_window->DispatchMouseEvent(&move1);
+  root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&move1);
   EXPECT_EQ(ui::kCursorNull, root_window->last_cursor().native_type());
 }
 
 #if defined(OS_MACOSX)
 #define MAYBE_TransformActivate FAILS_TransformActivate
 #else
 #define MAYBE_TransformActivate TransformActivate
 #endif
 TEST_F(WindowManagerTest, MAYBE_TransformActivate) {
   // Disable ash grid so that test can place a window at
@@ skipping 18 matching lines @@
       CreateTestWindowWithDelegate(&wd, 1, gfx::Rect(0, 10, 50, 50), NULL));
   d1.SetWindow(w1.get());
   w1->Show();
 
   gfx::Point miss_point(5, 5);
   transform.TransformPoint(miss_point);
   aura::MouseEvent mouseev1(ui::ET_MOUSE_PRESSED,
                             miss_point,
                             miss_point,
                             ui::EF_LEFT_MOUSE_BUTTON);
-  root_window->DispatchMouseEvent(&mouseev1);
+  root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&mouseev1);
   EXPECT_FALSE(w1->GetFocusManager()->GetFocusedWindow());
   aura::MouseEvent mouseup(ui::ET_MOUSE_RELEASED,
                            miss_point,
                            miss_point,
                            ui::EF_LEFT_MOUSE_BUTTON);
-  root_window->DispatchMouseEvent(&mouseup);
+  root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&mouseup);
 
   gfx::Point hit_point(5, 15);
   transform.TransformPoint(hit_point);
   aura::MouseEvent mouseev2(ui::ET_MOUSE_PRESSED,
                             hit_point,
                             hit_point,
                             ui::EF_LEFT_MOUSE_BUTTON);
-  root_window->DispatchMouseEvent(&mouseev2);
+  root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&mouseev2);
   EXPECT_TRUE(wm::IsActiveWindow(w1.get()));
   EXPECT_EQ(w1.get(), w1->GetFocusManager()->GetFocusedWindow());
 }
 
 TEST_F(WindowManagerTest, AdditionalFilters) {
   // The IME event filter interferes with the basic key event propagation we
   // attempt to do here, so we remove it.
   Shell::TestApi shell_test(Shell::GetInstance());
   Shell::GetInstance()->RemoveEnvEventFilter(
       shell_test.input_method_event_filter());
@@ skipping 10 matching lines @@
   scoped_ptr<aura::test::TestEventFilter> f2(new aura::test::TestEventFilter);
 
   // Adds them to root window event filter.
   aura::shared::CompoundEventFilter* env_filter =
       Shell::GetInstance()->env_filter();
   env_filter->AddFilter(f1.get());
   env_filter->AddFilter(f2.get());
 
   // Dispatches mouse and keyboard events.
   aura::KeyEvent key_event(ui::ET_KEY_PRESSED, ui::VKEY_A, 0);
-  root_window->DispatchKeyEvent(&key_event);
+  root_window->AsRootWindowHostDelegate()->OnHostKeyEvent(&key_event);
   aura::MouseEvent mouse_pressed(
       ui::ET_MOUSE_PRESSED, gfx::Point(0, 0), gfx::Point(0, 0), 0x0);
-  root_window->DispatchMouseEvent(&mouse_pressed);
+  root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&mouse_pressed);
 
   // Both filters should get the events.
   EXPECT_EQ(1, f1->key_event_count());
   EXPECT_EQ(1, f1->mouse_event_count());
   EXPECT_EQ(1, f2->key_event_count());
   EXPECT_EQ(1, f2->mouse_event_count());
 
   f1->ResetCounts();
   f2->ResetCounts();
 
   // Makes f1 consume events.
   f1->set_consumes_key_events(true);
   f1->set_consumes_mouse_events(true);
 
   // Dispatches events.
-  root_window->DispatchKeyEvent(&key_event);
+  root_window->AsRootWindowHostDelegate()->OnHostKeyEvent(&key_event);
   aura::MouseEvent mouse_released(
       ui::ET_MOUSE_RELEASED, gfx::Point(0, 0), gfx::Point(0, 0), 0x0);
-  root_window->DispatchMouseEvent(&mouse_released);
+  root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&mouse_released);
 
   // f1 should still get the events but f2 no longer gets them.
   EXPECT_EQ(1, f1->key_event_count());
   EXPECT_EQ(1, f1->mouse_event_count());
   EXPECT_EQ(0, f2->key_event_count());
   EXPECT_EQ(0, f2->mouse_event_count());
 
   f1->ResetCounts();
   f2->ResetCounts();
 
   // Remove f1 from additonal filters list.
   env_filter->RemoveFilter(f1.get());
 
   // Dispatches events.
-  root_window->DispatchKeyEvent(&key_event);
-  root_window->DispatchMouseEvent(&mouse_pressed);
+  root_window->AsRootWindowHostDelegate()->OnHostKeyEvent(&key_event);
+  root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&mouse_pressed);
 
   // f1 should get no events since it's out and f2 should get them.
   EXPECT_EQ(0, f1->key_event_count());
   EXPECT_EQ(0, f1->mouse_event_count());
   EXPECT_EQ(1, f2->key_event_count());
   EXPECT_EQ(1, f2->mouse_event_count());
 
   env_filter->RemoveFilter(f2.get());
 }
 
@@ skipping 11 matching lines @@
       ash::Shell::GetInstance()->cursor_manager();
 
   aura::MouseEvent mouse_moved(
       ui::ET_MOUSE_MOVED, gfx::Point(0, 0), gfx::Point(0, 0), 0x0);
   aura::TouchEvent touch_pressed1(
       ui::ET_TOUCH_PRESSED, gfx::Point(0, 0), 0, getTime());
   aura::TouchEvent touch_pressed2(
       ui::ET_TOUCH_PRESSED, gfx::Point(0, 0), 1, getTime());
 
   env_filter->set_update_cursor_visibility(true);
-  root_window->DispatchMouseEvent(&mouse_moved);
+  root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&mouse_moved);
   EXPECT_TRUE(cursor_manager->cursor_visible());
-  root_window->DispatchTouchEvent(&touch_pressed1);
+  root_window->AsRootWindowHostDelegate()->OnHostTouchEvent(&touch_pressed1);
   EXPECT_FALSE(cursor_manager->cursor_visible());
-  root_window->DispatchMouseEvent(&mouse_moved);
+  root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&mouse_moved);
   EXPECT_TRUE(cursor_manager->cursor_visible());
 
   env_filter->set_update_cursor_visibility(false);
   cursor_manager->ShowCursor(false);
-  root_window->DispatchMouseEvent(&mouse_moved);
+  root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&mouse_moved);
   EXPECT_FALSE(cursor_manager->cursor_visible());
   cursor_manager->ShowCursor(true);
-  root_window->DispatchTouchEvent(&touch_pressed2);
+  root_window->AsRootWindowHostDelegate()->OnHostTouchEvent(&touch_pressed2);
   EXPECT_TRUE(cursor_manager->cursor_visible());
 }
 
 }  // namespace ash