Move ash::DisplayInfo to ui

ash/common/wm_shell.h

 // 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.
 
 #ifndef ASH_COMMON_WM_SHELL_H_
 #define ASH_COMMON_WM_SHELL_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "ash/common/media_delegate.h"
 #include "ash/common/metrics/gesture_action_type.h"
 #include "ash/common/metrics/user_metrics_action.h"
 #include "ash/common/wm/lock_state_observer.h"
 #include "base/observer_list.h"
 #include "ui/base/ui_base_types.h"
 
 namespace display {
 class Display;
+class ManagedDisplayInfo;
 }
 
 namespace gfx {
 class Insets;
 class Point;
 }
 
 namespace views {
 class PointerWatcher;
 }
 
 namespace ash {
 
 class AcceleratorController;
 class AccessibilityDelegate;
 class BrightnessControlDelegate;
-class DisplayInfo;
 class FocusCycler;
 class ImmersiveContextAsh;
 class ImmersiveFullscreenController;
 class KeyboardBrightnessControlDelegate;
 class KeyboardUI;
 class MaximizeModeController;
 class MruWindowTracker;
 class NewWindowDelegate;
 class PaletteDelegate;
 class ScopedDisableInternalMouseAndKeyboard;
@@ skipping 119 matching lines @@
   virtual WmWindow* GetRootWindowForDisplayId(int64_t display_id) = 0;
 
   // Returns the root window that newly created windows should be added to.
   // Value can be temporarily overridden using ScopedRootWindowForNewWindows.
   // NOTE: this returns the root, newly created window should be added to the
   // appropriate container in the returned window.
   WmWindow* GetRootWindowForNewWindows();
 
   // Retuns the display info associated with |display_id|.
   // TODO(mash): Remove when DisplayManager has been moved. crbug.com/622480
-  virtual const DisplayInfo& GetDisplayInfo(int64_t display_id) const = 0;
+  virtual const display::ManagedDisplayInfo& GetDisplayInfo(
+      int64_t display_id) const = 0;
 
   // Matches that of DisplayManager::IsActiveDisplayId().
   // TODO(mash): Remove when DisplayManager has been moved. crbug.com/622480
   virtual bool IsActiveDisplayId(int64_t display_id) const = 0;
 
   // Returns true if the desktop is in unified mode.
   // TODO(mash): Remove when DisplayManager has been moved. crbug.com/622480
   virtual bool IsInUnifiedMode() const = 0;
 
   // Returns the first display; this is the first display listed by hardware,
@@ skipping 238 matching lines @@
   bool simulate_modal_window_open_for_testing_ = false;
 
 #if defined(OS_CHROMEOS)
   std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_;
 #endif
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_WM_SHELL_H_