Move ash::DisplayInfo to ui

ash/aura/wm_shell_aura.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 "ash/aura/wm_shell_aura.h"
 
 #include <utility>
 
 #include "ash/aura/pointer_watcher_adapter.h"
 #include "ash/aura/wm_window_aura.h"
@@ skipping 89 matching lines @@
 WmWindow* WmShellAura::GetPrimaryRootWindow() {
   return WmWindowAura::Get(Shell::GetPrimaryRootWindow());
 }
 
 WmWindow* WmShellAura::GetRootWindowForDisplayId(int64_t display_id) {
   return WmWindowAura::Get(Shell::GetInstance()
                                ->window_tree_host_manager()
                                ->GetRootWindowForDisplayId(display_id));
 }
 
-const DisplayInfo& WmShellAura::GetDisplayInfo(int64_t display_id) const {
+const ui::ManagedDisplayInfo& WmShellAura::GetDisplayInfo(
+    int64_t display_id) const {
   return Shell::GetInstance()->display_manager()->GetDisplayInfo(display_id);
 }
 
 bool WmShellAura::IsActiveDisplayId(int64_t display_id) const {
   return Shell::GetInstance()->display_manager()->IsActiveDisplayId(display_id);
 }
 
 display::Display WmShellAura::GetFirstDisplay() const {
   return Shell::GetInstance()
       ->display_manager()
@@ skipping 179 matching lines @@
   FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_,
                     OnDisplayConfigurationChanging());
 }
 
 void WmShellAura::OnDisplayConfigurationChanged() {
   FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_,
                     OnDisplayConfigurationChanged());
 }
 
 }  // namespace ash