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

ui/display/manager/chromeos/display_util.h

Index: ui/display/manager/chromeos/display_util.h
diff --git a/ui/display/chromeos/display_util.h b/ui/display/manager/chromeos/display_util.h
similarity index 83%
rename from ui/display/chromeos/display_util.h
rename to ui/display/manager/chromeos/display_util.h
index dc0969897c2cd751e8fcd659201dd9cf2d032637..ff42a574da9c772704fdc44943380099108a81a0 100644
--- a/ui/display/chromeos/display_util.h
+++ b/ui/display/manager/chromeos/display_util.h
@@ -2,14 +2,14 @@
 // 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_H_
-#define UI_DISPLAY_CHROMEOS_DISPLAY_UTIL_H_
+#ifndef UI_DISPLAY_MANAGER_CHROMEOS_DISPLAY_UTIL_H_
+#define UI_DISPLAY_MANAGER_CHROMEOS_DISPLAY_UTIL_H_
 
 #include <string>
 #include <vector>
 
 #include "third_party/cros_system_api/dbus/service_constants.h"
-#include "ui/display/display_export.h"
+#include "ui/display/manager/display_manager_export.h"
 #include "ui/display/types/display_constants.h"
 
 namespace ui {
@@ -25,7 +25,7 @@ std::string MultipleDisplayStateToString(MultipleDisplayState state);
 // Returns the number of displays in |displays| that should be turned on, per
 // |state|.  If |display_power| is non-NULL, it is updated to contain the
 // on/off state of each corresponding entry in |displays|.
-int DISPLAY_EXPORT
+int DISPLAY_MANAGER_EXPORT
 GetDisplayPower(const std::vector<DisplaySnapshot*>& displays,
                 chromeos::DisplayPowerState state,
                 std::vector<bool>* display_power);
@@ -37,4 +37,4 @@ bool IsPhysicalDisplayType(ui::DisplayConnectionType type);
 
 }  // namespace ui
 
-#endif  // UI_DISPLAY_CHROMEOS_DISPLAY_UTIL_H_
+#endif  // UI_DISPLAY_MANAGER_CHROMEOS_DISPLAY_UTIL_H_