diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-13 09:54:28 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-13 09:54:28 +0000 |
| commit | 6dbcc2148cbb6acf9a6913f71e45b8bb2ed4c678 (patch) | |
| tree | d802b839e0f7b5bc231c59f7a4a1ad691e371157 /ash | |
| parent | e58eb5cfa2db649e8a068683161724bb45ca11a0 (diff) | |
| download | chromium_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')
| -rw-r--r-- | ash/display/display_change_observer_x11.cc | 6 | ||||
| -rw-r--r-- | ash/display/display_change_observer_x11.h | 2 |
2 files changed, 4 insertions, 4 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 ? 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<chromeos::OutputInfo>& outputs) const OVERRIDE; + const chromeos::OutputSnapshotList& outputs) const OVERRIDE; // Overriden from chromeos::OutputConfigurator::Observer: virtual void OnDisplayModeChanged() OVERRIDE; |