Revert of Clean up WindowEventDispatcher some more.

mojo/examples/aura_demo/window_tree_host_mojo.cc

 // Copyright (c) 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 "mojo/examples/aura_demo/window_tree_host_mojo.h"
 
 #include "mojo/examples/aura_demo/demo_context_factory.h"
 #include "mojo/public/bindings/allocation_scope.h"
 #include "mojo/public/gles2/gles2.h"
 #include "mojo/services/native_viewport/geometry_conversions.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
-#include "ui/aura/window_event_dispatcher.h"
+#include "ui/aura/window_tree_host_delegate.h"
 #include "ui/compositor/compositor.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace mojo {
 namespace examples {
 
 // static
@@ skipping 117 matching lines @@
 }
 
 void WindowTreeHostMojo::OnCursorVisibilityChangedNative(bool show) {
   NOTIMPLEMENTED();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WindowTreeHostMojo, ui::EventSource implementation:
 
 ui::EventProcessor* WindowTreeHostMojo::GetEventProcessor() {
-  return dispatcher();
+  return delegate_->GetEventProcessor();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WindowTreeHostMojo, NativeViewportClient implementation:
 
 void WindowTreeHostMojo::OnCreated() {
   CreateCompositor(GetAcceleratedWidget());
   compositor_created_callback_.Run();
 }
 
 void WindowTreeHostMojo::OnBoundsChanged(const Rect& bounds) {
   bounds_ = gfx::Rect(bounds.position().x(), bounds.position().y(),
                       bounds.size().width(), bounds.size().height());
-  window()->SetBounds(gfx::Rect(bounds_.size()));
+  if (delegate_)
+    window()->SetBounds(gfx::Rect(bounds_.size()));
   OnHostResized(bounds_.size());
 }
 
 void WindowTreeHostMojo::OnDestroyed() {
   base::MessageLoop::current()->Quit();
 }
 
 void WindowTreeHostMojo::OnEvent(const Event& event) {
   if (!event.location().is_null())
     native_viewport_->AckEvent(event);
@@ skipping 19 matching lines @@
           event.flags(), event.key_data().is_char());
       SendEventToProcessor(&ev);
       break;
     }
     // TODO(beng): touch, etc.
   }
 };
 
 }  // namespace examples
 }  // namespace mojo