chromeos: Include mode details in OutputSnapshot.

chromeos/display/output_util.cc

 // Copyright (c) 2013 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 "chromeos/display/output_util.h"
 
 #include <X11/Xlib.h>
 #include <X11/extensions/Xrandr.h>
 #include <X11/Xatom.h>
 
@@ skipping 313 matching lines @@
   }
 
   return false;
 }
 
 bool IsInternalOutputName(const std::string& name) {
   return name.find(kInternal_LVDS) == 0 || name.find(kInternal_eDP) == 0 ||
       name.find(kInternal_DSI) == 0;
 }
 
-const XRRModeInfo* FindModeInfo(const XRRScreenResources* screen_resources,
-                                XID current_mode) {
+const XRRModeInfo* FindXRRModeInfo(const XRRScreenResources* screen_resources,
+                                   XID current_mode) {
   for (int m = 0; m < screen_resources->nmode; m++) {
     XRRModeInfo *mode = &screen_resources->modes[m];
     if (mode->id == current_mode)
       return mode;
   }
   return NULL;
 }
 
 // Find a mode that matches the given size with highest
 // reflesh rate.
 RRMode FindOutputModeMatchingSize(
     const XRRScreenResources* screen_resources,
     const XRROutputInfo* output_info,
     size_t width,
     size_t height) {
   RRMode found = None;
   float best_rate = 0;
   bool non_interlaced_found = false;
   for (int i = 0; i < output_info->nmode; ++i) {
     RRMode mode = output_info->modes[i];
-    const XRRModeInfo* info = FindModeInfo(screen_resources, mode);
+    const XRRModeInfo* info = FindXRRModeInfo(screen_resources, mode);
 
     if (info->width == width && info->height == height) {
       float rate = GetRefreshRate(info);
 
       if (info->modeFlags & RR_Interlace) {
         if (non_interlaced_found)
           continue;
       } else {
         // Reset the best rate if the non interlaced is
         // found the first time.
@@ skipping 29 matching lines @@
     mode_info.hTotal = 1;
     mode_info.vTotal = 1;
     mode_info.dotClock = refresh_rate;
   }
   return mode_info;
 }
 
 }  // namespace test
 
 }  // namespace chromeos