From 129aad8497f52e19450572120d514dec4a8c66d6 Mon Sep 17 00:00:00 2001 From: "dnicoara@chromium.org" Date: Thu, 24 Apr 2014 23:17:04 +0000 Subject: 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 --- ash/display/display_controller.cc | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'ash/display/display_controller.cc') 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 } -- cgit v1.1