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/shell.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/shell.cc')
| -rw-r--r-- | ash/shell.cc | 11 |
1 files changed, 6 insertions, 5 deletions
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()); |