Move DisplayLayout and DisplayLayoutBuilder From ash To ui/display

ash/test/display_manager_test_api.cc

 // Copyright (c) 2012 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.
 
 #include "ash/test/display_manager_test_api.h"
 
 #include <cstdarg>
 #include <vector>
 
 #include "ash/ash_switches.h"
 #include "ash/display/display_info.h"
-#include "ash/display/display_layout_builder.h"
 #include "ash/display/display_layout_store.h"
 #include "ash/display/display_manager.h"
 #include "ash/display/display_util.h"
 #include "ash/display/extended_mouse_warp_controller.h"
 #include "ash/display/mouse_cursor_event_filter.h"
 #include "ash/display/unified_mouse_warp_controller.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/strings/string_split.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window_event_dispatcher.h"
+#include "ui/display/manager/display_layout_builder.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/display.h"
 
 namespace ash {
 namespace test {
-typedef std::vector<gfx::Display> DisplayList;
-typedef DisplayInfo DisplayInfo;
-typedef std::vector<DisplayInfo> DisplayInfoList;
-
 namespace {
 
 std::vector<DisplayInfo> CreateDisplayInfoListFromString(
     const std::string specs,
     DisplayManager* display_manager) {
   std::vector<DisplayInfo> display_info_list;
   std::vector<std::string> parts = base::SplitString(
       specs, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
   size_t index = 0;
 
-  DisplayList list = display_manager->IsInUnifiedMode()
-                         ? display_manager->software_mirroring_display_list()
-                         : display_manager->active_display_list();
+  display::DisplayList list =
+      display_manager->IsInUnifiedMode()
+          ? display_manager->software_mirroring_display_list()
+          : display_manager->active_display_list();
 
   for (std::vector<std::string>::const_iterator iter = parts.begin();
        iter != parts.end(); ++iter, ++index) {
     int64_t id = (index < list.size()) ? list[index].id()
                                        : gfx::Display::kInvalidDisplayID;
     display_info_list.push_back(
         DisplayInfo::CreateFromSpecWithID(*iter, id));
   }
   return display_info_list;
 }
@@ skipping 110 matching lines @@
   return display_manager->SetDisplayMode(display_id, mode);
 }
 
 void SwapPrimaryDisplay() {
   if (gfx::Screen::GetScreen()->GetNumDisplays() <= 1)
     return;
   Shell::GetInstance()->window_tree_host_manager()->SetPrimaryDisplayId(
       ScreenUtil::GetSecondaryDisplay().id());
 }
 
-scoped_ptr<DisplayLayout> CreateDisplayLayout(
-    DisplayPlacement::Position position,
+scoped_ptr<display::DisplayLayout> CreateDisplayLayout(
+    display::DisplayPlacement::Position position,
     int offset) {
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
-  DisplayIdList list = display_manager->GetCurrentDisplayIdList();
+  display::DisplayIdList list = display_manager->GetCurrentDisplayIdList();
 
-  DisplayLayoutBuilder builder(
+  display::DisplayLayoutBuilder builder(
       gfx::Screen::GetScreen()->GetPrimaryDisplay().id());
   builder.SetSecondaryPlacement(ScreenUtil::GetSecondaryDisplay().id(),
                                 position, offset);
   return builder.Build();
 }
 
-DisplayIdList CreateDisplayIdList2(int64_t id1, int64_t id2) {
-  DisplayIdList list;
+display::DisplayIdList CreateDisplayIdList2(int64_t id1, int64_t id2) {
+  display::DisplayIdList list;
   list.push_back(id1);
   list.push_back(id2);
   SortDisplayIdList(&list);
   return list;
 }
 
-DisplayIdList CreateDisplayIdListN(size_t count, ...) {
-  DisplayIdList list;
+display::DisplayIdList CreateDisplayIdListN(size_t count, ...) {
+  display::DisplayIdList list;
   va_list args;
   va_start(args, count);
   for (size_t i = 0; i < count; i++) {
     int64_t id = va_arg(args, int64_t);
     list.push_back(id);
   }
   SortDisplayIdList(&list);
   return list;
 }
 
 }  // namespace test
 }  // namespace ash