Revert 225054 "linux_aura: Implement most of DesktopScreenX11."

trunk/src/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc

Index: trunk/src/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc
===================================================================
--- trunk/src/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc	(revision 225060)
+++ trunk/src/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc	(working copy)
@@ -52,7 +52,12 @@
 #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)
@@ -61,18 +66,6 @@
 #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();