Move DisplayLayout and DisplayLayoutBuilder From ash To ui/display

ash/display/extended_mouse_warp_controller_unittest.cc

 // Copyright 2015 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/display/extended_mouse_warp_controller.h"
 
-#include "ash/display/display_layout_builder.h"
 #include "ash/display/display_layout_store.h"
 #include "ash/display/display_manager.h"
 #include "ash/display/mouse_cursor_event_filter.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/display_manager_test_api.h"
+#include "ui/display/manager/display_layout.h"
+#include "ui/display/manager/display_layout_builder.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 
 namespace ash {
 
 class ExtendedMouseWarpControllerTest : public test::AshTestBase {
  public:
   ExtendedMouseWarpControllerTest() {}
   ~ExtendedMouseWarpControllerTest() override {}
@@ skipping 30 matching lines @@
     return;
 
   UpdateDisplay("360x360,700x700");
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
   int64_t display_0_id =
       gfx::Screen::GetScreen()->GetDisplayNearestWindow(root_windows[0]).id();
   int64_t display_1_id =
       gfx::Screen::GetScreen()->GetDisplayNearestWindow(root_windows[1]).id();
 
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
-  scoped_ptr<DisplayLayout> layout(
-      test::CreateDisplayLayout(DisplayPlacement::RIGHT, 0));
+  scoped_ptr<display::DisplayLayout> layout(
+      test::CreateDisplayLayout(display::DisplayPlacement::RIGHT, 0));
 
   display_manager->SetLayoutForCurrentDisplays(layout->Copy());
   event_filter()->ShowSharedEdgeIndicator(root_windows[0] /* primary */);
 
   ASSERT_EQ(1U, GetWarpRegionsCount());
   EXPECT_EQ(gfx::Rect(359, 16, 1, 344), GetIndicatorBounds(display_0_id));
   EXPECT_EQ(gfx::Rect(360, 0, 1, 360), GetIndicatorBounds(display_1_id));
 
   event_filter()->ShowSharedEdgeIndicator(root_windows[1] /* secondary */);
   EXPECT_EQ(gfx::Rect(359, 0, 1, 360), GetIndicatorBounds(display_0_id));
@@ skipping 50 matching lines @@
 
   UpdateDisplay("360x360,700x700");
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
 
   int64_t display_0_id =
       gfx::Screen::GetScreen()->GetDisplayNearestWindow(root_windows[0]).id();
   int64_t display_1_id =
       gfx::Screen::GetScreen()->GetDisplayNearestWindow(root_windows[1]).id();
 
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
-  scoped_ptr<DisplayLayout> layout(
-      test::CreateDisplayLayout(DisplayPlacement::LEFT, 0));
+  scoped_ptr<display::DisplayLayout> layout(
+      test::CreateDisplayLayout(display::DisplayPlacement::LEFT, 0));
   display_manager->SetLayoutForCurrentDisplays(layout->Copy());
 
   event_filter()->ShowSharedEdgeIndicator(root_windows[0] /* primary */);
   ASSERT_EQ(1U, GetWarpRegionsCount());
   EXPECT_EQ(gfx::Rect(0, 16, 1, 344), GetIndicatorBounds(display_0_id));
   EXPECT_EQ(gfx::Rect(-1, 0, 1, 360), GetIndicatorBounds(display_1_id));
 
   event_filter()->ShowSharedEdgeIndicator(root_windows[1] /* secondary */);
   ASSERT_EQ(1U, GetWarpRegionsCount());
   EXPECT_EQ(gfx::Rect(0, 0, 1, 360), GetIndicatorBounds(display_0_id));
@@ skipping 19 matching lines @@
     return;
 
   UpdateDisplay("360x360,700x700");
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
   int64_t display_0_id =
       gfx::Screen::GetScreen()->GetDisplayNearestWindow(root_windows[0]).id();
   int64_t display_1_id =
       gfx::Screen::GetScreen()->GetDisplayNearestWindow(root_windows[1]).id();
 
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
-  scoped_ptr<DisplayLayout> layout(
-      test::CreateDisplayLayout(DisplayPlacement::TOP, 0));
+  scoped_ptr<display::DisplayLayout> layout(
+      test::CreateDisplayLayout(display::DisplayPlacement::TOP, 0));
   display_manager->SetLayoutForCurrentDisplays(layout->Copy());
   event_filter()->ShowSharedEdgeIndicator(root_windows[0] /* primary */);
   ASSERT_EQ(1U, GetWarpRegionsCount());
   EXPECT_EQ(gfx::Rect(0, 0, 360, 1), GetIndicatorBounds(display_0_id));
   EXPECT_EQ(gfx::Rect(0, -1, 360, 1), GetIndicatorBounds(display_1_id));
 
   event_filter()->ShowSharedEdgeIndicator(root_windows[1] /* secondary */);
   ASSERT_EQ(1U, GetWarpRegionsCount());
   EXPECT_EQ(gfx::Rect(0, 0, 360, 1), GetIndicatorBounds(display_0_id));
   EXPECT_EQ(gfx::Rect(0, -1, 360, 1), GetIndicatorBounds(display_1_id));
 
   layout->placement_list[0].offset = 250;
   display_manager->SetLayoutForCurrentDisplays(layout->Copy());
   event_filter()->ShowSharedEdgeIndicator(root_windows[0] /* primary */);
   ASSERT_EQ(1U, GetWarpRegionsCount());
   EXPECT_EQ(gfx::Rect(250, 0, 110, 1), GetIndicatorBounds(display_0_id));
   EXPECT_EQ(gfx::Rect(250, -1, 110, 1), GetIndicatorBounds(display_1_id));
 
   event_filter()->ShowSharedEdgeIndicator(root_windows[1] /* secondary */);
   ASSERT_EQ(1U, GetWarpRegionsCount());
   EXPECT_EQ(gfx::Rect(250, 0, 110, 1), GetIndicatorBounds(display_0_id));
   EXPECT_EQ(gfx::Rect(250, -1, 110, 1), GetIndicatorBounds(display_1_id));
 
-  layout->placement_list[0].position = DisplayPlacement::BOTTOM;
+  layout->placement_list[0].position = display::DisplayPlacement::BOTTOM;
   layout->placement_list[0].offset = 0;
   display_manager->SetLayoutForCurrentDisplays(layout->Copy());
   event_filter()->ShowSharedEdgeIndicator(root_windows[0] /* primary */);
   ASSERT_EQ(1U, GetWarpRegionsCount());
   EXPECT_EQ(gfx::Rect(0, 359, 360, 1), GetIndicatorBounds(display_0_id));
   EXPECT_EQ(gfx::Rect(0, 360, 360, 1), GetIndicatorBounds(display_1_id));
 
   event_filter()->ShowSharedEdgeIndicator(root_windows[1] /* secondary */);
   ASSERT_EQ(1U, GetWarpRegionsCount());
   EXPECT_EQ(gfx::Rect(0, 359, 360, 1), GetIndicatorBounds(display_0_id));
@@ skipping 69 matching lines @@
   int64_t display_0_id = screen->GetDisplayNearestWindow(root_windows[0]).id();
   int64_t display_1_id = screen->GetDisplayNearestWindow(root_windows[1]).id();
   int64_t display_2_id = screen->GetDisplayNearestWindow(root_windows[2]).id();
 
   // Layout so that all displays touches togter like this:
   //  +-----+---+
   //  |  0  | 1 |
   //  +-+---+--++
   //    |  2   |
   //    +------+
-  ash::DisplayLayoutBuilder builder(display_0_id);
+  display::DisplayLayoutBuilder builder(display_0_id);
   builder.AddDisplayPlacement(display_1_id, display_0_id,
-                              ash::DisplayPlacement::RIGHT, 0);
+                              display::DisplayPlacement::RIGHT, 0);
   builder.AddDisplayPlacement(display_2_id, display_0_id,
-                              ash::DisplayPlacement::BOTTOM, 100);
+                              display::DisplayPlacement::BOTTOM, 100);
 
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
   display_manager->SetLayoutForCurrentDisplays(builder.Build());
   ASSERT_EQ(3U, GetWarpRegionsCount());
 
   // Drag from 0.
   event_filter()->ShowSharedEdgeIndicator(root_windows[0]);
   ASSERT_EQ(3U, GetWarpRegionsCount());
   const ExtendedMouseWarpController::WarpRegion* region_0 = GetWarpRegion(0);
   const ExtendedMouseWarpController::WarpRegion* region_1 = GetWarpRegion(1);
@@ skipping 26 matching lines @@
   int64_t display_0_id = screen->GetDisplayNearestWindow(root_windows[0]).id();
   int64_t display_1_id = screen->GetDisplayNearestWindow(root_windows[1]).id();
   int64_t display_2_id = screen->GetDisplayNearestWindow(root_windows[2]).id();
 
   // Layout so that 0 and 1 displays are disconnected.
   //  +-----+ +---+
   //  |  0  | |1 |
   //  +-+---+-+++
   //    |  2   |
   //    +------+
-  ash::DisplayLayoutBuilder builder(display_0_id);
+  display::DisplayLayoutBuilder builder(display_0_id);
   builder.AddDisplayPlacement(display_2_id, display_0_id,
-                              ash::DisplayPlacement::BOTTOM, 100);
+                              display::DisplayPlacement::BOTTOM, 100);
   builder.AddDisplayPlacement(display_1_id, display_2_id,
-                              ash::DisplayPlacement::TOP, 800);
+                              display::DisplayPlacement::TOP, 800);
 
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
   display_manager->SetLayoutForCurrentDisplays(builder.Build());
   ASSERT_EQ(2U, GetWarpRegionsCount());
 
   // Drag from 0.
   event_filter()->ShowSharedEdgeIndicator(root_windows[0]);
   ASSERT_EQ(2U, GetWarpRegionsCount());
   const ExtendedMouseWarpController::WarpRegion* region_0 = GetWarpRegion(0);
   const ExtendedMouseWarpController::WarpRegion* region_1 = GetWarpRegion(1);
   // between 2 and 0
   EXPECT_EQ(gfx::Rect(100, 499, 600, 1),
             region_0->GetIndicatorBoundsForTest(display_0_id));
   EXPECT_EQ(gfx::Rect(100, 500, 600, 1),
             region_0->GetIndicatorBoundsForTest(display_2_id));
   // between 2 and 1
   EXPECT_EQ(gfx::Rect(900, 499, 200, 1),
             region_1->GetIndicatorBoundsForTest(display_1_id));
   EXPECT_EQ(gfx::Rect(900, 500, 200, 1),
             region_1->GetIndicatorBoundsForTest(display_2_id));
   event_filter()->HideSharedEdgeIndicator();
 }
 
 }  // namespace ash