Work on USE_ASH/USE_AURA split.

chrome/browser/chrome_browser_main.cc

 // 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.
 
 #include "chrome/browser/chrome_browser_main.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 161 matching lines @@
 #if defined(TOOLKIT_GTK)
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "ui/gfx/gtk_util.h"
 #endif
 
 #if defined(USE_X11)
 #include "chrome/browser/chrome_browser_main_x11.h"
 #endif
 
 #if defined(USE_AURA)
+#include "ui/aura/root_window.h"
+#endif
+
+#if defined(USE_ASH)
 #include "ash/shell.h"
-#include "ui/aura/root_window.h"
 #endif
 
 using content::BrowserThread;
 
 namespace {
 
 // This function provides some ways to test crash and assertion handling
 // behavior of the program.
 void HandleTestParameters(const CommandLine& command_line) {
   // This parameter causes an assertion.
@@ skipping 1581 matching lines @@
 
   if (!run_message_loop_)
     return true;  // Don't run the default message loop.
 
   // This should be invoked as close to the start of the browser's
   // UI thread message loop as possible to get a stable measurement
   // across versions.
   RecordBrowserStartupTime();
 
 #if defined(USE_AURA)
+#if defined(USE_ASH)
   ash::Shell::GetRootWindow()->ShowRootWindow();
+#endif
   MessageLoopForUI::current()->Run();
 #elif defined(TOOLKIT_VIEWS)
   views::AcceleratorHandler accelerator_handler;
   MessageLoopForUI::current()->RunWithDispatcher(&accelerator_handler);
 #elif defined(USE_X11)
   MessageLoopForUI::current()->RunWithDispatcher(NULL);
 #elif defined(OS_POSIX)
   MessageLoopForUI::current()->Run();
 #endif
 
@@ skipping 98 matching lines @@
     if (base::win::GetVersion() <= base::win::VERSION_XP)
       uma_name += "_XP";
 
     uma_name += "_PreRead_";
     uma_name += pre_read_percentage;
     AddPreReadHistogramTime(uma_name.c_str(), time);
   }
 #endif
 #endif
 }