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

chrome/browser/chrome_browser_main.cc

 // 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.
 
 #include "chrome/browser/chrome_browser_main.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 183 matching lines @@
 
 #if defined(TOOLKIT_USES_GTK)
 #include "ui/gfx/gtk_util.h"
 #endif
 
 #if defined(TOUCH_UI)
 #include "ui/base/touch/touch_factory.h"
 #endif
 
 #if defined(USE_AURA)
-#include "ui/aura/desktop.h"
-#include "ui/aura_shell/shell_factory.h"
-#include "ui/aura/desktop.h"
+#include "ui/aura_shell/shell.h"
 #endif
 
 namespace net {
 class NetLog;
 }  // namespace net
 
 namespace {
 
 // This function provides some ways to test crash and assertion handling
 // behavior of the program.
@@ skipping 1144 matching lines @@
 
   // Convert active labs into switches. Modifies the current command line.
   about_flags::ConvertFlagsToSwitches(local_state,
                                       CommandLine::ForCurrentProcess());
 
   // Reset the command line in the crash report details, since we may have
   // just changed it to include experiments.
   child_process_logging::SetCommandLine(CommandLine::ForCurrentProcess());
 
 #if defined(USE_AURA)
-  aura_shell::InitDesktopWindow();
+  aura_shell::Shell shell;
+  shell.Init();
 #elif defined(TOOLKIT_VIEWS)
   views::Widget::SetPureViews(
       CommandLine::ForCurrentProcess()->HasSwitch(switches::kUsePureViews));
   // Launch the views desktop shell window and register it as the default parent
   // for all unparented views widgets.
   if (parsed_command_line().HasSwitch(switches::kViewsDesktop)) {
     std::string desktop_type_cmd =
         parsed_command_line().GetSwitchValueASCII(switches::kViewsDesktop);
     if (desktop_type_cmd != "disabled") {
       views::desktop::DesktopWindowView::DesktopType desktop_type;
@@ skipping 699 matching lines @@
   if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) &&
       (pre_read == "0" || pre_read == "1")) {
     std::string uma_name(name);
     uma_name += "_PreRead";
     uma_name += pre_read == "1" ? "Enabled" : "Disabled";
     AddPreReadHistogramTime(uma_name.c_str(), time);
   }
 #endif
 #endif
 }