Update naming from OutputConfiguratorAnimation to DisplayConfiguratorAnimation

ash/display/display_configurator_animation.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/output_configurator_animation.h"
+#include "ash/display/display_configurator_animation.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 74 matching lines @@
   size_t completed_counter_;
   bool animation_aborted_;
   ScopedVector<Observer> observer_list_;
   base::Closure callback_;
 
   DISALLOW_COPY_AND_ASSIGN(CallbackRunningObserver);
 };
 
 }  // namespace
 
-OutputConfiguratorAnimation::OutputConfiguratorAnimation() {
+DisplayConfiguratorAnimation::DisplayConfiguratorAnimation() {
 }
 
-OutputConfiguratorAnimation::~OutputConfiguratorAnimation() {
+DisplayConfiguratorAnimation::~DisplayConfiguratorAnimation() {
   ClearHidingLayers();
 }
 
-void OutputConfiguratorAnimation::StartFadeOutAnimation(
+void DisplayConfiguratorAnimation::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().
   aura::Window::Windows root_windows =
       Shell::GetInstance()->GetAllRootWindows();
@@ skipping 15 matching lines @@
         kFadingAnimationDurationInMS));
     observer->AddNewAnimator(hiding_layer->GetAnimator());
     hiding_layer->SetOpacity(1.0f);
     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<OutputConfiguratorAnimation>());
+  timer_.reset(new base::OneShotTimer<DisplayConfiguratorAnimation>());
   timer_->Start(FROM_HERE,
                 base::TimeDelta::FromSeconds(kFadingTimeoutDurationInSeconds),
                 this,
-                &OutputConfiguratorAnimation::ClearHidingLayers);
+                &DisplayConfiguratorAnimation::ClearHidingLayers);
 }
 
-void OutputConfiguratorAnimation::StartFadeInAnimation() {
+void DisplayConfiguratorAnimation::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(&OutputConfiguratorAnimation::ClearHidingLayers,
+      base::Bind(&DisplayConfiguratorAnimation::ClearHidingLayers,
                  base::Unretained(this)));
 
   // Ensure that layers are not animating.
   for (std::map<aura::Window*, ui::Layer*>::iterator it =
            hiding_layers_.begin(); it != hiding_layers_.end(); ++it) {
     ui::LayerAnimator* animator = it->second->GetAnimator();
     if (animator->is_animating())
       animator->StopAnimating();
   }
 
@@ skipping 28 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 OutputConfiguratorAnimation::OnDisplayModeChanged(
-    const ui::DisplayConfigurator::DisplayStateList& outputs) {
+void DisplayConfiguratorAnimation::OnDisplayModeChanged(
+    const ui::DisplayConfigurator::DisplayStateList& displays) {
   if (!hiding_layers_.empty())
     StartFadeInAnimation();
 }
 
-void OutputConfiguratorAnimation::OnDisplayModeChangeFailed(
+void DisplayConfiguratorAnimation::OnDisplayModeChangeFailed(
     ui::MultipleDisplayState failed_new_state) {
   if (!hiding_layers_.empty())
     StartFadeInAnimation();
 }
 
-void OutputConfiguratorAnimation::ClearHidingLayers() {
+void DisplayConfiguratorAnimation::ClearHidingLayers() {
   if (timer_) {
     timer_->Stop();
     timer_.reset();
   }
   STLDeleteContainerPairSecondPointers(
       hiding_layers_.begin(), hiding_layers_.end());
   hiding_layers_.clear();
 }
 
 }  // namespace ash