aura: Remove event-dispatch methods from WindowTreeHostDelegate interface.

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/shell_test_api.h"
 #include "ash/test/test_activation_delegate.h"
 #include "ash/wm/window_util.h"
@@ skipping 169 matching lines @@
   generator.ClickLeftButton();
 
   aura::client::FocusClient* focus_client =
       aura::client::GetFocusClient(w121.get());
   EXPECT_EQ(w121.get(), focus_client->GetFocusedWindow());
 
   aura::WindowEventDispatcher* dispatcher = root_window->GetDispatcher();
 
   // The key press should be sent to the focused sub-window.
   ui::KeyEvent keyev(ui::ET_KEY_PRESSED, ui::VKEY_E, 0, false);
-  dispatcher->AsWindowTreeHostDelegate()->OnHostKeyEvent(&keyev);
+  ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&keyev);
+  ASSERT_FALSE(details.dispatcher_destroyed);
   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::ConvertPointToTarget(w122->parent(), root_window, &click_point);
   ui::TouchEvent touchev(ui::ET_TOUCH_PRESSED, click_point, 0, getTime());
-  dispatcher->AsWindowTreeHostDelegate()->OnHostTouchEvent(&touchev);
+  details = dispatcher->OnEventFromSource(&touchev);
+  ASSERT_FALSE(details.dispatcher_destroyed);
   focus_client = aura::client::GetFocusClient(w122.get());
   EXPECT_EQ(w122.get(), focus_client->GetFocusedWindow());
 
   // The key press should be sent to the focused sub-window.
-  dispatcher->AsWindowTreeHostDelegate()->OnHostKeyEvent(&keyev);
+  details = dispatcher->OnEventFromSource(&keyev);
+  ASSERT_FALSE(details.dispatcher_destroyed);
   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(aura::client::GetFocusClient(w12.get()),
             aura::client::GetFocusClient(w122.get()));
   EXPECT_EQ(w12.get(),
             aura::client::GetFocusClient(w12.get())->GetFocusedWindow());
 
@@ skipping 16 matching lines @@
   EXPECT_EQ(w123.get(),
             aura::client::GetFocusClient(w12.get())->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(aura::client::GetFocusClient(w12.get()),
             aura::client::GetFocusClient(w123.get()));
   EXPECT_EQ(NULL, aura::client::GetFocusClient(w12.get())->GetFocusedWindow());
-  EXPECT_FALSE(dispatcher->AsWindowTreeHostDelegate()->OnHostKeyEvent(&keyev));
+  details = dispatcher->OnEventFromSource(&keyev);
+  EXPECT_FALSE(keyev.handled() || details.dispatcher_destroyed);
 
   // Set the focus back to w123
   aura::client::SetActivationDelegate(w1.get(), NULL);
   w123->Show();
   w123->Focus();
   EXPECT_EQ(w123.get(),
             aura::client::GetFocusClient(w12.get())->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, aura::client::GetFocusClient(w123.get()));
-  EXPECT_FALSE(dispatcher->AsWindowTreeHostDelegate()->OnHostKeyEvent(&keyev));
+  details = dispatcher->OnEventFromSource(&keyev);
+  EXPECT_FALSE(keyev.handled() || details.dispatcher_destroyed);
 }
 
 // Various assertion testing for activating windows.
 TEST_F(WindowManagerTest, ActivateOnMouse) {
   aura::Window* root_window = Shell::GetPrimaryRootWindow();
 
   test::TestActivationDelegate d1;
   aura::test::TestWindowDelegate wd;
   scoped_ptr<aura::Window> w1(CreateTestWindowInShellWithDelegate(
       &wd, -1, gfx::Rect(10, 10, 50, 50)));
@@ skipping 171 matching lines @@
   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::ConvertPointToTarget(w2->parent(), root_window, &press_point);
   ui::TouchEvent touchev1(ui::ET_TOUCH_PRESSED, press_point, 0, getTime());
 
   aura::WindowEventDispatcher* dispatcher = root_window->GetDispatcher();
-  dispatcher->AsWindowTreeHostDelegate()->OnHostTouchEvent(&touchev1);
+  ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&touchev1);
+  ASSERT_FALSE(details.dispatcher_destroyed);
 
   // Window2 should have become active.
   EXPECT_TRUE(wm::IsActiveWindow(w2.get()));
   EXPECT_EQ(w2.get(), focus_client->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::ConvertPointToTarget(w1->parent(), root_window, &press_point);
   d1.set_activate(false);
   ui::TouchEvent touchev2(ui::ET_TOUCH_PRESSED, press_point, 1, getTime());
-  dispatcher->AsWindowTreeHostDelegate()->OnHostTouchEvent(&touchev2);
+  details = dispatcher->OnEventFromSource(&touchev2);
+  ASSERT_FALSE(details.dispatcher_destroyed);
 
   // Window2 should still be active and focused.
   EXPECT_TRUE(wm::IsActiveWindow(w2.get()));
   EXPECT_EQ(w2.get(), focus_client->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 30 matching lines @@
 
   aura::WindowEventDispatcher* dispatcher = root_window->GetDispatcher();
 
   // Cursor starts as a pointer (set during Shell::Init()).
   EXPECT_EQ(ui::kCursorPointer, dispatcher->last_cursor().native_type());
 
   {
     // Resize edges and corners show proper cursors.
     window_delegate.set_hittest_code(HTBOTTOM);
     ui::MouseEvent move1(ui::ET_MOUSE_MOVED, point1, point1, 0, 0);
-    dispatcher->AsWindowTreeHostDelegate()->OnHostMouseEvent(&move1);
+    ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&move1);
+    ASSERT_FALSE(details.dispatcher_destroyed);
     EXPECT_EQ(ui::kCursorSouthResize, dispatcher->last_cursor().native_type());
   }
 
   {
     window_delegate.set_hittest_code(HTBOTTOMLEFT);
     ui::MouseEvent move2(ui::ET_MOUSE_MOVED, point2, point2, 0, 0);
-    dispatcher->AsWindowTreeHostDelegate()->OnHostMouseEvent(&move2);
+    ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&move2);
+    ASSERT_FALSE(details.dispatcher_destroyed);
     EXPECT_EQ(ui::kCursorSouthWestResize,
               dispatcher->last_cursor().native_type());
   }
 
   {
     window_delegate.set_hittest_code(HTBOTTOMRIGHT);
     ui::MouseEvent move1(ui::ET_MOUSE_MOVED, point1, point1, 0, 0);
-    dispatcher->AsWindowTreeHostDelegate()->OnHostMouseEvent(&move1);
+    ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&move1);
+    ASSERT_FALSE(details.dispatcher_destroyed);
     EXPECT_EQ(ui::kCursorSouthEastResize,
               dispatcher->last_cursor().native_type());
   }
 
   {
     window_delegate.set_hittest_code(HTLEFT);
     ui::MouseEvent move2(ui::ET_MOUSE_MOVED, point2, point2, 0, 0);
-    dispatcher->AsWindowTreeHostDelegate()->OnHostMouseEvent(&move2);
+    ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&move2);
+    ASSERT_FALSE(details.dispatcher_destroyed);
     EXPECT_EQ(ui::kCursorWestResize, dispatcher->last_cursor().native_type());
   }
 
   {
     window_delegate.set_hittest_code(HTRIGHT);
     ui::MouseEvent move1(ui::ET_MOUSE_MOVED, point1, point1, 0, 0);
-    dispatcher->AsWindowTreeHostDelegate()->OnHostMouseEvent(&move1);
+    ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&move1);
+    ASSERT_FALSE(details.dispatcher_destroyed);
     EXPECT_EQ(ui::kCursorEastResize, dispatcher->last_cursor().native_type());
   }
 
   {
     window_delegate.set_hittest_code(HTTOP);
     ui::MouseEvent move2(ui::ET_MOUSE_MOVED, point2, point2, 0, 0);
-    dispatcher->AsWindowTreeHostDelegate()->OnHostMouseEvent(&move2);
+    ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&move2);
+    ASSERT_FALSE(details.dispatcher_destroyed);
     EXPECT_EQ(ui::kCursorNorthResize, dispatcher->last_cursor().native_type());
   }
 
   {
     window_delegate.set_hittest_code(HTTOPLEFT);
     ui::MouseEvent move1(ui::ET_MOUSE_MOVED, point1, point1, 0, 0);
-    dispatcher->AsWindowTreeHostDelegate()->OnHostMouseEvent(&move1);
+    ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&move1);
+    ASSERT_FALSE(details.dispatcher_destroyed);
     EXPECT_EQ(ui::kCursorNorthWestResize,
               dispatcher->last_cursor().native_type());
   }
 
   {
     window_delegate.set_hittest_code(HTTOPRIGHT);
     ui::MouseEvent move2(ui::ET_MOUSE_MOVED, point2, point2, 0, 0);
-    dispatcher->AsWindowTreeHostDelegate()->OnHostMouseEvent(&move2);
+    ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&move2);
+    ASSERT_FALSE(details.dispatcher_destroyed);
     EXPECT_EQ(ui::kCursorNorthEastResize,
               dispatcher->last_cursor().native_type());
   }
 
   {
     // Client area uses null cursor.
     window_delegate.set_hittest_code(HTCLIENT);
     ui::MouseEvent move1(ui::ET_MOUSE_MOVED, point1, point1, 0, 0);
-    dispatcher->AsWindowTreeHostDelegate()->OnHostMouseEvent(&move1);
+    ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&move1);
+    ASSERT_FALSE(details.dispatcher_destroyed);
     EXPECT_EQ(ui::kCursorNull, dispatcher->last_cursor().native_type());
   }
 }
 
 #if defined(OS_WIN)
 #define MAYBE_TransformActivate DISABLED_TransformActivate
 #else
 #define MAYBE_TransformActivate TransformActivate
 #endif
 TEST_F(WindowManagerTest, MAYBE_TransformActivate) {
@@ skipping 17 matching lines @@
   w1->Show();
 
   gfx::Point miss_point(5, 5);
   transform.TransformPoint(&miss_point);
   ui::MouseEvent mouseev1(ui::ET_MOUSE_PRESSED,
                           miss_point,
                           miss_point,
                           ui::EF_LEFT_MOUSE_BUTTON,
                           ui::EF_LEFT_MOUSE_BUTTON);
   aura::WindowEventDispatcher* dispatcher = root_window->GetDispatcher();
-  dispatcher->AsWindowTreeHostDelegate()->OnHostMouseEvent(&mouseev1);
+  ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&mouseev1);
+  ASSERT_FALSE(details.dispatcher_destroyed);
   EXPECT_EQ(NULL, aura::client::GetFocusClient(w1.get())->GetFocusedWindow());
   ui::MouseEvent mouseup(ui::ET_MOUSE_RELEASED,
                          miss_point,
                          miss_point,
                          ui::EF_LEFT_MOUSE_BUTTON,
                          ui::EF_LEFT_MOUSE_BUTTON);
-  dispatcher->AsWindowTreeHostDelegate()->OnHostMouseEvent(&mouseup);
+  details = dispatcher->OnEventFromSource(&mouseup);
+  ASSERT_FALSE(details.dispatcher_destroyed);
 
   gfx::Point hit_point(5, 15);
   transform.TransformPoint(&hit_point);
   ui::MouseEvent mouseev2(ui::ET_MOUSE_PRESSED,
                           hit_point,
                           hit_point,
                           ui::EF_LEFT_MOUSE_BUTTON,
                           ui::EF_LEFT_MOUSE_BUTTON);
-  dispatcher->AsWindowTreeHostDelegate()->OnHostMouseEvent(&mouseev2);
+  details = dispatcher->OnEventFromSource(&mouseev2);
+  ASSERT_FALSE(details.dispatcher_destroyed);
   EXPECT_TRUE(wm::IsActiveWindow(w1.get()));
   EXPECT_EQ(w1.get(),
             aura::client::GetFocusClient(w1.get())->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.
   test::ShellTestApi shell_test(Shell::GetInstance());
   Shell::GetInstance()->RemovePreTargetHandler(
@@ skipping 12 matching lines @@
 
   // Adds them to root window event filter.
   views::corewm::CompoundEventFilter* env_filter =
       Shell::GetInstance()->env_filter();
   env_filter->AddHandler(f1.get());
   env_filter->AddHandler(f2.get());
 
   // Dispatches mouse and keyboard events.
   ui::KeyEvent key_event(ui::ET_KEY_PRESSED, ui::VKEY_A, 0, false);
   aura::WindowEventDispatcher* dispatcher = root_window->GetDispatcher();
-  dispatcher->AsWindowTreeHostDelegate()->OnHostKeyEvent(&key_event);
+  ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&key_event);
+  ASSERT_FALSE(details.dispatcher_destroyed);
   ui::MouseEvent mouse_pressed(
       ui::ET_MOUSE_PRESSED, gfx::Point(0, 0), gfx::Point(0, 0), 0, 0);
-  dispatcher->AsWindowTreeHostDelegate()->OnHostMouseEvent(&mouse_pressed);
+  details = dispatcher->OnEventFromSource(&mouse_pressed);
+  ASSERT_FALSE(details.dispatcher_destroyed);
 
   // Both filters should get the events.
   EXPECT_EQ(1, f1->num_key_events());
   EXPECT_EQ(1, f1->num_mouse_events());
   EXPECT_EQ(1, f2->num_key_events());
   EXPECT_EQ(1, f2->num_mouse_events());
 
   f1->Reset();
   f2->Reset();
 
   // Makes f1 consume events.
   f1->set_key_event_handling_result(ui::ER_CONSUMED);
   f1->set_mouse_event_handling_result(ui::ER_CONSUMED);
 
   // Dispatches events.
-  dispatcher->AsWindowTreeHostDelegate()->OnHostKeyEvent(&key_event);
+  details = dispatcher->OnEventFromSource(&key_event);
+  ASSERT_FALSE(details.dispatcher_destroyed);
   ui::MouseEvent mouse_released(
       ui::ET_MOUSE_RELEASED, gfx::Point(0, 0), gfx::Point(0, 0), 0, 0);
-  dispatcher->AsWindowTreeHostDelegate()->OnHostMouseEvent(&mouse_released);
+  details = dispatcher->OnEventFromSource(&mouse_released);
+  ASSERT_FALSE(details.dispatcher_destroyed);
 
   // f1 should still get the events but f2 no longer gets them.
   EXPECT_EQ(1, f1->num_key_events());
   EXPECT_EQ(1, f1->num_mouse_events());
   EXPECT_EQ(0, f2->num_key_events());
   EXPECT_EQ(0, f2->num_mouse_events());
 
   f1->Reset();
   f2->Reset();
 
   // Remove f1 from additonal filters list.
   env_filter->RemoveHandler(f1.get());
 
   // Dispatches events.
-  dispatcher->AsWindowTreeHostDelegate()->OnHostKeyEvent(&key_event);
-  dispatcher->AsWindowTreeHostDelegate()->OnHostMouseEvent(&mouse_pressed);
+  details = dispatcher->OnEventFromSource(&key_event);
+  ASSERT_FALSE(details.dispatcher_destroyed);
+  details = dispatcher->OnEventFromSource(&mouse_pressed);
+  ASSERT_FALSE(details.dispatcher_destroyed);
 
   // f1 should get no events since it's out and f2 should get them.
   EXPECT_EQ(0, f1->num_key_events());
   EXPECT_EQ(0, f1->num_mouse_events());
   EXPECT_EQ(1, f2->num_key_events());
   EXPECT_EQ(1, f2->num_mouse_events());
 
   env_filter->RemoveHandler(f2.get());
 }
 
@@ skipping 100 matching lines @@
   observer_a.reset();
   observer_b.reset();
   generator.MoveMouseTo(50, 50);
   EXPECT_TRUE(observer_a.did_visibility_change());
   EXPECT_FALSE(observer_b.did_visibility_change());
   EXPECT_TRUE(observer_a.is_cursor_visible());
 }
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace ash