aura: Remove event-dispatch methods from WindowTreeHostDelegate interface.

ash/sticky_keys/sticky_keys_unittest.cc

 // Copyright 2013 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/sticky_keys/sticky_keys_controller.h"
 
 #include <X11/Xlib.h>
 #undef None
 #undef Bool
 #undef RootWindow
@@ skipping 246 matching lines @@
 
   void SendActivateStickyKeyPattern(StickyKeysHandler* handler,
                                     ui::KeyboardCode key_code) {
     scoped_ptr<ui::KeyEvent> ev;
     ev.reset(GenerateKey(true, key_code));
     handler->HandleKeyEvent(ev.get());
     ev.reset(GenerateKey(false, key_code));
     handler->HandleKeyEvent(ev.get());
   }
 
-  void SendActivateStickyKeyPattern(aura::WindowTreeHostDelegate* delegate,
+  void SendActivateStickyKeyPattern(aura::WindowEventDispatcher* dispatcher,
                                     ui::KeyboardCode key_code) {
     scoped_ptr<ui::KeyEvent> ev;
     ev.reset(GenerateKey(true, key_code));
-    delegate->OnHostKeyEvent(ev.get());
+    ui::EventDispatchDetails details = dispatcher->OnEventFromSource(ev.get());
+    CHECK(!details.dispatcher_destroyed);
     ev.reset(GenerateKey(false, key_code));
-    delegate->OnHostKeyEvent(ev.get());
+    details = dispatcher->OnEventFromSource(ev.get());
+    CHECK(!details.dispatcher_destroyed);
   }
 
   aura::Window* target() { return target_; }
 
  private:
   // Owned by root window of shell, but we can still delete |target_| safely.
   aura::Window* target_;
   // The root window of |target_|. Not owned.
   aura::Window* root_window_;
 
@@ skipping 501 matching lines @@
   mev.reset(GenerateSynthesizedMouseEvent(false));
   sticky_key.HandleMouseEvent(mev.get());
   EXPECT_TRUE(mev->flags() & ui::EF_CONTROL_DOWN);
   EXPECT_EQ(STICKY_KEY_STATE_DISABLED, sticky_key.current_state());
 }
 
 TEST_F(StickyKeysTest, KeyEventDispatchImpl) {
   // Test the actual key event dispatch implementation.
   EventBuffer buffer;
   ScopedVector<ui::Event> events;
-  aura::WindowTreeHostDelegate* delegate = Shell::GetPrimaryRootWindow()
-      ->GetDispatcher()->AsWindowTreeHostDelegate();
+  aura::WindowEventDispatcher* dispatcher = Shell::GetPrimaryRootWindow()
+      ->GetDispatcher();
   Shell::GetInstance()->AddPreTargetHandler(&buffer);
   Shell::GetInstance()->sticky_keys_controller()->Enable(true);
 
-  SendActivateStickyKeyPattern(delegate, ui::VKEY_CONTROL);
+  SendActivateStickyKeyPattern(dispatcher, ui::VKEY_CONTROL);
   scoped_ptr<ui::KeyEvent> ev;
   buffer.PopEvents(&events);
 
   // Test key press event is correctly modified and modifier release
   // event is sent.
   ev.reset(GenerateKey(true, ui::VKEY_C));
-  delegate->OnHostKeyEvent(ev.get());
+  ui::EventDispatchDetails details = dispatcher->OnEventFromSource(ev.get());
   buffer.PopEvents(&events);
   EXPECT_EQ(2u, events.size());
   EXPECT_EQ(ui::ET_KEY_PRESSED, events[0]->type());
   EXPECT_EQ(ui::VKEY_C, static_cast<ui::KeyEvent*>(events[0])->key_code());
   EXPECT_TRUE(events[0]->flags() & ui::EF_CONTROL_DOWN);
   EXPECT_EQ(ui::ET_KEY_RELEASED, events[1]->type());
   EXPECT_EQ(ui::VKEY_CONTROL,
             static_cast<ui::KeyEvent*>(events[1])->key_code());
 
   // Test key release event is not modified.
   ev.reset(GenerateKey(false, ui::VKEY_C));
-  delegate->OnHostKeyEvent(ev.get());
+  details = dispatcher->OnEventFromSource(ev.get());
+  ASSERT_FALSE(details.dispatcher_destroyed);
   buffer.PopEvents(&events);
   EXPECT_EQ(1u, events.size());
   EXPECT_EQ(ui::ET_KEY_RELEASED, events[0]->type());
   EXPECT_EQ(ui::VKEY_C,
             static_cast<ui::KeyEvent*>(events[0])->key_code());
   EXPECT_FALSE(events[0]->flags() & ui::EF_CONTROL_DOWN);
 
   Shell::GetInstance()->RemovePreTargetHandler(&buffer);
 }
 
 TEST_F(StickyKeysTest, MouseEventDispatchImpl) {
   // Test the actual sticky mouse event dispatch implementation.
   EventBuffer buffer;
   ScopedVector<ui::Event> events;
-  aura::WindowTreeHostDelegate* delegate = Shell::GetPrimaryRootWindow()
-      ->GetDispatcher()->AsWindowTreeHostDelegate();
+  aura::WindowEventDispatcher* dispatcher = Shell::GetPrimaryRootWindow()
+      ->GetDispatcher();
   Shell::GetInstance()->AddPreTargetHandler(&buffer);
   Shell::GetInstance()->sticky_keys_controller()->Enable(true);
 
   scoped_ptr<ui::MouseEvent> ev;
-  SendActivateStickyKeyPattern(delegate, ui::VKEY_CONTROL);
+  SendActivateStickyKeyPattern(dispatcher, ui::VKEY_CONTROL);
   buffer.PopEvents(&events);
 
   // Test mouse press event is correctly modified.
   ev.reset(GenerateMouseEvent(true));
-  delegate->OnHostMouseEvent(ev.get());
+  ui::EventDispatchDetails details = dispatcher->OnEventFromSource(ev.get());
   buffer.PopEvents(&events);
   EXPECT_EQ(1u, events.size());
   EXPECT_EQ(ui::ET_MOUSE_PRESSED, events[0]->type());
   EXPECT_TRUE(events[0]->flags() & ui::EF_CONTROL_DOWN);
 
   // Test mouse release event is correctly modified and modifier release
   // event is sent.
   ev.reset(GenerateMouseEvent(false));
-  delegate->OnHostMouseEvent(ev.get());
+  details = dispatcher->OnEventFromSource(ev.get());
+  ASSERT_FALSE(details.dispatcher_destroyed);
   buffer.PopEvents(&events);
   EXPECT_EQ(2u, events.size());
   EXPECT_EQ(ui::ET_MOUSE_RELEASED, events[0]->type());
   EXPECT_TRUE(events[0]->flags() & ui::EF_CONTROL_DOWN);
   EXPECT_EQ(ui::ET_KEY_RELEASED, events[1]->type());
   EXPECT_EQ(ui::VKEY_CONTROL,
             static_cast<ui::KeyEvent*>(events[1])->key_code());
 
   Shell::GetInstance()->RemovePreTargetHandler(&buffer);
 }
 
 TEST_F(StickyKeysTest, MouseWheelEventDispatchImpl) {
   // Test the actual mouse wheel event dispatch implementation.
   EventBuffer buffer;
   ScopedVector<ui::Event> events;
-  aura::WindowTreeHostDelegate* delegate = Shell::GetPrimaryRootWindow()
-      ->GetDispatcher()->AsWindowTreeHostDelegate();
+  aura::WindowEventDispatcher* dispatcher = Shell::GetPrimaryRootWindow()
+      ->GetDispatcher();
   Shell::GetInstance()->AddPreTargetHandler(&buffer);
   Shell::GetInstance()->sticky_keys_controller()->Enable(true);
 
   scoped_ptr<ui::MouseWheelEvent> ev;
-  SendActivateStickyKeyPattern(delegate, ui::VKEY_CONTROL);
+  SendActivateStickyKeyPattern(dispatcher, ui::VKEY_CONTROL);
   buffer.PopEvents(&events);
 
   // Test positive mouse wheel event is correctly modified and modifier release
   // event is sent.
   ev.reset(GenerateMouseWheelEvent(ui::MouseWheelEvent::kWheelDelta));
-  delegate->OnHostMouseEvent(ev.get());
+  ui::EventDispatchDetails details = dispatcher->OnEventFromSource(ev.get());
+  ASSERT_FALSE(details.dispatcher_destroyed);
   buffer.PopEvents(&events);
   EXPECT_EQ(2u, events.size());
   EXPECT_TRUE(events[0]->IsMouseWheelEvent());
   EXPECT_EQ(ui::MouseWheelEvent::kWheelDelta,
             static_cast<ui::MouseWheelEvent*>(events[0])->y_offset());
   EXPECT_TRUE(events[0]->flags() & ui::EF_CONTROL_DOWN);
   EXPECT_EQ(ui::ET_KEY_RELEASED, events[1]->type());
   EXPECT_EQ(ui::VKEY_CONTROL,
             static_cast<ui::KeyEvent*>(events[1])->key_code());
 
   // Test negative mouse wheel event is correctly modified and modifier release
   // event is sent.
-  SendActivateStickyKeyPattern(delegate, ui::VKEY_CONTROL);
+  SendActivateStickyKeyPattern(dispatcher, ui::VKEY_CONTROL);
   buffer.PopEvents(&events);
 
   ev.reset(GenerateMouseWheelEvent(-ui::MouseWheelEvent::kWheelDelta));
-  delegate->OnHostMouseEvent(ev.get());
+  details = dispatcher->OnEventFromSource(ev.get());
+  ASSERT_FALSE(details.dispatcher_destroyed);
   buffer.PopEvents(&events);
   EXPECT_EQ(2u, events.size());
   EXPECT_TRUE(events[0]->IsMouseWheelEvent());
   EXPECT_EQ(-ui::MouseWheelEvent::kWheelDelta,
             static_cast<ui::MouseWheelEvent*>(events[0])->y_offset());
   EXPECT_TRUE(events[0]->flags() & ui::EF_CONTROL_DOWN);
   EXPECT_EQ(ui::ET_KEY_RELEASED, events[1]->type());
   EXPECT_EQ(ui::VKEY_CONTROL,
             static_cast<ui::KeyEvent*>(events[1])->key_code());
 
   Shell::GetInstance()->RemovePreTargetHandler(&buffer);
 }
 
 }  // namespace ash