| Index: ash/display/display_change_observer_x11.cc
|
| diff --git a/ash/display/display_change_observer_x11.cc b/ash/display/display_change_observer_x11.cc
|
| index 860a5ea4996905c796694331098a2cb8f882b0b3..2802e6c8984a836f65e3cbfb61e23587db525594 100644
|
| --- a/ash/display/display_change_observer_x11.cc
|
| +++ b/ash/display/display_change_observer_x11.cc
|
| @@ -27,6 +27,9 @@
|
|
|
| namespace ash {
|
| namespace internal {
|
| +
|
| +using chromeos::OutputConfigurator;
|
| +
|
| namespace {
|
|
|
| // The DPI threshold to detect high density screen.
|
| @@ -89,7 +92,9 @@ bool DisplayChangeObserverX11::GetResolutionForDisplayId(int64 display_id,
|
| return true;
|
| }
|
|
|
| -void DisplayChangeObserverX11::OnDisplayModeChanged() {
|
| +void DisplayChangeObserverX11::OnDisplayModeChanged(
|
| + const std::vector<OutputConfigurator::OutputSnapshot>& outputs) {
|
| + // TODO(derat): Use |outputs| instead of re-fetching information.
|
| XRRScreenResources* screen_resources =
|
| XRRGetScreenResources(xdisplay_, x_root_window_);
|
| std::map<XID, XRRCrtcInfo*> crtc_info_map;
|
| @@ -131,7 +136,7 @@ void DisplayChangeObserverX11::OnDisplayModeChanged() {
|
| continue;
|
| }
|
| const XRRModeInfo* mode =
|
| - chromeos::FindModeInfo(screen_resources, crtc_info->mode);
|
| + chromeos::FindXRRModeInfo(screen_resources, crtc_info->mode);
|
| if (!mode) {
|
| LOG(WARNING) << "Could not find a mode for the output: output_index="
|
| << output_index;
|
|
|