Revert 269892 "linux_aura: Compile ash into chrome."

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 269901)
+++ trunk/src/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc	(working copy)
@@ -24,7 +24,6 @@
 #include "chrome/browser/ui/libgtk2ui/gtk2_ui.h"
 #include "chrome/common/pref_names.h"
 #include "ui/aura/window.h"
-#include "ui/base/ime/input_method_initializer.h"
 #include "ui/native_theme/native_theme_aura.h"
 #include "ui/views/linux_ui/linux_ui.h"
 #endif
@@ -71,12 +70,7 @@
       command_line->HasSwitch(switches::kViewerLaunchViaAppId)) {
     return chrome::HOST_DESKTOP_TYPE_ASH;
   }
-#elif defined(OS_LINUX)
-  const CommandLine* command_line = CommandLine::ForCurrentProcess();
-  if (command_line->HasSwitch(switches::kOpenAsh))
-    return chrome::HOST_DESKTOP_TYPE_ASH;
 #endif
-
   return chrome::HOST_DESKTOP_TYPE_NATIVE;
 }
 #endif  // !defined(OS_CHROMEOS) && defined(USE_ASH)
@@ -91,16 +85,10 @@
 
 void ChromeBrowserMainExtraPartsAura::PreEarlyInitialization() {
 #if defined(USE_X11) && !defined(OS_CHROMEOS)
-  if (GetInitialDesktop() != chrome::HOST_DESKTOP_TYPE_ASH) {
-    // TODO(erg): Refactor this into a dlopen call when we add a GTK3 port.
-    views::LinuxUI* gtk2_ui = BuildGtk2UI();
-    gtk2_ui->SetNativeThemeOverride(base::Bind(&GetNativeThemeForWindow));
-    views::LinuxUI::SetInstance(gtk2_ui);
-  } else {
-    // TODO(erg): Eventually, we'll need to somehow support IMEs in ash on
-    // Linux.
-    ui::InitializeInputMethodForTesting();
-  }
+  // TODO(erg): Refactor this into a dlopen call when we add a GTK3 port.
+  views::LinuxUI* gtk2_ui = BuildGtk2UI();
+  gtk2_ui->SetNativeThemeOverride(base::Bind(&GetNativeThemeForWindow));
+  views::LinuxUI::SetInstance(gtk2_ui);
 #endif
 }
 
@@ -113,8 +101,7 @@
 #endif
 
 #if defined(USE_X11) && !defined(OS_CHROMEOS)
-  if (GetInitialDesktop() != chrome::HOST_DESKTOP_TYPE_ASH)
-    views::LinuxUI::instance()->Initialize();
+  views::LinuxUI::instance()->Initialize();
 #endif
 }