summaryrefslogtreecommitdiffstats
path: root/ash/shell.cc
diff options
context:
space:
mode:
authordnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-08 20:59:09 +0000
committerdnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-08 20:59:09 +0000
commitbcec7fb666c9742f77462d276c65ffdc46e79780 (patch)
treeed4415aa4022ac3b4208d3d09d034578b266df87 /ash/shell.cc
parent47ed74585b6c76d92f804b3f2cb7a26804469a13 (diff)
downloadchromium_src-bcec7fb666c9742f77462d276c65ffdc46e79780.zip
chromium_src-bcec7fb666c9742f77462d276c65ffdc46e79780.tar.gz
chromium_src-bcec7fb666c9742f77462d276c65ffdc46e79780.tar.bz2
Renaming ui/display constants and variables from OUTPUT_* to DISPLAY_*
This moves all display configuration to using one terminology when referring to displays. BUG=333413 Review URL: https://codereview.chromium.org/227833002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262503 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.cc')
-rw-r--r--ash/shell.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/shell.cc b/ash/shell.cc
index c0064c3..eea3bff 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -911,7 +911,7 @@ void Shell::Init() {
#if defined(OS_CHROMEOS)
// Pass the initial display state to PowerButtonController.
power_button_controller_->OnDisplayModeChanged(
- display_configurator_->cached_outputs());
+ display_configurator_->cached_displays());
#endif
AddShellObserver(lock_state_controller_.get());