Revert of Clean up WindowEventDispatcher some more.

ui/aura/remote_window_tree_host_win.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 "ui/aura/remote_window_tree_host_win.h"
 
 #include <windows.h>
 
 #include <algorithm>
 
@@ skipping 471 matching lines @@
 
 void RemoteWindowTreeHostWin::OnDeviceScaleFactorChanged(
     float device_scale_factor) {
   NOTIMPLEMENTED();
 }
 
 void RemoteWindowTreeHostWin::PrepareForShutdown() {
 }
 
 ui::EventProcessor* RemoteWindowTreeHostWin::GetEventProcessor() {
-  return dispatcher();
+  return delegate_->GetEventProcessor();
 }
 
 void RemoteWindowTreeHostWin::CancelComposition() {
   if (!host_)
     return;
   host_->Send(new MetroViewerHostMsg_ImeCancelComposition);
 }
 
 void RemoteWindowTreeHostWin::OnTextInputClientUpdated(
     const std::vector<int32>& input_scopes,
@@ skipping 81 matching lines @@
 
 void RemoteWindowTreeHostWin::OnChar(uint32 key_code,
                                      uint32 repeat_count,
                                      uint32 scan_code,
                                      uint32 flags) {
   DispatchKeyboardMessage(ui::ET_KEY_PRESSED, key_code, repeat_count,
                           scan_code, flags, true);
 }
 
 void RemoteWindowTreeHostWin::OnWindowActivated() {
-  OnHostActivated();
+  delegate_->OnHostActivated();
 }
 
 void RemoteWindowTreeHostWin::OnEdgeGesture() {
   ui::GestureEvent event(
       ui::ET_GESTURE_WIN8_EDGE_SWIPE,
       0,
       0,
       0,
       ui::EventTimeForNow(),
       ui::GestureEventDetails(ui::ET_GESTURE_WIN8_EDGE_SWIPE, 0, 0),
@@ skipping 163 matching lines @@
 }
 
 void RemoteWindowTreeHostWin::SetEventFlags(uint32 flags) {
   if (flags == event_flags_)
     return;
   event_flags_ = flags;
   SetVirtualKeyStates(event_flags_);
 }
 
 }  // namespace aura