summaryrefslogtreecommitdiffstats
path: root/ash/display/display_change_observer_x11.cc
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-13 09:54:28 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-13 09:54:28 +0000
commit6dbcc2148cbb6acf9a6913f71e45b8bb2ed4c678 (patch)
treed802b839e0f7b5bc231c59f7a4a1ad691e371157 /ash/display/display_change_observer_x11.cc
parente58eb5cfa2db649e8a068683161724bb45ca11a0 (diff)
downloadchromium_src-6dbcc2148cbb6acf9a6913f71e45b8bb2ed4c678.zip
chromium_src-6dbcc2148cbb6acf9a6913f71e45b8bb2ed4c678.tar.gz
chromium_src-6dbcc2148cbb6acf9a6913f71e45b8bb2ed4c678.tar.bz2
Use the correct output index to get state for outputs.
BUG=239412 TEST=manual. see bug for repro step. Review URL: https://chromiumcodereview.appspot.com/14699004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199695 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/display/display_change_observer_x11.cc')
-rw-r--r--ash/display/display_change_observer_x11.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/ash/display/display_change_observer_x11.cc b/ash/display/display_change_observer_x11.cc
index 90047a1..cb405d2 100644
--- a/ash/display/display_change_observer_x11.cc
+++ b/ash/display/display_change_observer_x11.cc
@@ -132,11 +132,11 @@ DisplayChangeObserverX11::~DisplayChangeObserverX11() {
}
chromeos::OutputState DisplayChangeObserverX11::GetStateForOutputs(
- const std::vector<chromeos::OutputInfo>& outputs) const {
+ const chromeos::OutputSnapshotList& outputs) const {
CHECK(outputs.size() == 2);
DisplayIdPair pair = std::make_pair(
- GetDisplayId(outputs[0].output, outputs[0].output_index),
- GetDisplayId(outputs[1].output, outputs[1].output_index));
+ GetDisplayId(outputs[0].output, outputs[0].index),
+ GetDisplayId(outputs[1].output, outputs[1].index));
DisplayLayout layout = Shell::GetInstance()->display_controller()->
GetRegisteredDisplayLayout(pair);
return layout.mirrored ?