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

ui/display/manager/display_manager_utilities.h

Index: ui/display/manager/display_manager_utilities.h
diff --git a/ui/display/manager/display_manager_utilities.h b/ui/display/manager/display_manager_utilities.h
index 3c826c725c7cf8ef99ebe8ff371274bc4268ce11..ca00405531e2f5914749284339180438ba932f35 100644
--- a/ui/display/manager/display_manager_utilities.h
+++ b/ui/display/manager/display_manager_utilities.h
@@ -8,8 +8,8 @@
 #include <set>
 
 #include "ui/display/display.h"
-#include "ui/display/display_export.h"
-#include "ui/display/manager/display_layout.h"
+#include "ui/display/display_layout.h"
+#include "ui/display/manager/display_manager_export.h"
 #include "ui/display/manager/managed_display_info.h"
 
 namespace gfx {
@@ -24,32 +24,31 @@ class ManagedDisplayMode;
 
 // Creates the display mode list for internal display
 // based on |native_mode|.
-DISPLAY_EXPORT ManagedDisplayInfo::ManagedDisplayModeList
+DISPLAY_MANAGER_EXPORT ManagedDisplayInfo::ManagedDisplayModeList
 CreateInternalManagedDisplayModeList(
     const scoped_refptr<ManagedDisplayMode>& native_mode);
 
 // Creates the display mode list for unified display
 // based on |native_mode| and |scales|.
-DISPLAY_EXPORT ManagedDisplayInfo::ManagedDisplayModeList
+DISPLAY_MANAGER_EXPORT ManagedDisplayInfo::ManagedDisplayModeList
 CreateUnifiedManagedDisplayModeList(
     const scoped_refptr<ManagedDisplayMode>& native_mode,
     const std::set<std::pair<float, float>>& dsf_scale_list);
 
 // Gets the display mode for |resolution|. Returns false if no display
 // mode matches the resolution, or the display is an internal display.
-DISPLAY_EXPORT scoped_refptr<ManagedDisplayMode> GetDisplayModeForResolution(
-    const ManagedDisplayInfo& info,
-    const gfx::Size& resolution);
+DISPLAY_MANAGER_EXPORT scoped_refptr<ManagedDisplayMode>
+GetDisplayModeForResolution(const ManagedDisplayInfo& info,
+                            const gfx::Size& resolution);
 
 // Gets the display mode for the next valid UI scale. Returns false
 // if the display is not an internal display.
-DISPLAY_EXPORT scoped_refptr<ManagedDisplayMode> GetDisplayModeForNextUIScale(
-    const ManagedDisplayInfo& info,
-    bool up);
+DISPLAY_MANAGER_EXPORT scoped_refptr<ManagedDisplayMode>
+GetDisplayModeForNextUIScale(const ManagedDisplayInfo& info, bool up);
 
 // Gets the display mode for the next valid resolution. Returns false
 // if the display is an internal display.
-DISPLAY_EXPORT scoped_refptr<ManagedDisplayMode>
+DISPLAY_MANAGER_EXPORT scoped_refptr<ManagedDisplayMode>
 GetDisplayModeForNextResolution(const ManagedDisplayInfo& info, bool up);
 
 // Tests if the |info| has display mode that matches |ui_scale|.
@@ -57,19 +56,20 @@ bool HasDisplayModeForUIScale(const ManagedDisplayInfo& info, float ui_scale);
 
 // Computes the bounds that defines the bounds between two displays.
 // Returns false if two displays do not intersect.
-DISPLAY_EXPORT bool ComputeBoundary(const Display& primary_display,
-                                    const Display& secondary_display,
-                                    gfx::Rect* primary_edge_in_screen,
-                                    gfx::Rect* secondary_edge_in_screen);
+DISPLAY_MANAGER_EXPORT bool ComputeBoundary(
+    const Display& primary_display,
+    const Display& secondary_display,
+    gfx::Rect* primary_edge_in_screen,
+    gfx::Rect* secondary_edge_in_screen);
 
 // Returns the index in the displays whose bounds contains |point_in_screen|.
 // Returns -1 if no such display exist.
-DISPLAY_EXPORT int FindDisplayIndexContainingPoint(
+DISPLAY_MANAGER_EXPORT int FindDisplayIndexContainingPoint(
     const std::vector<Display>& displays,
     const gfx::Point& point_in_screen);
 
 // Sorts id list using |CompareDisplayIds| below.
-DISPLAY_EXPORT void SortDisplayIdList(DisplayIdList* list);
+DISPLAY_MANAGER_EXPORT void SortDisplayIdList(DisplayIdList* list);
 
 // Default id generator.
 class DefaultDisplayIdGenerator {
@@ -92,14 +92,15 @@ DisplayIdList GenerateDisplayIdList(ForwardIterator first,
 }
 
 // Creates sorted DisplayIdList.
-DISPLAY_EXPORT DisplayIdList CreateDisplayIdList(const Displays& list);
+DISPLAY_MANAGER_EXPORT DisplayIdList CreateDisplayIdList(const Displays& list);
 
-DISPLAY_EXPORT std::string DisplayIdListToString(const DisplayIdList& list);
+DISPLAY_MANAGER_EXPORT std::string DisplayIdListToString(
+    const DisplayIdList& list);
 
 // Returns true if one of following conditions is met.
 // 1) id1 is internal.
 // 2) output index of id1 < output index of id2 and id2 isn't internal.
-DISPLAY_EXPORT bool CompareDisplayIds(int64_t id1, int64_t id2);
+DISPLAY_MANAGER_EXPORT bool CompareDisplayIds(int64_t id1, int64_t id2);
 
 }  // namespace display