Clean up selected ash defines for MessagePumpLinux

ash/system/chromeos/tray_display.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/system/chromeos/tray_display.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/display/display_manager.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
@@ skipping 40 matching lines @@
     label_ = new views::Label();
     label_->SetMultiLine(true);
     label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     AddChildView(label_);
     Update();
   }
 
   virtual ~DisplayView() {}
 
   void Update() {
+#if !defined(USE_X11)
+     SetVisible(false);
+#else
     chromeos::OutputState state =
         base::chromeos::IsRunningOnChromeOS() ?
         Shell::GetInstance()->output_configurator()->output_state() :
         InferOutputState();
     switch (state) {
       case chromeos::STATE_INVALID:
       case chromeos::STATE_HEADLESS:
       case chromeos::STATE_SINGLE:
         SetVisible(false);
         return;
       case chromeos::STATE_DUAL_MIRROR: {
         label_->SetText(l10n_util::GetStringFUTF16(
             IDS_ASH_STATUS_TRAY_DISPLAY_MIRRORING, GetExternalDisplayName()));
         SetVisible(true);
         return;
       }
       case chromeos::STATE_DUAL_EXTENDED:
       case chromeos::STATE_DUAL_UNKNOWN: {
         label_->SetText(l10n_util::GetStringFUTF16(
             IDS_ASH_STATUS_TRAY_DISPLAY_EXTENDED, GetExternalDisplayName()));
         SetVisible(true);
         return;
       }
       default:
         NOTREACHED();
     }
+#endif
   }
 
   chromeos::OutputState InferOutputState() const {
     return Shell::GetScreen()->GetNumDisplays() == 1 ?
         chromeos::STATE_SINGLE : chromeos::STATE_DUAL_EXTENDED;
   }
 
  private:
   // Returns the name of the currently connected external display.
   string16 GetExternalDisplayName() const {
@@ skipping 38 matching lines @@
   views::ImageView* image_;
   views::Label* label_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayView);
 };
 
 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) {
   default_ = new DisplayView(status);
   return default_;
 }
 
 void TrayDisplay::DestroyDefaultView() {
   default_ = NULL;
 }
@@ skipping 15 matching lines @@
 
 #if defined(OS_CHROMEOS)
 void TrayDisplay::OnDisplayModeChanged() {
   if (default_)
     default_->Update();
 }
 #endif
 
 }  // namespace internal
 }  // namespace ash