Move ash::DisplayInfo to ui

components/exo/wm_helper_mus.cc

 // Copyright 2016 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 "components/exo/wm_helper_mus.h"
 
-#include "ash/common/display/display_info.h"
 #include "services/ui/public/cpp/window_tree_client.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
+#include "ui/display/manager/managed_display_info.h"
 #include "ui/views/mus/native_widget_mus.h"
 #include "ui/views/mus/window_manager_connection.h"
 #include "ui/views/widget/widget.h"
 
 namespace exo {
 namespace {
 
 aura::Window* GetToplevelAuraWindow(ui::Window* window) {
   DCHECK(window);
   // We never create child ui::Window, so window->parent() should be null.
@@ skipping 44 matching lines @@
 }
 
 WMHelperMus::~WMHelperMus() {
   views::WindowManagerConnection::Get()->client()->RemoveObserver(this);
   aura::Env::GetInstance()->RemoveObserver(this);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WMHelperMus, private:
 
-const ash::DisplayInfo WMHelperMus::GetDisplayInfo(int64_t display_id) const {
+const ui::ManagedDisplayInfo WMHelperMus::GetDisplayInfo(
+    int64_t display_id) const {
   // TODO(penghuang): Return real display info when it is supported in mus.
-  return ash::DisplayInfo(display_id, "", false);
+  return ui::ManagedDisplayInfo(display_id, "", false);
 }
 
 aura::Window* WMHelperMus::GetContainer(int container_id) {
   NOTIMPLEMENTED();
   return nullptr;
 }
 
 aura::Window* WMHelperMus::GetActiveWindow() const {
   ui::Window* window =
       views::WindowManagerConnection::Get()->client()->GetFocusedWindow();
@@ skipping 84 matching lines @@
 
 void WMHelperMus::OnWindowFocused(aura::Window* gained_focus,
                                   aura::Window* lost_focus) {
   if (focused_window_ != gained_focus) {
     focused_window_ = gained_focus;
     NotifyWindowFocused(gained_focus, lost_focus);
   }
 }
 
 }  // namespace exo