Window ownership -> WindowTreeHost

ui/aura/window.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_H_
 #define UI_AURA_WINDOW_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 27 matching lines @@
 namespace ui {
 class EventHandler;
 class Layer;
 class Texture;
 }
 
 namespace aura {
 
 class LayoutManager;
 class WindowDelegate;
-class WindowEventDispatcher;
 class WindowObserver;
+class WindowTreeHost;
 
 // Defined in window_property.h (which we do not include)
 template<typename T>
 struct WindowProperty;
 
 namespace test {
 class WindowTestApi;
 }
 
 // Aura window implementation. Interesting events are sent to the
@@ skipping 56 matching lines @@
   Window* parent() { return parent_; }
   const Window* parent() const { return parent_; }
 
   // Returns the root Window that contains this Window. The root Window is
   // defined as the Window that has a dispatcher. These functions return NULL if
   // the Window is contained in a hierarchy that does not have a dispatcher at
   // its root.
   virtual Window* GetRootWindow();
   virtual const Window* GetRootWindow() const;
 
-  WindowEventDispatcher* GetDispatcher();
-  const WindowEventDispatcher* GetDispatcher() const;
-  void set_dispatcher(WindowEventDispatcher* dispatcher) {
-    dispatcher_ = dispatcher;
-  }
-  bool HasDispatcher() const { return !!dispatcher_; }
+  WindowTreeHost* GetHost();
+  const WindowTreeHost* GetHost() const;
+  void set_host(WindowTreeHost* host) { host_ = host; }
+  bool IsRootWindow() const { return !!host_; }
 
   // The Window does not own this object.
   void set_user_data(void* user_data) { user_data_ = user_data; }
   void* user_data() const { return user_data_; }
 
   // Changes the visibility of the window.
   void Show();
   void Hide();
   // Returns true if this window and all its ancestors are visible.
   bool IsVisible() const;
@@ skipping 188 matching lines @@
 #endif
 
  protected:
   // Deletes (or removes if not owned by parent) all child windows. Intended for
   // use from the destructor.
   void RemoveOrDestroyChildren();
 
  private:
   friend class test::WindowTestApi;
   friend class LayoutManager;
-  friend class WindowEventDispatcher;
   friend class WindowTargeter;
 
   // Called by the public {Set,Get,Clear}Property functions.
   int64 SetPropertyInternal(const void* key,
                             const char* name,
                             PropertyDeallocator deallocator,
                             int64 value,
                             int64 default_value);
   int64 GetPropertyInternal(const void* key, int64 default_value) const;
 
@@ skipping 134 matching lines @@
         const_cast<const Window*>(this)->GetAncestorWithLayer(offset));
   }
   const Window* GetAncestorWithLayer(gfx::Vector2d* offset) const;
 
   // Bounds of this window relative to the parent. This is cached as the bounds
   // of the Layer and Window are not necessarily the same. In particular bounds
   // of the Layer are relative to the first ancestor with a Layer, where as this
   // is relative to the parent Window.
   gfx::Rect bounds_;
 
-  WindowEventDispatcher* dispatcher_;
+  WindowTreeHost* host_;
 
   ui::wm::WindowType type_;
 
   // True if the Window is owned by its parent - i.e. it will be deleted by its
   // parent during its parents destruction. True is the default.
   bool owned_by_parent_;
 
   WindowDelegate* delegate_;
 
   // The Window's parent.
@@ skipping 39 matching lines @@
   };
 
   std::map<const void*, Value> prop_map_;
 
   DISALLOW_COPY_AND_ASSIGN(Window);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_WINDOW_H_