Move chromeos specific utility functions for display to chromeos/display

chromeos/display/output_configurator.h

 // 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.
 
 #ifndef CHROMEOS_DISPLAY_OUTPUT_CONFIGURATOR_H_
 #define CHROMEOS_DISPLAY_OUTPUT_CONFIGURATOR_H_
 
 #include <map>
+#include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/event_types.h"
 #include "base/observer_list.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/timer.h"
 #include "chromeos/chromeos_export.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
@@ skipping 36 matching lines @@
 
     int y;
     int height;
 
     bool is_internal;
     bool is_aspect_preserving_scaling;
 
     // XInput device ID or 0 if this output isn't a touchscreen.
     int touch_device_id;
 
-    // TODO(oshima): Move xrandr related functions to here
-    // from ui/base/x and replace this with display id.
-    int index;
+    // Display id for this output.
+    int64 display_id;
+
+    bool has_display_id;
   };
 
   struct CoordinateTransformation {
     // Initialized to the identity transformation.
     CoordinateTransformation();
 
     float x_scale;
     float x_offset;
     float y_scale;
     float y_offset;
@@ skipping 23 matching lines @@
     virtual void OnDisplayModeChangeFailed(OutputState failed_new_state) {}
   };
 
   // Interface for classes that make decisions about which output state
   // should be used.
   class StateController {
    public:
     virtual ~StateController() {}
 
     // Called when displays are detected.
-    virtual OutputState GetStateForOutputs(
-        const std::vector<OutputSnapshot>& outputs) const = 0;
+    virtual OutputState GetStateForDisplayIds(
+        const std::vector<int64>& display_ids) const = 0;
   };
 
   // Interface for classes that perform actions on behalf of OutputController.
   class Delegate {
    public:
     virtual ~Delegate() {}
 
     virtual void SetPanelFittingEnabled(bool enabled) = 0;
 
     // Initializes the XRandR extension, saving the base event ID to
@@ skipping 86 matching lines @@
 
   // Gap between screens so cursor at bottom of active display doesn't
   // partially appear on top of inactive display. Higher numbers guard
   // against larger cursors, but also waste more memory.
   // For simplicity, this is hard-coded to avoid the complexity of always
   // determining the DPI of the screen and rationalizing which screen we
   // need to use for the DPI calculation.
   // See crbug.com/130188 for initial discussion.
   static const int kVerticalGap = 60;
 
-  // Returns true if an output named |name| is an internal display.
-  static bool IsInternalOutputName(const std::string& name);
-
   OutputConfigurator();
   virtual ~OutputConfigurator();
 
   OutputState output_state() const { return output_state_; }
   DisplayPowerState power_state() const { return power_state_; }
 
   void set_state_controller(StateController* controller) {
     state_controller_ = controller;
   }
 
@@ skipping 115 matching lines @@
   scoped_ptr<base::OneShotTimer<OutputConfigurator> > configure_timer_;
 
   DISALLOW_COPY_AND_ASSIGN(OutputConfigurator);
 };
 
 typedef std::vector<OutputConfigurator::OutputSnapshot> OutputSnapshotList;
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DISPLAY_OUTPUT_CONFIGURATOR_H_