| Index: ash/monitor/multi_monitor_manager.h
|
| diff --git a/ash/monitor/multi_monitor_manager.h b/ash/monitor/multi_monitor_manager.h
|
| index 381bba84ca87653ac23ba3f9e1794fa5bddf7997..0faf39d6b27b86ee293a7bcb3bff141494cab4da 100644
|
| --- a/ash/monitor/multi_monitor_manager.h
|
| +++ b/ash/monitor/multi_monitor_manager.h
|
| @@ -48,12 +48,12 @@ class ASH_EXPORT MultiMonitorManager : public aura::MonitorManager,
|
| const std::vector<gfx::Display>& displays) OVERRIDE;
|
| virtual aura::RootWindow* CreateRootWindowForMonitor(
|
| const gfx::Display& display) OVERRIDE;
|
| - virtual const gfx::Display& GetMonitorAt(size_t index) OVERRIDE;
|
| + virtual const gfx::Display& GetDisplayAt(size_t index) OVERRIDE;
|
|
|
| - virtual size_t GetNumMonitors() const OVERRIDE;
|
| - virtual const gfx::Display& GetMonitorNearestPoint(
|
| + virtual size_t GetNumDisplays() const OVERRIDE;
|
| + virtual const gfx::Display& GetDisplayNearestPoint(
|
| const gfx::Point& point) const OVERRIDE;
|
| - virtual const gfx::Display& GetMonitorNearestWindow(
|
| + virtual const gfx::Display& GetDisplayNearestWindow(
|
| const aura::Window* window) const OVERRIDE;
|
|
|
| // RootWindowObserver overrides:
|
|
|