Index: chrome/browser/chrome_browser_main.cc |
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc |
index 9905d8a3d85d01dc8219ab68d8d955865398b11e..2678e88deb594d5e9ada63944e0c1a9c3edc9131 100644 |
--- a/chrome/browser/chrome_browser_main.cc |
+++ b/chrome/browser/chrome_browser_main.cc |
@@ -1895,7 +1895,9 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { |
bool ChromeBrowserMainParts::MainMessageLoopRun(int* result_code) { |
// Set the result code set in PreMainMessageLoopRun or set above. |
*result_code = result_code_; |
- |
+#if defined(USE_ASH) |
sky
2012/05/01 15:43:27
If you need to move Show here, can it now be moved
oshima
2012/05/01 16:25:33
Done.
|
+ ash::Shell::GetRootWindow()->ShowRootWindow(); |
+#endif |
if (!run_message_loop_) |
return true; // Don't run the default message loop. |
@@ -1903,11 +1905,7 @@ bool ChromeBrowserMainParts::MainMessageLoopRun(int* result_code) { |
// 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; |