change the way windows are parented when their parent is set to NULL.

ui/aura/desktop.h

Index: ui/aura/desktop.h
===================================================================
--- ui/aura/desktop.h	(revision 104542)
+++ ui/aura/desktop.h	(working copy)
@@ -23,6 +23,7 @@
 
 namespace aura {
 
+class DesktopDelegate;
 class DesktopHost;
 class MouseEvent;
 
@@ -32,12 +33,14 @@
   Desktop();
   ~Desktop();
 
+  DesktopDelegate* delegate() { return delegate_; }
+  void set_delegate(DesktopDelegate* delegate) {
+    delegate_ = delegate;
+  }
+
   // Initializes the desktop.
   void Init();
 
-  // Initializes |default_parent()| for testing.
-  void CreateDefaultParentForTesting();
-
   // Shows the desktop host.
   void Show();
 
@@ -68,13 +71,6 @@
 
   Window* window() { return window_.get(); }
 
-  // The window where windows created without an explicitly specified parent are
-  // parented.
-  Window* default_parent() { return default_parent_; }
-  void set_default_parent(Window* default_parent) {
-    default_parent_ = default_parent;
-  }
-
   static void set_compositor_factory_for_testing(ui::Compositor*(*factory)()) {
     compositor_factory_ = factory;
   }
@@ -103,18 +99,15 @@
   static Desktop* GetInstance();
 
  private:
-  // Returns the topmost window to activate. This ignores |ignore|.
-  Window* GetTopmostWindowToActivate(Window* ignore);
-
   // Overridden from ui::CompositorDelegate
   virtual void ScheduleDraw();
 
+  DesktopDelegate* delegate_;
+
   scoped_refptr<ui::Compositor> compositor_;
 
   scoped_ptr<internal::RootWindow> window_;
 
-  Window* default_parent_;
-
   scoped_ptr<DesktopHost> host_;
 
   static Desktop* instance_;