Work on USE_ASH/USE_AURA split.

chrome/browser/chrome_browser_main.cc

Index: chrome/browser/chrome_browser_main.cc
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index 10cc98fe594ea5f0c74bb7f9d33f824baf49197b..8528d7231ed68cb98343026dab2b190261819d43 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -179,10 +179,13 @@
 #endif
 
 #if defined(USE_AURA)
-#include "ash/shell.h"
 #include "ui/aura/root_window.h"
 #endif
 
+#if defined(USE_ASH)
+#include "ash/shell.h"
+#endif
+
 using content::BrowserThread;
 
 namespace {
@@ -1782,7 +1785,9 @@ bool ChromeBrowserMainParts::MainMessageLoopRun(int* result_code) {
   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;