Clean up selected ash defines for MessagePumpLinux

ash/shell/content_client/shell_browser_main_parts.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 "ash/shell/content_client/shell_browser_main_parts.h"
 
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/shell.h"
 #include "ash/shell/shell_delegate_impl.h"
 #include "ash/shell/window_watcher.h"
@@ skipping 17 matching lines @@
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/test/compositor_test_support.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/focus/accelerator_handler.h"
 #include "ui/views/test/test_views_delegate.h"
 
 #if defined(ENABLE_MESSAGE_CENTER)
 #include "ui/message_center/message_center.h"
 #endif
 
 #if defined(OS_LINUX)

[sadrul, 2013/04/09 18:50:24]

This should be #if defined(USE_X11)

[rjkroege, 2013/04/09 19:50:10]

Done.

 #include "ui/base/touch/touch_factory_x11.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/dbus/dbus_thread_manager.h"
 #endif
 
 namespace ash {
 namespace shell {
 void InitWindowTypeLauncher();
@@ skipping 33 matching lines @@
     const content::MainFunctionParams& parameters)
     : BrowserMainParts(),
       delegate_(NULL) {
 }
 
 ShellBrowserMainParts::~ShellBrowserMainParts() {
 }
 
 #if !defined(OS_MACOSX)
 void ShellBrowserMainParts::PreMainMessageLoopStart() {
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) && !defined(USE_MESSAGEPUMP_LINUX)

[sadrul, 2013/04/09 18:50:24]

This should just be #if defined(USE_X11)

[rjkroege, 2013/04/09 19:50:10]

That sounds reasonable. done.

   ui::TouchFactory::SetTouchDeviceListFromCommandLine();
 #endif
 }
 #endif
 
 void ShellBrowserMainParts::PostMainMessageLoopStart() {
 #if defined(OS_CHROMEOS)
   chromeos::DBusThreadManager::Initialize();
 #endif
 }
@@ skipping 48 matching lines @@
   aura::Env::DeleteInstance();
 }
 
 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) {
   MessageLoopForUI::current()->Run();
   return true;
 }
 
 }  // namespace shell
 }  // namespace ash