Split //ui/display and create //ui/display/manager.

ui/display/manager/chromeos/x11/native_display_delegate_x11.h

 // 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.
 
-#ifndef UI_DISPLAY_CHROMEOS_X11_NATIVE_DISPLAY_DELEGATE_X11_H_
-#define UI_DISPLAY_CHROMEOS_X11_NATIVE_DISPLAY_DELEGATE_X11_H_
+#ifndef UI_DISPLAY_MANAGER_CHROMEOS_X11_NATIVE_DISPLAY_DELEGATE_X11_H_
+#define UI_DISPLAY_MANAGER_CHROMEOS_X11_NATIVE_DISPLAY_DELEGATE_X11_H_
 
 #include <stdint.h>
 
 #include <map>
 #include <memory>
 #include <set>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/event_types.h"
 #include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "base/observer_list.h"
-#include "ui/display/display_export.h"
+#include "ui/display/manager/display_manager_export.h"
 #include "ui/display/types/native_display_delegate.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/x/x11_types.h"
 
 // Forward declarations for Xlib and Xrandr.
 // This is so unused X definitions don't pollute the namespace.
 typedef XID RROutput;
 typedef XID RRCrtc;
 typedef XID RRMode;
 typedef XID _Window;
 
 struct _XRROutputInfo;
 typedef _XRROutputInfo XRROutputInfo;
 struct _XRRScreenResources;
 typedef _XRRScreenResources XRRScreenResources;
 struct _XRRCrtcGamma;
 typedef _XRRCrtcGamma XRRCrtcGamma;
 
 extern "C" {
 void XRRFreeScreenResources(XRRScreenResources* resources);
 }
 
 namespace ui {
 
 class DisplayModeX11;
 class DisplaySnapshotX11;
 class NativeDisplayEventDispatcherX11;
 
-class DISPLAY_EXPORT NativeDisplayDelegateX11 : public NativeDisplayDelegate {
+class DISPLAY_MANAGER_EXPORT NativeDisplayDelegateX11
+    : public NativeDisplayDelegate {
  public:
   // Helper class that allows NativeDisplayEventDispatcherX11 and
   // NativeDisplayDelegateX11::PlatformEventObserverX11 to interact with this
   // class or with mocks in tests.
   class HelperDelegate {
    public:
     virtual ~HelperDelegate() {}
 
     // Tells XRandR to update its configuration in response to |event|, an
     // RRScreenChangeNotify event.
@@ skipping 70 matching lines @@
 
   // Helper functions that perform the actual HDCP requests.
   bool GetHDCPState(const DisplaySnapshot& output, HDCPState* state);
   bool SetHDCPState(const DisplaySnapshot& output, HDCPState state);
 
   // Returns whether |id| is configured to preserve aspect when scaling.
   bool IsOutputAspectPreservingScaling(RROutput id);
 
   // Creates the gamma ramp for |new_profile|, or NULL if it doesn't exist.
   // The caller should take the ownership.
-  XRRCrtcGamma* CreateGammaRampForProfile(
-      const DisplaySnapshotX11& x11_output,
-      ColorCalibrationProfile new_profile);
+  XRRCrtcGamma* CreateGammaRampForProfile(const DisplaySnapshotX11& x11_output,
+                                          ColorCalibrationProfile new_profile);
 
   void DrawBackground();
 
   XDisplay* display_;
   _Window window_;
 
   // Initialized when the server is grabbed and freed when it's ungrabbed.
   gfx::XScopedPtr<
       XRRScreenResources,
       gfx::XObjectDeleter<XRRScreenResources, void, XRRFreeScreenResources>>
@@ skipping 16 matching lines @@
   base::ObserverList<NativeDisplayObserver> observers_;
 
   // A background color used during boot time + multi displays.
   uint32_t background_color_argb_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeDisplayDelegateX11);
 };
 
 }  // namespace ui
 
-#endif  // UI_DISPLAY_CHROMEOS_X11_NATIVE_DISPLAY_DELEGATE_X11_H_
+#endif  // UI_DISPLAY_MANAGER_CHROMEOS_X11_NATIVE_DISPLAY_DELEGATE_X11_H_