Move ash::DisplayInfo to ui

ash/wm/panels/panel_layout_manager_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/common/wm/panels/panel_layout_manager.h"
 
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/ash_switches.h"
-#include "ash/common/display/display_info.h"
 #include "ash/common/shelf/shelf_button.h"
 #include "ash/common/shelf/shelf_layout_manager.h"
 #include "ash/common/shelf/shelf_model.h"
 #include "ash/common/shelf/shelf_types.h"
 #include "ash/common/shelf/shelf_view.h"
 #include "ash/common/shelf/shelf_widget.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/system/web_notification/web_notification_tray.h"
 #include "ash/common/wm/mru_window_tracker.h"
@@ skipping 13 matching lines @@
 #include "ash/wm/window_util.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/i18n/rtl.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
+#include "ui/display/manager/managed_display_info.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 
 namespace {
 
 std::string ToDisplayName(int64_t id) {
   return "x-" + base::Int64ToString(id);
 }
 
-DisplayInfo CreateDisplayInfo(int64_t id, const gfx::Rect& bounds) {
-  DisplayInfo info(id, ToDisplayName(id), false);
+ui::ManagedDisplayInfo CreateDisplayInfo(int64_t id, const gfx::Rect& bounds) {
+  ui::ManagedDisplayInfo info(id, ToDisplayName(id), false);
   info.SetBounds(bounds);
   return info;
 }
 
 DisplayManager* display_manager() {
   return Shell::GetInstance()->display_manager();
 }
 
 }  // namespace
 
@@ skipping 238 matching lines @@
   gfx::Rect bounds(0, 0, 201, 201);
   std::unique_ptr<aura::Window> window(CreatePanelWindow(bounds));
   EXPECT_EQ(GetPanelContainer(window.get()), window->parent());
   EXPECT_NO_FATAL_FAILURE(IsPanelAboveLauncherIcon(window.get()));
   EXPECT_NO_FATAL_FAILURE(IsCalloutAboveLauncherIcon(window.get()));
 }
 
 // Tests for crashes during undocking.
 // See https://crbug.com/632755
 TEST_F(PanelLayoutManagerTest, UndockTest) {
-  std::vector<DisplayInfo> info_list;
+  std::vector<ui::ManagedDisplayInfo> info_list;
 
   const int64_t internal_display_id =
       test::DisplayManagerTestApi().SetFirstDisplayAsInternalDisplay();
 
   // Create the primary display info.
-  DisplayInfo internal_display =
+  ui::ManagedDisplayInfo internal_display =
       CreateDisplayInfo(internal_display_id, gfx::Rect(0, 0, 1280, 720));
   // Create the secondary external display info. This will be docked display.
-  DisplayInfo external_display_info =
+  ui::ManagedDisplayInfo external_display_info =
       CreateDisplayInfo(2, gfx::Rect(0, 0, 1920, 1080));
 
   info_list.push_back(external_display_info);
   // Docked state.
   display_manager()->OnNativeDisplaysChanged(info_list);
 
   // Create a panel in the docked state
   std::unique_ptr<aura::Window> p1_d2(
       CreatePanelWindow(gfx::Rect(1555, 800, 50, 50)));
 
   info_list.clear();
   info_list.push_back(internal_display);
 
   // Undock and bring back the native device display as primary display.
   display_manager()->OnNativeDisplaysChanged(info_list);
 }
 
 // Tests for any crash during docking and then undocking.
 // See https://crbug.com/632755
 TEST_F(PanelLayoutManagerTest, DockUndockTest) {
-  std::vector<DisplayInfo> info_list;
+  std::vector<ui::ManagedDisplayInfo> info_list;
 
   const int64_t internal_display_id =
       test::DisplayManagerTestApi().SetFirstDisplayAsInternalDisplay();
 
   // Create the primary display info.
-  DisplayInfo internal_display =
+  ui::ManagedDisplayInfo internal_display =
       CreateDisplayInfo(internal_display_id, gfx::Rect(0, 0, 1280, 720));
 
   info_list.push_back(internal_display);
   display_manager()->OnNativeDisplaysChanged(info_list);
 
   // Create a panel in the undocked state.
   std::unique_ptr<aura::Window> p1_d2(
       CreatePanelWindow(gfx::Rect(600, 200, 50, 50)));
 
   // Create the secondary external display info. This will be docked display.
-  DisplayInfo external_display_info =
+  ui::ManagedDisplayInfo external_display_info =
       CreateDisplayInfo(2, gfx::Rect(0, 0, 1920, 1080));
 
   info_list.push_back(external_display_info);
   // Adding external Display
   display_manager()->OnNativeDisplaysChanged(info_list);
 
   info_list.clear();
   info_list.push_back(external_display_info);
 
   // Docked state.
@@ skipping 540 matching lines @@
   touch.set_location(gfx::Point(bounds.x() - 1, bounds.y() + 5));
   target = targeter->FindTargetForEvent(root, &touch);
   EXPECT_NE(w.get(), target);
 }
 
 INSTANTIATE_TEST_CASE_P(LtrRtl,
                         PanelLayoutManagerTextDirectionTest,
                         testing::Bool());
 
 }  // namespace ash