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

ui/display/manager/chromeos/x11/display_snapshot_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_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.
 typedef unsigned long XID;
 typedef XID RROutput;
 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,
                      const gfx::Size& physical_size,
                      DisplayConnectionType type,
                      bool is_aspect_preserving_scaling,
                      bool has_overscan,
                      std::string display_name,
                      std::vector<std::unique_ptr<const DisplayMode>> modes,
                      const std::vector<uint8_t>& edid,
@@ skipping 20 matching lines @@
 
   // This output's index in the array returned by XRandR. Stable even as
   // outputs are connected or disconnected.
   int index_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplaySnapshotX11);
 };
 
 }  // namespace ui
 
-#endif  // UI_DISPLAY_CHROMEOS_X11_DISPLAY_SNAPSHOT_X11_H_
+#endif  // UI_DISPLAY_MANAGER_CHROMEOS_X11_DISPLAY_SNAPSHOT_X11_H_