Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(210)

Unified Diff: ash/test/shell_test_api.cc

Issue 250163002: Update naming from OutputConfiguratorAnimation to DisplayConfiguratorAnimation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/test/shell_test_api.h ('k') | chrome/browser/ui/webui/options/chromeos/display_options_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/shell_test_api.cc
diff --git a/ash/test/shell_test_api.cc b/ash/test/shell_test_api.cc
index d44a137c65bb947410338890b97c30e80669a6d2..0a7d4fd1622f170f9207b47b642d10c61d747440 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)
}
« no previous file with comments | « ash/test/shell_test_api.h ('k') | chrome/browser/ui/webui/options/chromeos/display_options_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698