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

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

Index: ui/display/manager/chromeos/x11/display_util_x11.h
diff --git a/ui/display/chromeos/x11/display_util_x11.h b/ui/display/manager/chromeos/x11/display_util_x11.h
similarity index 56%
rename from ui/display/chromeos/x11/display_util_x11.h
rename to ui/display/manager/chromeos/x11/display_util_x11.h
index 1bc2369e8ff6a9f19ff26bd4ab74ae28136d98f3..c32b16506459e7d12db79a4c90ae3a84bb2c263a 100644
--- a/ui/display/chromeos/x11/display_util_x11.h
+++ b/ui/display/manager/chromeos/x11/display_util_x11.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_DISPLAY_CHROMEOS_DISPLAY_UTIL_X11_H_
-#define UI_DISPLAY_CHROMEOS_DISPLAY_UTIL_X11_H_
+#ifndef UI_DISPLAY_MANAGER_CHROMEOS_X11_DISPLAY_UTIL_X11_H_
+#define UI_DISPLAY_MANAGER_CHROMEOS_X11_DISPLAY_UTIL_X11_H_
 
 #include <string>
 
-#include "ui/display/display_export.h"
+#include "ui/display/manager/display_manager_export.h"
 #include "ui/display/types/display_constants.h"
 
 typedef unsigned long XID;
@@ -17,9 +17,9 @@ namespace ui {
 
 // Returns the DisplayConnectionType by matching known type prefixes to |name|.
 // Returns DISPLAY_TYPE_UNKNOWN if no valid match.
-DISPLAY_EXPORT DisplayConnectionType
-    GetDisplayConnectionTypeFromName(const std::string& name);
+DISPLAY_MANAGER_EXPORT DisplayConnectionType
+GetDisplayConnectionTypeFromName(const std::string& name);
 
 }  // namespace ui
 
-#endif  // UI_DISPLAY_CHROMEOS_DISPLAY_UTIL_X11_H_
+#endif  // UI_DISPLAY_MANAGER_CHROMEOS_X11_DISPLAY_UTIL_X11_H_