Revert 225054 "linux_aura: Implement most of DesktopScreenX11."

trunk/src/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.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/ui/aura/chrome_browser_main_extra_parts_aura.h"
 
 #include "chrome/browser/chrome_browser_main.h"
 #include "chrome/browser/ui/aura/active_desktop_monitor.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "ui/aura/env.h"
@@ skipping 34 matching lines @@
 ChromeBrowserMainExtraPartsAura::ChromeBrowserMainExtraPartsAura() {
 }
 
 ChromeBrowserMainExtraPartsAura::~ChromeBrowserMainExtraPartsAura() {
 }
 
 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)
   // TODO(erg): Refactor this into a dlopen call when we add a GTK3 port.
   views::LinuxUI::SetInstance(BuildGtk2UI());
 #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();
 
   // aura::Env instance is deleted in BrowserProcessImpl::StartTearDown
   // after the metrics service is deleted.
 }