diff options
| author | dnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-24 23:17:04 +0000 |
|---|---|---|
| committer | dnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-24 23:17:04 +0000 |
| commit | 129aad8497f52e19450572120d514dec4a8c66d6 (patch) | |
| tree | 9c65fa9b793cd90618d61c45b39d4d66b1a5f3c8 /ash/display/display_controller.cc | |
| parent | 1eb088e6b30f7e8dd2d0eabcef6993a0c7bc7ef0 (diff) | |
| download | chromium_src-129aad8497f52e19450572120d514dec4a8c66d6.zip chromium_src-129aad8497f52e19450572120d514dec4a8c66d6.tar.gz chromium_src-129aad8497f52e19450572120d514dec4a8c66d6.tar.bz2 | |
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
Diffstat (limited to 'ash/display/display_controller.cc')
| -rw-r--r-- | ash/display/display_controller.cc | 13 |
1 files changed, 7 insertions, 6 deletions
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 } |