Clean up selected ash defines for MessagePumpLinux

ash/system/chromeos/tray_display.cc

Index: ash/system/chromeos/tray_display.cc
diff --git a/ash/system/chromeos/tray_display.cc b/ash/system/chromeos/tray_display.cc
index 1d315bb3d576daa7ce43e47f0806004185a38b22..5498e0d4e0ebcb8069b0d10ec13ed72ef6943310 100644
--- a/ash/system/chromeos/tray_display.cc
+++ b/ash/system/chromeos/tray_display.cc
@@ -58,6 +58,9 @@ class DisplayView : public ash::internal::ActionableView {
   virtual ~DisplayView() {}
 
   void Update() {
+#if !defined(USE_X11)
+     SetVisible(false);
+#else
     chromeos::OutputState state =
         base::chromeos::IsRunningOnChromeOS() ?
         Shell::GetInstance()->output_configurator()->output_state() :
@@ -80,6 +83,7 @@ class DisplayView : public ash::internal::ActionableView {
         return;
     }
     NOTREACHED() << "Unhandled state " << state;
+#endif
   }
 
   chromeos::OutputState InferOutputState() const {
@@ -138,12 +142,16 @@ TrayDisplay::TrayDisplay(SystemTray* system_tray)
     : SystemTrayItem(system_tray),
       default_(NULL) {
   Shell::GetScreen()->AddObserver(this);
+#if defined(USE_X11)
   Shell::GetInstance()->output_configurator()->AddObserver(this);
+#endif
 }
 
 TrayDisplay::~TrayDisplay() {
   Shell::GetScreen()->RemoveObserver(this);
+#if defined(USE_X11)
   Shell::GetInstance()->output_configurator()->RemoveObserver(this);
+#endif
 }
 
 views::View* TrayDisplay::CreateDefaultView(user::LoginStatus status) {