aura: Remove event-dispatch methods from WindowTreeHostDelegate interface.

ash/sticky_keys/sticky_keys_controller.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"
 
 #if defined(USE_X11)
 #include <X11/extensions/XInput2.h>
 #include <X11/Xlib.h>
 #undef RootWindow
@@ skipping 29 matching lines @@
   // StickyKeysHandlerDelegate overrides.
   virtual void DispatchKeyEvent(ui::KeyEvent* event,
                                 aura::Window* target) OVERRIDE;
 
   virtual void DispatchMouseEvent(ui::MouseEvent* event,
                                   aura::Window* target) OVERRIDE;
 
   virtual void DispatchScrollEvent(ui::ScrollEvent* event,
                                    aura::Window* target) OVERRIDE;
  private:
+  void DispatchEvent(ui::Event* event, aura::Window* target);
+
   DISALLOW_COPY_AND_ASSIGN(StickyKeysHandlerDelegateImpl);
 };
 
 StickyKeysHandlerDelegateImpl::StickyKeysHandlerDelegateImpl() {
 }
 
 StickyKeysHandlerDelegateImpl::~StickyKeysHandlerDelegateImpl() {
 }
 
 void StickyKeysHandlerDelegateImpl::DispatchKeyEvent(ui::KeyEvent* event,
                                                      aura::Window* target) {
-  DCHECK(target);
-  target->GetDispatcher()->AsWindowTreeHostDelegate()->OnHostKeyEvent(event);
+  DispatchEvent(event, target);
 }
 
 void StickyKeysHandlerDelegateImpl::DispatchMouseEvent(ui::MouseEvent* event,
                                                        aura::Window* target) {
   DCHECK(target);
   // We need to send a new, untransformed mouse event to the host.
   if (event->IsMouseWheelEvent()) {
     ui::MouseWheelEvent new_event(*static_cast<ui::MouseWheelEvent*>(event));
-    target->GetDispatcher()->AsWindowTreeHostDelegate()
-        ->OnHostMouseEvent(&new_event);
+    DispatchEvent(&new_event, target);
   } else {
     ui::MouseEvent new_event(*event, target, target->GetRootWindow());
-    target->GetDispatcher()->AsWindowTreeHostDelegate()
-        ->OnHostMouseEvent(&new_event);
+    DispatchEvent(&new_event, target);
   }
 }
 
 void StickyKeysHandlerDelegateImpl::DispatchScrollEvent(
     ui::ScrollEvent* event,
     aura::Window* target)  {
+  DispatchEvent(event, target);
+}
+
+void StickyKeysHandlerDelegateImpl::DispatchEvent(ui::Event* event,
+                                                  aura::Window* target) {
   DCHECK(target);
-  target->GetDispatcher()->AsWindowTreeHostDelegate()
-      ->OnHostScrollEvent(event);
+  ui::EventDispatchDetails details =
+      target->GetDispatcher()->OnEventFromSource(event);
+  if (details.dispatcher_destroyed)
+    return;
 }
 
 }  // namespace
 
 ///////////////////////////////////////////////////////////////////////////////
 //  StickyKeys
 StickyKeysController::StickyKeysController()
     : enabled_(false) {
 }
 
@@ skipping 370 matching lines @@
           &xievent->mods.effective));
     }
   }
 #elif defined(USE_OZONE)
   NOTIMPLEMENTED() << "Modifier key is not handled";
 #endif
   event->set_flags(event->flags() | modifier_flag_);
 }
 
 }  // namespace ash