From 6dbcc2148cbb6acf9a6913f71e45b8bb2ed4c678 Mon Sep 17 00:00:00 2001 From: "oshima@chromium.org" Date: Mon, 13 May 2013 09:54:28 +0000 Subject: 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 --- ash/display/display_change_observer_x11.cc | 6 +++--- ash/display/display_change_observer_x11.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'ash/display') 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& 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 ? diff --git a/ash/display/display_change_observer_x11.h b/ash/display/display_change_observer_x11.h index 137137b..3bcf461 100644 --- a/ash/display/display_change_observer_x11.h +++ b/ash/display/display_change_observer_x11.h @@ -29,7 +29,7 @@ class DisplayChangeObserverX11 // chromeos::OutputConfigurator::StateController overrides: virtual chromeos::OutputState GetStateForOutputs( - const std::vector& outputs) const OVERRIDE; + const chromeos::OutputSnapshotList& outputs) const OVERRIDE; // Overriden from chromeos::OutputConfigurator::Observer: virtual void OnDisplayModeChanged() OVERRIDE; -- cgit v1.1