Relocate reuseable portions of ash/display/display_util.*

ash/display/display_util.h

Index: ash/display/display_util.h
diff --git a/ash/display/display_util.h b/ash/display/display_util.h
index 2e4f01e83712c6fe84db837d87cc2105baa431b0..343ebcadf67d44dd8bd9097051196fe2664945e2 100644
--- a/ash/display/display_util.h
+++ b/ash/display/display_util.h
@@ -30,53 +30,12 @@ namespace ui {}
 
 namespace ash {
 class AshWindowTreeHost;
-class ManagedDisplayMode;
-
-// Creates the display mode list for internal display
-// based on |native_mode|.
-ASH_EXPORT display::ManagedDisplayInfo::ManagedDisplayModeList
-CreateInternalManagedDisplayModeList(
-    const scoped_refptr<display::ManagedDisplayMode>& native_mode);
-
-// Creates the display mode list for unified display
-// based on |native_mode| and |scales|.
-ASH_EXPORT display::ManagedDisplayInfo::ManagedDisplayModeList
-CreateUnifiedManagedDisplayModeList(
-    const scoped_refptr<display::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.
-ASH_EXPORT scoped_refptr<display::ManagedDisplayMode>
-GetDisplayModeForResolution(const display::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.
-ASH_EXPORT scoped_refptr<display::ManagedDisplayMode>
-GetDisplayModeForNextUIScale(const display::ManagedDisplayInfo& info, bool up);
-
-// Gets the display mode for the next valid resolution. Returns false
-// if the display is an internal display.
-ASH_EXPORT scoped_refptr<display::ManagedDisplayMode>
-GetDisplayModeForNextResolution(const display::ManagedDisplayInfo& info,
-                                bool up);
 
+// TODO(rjkroege): Move this into display_manager.h
 // Sets the UI scale for the |display_id|. Returns false if the
 // display_id is not an internal display.
 ASH_EXPORT bool SetDisplayUIScale(int64_t display_id, float scale);
 
-// Tests if the |info| has display mode that matches |ui_scale|.
-bool HasDisplayModeForUIScale(const display::ManagedDisplayInfo& info,
-                              float ui_scale);
-
-// Computes the bounds that defines the bounds between two displays.
-// Returns false if two displays do not intersect.
-bool ComputeBoundary(const display::Display& primary_display,
-                     const display::Display& secondary_display,
-                     gfx::Rect* primary_edge_in_screen,
-                     gfx::Rect* secondary_edge_in_screen);
-
 // Creates edge bounds from |bounds_in_screen| that fits the edge
 // of the native window for |ash_host|.
 ASH_EXPORT gfx::Rect GetNativeEdgeBounds(AshWindowTreeHost* ash_host,
@@ -90,48 +49,6 @@ void MoveCursorTo(AshWindowTreeHost* ash_host,
                   const gfx::Point& point_in_screen,
                   bool update_last_location_now);
 
-// Returns the index in the displays whose bounds contains |point_in_screen|.
-// Returns -1 if no such display exist.
-ASH_EXPORT int FindDisplayIndexContainingPoint(
-    const std::vector<display::Display>& displays,
-    const gfx::Point& point_in_screen);
-
-// Sorts id list using |CompareDisplayIds| below.
-ASH_EXPORT void SortDisplayIdList(display::DisplayIdList* list);
-
-// Default id generator.
-class DefaultDisplayIdGenerator {
- public:
-  int64_t operator()(int64_t id) { return id; }
-};
-
-// Generate sorted display::DisplayIdList from iterators.
-template <class ForwardIterator, class Generator = DefaultDisplayIdGenerator>
-display::DisplayIdList GenerateDisplayIdList(
-    ForwardIterator first,
-    ForwardIterator last,
-    Generator generator = Generator()) {
-  display::DisplayIdList list;
-  while (first != last) {
-    list.push_back(generator(*first));
-    ++first;
-  }
-  SortDisplayIdList(&list);
-  return list;
-}
-
-// Creates sorted display::DisplayIdList.
-ASH_EXPORT display::DisplayIdList CreateDisplayIdList(
-    const display::DisplayList& list);
-
-ASH_EXPORT std::string DisplayIdListToString(
-    const display::DisplayIdList& list);
-
-// Returns true if one of following conditinos is met.
-// 1) id1 is internal.
-// 2) output index of id1 < output index of id2 and id2 isn't internal.
-ASH_EXPORT bool CompareDisplayIds(int64_t id1, int64_t id2);
-
 #if defined(OS_CHROMEOS)
 // Shows the notification message for display related issues.
 void ShowDisplayErrorNotification(int message_id);