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

ui/display/manager/chromeos/touchscreen_util.h

Index: ui/display/manager/chromeos/touchscreen_util.h
diff --git a/ui/display/chromeos/touchscreen_util.h b/ui/display/manager/chromeos/touchscreen_util.h
similarity index 68%
rename from ui/display/chromeos/touchscreen_util.h
rename to ui/display/manager/chromeos/touchscreen_util.h
index 2edb410a3778db5ad242748a5aa190ff63df902d..0328c131fa60d3d94a812c6d08ec2a8a582ed56e 100644
--- a/ui/display/chromeos/touchscreen_util.h
+++ b/ui/display/manager/chromeos/touchscreen_util.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_TOUCHSCREEN_UTIL_H_
-#define UI_DISPLAY_CHROMEOS_TOUCHSCREEN_UTIL_H_
+#ifndef UI_DISPLAY_MANAGER_CHROMEOS_TOUCHSCREEN_UTIL_H_
+#define UI_DISPLAY_MANAGER_CHROMEOS_TOUCHSCREEN_UTIL_H_
 
 #include <vector>
 
-#include "ui/display/display_export.h"
+#include "ui/display/manager/display_manager_export.h"
 #include "ui/display/manager/managed_display_info.h"
 #include "ui/events/devices/touchscreen_device.h"
 
@@ -15,10 +15,10 @@ namespace display {
 
 // Given a list of displays and a list of touchscreens, associate them. The
 // information in |displays| will be updated to reflect the mapping.
-DISPLAY_EXPORT void AssociateTouchscreens(
+DISPLAY_MANAGER_EXPORT void AssociateTouchscreens(
     std::vector<display::ManagedDisplayInfo>* displays,
     const std::vector<ui::TouchscreenDevice>& touchscreens);
 
 }  // namespace display
 
-#endif  // UI_DISPLAY_CHROMEOS_TOUCHSCREEN_UTIL_H_
+#endif  // UI_DISPLAY_MANAGER_CHROMEOS_TOUCHSCREEN_UTIL_H_