| Index: ash/common/wm_shell.h
|
| diff --git a/ash/common/wm_shell.h b/ash/common/wm_shell.h
|
| index 2c05b0cf0c297498d9c985ed57cb241629e7f4a6..abcb16bd9b4becd7b38035e4d8f285d4069f57b7 100644
|
| --- a/ash/common/wm_shell.h
|
| +++ b/ash/common/wm_shell.h
|
| @@ -27,6 +27,10 @@ class Insets;
|
| class Point;
|
| }
|
|
|
| +namespace ui {
|
| +class ManagedDisplayInfo;
|
| +}
|
| +
|
| namespace views {
|
| class PointerWatcher;
|
| }
|
| @@ -36,7 +40,6 @@ namespace ash {
|
| class AcceleratorController;
|
| class AccessibilityDelegate;
|
| class BrightnessControlDelegate;
|
| -class DisplayInfo;
|
| class FocusCycler;
|
| class ImmersiveContextAsh;
|
| class ImmersiveFullscreenController;
|
| @@ -172,7 +175,8 @@ class ASH_EXPORT WmShell {
|
|
|
| // 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 ui::ManagedDisplayInfo& GetDisplayInfo(
|
| + int64_t display_id) const = 0;
|
|
|
| // Matches that of DisplayManager::IsActiveDisplayId().
|
| // TODO(mash): Remove when DisplayManager has been moved. crbug.com/622480
|
|
|