Move DisplayLayout and DisplayLayoutBuilder From ash To ui/display

ash/display/display_util.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_DISPLAY_DISPLAY_UTIL_H_
 #define ASH_DISPLAY_DISPLAY_UTIL_H_
 
 #include <stdint.h>
 
 #include <set>
 #include <utility>
 #include <vector>
 
 #include "ash/ash_export.h"
-#include "ash/display/display_layout.h"
+#include "ui/display/manager/display_layout.h"
 
 namespace gfx {
 class Display;
 class Point;
 class Rect;
 class Size;
 }
 
 namespace ash {
 class AshWindowTreeHost;
@@ skipping 56 matching lines @@
                   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<gfx::Display>& displays,
     const gfx::Point& point_in_screen);
 
 // Sorts id list using |CompareDisplayIds| below.
-ASH_EXPORT void SortDisplayIdList(DisplayIdList* list);
+ASH_EXPORT void SortDisplayIdList(display::DisplayIdList* list);
 
 // Default id generator.
 class DefaultDisplayIdGenerator {
  public:
   int64_t operator()(int64_t id) { return id; }
 };
 
-// Generate sorted DisplayIdList from iterators.
+// Generate sorted display::DisplayIdList from iterators.
 template <class ForwardIterator, class Generator = DefaultDisplayIdGenerator>
-DisplayIdList GenerateDisplayIdList(ForwardIterator first,
-                                    ForwardIterator last,
-                                    Generator generator = Generator()) {
-  DisplayIdList list;
+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 DisplayIdList.
-ASH_EXPORT DisplayIdList CreateDisplayIdList(const DisplayList& list);
+// Creates sorted display::DisplayIdList.
+ASH_EXPORT display::DisplayIdList CreateDisplayIdList(
+    const display::DisplayList& list);
 
-ASH_EXPORT std::string DisplayIdListToString(const DisplayIdList& 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);
 
 }  // namespace ash
 
 #endif  // ASH_DISPLAY_DISPLAY_UTIL_H_