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

ui/aura/aura.gyp

 # Copyright (c) 2011 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
@@ skipping 12 matching lines @@
         'AURA_IMPLEMENTATION',
       ],
       'sources': [
         'cursor.h',
         'desktop_host.h',
         'desktop_host_linux.cc',
         'desktop_host_win.cc',
         'desktop_host_win.h',
         'desktop.cc',
         'desktop.h',
+        'desktop_delegate.h',
         'event.cc',
         'event.h',
         'event_filter.cc',
         'event_filter.h',
         'focus_manager.h',
         'hit_test.h',
         'layout_manager.h',
         'root_window.cc',
         'root_window.h',
         'toplevel_window_container.cc',
         'toplevel_window_container.h',
         'toplevel_window_event_filter.cc',
         'toplevel_window_event_filter.h',
         'window.cc',
         'window.h',
         'window_delegate.h',
+        'window_type.h',
       ],
     },
     {
       'target_name': 'aura_demo',
       'type': 'executable',
       'dependencies': [
         '../../base/base.gyp:base',
         '../../base/base.gyp:base_i18n',
         '../../skia/skia.gyp:skia',
         '../../third_party/icu/icu.gyp:icui18n',
@@ skipping 25 matching lines @@
         '../ui.gyp:ui',
         '../ui.gyp:ui_resources',
         'aura',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'window_unittest.cc',
         'run_all_unittests.cc',
+        'test_desktop_delegate.cc',
+        'test_desktop_delegate.h',
         'test_suite.cc',
         'test_suite.h',
         '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
       ],
       # osmesa GL implementation is used on linux.
       'conditions': [
         ['OS=="linux"', {
           'dependencies': [
             '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
           ],
         }],
         ['OS!="mac"', {
           'dependencies': [
             '../../chrome/chrome.gyp:packed_resources',
            ],
         }],
       ],
     },
   ],
 }