Introduce DisplayConfigurationController

ash/display/display_animator_chromeos.cc

 // Copyright 2014 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_animator.h"
+#include "ash/display/display_animator_chromeos.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "base/time/time.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animation_observer.h"
@@ skipping 68 matching lines @@
   size_t completed_counter_;
   bool animation_aborted_;
   ScopedVector<Observer> observer_list_;
   base::Closure callback_;
 
   DISALLOW_COPY_AND_ASSIGN(CallbackRunningObserver);
 };
 
 }  // namespace
 
-DisplayAnimator::DisplayAnimator() : weak_ptr_factory_(this) {}
+DisplayAnimatorChromeOS::DisplayAnimatorChromeOS() : weak_ptr_factory_(this) {
+  Shell::GetInstance()->display_configurator()->AddObserver(this);
+}
 
-DisplayAnimator::~DisplayAnimator() {
+DisplayAnimatorChromeOS::~DisplayAnimatorChromeOS() {
+  Shell::GetInstance()->display_configurator()->RemoveObserver(this);
   ClearHidingLayers();
 }
 
-void DisplayAnimator::StartFadeOutAnimation(base::Closure callback) {
+void DisplayAnimatorChromeOS::StartFadeOutAnimation(base::Closure callback) {
   CallbackRunningObserver* observer = new CallbackRunningObserver(callback);
   ClearHidingLayers();
 
   // Make the fade-out animation for all root windows.  Instead of actually
   // hiding the root windows, we put a black layer over a root window for
   // safety.  These layers remain to hide root windows and will be deleted
   // after the animation of OnDisplayModeChanged().
   for (aura::Window* root_window : Shell::GetInstance()->GetAllRootWindows()) {
     ui::Layer* hiding_layer = new ui::Layer(ui::LAYER_SOLID_COLOR);
     hiding_layer->SetColor(SK_ColorBLACK);
@@ skipping 13 matching lines @@
     hiding_layer->SetVisible(true);
     hiding_layers_[root_window] = hiding_layer;
   }
 
   // In case that OnDisplayModeChanged() isn't called or its animator is
   // canceled due to some unknown errors, we set a timer to clear these
   // hiding layers.
   timer_.reset(new base::OneShotTimer());
   timer_->Start(FROM_HERE,
                 base::TimeDelta::FromSeconds(kFadingTimeoutDurationInSeconds),
-                this, &DisplayAnimator::ClearHidingLayers);
+                this, &DisplayAnimatorChromeOS::ClearHidingLayers);
 }
 
-void DisplayAnimator::StartFadeInAnimation() {
+void DisplayAnimatorChromeOS::StartFadeInAnimation() {
   // We want to make sure clearing all of hiding layers after the animation
   // finished.  Note that this callback can be canceled, but the cancel only
   // happens when the next animation is scheduled.  Thus the hiding layers
   // should be deleted eventually.
-  CallbackRunningObserver* observer = new CallbackRunningObserver(base::Bind(
-      &DisplayAnimator::ClearHidingLayers, weak_ptr_factory_.GetWeakPtr()));
+  CallbackRunningObserver* observer = new CallbackRunningObserver(
+      base::Bind(&DisplayAnimatorChromeOS::ClearHidingLayers,
+                 weak_ptr_factory_.GetWeakPtr()));
 
   // Ensure that layers are not animating.
   for (std::map<aura::Window*, ui::Layer*>::value_type& e : hiding_layers_) {
     ui::LayerAnimator* animator = e.second->GetAnimator();
     if (animator->is_animating())
       animator->StopAnimating();
   }
 
   // Schedules the fade-in effect for all root windows.  Because we put the
   // black layers for fade-out, here we actually turn those black layers
@@ skipping 22 matching lines @@
 
     ui::ScopedLayerAnimationSettings settings(hiding_layer->GetAnimator());
     settings.SetTransitionDuration(
         base::TimeDelta::FromMilliseconds(kFadingAnimationDurationInMS));
     observer->AddNewAnimator(hiding_layer->GetAnimator());
     hiding_layer->SetOpacity(0.0f);
     hiding_layer->SetVisible(false);
   }
 }
 
-void DisplayAnimator::OnDisplayModeChanged(
+void DisplayAnimatorChromeOS::OnDisplayModeChanged(
     const ui::DisplayConfigurator::DisplayStateList& displays) {
   if (!hiding_layers_.empty())
     StartFadeInAnimation();
 }
 
-void DisplayAnimator::OnDisplayModeChangeFailed(
+void DisplayAnimatorChromeOS::OnDisplayModeChangeFailed(
     const ui::DisplayConfigurator::DisplayStateList& displays,
     ui::MultipleDisplayState failed_new_state) {
   if (!hiding_layers_.empty())
     StartFadeInAnimation();
 }
 
-void DisplayAnimator::ClearHidingLayers() {
+void DisplayAnimatorChromeOS::ClearHidingLayers() {
   if (timer_) {
     timer_->Stop();
     timer_.reset();
   }
   STLDeleteContainerPairSecondPointers(hiding_layers_.begin(),
                                        hiding_layers_.end());
   hiding_layers_.clear();
 }
 
 }  // namespace ash