Refactoring display configuration state to allow generic state objects

ui/display/chromeos/native_display_delegate.h

Index: ui/display/chromeos/native_display_delegate.h
diff --git a/ui/display/chromeos/native_display_delegate.h b/ui/display/chromeos/native_display_delegate.h
index c5d07123c4149c072d0ea48fbc6fcd2f2687145b..bacedfd6d9c31d1a5b8d4b4021314821efe551f2 100644
--- a/ui/display/chromeos/native_display_delegate.h
+++ b/ui/display/chromeos/native_display_delegate.h
@@ -5,30 +5,33 @@
 #ifndef UI_DISPLAY_CHROMEOS_NATIVE_DISPLAY_DELEGATE_H_
 #define UI_DISPLAY_CHROMEOS_NATIVE_DISPLAY_DELEGATE_H_
 
-#include "ui/display/chromeos/output_configurator.h"
 #include "ui/display/display_constants.h"
+#include "ui/display/display_export.h"
+
+namespace gfx {
+class Point;
+class Size;
+}
 
 namespace ui {
+class DisplayMode;
+class DisplaySnapshot;
 
 class NativeDisplayObserver;
 
 // Interface for classes that perform display configuration actions on behalf
 // of OutputConfigurator.
-// TODO(dnicoara) This interface will eventually be platform independent,
-// however it first requires refactoring the datatypes: crbug.com/333413
-class NativeDisplayDelegate {
+class DISPLAY_EXPORT NativeDisplayDelegate {
  public:
   virtual ~NativeDisplayDelegate() {}
 
-  // Initializes the XRandR extension, saving the base event ID to |event_base|.
   virtual void Initialize() = 0;
 
-  // Grabs the X server and refreshes XRandR-related resources.  While
-  // the server is grabbed, other clients are blocked.  Must be balanced
+  // Grabs and refreshes any display server related resources. Must be balanced
   // by a call to UngrabServer().
   virtual void GrabServer() = 0;
 
-  // Ungrabs the server and frees XRandR-related resources.
+  // Released the display server and any resources allocated by GrabServer().
   virtual void UngrabServer() = 0;
 
   // Flushes all pending requests and waits for replies.
@@ -41,42 +44,38 @@ class NativeDisplayDelegate {
   virtual void ForceDPMSOn() = 0;
 
   // Returns information about the current outputs. This method may block for
-  // 60 milliseconds or more. The returned outputs are not fully initialized;
-  // the rest of the work happens in
-  // OutputConfigurator::UpdateCachedOutputs().
-  virtual std::vector<OutputConfigurator::OutputSnapshot> GetOutputs() = 0;
-
-  // Adds |mode| to |output|.
-  virtual void AddMode(const OutputConfigurator::OutputSnapshot& output,
-                       RRMode mode) = 0;
-
-  // Calls XRRSetCrtcConfig() with the given options but some of our default
-  // output count and rotation arguments. Returns true on success.
-  virtual bool Configure(const OutputConfigurator::OutputSnapshot& output,
-                         RRMode mode,
-                         int x,
-                         int y) = 0;
-
-  // Called to set the frame buffer (underlying XRR "screen") size.  Has
-  // a side-effect of disabling all CRTCs.
-  virtual void CreateFrameBuffer(
-      int width,
-      int height,
-      const std::vector<OutputConfigurator::OutputSnapshot>& outputs) = 0;
+  // 60 milliseconds or more.
+  // NativeDisplayDelegate maintains ownership of the ui::DisplaySnapshot
+  // pointers.
+  virtual std::vector<ui::DisplaySnapshot*> GetOutputs() = 0;
+
+  // Adds |mode| to |output|. |mode| must be a valid display mode pointer.
+  virtual void AddMode(const ui::DisplaySnapshot& output,
+                       const ui::DisplayMode* mode) = 0;
+
+  // Configures the display represented by |output| to use |mode| and positions
+  // the display to |origin| in the framebuffer. |mode| can be NULL, which
+  // represents disabling the display. Returns true on success.
+  virtual bool Configure(const ui::DisplaySnapshot& output,
+                         const ui::DisplayMode* mode,
+                         const gfx::Point& origin) = 0;
+
+  // Called to set the frame buffer (underlying XRR "screen") size.
+  virtual void CreateFrameBuffer(const gfx::Size& size) = 0;
 
   // Gets HDCP state of output.
-  virtual bool GetHDCPState(const OutputConfigurator::OutputSnapshot& output,
-                            HDCPState* state) = 0;
+  virtual bool GetHDCPState(const ui::DisplaySnapshot& output,
+                            ui::HDCPState* state) = 0;
 
   // Sets HDCP state of output.
-  virtual bool SetHDCPState(const OutputConfigurator::OutputSnapshot& output,
-                            HDCPState state) = 0;
+  virtual bool SetHDCPState(const ui::DisplaySnapshot& output,
+                            ui::HDCPState state) = 0;
 
   virtual void AddObserver(NativeDisplayObserver* observer) = 0;
 
   virtual void RemoveObserver(NativeDisplayObserver* observer) = 0;
 };
 
-}  //  namespace ui
+}  // namespace ui
 
 #endif  // UI_DISPLAY_CHROMEOS_NATIVE_DISPLAY_DELEGATE_H_