Index: chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc |
diff --git a/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc b/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc |
index 328b5702aa2aa47e27d7004bdcabd8fd5f676f9e..a63ebce3c490bbd109481c24ef43a0011bf3fc15 100644 |
--- a/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc |
+++ b/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc |
@@ -52,12 +52,7 @@ void ChromeBrowserMainExtraPartsAura::ToolkitInitialized() { |
#if !defined(OS_CHROMEOS) |
#if defined(USE_ASH) |
active_desktop_monitor_.reset(new ActiveDesktopMonitor(GetInitialDesktop())); |
- if (!chrome::ShouldOpenAshOnStartup()) |
#endif |
- { |
- gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, |
- views::CreateDesktopScreen()); |
- } |
#endif |
#if !defined(USE_ASH) && defined(OS_LINUX) && defined(USE_X11) |
@@ -66,6 +61,18 @@ void ChromeBrowserMainExtraPartsAura::ToolkitInitialized() { |
#endif |
} |
+void ChromeBrowserMainExtraPartsAura::PostMainMessageLoopStart() { |
+#if !defined(OS_CHROMEOS) |
+#if defined(USE_ASH) |
+ if (!chrome::ShouldOpenAshOnStartup()) |
+#endif |
+ { |
+ gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, |
+ views::CreateDesktopScreen()); |
+ } |
+#endif |
+} |
+ |
void ChromeBrowserMainExtraPartsAura::PostMainMessageLoopRun() { |
active_desktop_monitor_.reset(); |