Clean up selected ash defines for MessagePumpLinux

ash/display/display_controller.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/display/display_controller.h"
 
 #include <algorithm>
 #include <map>
 
 #include "ash/ash_root_window_transformer.h"
@@ skipping 17 matching lines @@
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_property.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/dip_util.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 
 #if defined(OS_CHROMEOS)
-#include "ash/display/output_configurator_animation.h"
 #include "base/chromeos/chromeos_version.h"
 #include "base/time.h"
+#if defined(USE_X11)
+#include "ash/display/output_configurator_animation.h"
 #include "chromeos/display/output_configurator.h"
 #include "ui/base/x/x11_util.h"
 
 // Including this at the bottom to avoid other
 // potential conflict with chrome headers.
 #include <X11/extensions/Xrandr.h>
 #undef RootWindow
+#endif

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

  // defined(USE_X11)

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

Done.

 #endif  // defined(OS_CHROMEOS)
 
 DECLARE_WINDOW_PROPERTY_TYPE(gfx::Display::Rotation);
 
 namespace ash {
 namespace {
 
 DEFINE_WINDOW_PROPERTY_KEY(gfx::Display::Rotation, kRotationPropertyKey,
                            gfx::Display::ROTATE_0);
 
@@ skipping 116 matching lines @@
                                    reverse_rotate,
                                    info.GetOverscanInsetsInPixel(),
                                    info.ui_scale()));
   root_window->SetRootWindowTransformer(transformer.Pass());
 }
 
 void SetDisplayPropertiesOnHostWindow(aura::RootWindow* root,
                                       const gfx::Display& display) {
   internal::DisplayInfo info =
       GetDisplayManager()->GetDisplayInfo(display.id());
-#if defined(OS_CHROMEOS)
+#if defined(OS_CHROMEOS) && defined(USE_X11)
   // Native window property (Atom in X11) that specifies the display's
   // rotation, scale factor and if it's internal display.  They are
   // read and used by touchpad/mouse driver directly on X (contact
   // adlr@ for more details on touchpad/mouse driver side). The value
   // of the rotation is one of 0 (normal), 1 (90 degrees clockwise), 2
   // (180 degree) or 3 (270 degrees clockwise).  The value of the
   // scale factor is in percent (100, 140, 200 etc).
   const char kRotationProp[] = "_CHROME_DISPLAY_ROTATION";
   const char kScaleFactorProp[] = "_CHROME_DISPLAY_SCALE_FACTOR";
   const char kInternalProp[] = "_CHROME_DISPLAY_INTERNAL";
@@ skipping 403 matching lines @@
       paired_layouts_.find(pair);
   return iter != paired_layouts_.end() ? iter->second : default_display_layout_;
 }
 
 void DisplayController::CycleDisplayMode() {
   if (limiter_.get()) {
     if  (limiter_->IsThrottled())
       return;
     limiter_->SetThrottleTimeout(kCycleDisplayThrottleTimeoutMs);
   }
-#if defined(OS_CHROMEOS)
+#if defined(OS_CHROMEOS) && defined(USE_X11)
   Shell* shell = Shell::GetInstance();
   internal::DisplayManager* display_manager = GetDisplayManager();
   if (!base::chromeos::IsRunningOnChromeOS()) {
     internal::DisplayManager::CycleDisplay();
   } else if (display_manager->num_connected_displays() > 1) {
     chromeos::OutputState new_state = display_manager->IsMirrored() ?
        chromeos::STATE_DUAL_EXTENDED : chromeos::STATE_DUAL_MIRROR;
     internal::OutputConfiguratorAnimation* animation =
         shell->output_configurator_animation();
     animation->StartFadeOutAnimation(base::Bind(
         base::IgnoreResult(&chromeos::OutputConfigurator::SetDisplayMode),
         base::Unretained(shell->output_configurator()),
         new_state));
   }
 #endif
 }
 
 void DisplayController::SwapPrimaryDisplay() {
   if (limiter_.get()) {
     if  (limiter_->IsThrottled())
       return;
     limiter_->SetThrottleTimeout(kSwapDisplayThrottleTimeoutMs);
   }
 
   if (Shell::GetScreen()->GetNumDisplays() > 1) {
-#if defined(OS_CHROMEOS)
+#if defined(OS_CHROMEOS) && defined(USE_X11)
     internal::OutputConfiguratorAnimation* animation =
         Shell::GetInstance()->output_configurator_animation();
     if (animation) {
       animation->StartFadeOutAnimation(base::Bind(
           &DisplayController::OnFadeOutForSwapDisplayFinished,
           base::Unretained(this)));
     } else {
       SetPrimaryDisplay(ScreenAsh::GetSecondaryDisplay());
     }
 #else
@@ skipping 286 matching lines @@
     int64 id1,
     int64 id2,
     const DisplayLayout& layout,
     bool override) {
   DisplayIdPair pair = std::make_pair(id1, id2);
   if (override || paired_layouts_.find(pair) == paired_layouts_.end())
     paired_layouts_[pair] = layout;
 }
 
 void DisplayController::OnFadeOutForSwapDisplayFinished() {
-#if defined(OS_CHROMEOS)
+#if defined(OS_CHROMEOS) && defined(USE_X11)
   SetPrimaryDisplay(ScreenAsh::GetSecondaryDisplay());
   Shell::GetInstance()->output_configurator_animation()->StartFadeInAnimation();
 #endif
 }
 
 }  // namespace ash