Move ash::DisplayInfo to ui

ash/desktop_background/desktop_background_view.cc

Index: ash/desktop_background/desktop_background_view.cc
diff --git a/ash/desktop_background/desktop_background_view.cc b/ash/desktop_background/desktop_background_view.cc
index be85e5e6c455a2eee9371ae8a9dff93a4aca2cc5..47ef054dcebb8a6da08f54c53a19952276dba6df 100644
--- a/ash/desktop_background/desktop_background_view.cc
+++ b/ash/desktop_background/desktop_background_view.cc
@@ -5,7 +5,6 @@
 #include "ash/desktop_background/desktop_background_view.h"
 
 #include "ash/aura/wm_window_aura.h"
-#include "ash/common/display/display_info.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/wm/overview/window_selector_controller.h"
 #include "ash/common/wm_lookup.h"
@@ -16,6 +15,7 @@
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ui/display/display.h"
+#include "ui/display/manager/display_info.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/safe_integer_conversions.h"
@@ -42,7 +42,7 @@ class LayerControlView : public views::View {
   void Layout() override {
     WmWindow* window = WmLookup::Get()->GetWindowForWidget(GetWidget());
     display::Display display = window->GetDisplayNearestWindow();
-    DisplayInfo info = WmShell::Get()->GetDisplayInfo(display.id());
+    ui::DisplayInfo info = WmShell::Get()->GetDisplayInfo(display.id());
     float ui_scale = info.GetEffectiveUIScale();
     gfx::Size rounded_size =
         gfx::ScaleToFlooredSize(display.size(), 1.f / ui_scale);