diff options
| author | dnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-07 20:06:11 +0000 |
|---|---|---|
| committer | dnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-07 20:06:11 +0000 |
| commit | 1e31cbd00e25a70b4826f16bac3b044bec7725a7 (patch) | |
| tree | 615f96d9f5c5c0c7a134c24ee2451213c98f226c /ash/test | |
| parent | c32b4c577f0ba82a2d8024af1c8ab9cec80c800f (diff) | |
| download | chromium_src-1e31cbd00e25a70b4826f16bac3b044bec7725a7.zip chromium_src-1e31cbd00e25a70b4826f16bac3b044bec7725a7.tar.gz chromium_src-1e31cbd00e25a70b4826f16bac3b044bec7725a7.tar.bz2 | |
Renamed OutputConfigurator to DisplayConfigurator
BUG=333413
Review URL: https://codereview.chromium.org/226183004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262183 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/test')
| -rw-r--r-- | ash/test/shell_test_api.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/test/shell_test_api.cc b/ash/test/shell_test_api.cc index b8c3e2d..d44a137 100644 --- a/ash/test/shell_test_api.cc +++ b/ash/test/shell_test_api.cc @@ -10,7 +10,7 @@ #if defined(OS_CHROMEOS) #include "ash/display/output_configurator_animation.h" -#include "ui/display/chromeos/output_configurator.h" +#include "ui/display/chromeos/display_configurator.h" #endif namespace ash { @@ -62,7 +62,7 @@ MaximizeModeWindowManager* ShellTestApi::maximize_mode_window_manager() { void ShellTestApi::DisableOutputConfiguratorAnimation() { #if defined(OS_CHROMEOS) if (shell_->output_configurator_animation_) { - shell_->output_configurator_->RemoveObserver( + shell_->display_configurator_->RemoveObserver( shell_->output_configurator_animation_.get()); shell_->output_configurator_animation_.reset(); } |