Update naming from OutputConfiguratorAnimation to DisplayConfiguratorAnimation

ash/display/display_configurator_animation.cc

Index: ash/display/display_configurator_animation.cc
diff --git a/ash/display/output_configurator_animation.cc b/ash/display/display_configurator_animation.cc
similarity index 90%
rename from ash/display/output_configurator_animation.cc
rename to ash/display/display_configurator_animation.cc
index f2aa2524cbad06dfb33b254b94330f8dac72c3e0..be69b475b1fc2bfdb655c173c9fa79491d40c42c 100644
--- a/ash/display/output_configurator_animation.cc
+++ b/ash/display/display_configurator_animation.cc
@@ -2,7 +2,7 @@
 // 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"
@@ -97,14 +97,14 @@ class 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();
@@ -140,20 +140,20 @@ void OutputConfiguratorAnimation::StartFadeOutAnimation(
   // 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.
@@ -202,19 +202,19 @@ void OutputConfiguratorAnimation::StartFadeInAnimation() {
   }
 }
 
-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();