Move DisplayLayout and DisplayLayoutBuilder From ash To ui/display

ash/display/screen_position_controller_unittest.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/display/screen_position_controller.h"
 
 #include "ash/display/display_manager.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/shell_test_api.h"
 #include "ui/aura/env.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window_tracker.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/layout.h"
+#include "ui/display/manager/display_layout.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/screen.h"
 
 #if defined(OS_WIN)
 // TODO(scottmg): RootWindow doesn't get resized immediately on Windows
 // Ash. http://crbug.com/247916.
 #define MAYBE_ConvertHostPointToScreen DISABLED_ConvertHostPointToScreen
 #define MAYBE_ConvertHostPointToScreenHiDPI DISABLED_ConvertHostPointToScreenHiDPI
 #define MAYBE_ConvertHostPointToScreenRotate DISABLED_ConvertHostPointToScreenRotate
 #define MAYBE_ConvertHostPointToScreenUIScale DISABLED_ConvertHostPointToScreenUIScale
 #define MAYBE_ConvertToScreenWhileRemovingSecondaryDisplay \
   DISABLED_ConvertToScreenWhileRemovingSecondaryDisplay
 #else
 #define MAYBE_ConvertHostPointToScreen ConvertHostPointToScreen
 #define MAYBE_ConvertHostPointToScreenHiDPI ConvertHostPointToScreenHiDPI
 #define MAYBE_ConvertHostPointToScreenRotate ConvertHostPointToScreenRotate
 #define MAYBE_ConvertHostPointToScreenUIScale ConvertHostPointToScreenUIScale
 #define MAYBE_ConvertToScreenWhileRemovingSecondaryDisplay \
   ConvertToScreenWhileRemovingSecondaryDisplay
 #endif
 
 namespace ash {
 namespace test {
 
 namespace {
 
-void SetSecondaryDisplayLayout(DisplayPlacement::Position position) {
-  scoped_ptr<DisplayLayout> layout(Shell::GetInstance()
-                                       ->display_manager()
-                                       ->GetCurrentDisplayLayout()
-                                       .Copy());
+void SetSecondaryDisplayLayout(display::DisplayPlacement::Position position) {
+  scoped_ptr<display::DisplayLayout> layout(Shell::GetInstance()
+                                                ->display_manager()
+                                                ->GetCurrentDisplayLayout()
+                                                .Copy());
   layout->placement_list[0].position = position;
   Shell::GetInstance()->display_manager()->SetLayoutForCurrentDisplays(
       std::move(layout));
 }
 
 ScreenPositionController* GetScreenPositionController() {
   ShellTestApi test_api(Shell::GetInstance());
   return test_api.screen_position_controller();
 }
 
@@ skipping 51 matching lines @@
             root_windows[0]->GetHost()->GetBounds().size().ToString());
   EXPECT_EQ("100,500",
             root_windows[1]->GetHost()->GetBounds().origin().ToString());
   EXPECT_EQ("200x200",
             root_windows[1]->GetHost()->GetBounds().size().ToString());
 
   const gfx::Point window_pos(100, 100);
   window_->SetBoundsInScreen(
       gfx::Rect(window_pos, gfx::Size(100, 100)),
       gfx::Screen::GetScreen()->GetDisplayNearestPoint(window_pos));
-  SetSecondaryDisplayLayout(DisplayPlacement::RIGHT);
+  SetSecondaryDisplayLayout(display::DisplayPlacement::RIGHT);
   // The point is on the primary root window.
   EXPECT_EQ("50,50", ConvertHostPointToScreen(50, 50));
   // The point is out of the all root windows.
   EXPECT_EQ("250,250", ConvertHostPointToScreen(250, 250));
   // The point is on the secondary display.
   EXPECT_EQ("250,0", ConvertHostPointToScreen(50, 400));
 
-  SetSecondaryDisplayLayout(DisplayPlacement::BOTTOM);
+  SetSecondaryDisplayLayout(display::DisplayPlacement::BOTTOM);
   // The point is on the primary root window.
   EXPECT_EQ("50,50", ConvertHostPointToScreen(50, 50));
   // The point is out of the all root windows.
   EXPECT_EQ("250,250", ConvertHostPointToScreen(250, 250));
   // The point is on the secondary display.
   EXPECT_EQ("50,200", ConvertHostPointToScreen(50, 400));
 
-  SetSecondaryDisplayLayout(DisplayPlacement::LEFT);
+  SetSecondaryDisplayLayout(display::DisplayPlacement::LEFT);
   // The point is on the primary root window.
   EXPECT_EQ("50,50", ConvertHostPointToScreen(50, 50));
   // The point is out of the all root windows.
   EXPECT_EQ("250,250", ConvertHostPointToScreen(250, 250));
   // The point is on the secondary display.
   EXPECT_EQ("-150,0", ConvertHostPointToScreen(50, 400));
 
-  SetSecondaryDisplayLayout(DisplayPlacement::TOP);
+  SetSecondaryDisplayLayout(display::DisplayPlacement::TOP);
   // The point is on the primary root window.
   EXPECT_EQ("50,50", ConvertHostPointToScreen(50, 50));
   // The point is out of the all root windows.
   EXPECT_EQ("250,250", ConvertHostPointToScreen(250, 250));
   // The point is on the secondary display.
   EXPECT_EQ("50,-200", ConvertHostPointToScreen(50, 400));
 
-  SetSecondaryDisplayLayout(DisplayPlacement::RIGHT);
+  SetSecondaryDisplayLayout(display::DisplayPlacement::RIGHT);
   const gfx::Point window_pos2(300, 100);
   window_->SetBoundsInScreen(
       gfx::Rect(window_pos2, gfx::Size(100, 100)),
       gfx::Screen::GetScreen()->GetDisplayNearestPoint(window_pos2));
   // The point is on the secondary display.
   EXPECT_EQ("250,50", ConvertHostPointToScreen(50, 50));
   // The point is out of the all root windows.
   EXPECT_EQ("450,250", ConvertHostPointToScreen(250, 250));
   // The point is on the primary root window.
   EXPECT_EQ("50,0", ConvertHostPointToScreen(50, -400));
 
-  SetSecondaryDisplayLayout(DisplayPlacement::BOTTOM);
+  SetSecondaryDisplayLayout(display::DisplayPlacement::BOTTOM);
   // The point is on the secondary display.
   EXPECT_EQ("50,250", ConvertHostPointToScreen(50, 50));
   // The point is out of the all root windows.
   EXPECT_EQ("250,450", ConvertHostPointToScreen(250, 250));
   // The point is on the primary root window.
   EXPECT_EQ("50,0", ConvertHostPointToScreen(50, -400));
 
-  SetSecondaryDisplayLayout(DisplayPlacement::LEFT);
+  SetSecondaryDisplayLayout(display::DisplayPlacement::LEFT);
   // The point is on the secondary display.
   EXPECT_EQ("-150,50", ConvertHostPointToScreen(50, 50));
   // The point is out of the all root windows.
   EXPECT_EQ("50,250", ConvertHostPointToScreen(250, 250));
   // The point is on the primary root window.
   EXPECT_EQ("50,0", ConvertHostPointToScreen(50, -400));
 
-  SetSecondaryDisplayLayout(DisplayPlacement::TOP);
+  SetSecondaryDisplayLayout(display::DisplayPlacement::TOP);
   // The point is on the secondary display.
   EXPECT_EQ("50,-150", ConvertHostPointToScreen(50, 50));
   // The point is out of the all root windows.
   EXPECT_EQ("250,50", ConvertHostPointToScreen(250, 250));
   // The point is on the primary root window.
   EXPECT_EQ("50,0", ConvertHostPointToScreen(50, -400));
 }
 
 TEST_F(ScreenPositionControllerTest, MAYBE_ConvertHostPointToScreenHiDPI) {
   UpdateDisplay("50+50-200x200*2,50+300-300x300");
@@ skipping 164 matching lines @@
   // destroyed.
   EXPECT_FALSE(tracker.Contains(root_windows[1]));
 
   // Check that we could convert all of the mouse events we got to screen
   // coordinates.
   EXPECT_TRUE(event_handler->could_convert_to_screen());
 }
 
 }  // namespace test
 }  // namespace ash