Update naming from OutputConfiguratorAnimation to DisplayConfiguratorAnimation

BUG=333413

Review URL: https://codereview.chromium.org/250163002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266034 0039d316-1c4b-4281-b951-d872f2087c98

10 files changed, 54 insertions, 52 deletions

diff --git a/ash/ash.gyp b/ash/ash.gyp
index b0b9c6e..1925dea 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -112,6 +112,8 @@
         'display/cursor_window_controller.h',
         'display/display_change_observer_chromeos.cc',
         'display/display_change_observer_chromeos.h',
+        'display/display_configurator_animation.cc',
+        'display/display_configurator_animation.h',
         'display/display_controller.cc',
         'display/display_controller.h',
         'display/display_error_observer_chromeos.cc',
@@ -131,8 +133,6 @@
         'display/mirror_window_controller.h',
         'display/mouse_cursor_event_filter.cc',
         'display/mouse_cursor_event_filter.h',
-        'display/output_configurator_animation.cc',
-        'display/output_configurator_animation.h',
         'display/projecting_observer_chromeos.cc',
         'display/projecting_observer_chromeos.h',
         'display/resolution_notification_controller.cc',
@@ -724,8 +724,8 @@
           ],
         }, { # else: chromeos!=1
           'sources/': [
-            ['exclude', 'display/output_configurator_animation.cc'],
-            ['exclude', 'display/output_configurator_animation.h'],
+            ['exclude', 'display/display_configurator_animation.cc'],
+            ['exclude', 'display/display_configurator_animation.h'],
             ['exclude', 'display/resolution_notification_controller.cc'],
             ['exclude', 'display/resolution_notification_controller.h'],
           ],
diff --git a/ash/display/output_configurator_animation.cc b/ash/display/display_configurator_animation.cc
index f2aa252..7398d270 100644
--- a/ash/display/output_configurator_animation.cc
+++ b/ash/display/display_configurator_animation.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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/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();
diff --git a/ash/display/output_configurator_animation.h b/ash/display/display_configurator_animation.h
index e82217a..98b54e53 100644
--- a/ash/display/output_configurator_animation.h
+++ b/ash/display/display_configurator_animation.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
-#ifndef ASH_DISPLAY_OUTPUT_CONFIGURATOR_ANIMATION_H_
-#define ASH_DISPLAY_OUTPUT_CONFIGURATOR_ANIMATION_H_
+#ifndef ASH_DISPLAY_DISPLAY_CONFIGURATOR_ANIMATION_H_
+#define ASH_DISPLAY_DISPLAY_CONFIGURATOR_ANIMATION_H_
 
 #include <map>
 
@@ -23,14 +23,14 @@ class Layer;
 
 namespace ash {
 
-// OutputConfiguratorAnimation provides the visual effects for
+// DisplayConfiguratorAnimation provides the visual effects for
 // ui::DisplayConfigurator, such like fade-out/in during changing
 // the display mode.
-class ASH_EXPORT OutputConfiguratorAnimation
+class ASH_EXPORT DisplayConfiguratorAnimation
     : public ui::DisplayConfigurator::Observer {
  public:
-  OutputConfiguratorAnimation();
-  virtual ~OutputConfiguratorAnimation();
+  DisplayConfiguratorAnimation();
+  virtual ~DisplayConfiguratorAnimation();
 
   // Starts the fade-out animation for the all root windows.  It will
   // call |callback| once all of the animations have finished.
@@ -54,11 +54,11 @@ class ASH_EXPORT OutputConfiguratorAnimation
   void ClearHidingLayers();
 
   std::map<aura::Window*, ui::Layer*> hiding_layers_;
-  scoped_ptr<base::OneShotTimer<OutputConfiguratorAnimation> > timer_;
+  scoped_ptr<base::OneShotTimer<DisplayConfiguratorAnimation> > timer_;
 
-  DISALLOW_COPY_AND_ASSIGN(OutputConfiguratorAnimation);
+  DISALLOW_COPY_AND_ASSIGN(DisplayConfiguratorAnimation);
 };
 
 }  // namespace ash
 
-#endif  // ASH_DISPLAY_OUTPUT_CONFIGURATION_CONTROLLER_H_
+#endif  // ASH_DISPLAY_DISPLAY_CONFIGURATION_CONTROLLER_H_
diff --git a/ash/display/display_controller.cc b/ash/display/display_controller.cc
index 11c49ce..c8cad9e 100644
--- a/ash/display/display_controller.cc
+++ b/ash/display/display_controller.cc
@@ -40,7 +40,7 @@
 #include "ui/wm/public/activation_client.h"
 
 #if defined(OS_CHROMEOS)
-#include "ash/display/output_configurator_animation.h"
+#include "ash/display/display_configurator_animation.h"
 #include "base/sys_info.h"
 #include "base/time/time.h"
 #if defined(USE_X11)
@@ -382,8 +382,8 @@ void DisplayController::ToggleMirrorMode() {
   }
 #if defined(OS_CHROMEOS)
   Shell* shell = Shell::GetInstance();
-  OutputConfiguratorAnimation* animation =
-      shell->output_configurator_animation();
+  DisplayConfiguratorAnimation* animation =
+      shell->display_configurator_animation();
   animation->StartFadeOutAnimation(
       base::Bind(base::IgnoreResult(&DisplayManager::SetMirrorMode),
                  base::Unretained(display_manager),
@@ -400,8 +400,8 @@ void DisplayController::SwapPrimaryDisplay() {
 
   if (Shell::GetScreen()->GetNumDisplays() > 1) {
 #if defined(OS_CHROMEOS)
-    OutputConfiguratorAnimation* animation =
-        Shell::GetInstance()->output_configurator_animation();
+    DisplayConfiguratorAnimation* animation =
+        Shell::GetInstance()->display_configurator_animation();
     if (animation) {
       animation->StartFadeOutAnimation(base::Bind(
           &DisplayController::OnFadeOutForSwapDisplayFinished,
@@ -732,7 +732,8 @@ AshWindowTreeHost* DisplayController::AddWindowTreeHostForDisplay(
 void DisplayController::OnFadeOutForSwapDisplayFinished() {
 #if defined(OS_CHROMEOS)
   SetPrimaryDisplay(ScreenUtil::GetSecondaryDisplay());
-  Shell::GetInstance()->output_configurator_animation()->StartFadeInAnimation();
+  Shell::GetInstance()->display_configurator_animation()
+      ->StartFadeInAnimation();
 #endif
 }
 
diff --git a/ash/display/display_manager.cc b/ash/display/display_manager.cc
index 7f6d713..0f3bdda 100644
--- a/ash/display/display_manager.cc
+++ b/ash/display/display_manager.cc
@@ -36,7 +36,7 @@
 #endif
 
 #if defined(OS_CHROMEOS)
-#include "ash/display/output_configurator_animation.h"
+#include "ash/display/display_configurator_animation.h"
 #include "base/sys_info.h"
 #endif
 
@@ -890,8 +890,8 @@ void DisplayManager::SetMirrorMode(bool mirrored) {
   }
   UpdateDisplays(display_info_list);
 #if defined(OS_CHROMEOS)
-  if (Shell::GetInstance()->output_configurator_animation()) {
-    Shell::GetInstance()->output_configurator_animation()->
+  if (Shell::GetInstance()->display_configurator_animation()) {
+    Shell::GetInstance()->display_configurator_animation()->
         StartFadeInAnimation();
   }
 #endif
diff --git a/ash/shell.cc b/ash/shell.cc
index e694630..7dbe541 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -118,8 +118,8 @@
 #endif  // defined(USE_X11)
 #include "ash/ash_constants.h"
 #include "ash/display/display_change_observer_chromeos.h"
+#include "ash/display/display_configurator_animation.h"
 #include "ash/display/display_error_observer_chromeos.h"
-#include "ash/display/output_configurator_animation.h"
 #include "ash/display/projecting_observer_chromeos.h"
 #include "ash/display/resolution_notification_controller.h"
 #include "ash/sticky_keys/sticky_keys_controller.h"
@@ -772,8 +772,9 @@ Shell::~Shell() {
 #if defined(OS_CHROMEOS)
   if (display_change_observer_)
     display_configurator_->RemoveObserver(display_change_observer_.get());
-  if (output_configurator_animation_)
-    display_configurator_->RemoveObserver(output_configurator_animation_.get());
+  if (display_configurator_animation_)
+    display_configurator_->RemoveObserver(
+        display_configurator_animation_.get());
   if (display_error_observer_)
     display_configurator_->RemoveObserver(display_error_observer_.get());
   if (projecting_observer_)
@@ -797,8 +798,8 @@ void Shell::Init() {
   bool display_initialized = display_manager_->InitFromCommandLine();
 #if defined(OS_CHROMEOS)
   display_configurator_->Init(!gpu_support_->IsPanelFittingDisabled());
-  output_configurator_animation_.reset(new OutputConfiguratorAnimation());
-  display_configurator_->AddObserver(output_configurator_animation_.get());
+  display_configurator_animation_.reset(new DisplayConfiguratorAnimation());
+  display_configurator_->AddObserver(display_configurator_animation_.get());
 
   projecting_observer_.reset(new ProjectingObserver());
   display_configurator_->AddObserver(projecting_observer_.get());
diff --git a/ash/shell.h b/ash/shell.h
index 6f88e1d..718a6c6 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -83,6 +83,7 @@ class BluetoothNotificationController;
 class CaptureController;
 class DesktopBackgroundController;
 class DisplayChangeObserver;
+class DisplayConfiguratorAnimation;
 class DisplayController;
 class DisplayErrorObserver;
 class DisplayManager;
@@ -107,7 +108,6 @@ class MouseCursorEventFilter;
 class MruWindowTracker;
 class NestedDispatcherController;
 class NewWindowDelegate;
-class OutputConfiguratorAnimation;
 class OverlayEventFilter;
 class PartialMagnificationController;
 class PowerButtonController;
@@ -504,8 +504,8 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
   ui::DisplayConfigurator* display_configurator() {
     return display_configurator_.get();
   }
-  OutputConfiguratorAnimation* output_configurator_animation() {
-    return output_configurator_animation_.get();
+  DisplayConfiguratorAnimation* display_configurator_animation() {
+    return display_configurator_animation_.get();
   }
   DisplayErrorObserver* display_error_observer() {
     return display_error_observer_.get();
@@ -704,7 +704,7 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
       last_window_closed_logout_reminder_;
   // Controls video output device state.
   scoped_ptr<ui::DisplayConfigurator> display_configurator_;
-  scoped_ptr<OutputConfiguratorAnimation> output_configurator_animation_;
+  scoped_ptr<DisplayConfiguratorAnimation> display_configurator_animation_;
   scoped_ptr<DisplayErrorObserver> display_error_observer_;
   scoped_ptr<ProjectingObserver> projecting_observer_;
 
diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc
index f9e812c..5787568 100644
--- a/ash/test/ash_test_helper.cc
+++ b/ash/test/ash_test_helper.cc
@@ -98,7 +98,7 @@ void AshTestHelper::SetUp(bool start_session) {
 
   test::DisplayManagerTestApi(shell->display_manager()).
       DisableChangeDisplayUponHostResize();
-  ShellTestApi(shell).DisableOutputConfiguratorAnimation();
+  ShellTestApi(shell).DisableDisplayConfiguratorAnimation();
 
   test_screenshot_delegate_ = new TestScreenshotDelegate();
   shell->accelerator_controller()->SetScreenshotDelegate(
diff --git a/ash/test/shell_test_api.cc b/ash/test/shell_test_api.cc
index d44a137..0a7d4fd 100644
--- a/ash/test/shell_test_api.cc
+++ b/ash/test/shell_test_api.cc
@@ -9,7 +9,7 @@
 #include "ash/shell.h"
 
 #if defined(OS_CHROMEOS)
-#include "ash/display/output_configurator_animation.h"
+#include "ash/display/display_configurator_animation.h"
 #include "ui/display/chromeos/display_configurator.h"
 #endif
 
@@ -59,12 +59,12 @@ MaximizeModeWindowManager* ShellTestApi::maximize_mode_window_manager() {
   return shell_->maximize_mode_window_manager_.get();
 }
 
-void ShellTestApi::DisableOutputConfiguratorAnimation() {
+void ShellTestApi::DisableDisplayConfiguratorAnimation() {
 #if defined(OS_CHROMEOS)
-  if (shell_->output_configurator_animation_) {
+  if (shell_->display_configurator_animation_) {
     shell_->display_configurator_->RemoveObserver(
-        shell_->output_configurator_animation_.get());
-    shell_->output_configurator_animation_.reset();
+        shell_->display_configurator_animation_.get());
+    shell_->display_configurator_animation_.reset();
   }
 #endif  // defined(OS_CHROMEOS)
 }
diff --git a/ash/test/shell_test_api.h b/ash/test/shell_test_api.h
index 68c3749..7364397 100644
--- a/ash/test/shell_test_api.h
+++ b/ash/test/shell_test_api.h
@@ -41,7 +41,7 @@ public:
   DragDropController* drag_drop_controller();
   AppListController* app_list_controller();
   MaximizeModeWindowManager* maximize_mode_window_manager();
-  void DisableOutputConfiguratorAnimation();
+  void DisableDisplayConfiguratorAnimation();
 
   // Set ShelfDelegate.
   void SetShelfDelegate(ShelfDelegate* delegate);