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

Unified Diff: ash/system/chromeos/power/power_event_observer.cc

Issue 226183004: Renamed OutputConfigurator to DisplayConfigurator (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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
Index: ash/system/chromeos/power/power_event_observer.cc
diff --git a/ash/system/chromeos/power/power_event_observer.cc b/ash/system/chromeos/power/power_event_observer.cc
index d2f3e58dadc57c98cac66a0310c56c6bfa276f3d..5ede06bab05ce6e6f502b43ab51d0ce15878b074 100644
--- a/ash/system/chromeos/power/power_event_observer.cc
+++ b/ash/system/chromeos/power/power_event_observer.cc
@@ -10,7 +10,7 @@
#include "ash/wm/power_button_controller.h"
#include "base/prefs/pref_service.h"
#include "chromeos/dbus/dbus_thread_manager.h"
-#include "ui/display/chromeos/output_configurator.h"
+#include "ui/display/chromeos/display_configurator.h"
#include "ui/wm/core/user_activity_detector.h"
namespace ash {
@@ -51,11 +51,11 @@ void PowerEventObserver::SuspendImminent() {
}
shell->user_activity_detector()->OnDisplayPowerChanging();
- shell->output_configurator()->SuspendDisplays();
+ shell->display_configurator()->SuspendDisplays();
}
void PowerEventObserver::SystemResumed(const base::TimeDelta& sleep_duration) {
- Shell::GetInstance()->output_configurator()->ResumeDisplays();
+ Shell::GetInstance()->display_configurator()->ResumeDisplays();
Shell::GetInstance()->system_tray_notifier()->NotifyRefreshClock();
}

Powered by Google App Engine
This is Rietveld 408576698