chromeos: Include mode details in OutputSnapshot.

ash/display/display_change_observer_x11.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/display/display_change_observer_x11.h"
 
 #include <algorithm>
 #include <map>
 #include <set>
 #include <vector>
 
 #include <X11/extensions/Xrandr.h>
 
 #include "ash/ash_switches.h"
 #include "ash/display/display_info.h"
 #include "ash/display/display_layout_store.h"
 #include "ash/display/display_manager.h"
 #include "ash/display/display_util_x11.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_pump_aurax11.h"
 #include "chromeos/display/output_util.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/compositor/dip_util.h"
 #include "ui/gfx/display.h"
 
 namespace ash {
 namespace internal {
+
+using chromeos::OutputConfigurator;
+
 namespace {
 
 // The DPI threshold to detect high density screen.
 // Higher DPI than this will use device_scale_factor=2.
 const unsigned int kHighDensityDPIThreshold = 160;
 
 // 1 inch in mm.
 const float kInchInMm = 25.4f;
 
 int64 GetDisplayId(XID output, size_t output_index) {
@@ skipping 42 matching lines @@
   if (!Shell::GetInstance()->display_manager()->
       GetSelectedResolutionForDisplayId(display_id, &resolution)) {
     return false;
   }
 
   *width = resolution.width();
   *height = resolution.height();
   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;
 
   for (int c = 0; c < screen_resources->ncrtc; c++) {
     XID crtc_id = screen_resources->crtcs[c];
     XRRCrtcInfo *crtc_info =
         XRRGetCrtcInfo(xdisplay_, screen_resources, crtc_id);
     crtc_info_map[crtc_id] = crtc_info;
   }
@@ skipping 21 matching lines @@
       XRRFreeOutputInfo(output_info);
       continue;
     }
     const XRRCrtcInfo* crtc_info = crtc_info_map[output_info->crtc];
     if (!crtc_info) {
       LOG(WARNING) << "Crtc not found for output: output_index="
                    << output_index;
       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;
       continue;
     }
 
     float device_scale_factor = 1.0f;
     if (!ShouldIgnoreSize(output_info->mm_width, output_info->mm_height) &&
         (kInchInMm * mode->width / output_info->mm_width) >
         kHighDensityDPIThreshold) {
@@ skipping 45 matching lines @@
 void DisplayChangeObserverX11::OnAppTerminating() {
 #if defined(USE_ASH)
   // Stop handling display configuration events once the shutdown
   // process starts. crbug.com/177014.
   Shell::GetInstance()->output_configurator()->Stop();
 #endif
 }
 
 }  // namespace internal
 }  // namespace ash