Move ash::DisplayInfo to ui

components/exo/wm_helper_ash.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_ash.h"
 
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/display/display_manager.h"
 #include "ash/shell.h"
@@ skipping 20 matching lines @@
   aura::client::FocusClient* focus_client =
       aura::client::GetFocusClient(ash::Shell::GetPrimaryRootWindow());
   focus_client->RemoveObserver(this);
   ash::Shell::GetInstance()->activation_client()->RemoveObserver(this);
   ash::WmShell::Get()->RemoveShellObserver(this);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WMHelperAsh, private:
 
-const ash::DisplayInfo WMHelperAsh::GetDisplayInfo(int64_t display_id) const {
+const ui::DisplayInfo WMHelperAsh::GetDisplayInfo(int64_t display_id) const {
   return ash::Shell::GetInstance()->display_manager()->GetDisplayInfo(
       display_id);
 }
 
 aura::Window* WMHelperAsh::GetContainer(int container_id) {
   return ash::Shell::GetContainer(ash::Shell::GetTargetRootWindow(),
                                   container_id);
 }
 
 aura::Window* WMHelperAsh::GetActiveWindow() const {
@@ skipping 58 matching lines @@
 
 void WMHelperAsh::OnMaximizeModeStarted() {
   NotifyMaximizeModeStarted();
 }
 
 void WMHelperAsh::OnMaximizeModeEnded() {
   NotifyMaximizeModeEnded();
 }
 
 }  // namespace exo