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

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

Index: ui/display/manager/chromeos/x11/native_display_delegate_x11.h
diff --git a/ui/display/chromeos/x11/native_display_delegate_x11.h b/ui/display/manager/chromeos/x11/native_display_delegate_x11.h
similarity index 92%
rename from ui/display/chromeos/x11/native_display_delegate_x11.h
rename to ui/display/manager/chromeos/x11/native_display_delegate_x11.h
index c7cbdd21d367f83243a09c0a2fcd5b349ea20524..fb3536eb6c92eeb6aa1faaabc8df91e312a3b152 100644
--- a/ui/display/chromeos/x11/native_display_delegate_x11.h
+++ b/ui/display/manager/chromeos/x11/native_display_delegate_x11.h
@@ -2,8 +2,8 @@
 // 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>
 
@@ -17,7 +17,7 @@
 #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"
@@ -47,7 +47,8 @@ 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
@@ -138,9 +139,8 @@ class DISPLAY_EXPORT NativeDisplayDelegateX11 : public NativeDisplayDelegate {
 
   // 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();
 
@@ -177,4 +177,4 @@ class DISPLAY_EXPORT NativeDisplayDelegateX11 : public NativeDisplayDelegate {
 
 }  // namespace ui
 
-#endif  // UI_DISPLAY_CHROMEOS_X11_NATIVE_DISPLAY_DELEGATE_X11_H_
+#endif  // UI_DISPLAY_MANAGER_CHROMEOS_X11_NATIVE_DISPLAY_DELEGATE_X11_H_