Revert of Clean up WindowEventDispatcher some more.

ui/aura/window_tree_host.h

 // 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.
 
 #ifndef UI_AURA_WINDOW_TREE_HOST_H_
 #define UI_AURA_WINDOW_TREE_HOST_H_
 
 #include <vector>
 
 #include "base/event_types.h"
@@ skipping 11 matching lines @@
 }
 
 namespace ui {
 class Compositor;
 class ViewProp;
 }
 
 namespace aura {
 class RootWindowTransformer;
 class WindowEventDispatcher;
+class WindowTreeHostDelegate;
 class WindowTreeHostObserver;
 
 // WindowTreeHost bridges between a native window and the embedded RootWindow.
 // It provides the accelerated widget and maps events from the native os to
 // aura.
 class AURA_EXPORT WindowTreeHost {
  public:
   virtual ~WindowTreeHost();
 
   // Creates a new WindowTreeHost. The caller owns the returned value.
@@ skipping 29 matching lines @@
   gfx::Transform GetInverseRootTransform() const;
 
   // Updates the root window's size using |host_size|, current
   // transform and insets.
   void UpdateRootWindowSize(const gfx::Size& host_size);
 
   // Returns the actual size of the screen.
   // (gfx::Screen only reports on the virtual desktop exposed by Aura.)
   static gfx::Size GetNativeScreenSize();
 
+  void set_delegate(WindowTreeHostDelegate* delegate) {
+    delegate_ = delegate;
+  }
+
   // Converts |point| from the root window's coordinate system to native
   // screen's.
   void ConvertPointToNativeScreen(gfx::Point* point) const;
 
   // Converts |point| from native screen coordinate system to the root window's.
   void ConvertPointFromNativeScreen(gfx::Point* point) const;
 
   // Converts |point| from the root window's coordinate system to the
   // host window's.
   void ConvertPointToHost(gfx::Point* point) const;
@@ skipping 13 matching lines @@
   void OnCursorVisibilityChanged(bool visible);
 
   // Moves the cursor to the specified location relative to the root window.
   void MoveCursorTo(const gfx::Point& location);
 
   // Moves the cursor to the |host_location| given in host coordinates.
   void MoveCursorToHostLocation(const gfx::Point& host_location);
 
   gfx::NativeCursor last_cursor() const { return last_cursor_; }
 
+  WindowEventDispatcher* GetDispatcher();
+
   // Returns the accelerated widget.
   virtual gfx::AcceleratedWidget GetAcceleratedWidget() = 0;
 
   // Shows the WindowTreeHost.
   virtual void Show() = 0;
 
   // Hides the WindowTreeHost.
   virtual void Hide() = 0;
 
   // Toggles the host's full screen state.
@@ skipping 47 matching lines @@
   void DestroyDispatcher();
 
   void CreateCompositor(gfx::AcceleratedWidget accelerated_widget);
 
   // Returns the location of the RootWindow on native screen.
   virtual gfx::Point GetLocationOnNativeScreen() const = 0;
 
   void OnHostMoved(const gfx::Point& new_location);
   void OnHostResized(const gfx::Size& new_size);
   void OnHostCloseRequested();
-  void OnHostActivated();
-  void OnHostLostWindowCapture();
 
   // Sets the currently displayed cursor.
   virtual void SetCursorNative(gfx::NativeCursor cursor) = 0;
 
   // Moves the cursor to the specified location relative to the root window.
   virtual void MoveCursorToNative(const gfx::Point& location) = 0;
 
   // kCalled when the cursor visibility has changed.
   virtual void OnCursorVisibilityChangedNative(bool show) = 0;
 
+  WindowTreeHostDelegate* delegate_;
+
  private:
   // Moves the cursor to the specified location. This method is internally used
   // by MoveCursorTo() and MoveCursorToHostLocation().
   void MoveCursorToInternal(const gfx::Point& root_location,
                             const gfx::Point& host_location);
 
   // We don't use a scoped_ptr for |window_| since we need this ptr to be valid
   // during its deletion. (Window's dtor notifies observers that may attempt to
   // reach back up to access this object which will be valid until the end of
   // the dtor).
@@ skipping 11 matching lines @@
   gfx::NativeCursor last_cursor_;
 
   scoped_ptr<ui::ViewProp> prop_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTreeHost);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_WINDOW_TREE_HOST_H_