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

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

Index: ui/display/manager/chromeos/x11/display_snapshot_x11.h
diff --git a/ui/display/chromeos/x11/display_snapshot_x11.h b/ui/display/manager/chromeos/x11/display_snapshot_x11.h
similarity index 83%
rename from ui/display/chromeos/x11/display_snapshot_x11.h
rename to ui/display/manager/chromeos/x11/display_snapshot_x11.h
index 378148505ba6dbf4871261b61f2f0270167d3c6e..80f3574e287f35fb2d296e58547ce823f425a143 100644
--- a/ui/display/chromeos/x11/display_snapshot_x11.h
+++ b/ui/display/manager/chromeos/x11/display_snapshot_x11.h
@@ -2,13 +2,13 @@
 // 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_DISPLAY_SNAPSHOT_X11_H_
-#define UI_DISPLAY_CHROMEOS_X11_DISPLAY_SNAPSHOT_X11_H_
+#ifndef UI_DISPLAY_MANAGER_CHROMEOS_X11_DISPLAY_SNAPSHOT_X11_H_
+#define UI_DISPLAY_MANAGER_CHROMEOS_X11_DISPLAY_SNAPSHOT_X11_H_
 
 #include <stdint.h>
 
 #include "base/macros.h"
-#include "ui/display/display_export.h"
+#include "ui/display/manager/display_manager_export.h"
 #include "ui/display/types/display_snapshot.h"
 
 // Forward declare from Xlib and Xrandr.
@@ -18,7 +18,7 @@ typedef XID RRCrtc;
 
 namespace ui {
 
-class DISPLAY_EXPORT DisplaySnapshotX11 : public DisplaySnapshot {
+class DISPLAY_MANAGER_EXPORT DisplaySnapshotX11 : public DisplaySnapshot {
  public:
   DisplaySnapshotX11(int64_t display_id,
                      const gfx::Point& origin,
@@ -59,4 +59,4 @@ class DISPLAY_EXPORT DisplaySnapshotX11 : public DisplaySnapshot {
 
 }  // namespace ui
 
-#endif  // UI_DISPLAY_CHROMEOS_X11_DISPLAY_SNAPSHOT_X11_H_
+#endif  // UI_DISPLAY_MANAGER_CHROMEOS_X11_DISPLAY_SNAPSHOT_X11_H_