Revert of Remove some ifdefs from ash since it only supports ChromeOS now.

ash/display/display_configuration_controller.cc

 // Copyright 2016 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_configuration_controller.h"
 
 #include "ash/display/display_animator.h"
-#include "ash/display/display_animator_chromeos.h"
 #include "ash/display/display_util.h"
 #include "ash/rotator/screen_rotation_animator.h"
 #include "base/time/time.h"
+#include "ui/display/display_layout.h"
+#include "ui/display/manager/display_manager.h"
+
+#if defined(OS_CHROMEOS)
+#include "ash/display/display_animator_chromeos.h"
 #include "chromeos/system/devicemode.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/display/display_layout.h"
-#include "ui/display/manager/display_manager.h"
+#endif
 
 namespace {
 
 // Specifies how long the display change should have been disabled
 // after each display change operations.
 // |kCycleDisplayThrottleTimeoutMs| is set to be longer to avoid
 // changing the settings while the system is still configurating
 // displays. It will be overriden by |kAfterDisplayChangeThrottleTimeoutMs|
 // when the display change happens, so the actual timeout is much shorter.
 const int64_t kAfterDisplayChangeThrottleTimeoutMs = 500;
@@ skipping 21 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(DisplayChangeLimiter);
 };
 
 DisplayConfigurationController::DisplayConfigurationController(
     display::DisplayManager* display_manager,
     WindowTreeHostManager* window_tree_host_manager)
     : display_manager_(display_manager),
       window_tree_host_manager_(window_tree_host_manager),
       weak_ptr_factory_(this) {
   window_tree_host_manager_->AddObserver(this);
+#if defined(OS_CHROMEOS)
   if (chromeos::IsRunningAsSystemCompositor())
     limiter_.reset(new DisplayChangeLimiter);
   display_animator_.reset(new DisplayAnimatorChromeOS());
+#endif
 }
 
 DisplayConfigurationController::~DisplayConfigurationController() {
   window_tree_host_manager_->RemoveObserver(this);
 }
 
 void DisplayConfigurationController::SetDisplayLayout(
     std::unique_ptr<display::DisplayLayout> layout,
     bool user_action) {
   if (user_action && display_animator_) {
     display_animator_->StartFadeOutAnimation(
         base::Bind(&DisplayConfigurationController::SetDisplayLayoutImpl,
                    weak_ptr_factory_.GetWeakPtr(), base::Passed(&layout)));
   } else {
     SetDisplayLayoutImpl(std::move(layout));
   }
 }
 
 void DisplayConfigurationController::SetMirrorMode(bool mirror,
                                                    bool user_action) {
   if (display_manager_->num_connected_displays() > 2) {
+#if defined(OS_CHROMEOS)
     if (user_action) {
       ShowDisplayErrorNotification(
           l10n_util::GetStringUTF16(IDS_ASH_DISPLAY_MIRRORING_NOT_SUPPORTED),
           false);
     }
+#endif
     return;
   }
   if (display_manager_->num_connected_displays() <= 1 ||
       display_manager_->IsInMirrorMode() == mirror || IsLimited()) {
     return;
   }
   SetThrottleTimeout(kCycleDisplayThrottleTimeoutMs);
   if (user_action && display_animator_) {
     display_animator_->StartFadeOutAnimation(
         base::Bind(&DisplayConfigurationController::SetMirrorModeImpl,
@@ skipping 69 matching lines @@
 }
 
 void DisplayConfigurationController::SetPrimaryDisplayIdImpl(
     int64_t display_id) {
   window_tree_host_manager_->SetPrimaryDisplayId(display_id);
   if (display_animator_)
     display_animator_->StartFadeInAnimation();
 }
 
 }  // namespace ash