| Index: ash/display/display_controller.h
|
| diff --git a/ash/display/display_controller.h b/ash/display/display_controller.h
|
| index fb61b84b9101624f4dc79fca5236cee22542f9cc..92b7211223975db967d1e5d6a23f648ce437b05c 100644
|
| --- a/ash/display/display_controller.h
|
| +++ b/ash/display/display_controller.h
|
| @@ -145,11 +145,11 @@ class ASH_EXPORT DisplayController : public gfx::DisplayObserver,
|
| // Sets the work area's |insets| to the display assigned to |window|.
|
| bool UpdateWorkAreaOfDisplayNearestWindow(const aura::Window* window,
|
| const gfx::Insets& insets);
|
| - // aura::DisplayObserver overrides:
|
| - virtual void OnDisplayBoundsChanged(
|
| - const gfx::Display& display) OVERRIDE;
|
| + // gfx::DisplayObserver overrides:
|
| virtual void OnDisplayAdded(const gfx::Display& display) OVERRIDE;
|
| virtual void OnDisplayRemoved(const gfx::Display& display) OVERRIDE;
|
| + virtual void OnDisplayMetricsChanged(const gfx::Display& display,
|
| + DisplayObserver::MetricsType metrics) OVERRIDE;
|
|
|
| // aura::WindowTreeHostObserver overrides:
|
| virtual void OnHostResized(const aura::WindowTreeHost* host) OVERRIDE;
|
|
|