Refactoring display configuration state to allow generic state objects

ui/display/chromeos/x11/display_util.cc

 // Copyright 2014 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 "ui/display/chromeos/x11/display_util.h"
 
 #include <X11/extensions/Xrandr.h>
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
 
@@ skipping 44 matching lines @@
 OutputType GetOutputTypeFromName(const std::string& name) {
   for (unsigned int i = 0; i < arraysize(kOutputTypeMapping); ++i) {
     if (name.find(kOutputTypeMapping[i].name) == 0) {
       return kOutputTypeMapping[i].type;
     }
   }
 
   return OUTPUT_TYPE_UNKNOWN;
 }
 
-std::string GetDisplayName(const OutputConfigurator::OutputSnapshot& output) {
+std::string GetDisplayName(RROutput output) {
   std::string display_name;
-  GetOutputDeviceData(output.output, NULL, &display_name);
+  GetOutputDeviceData(output, NULL, &display_name);
   return display_name;
 }
 
-bool GetOutputOverscanFlag(const OutputConfigurator::OutputSnapshot& output,
-                           bool* flag) {
+bool GetOutputOverscanFlag(RROutput output, bool* flag) {
   unsigned long nitems = 0;
   unsigned char* prop = NULL;
-  if (!base::GetEDIDProperty(output.output, &nitems, &prop))
+  if (!base::GetEDIDProperty(output, &nitems, &prop))
     return false;
 
   bool found = ParseOutputOverscanFlag(prop, nitems, flag);
   XFree(prop);
   return found;
 }
 
 bool ParseOutputOverscanFlag(const unsigned char* prop,
                              unsigned long nitems,
                              bool* flag) {
@@ skipping 67 matching lines @@
         *flag = false;
       }
       return true;
     }
   }
 
   return false;
 }
 
 }  // namespace ui