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

Unified Diff: chrome/browser/ui/webui/options/chromeos/display_options_handler.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.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options/chromeos/display_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc
index f22e92c7d2c6e5034a2e5e40655bbee2bb24f5d9..668455dd8b9cdffed4e66e564d3af171dce5fe56 100644
--- a/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc
@@ -6,9 +6,9 @@
#include <string>
+#include "ash/display/display_configurator_animation.h"
#include "ash/display/display_controller.h"
#include "ash/display/display_manager.h"
-#include "ash/display/output_configurator_animation.h"
#include "ash/display/resolution_notification_controller.h"
#include "ash/shell.h"
#include "base/bind.h"
@@ -362,7 +362,7 @@ void DisplayOptionsHandler::OnFadeOutForDisplayLayoutFinished(
int position, int offset) {
SetCurrentDisplayLayout(
ash::DisplayLayout::FromInts(position, offset));
- ash::Shell::GetInstance()->output_configurator_animation()->
+ ash::Shell::GetInstance()->display_configurator_animation()->
StartFadeInAnimation();
}
@@ -377,7 +377,7 @@ void DisplayOptionsHandler::HandleMirroring(const base::ListValue* args) {
base::UserMetricsAction("Options_DisplayToggleMirroring"));
bool is_mirroring = false;
args->GetBoolean(0, &is_mirroring);
- ash::Shell::GetInstance()->output_configurator_animation()->
+ ash::Shell::GetInstance()->display_configurator_animation()->
StartFadeOutAnimation(base::Bind(
&DisplayOptionsHandler::OnFadeOutForMirroringFinished,
base::Unretained(this),
@@ -406,7 +406,7 @@ void DisplayOptionsHandler::HandleDisplayLayout(const base::ListValue* args) {
DCHECK_LE(ash::DisplayLayout::TOP, layout);
DCHECK_GE(ash::DisplayLayout::LEFT, layout);
content::RecordAction(base::UserMetricsAction("Options_DisplayRearrange"));
- ash::Shell::GetInstance()->output_configurator_animation()->
+ ash::Shell::GetInstance()->display_configurator_animation()->
StartFadeOutAnimation(base::Bind(
&DisplayOptionsHandler::OnFadeOutForDisplayLayoutFinished,
base::Unretained(this),
« no previous file with comments | « ash/test/shell_test_api.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698