Window ownership -> WindowTreeHost

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"
 #include "base/message_loop/message_loop.h"
 #include "ui/aura/aura_export.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace gfx {
 class Insets;
 class Point;
 class Rect;
 class Size;
 class Transform;
 }
 
 namespace ui {
 class Compositor;
+class ViewProp;
 }
 
 namespace aura {
 class RootWindowTransformer;
 class WindowEventDispatcher;
 class WindowTreeHostDelegate;
 
 // 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.
   static WindowTreeHost* Create(const gfx::Rect& bounds);
 
+  // Returns the WindowTreeHost for the specified accelerated widget, or NULL
+  // if there is none associated.
+  static WindowTreeHost* GetForAcceleratedWidget(gfx::AcceleratedWidget widget);
+
   void InitHost();
 
   void InitCompositor();
 
-  // TODO(beng): these will become trivial accessors in a future CL.
-  Window* window();
-  const Window* window() const;
+  Window* window() { return window_; }
+  const Window* window() const { return window_; }
 
   WindowEventDispatcher* dispatcher() {
     return const_cast<WindowEventDispatcher*>(
         const_cast<const WindowTreeHost*>(this)->dispatcher());
   }
   const WindowEventDispatcher* dispatcher() const { return dispatcher_.get(); }
 
   ui::Compositor* compositor() { return compositor_.get(); }
 
   void SetRootWindowTransformer(scoped_ptr<RootWindowTransformer> transformer);
@@ skipping 126 matching lines @@
   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).
+  Window* window_;  // Owning.
+
   scoped_ptr<WindowEventDispatcher> dispatcher_;
 
   scoped_ptr<ui::Compositor> compositor_;
 
   scoped_ptr<RootWindowTransformer> transformer_;
 
   // Last cursor set.  Used for testing.
   gfx::NativeCursor last_cursor_;
 
+  scoped_ptr<ui::ViewProp> prop_;
+
   DISALLOW_COPY_AND_ASSIGN(WindowTreeHost);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_WINDOW_TREE_HOST_H_