| Index: ash/shelf/shelf_window_watcher.h
|
| diff --git a/ash/shelf/shelf_window_watcher.h b/ash/shelf/shelf_window_watcher.h
|
| index cb99bc760da87c77635ddbac31b66894e82d139d..05e685fcb0eea508d6181f9574327d829c4bd0d6 100644
|
| --- a/ash/shelf/shelf_window_watcher.h
|
| +++ b/ash/shelf/shelf_window_watcher.h
|
| @@ -115,9 +115,10 @@ class ShelfWindowWatcher : public aura::client::ActivationChangeObserver,
|
| intptr_t old) OVERRIDE;
|
|
|
| // gfx::DisplayObserver overrides:
|
| - virtual void OnDisplayBoundsChanged(const gfx::Display& display) OVERRIDE;
|
| virtual void OnDisplayAdded(const gfx::Display& display) OVERRIDE;
|
| virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE;
|
| + virtual void OnDisplayMetricsChanged(const gfx::Display& display,
|
| + DisplayObserver::DisplayMetrics metrics) OVERRIDE;
|
|
|
| // Owned by Shell.
|
| ShelfModel* model_;
|
|
|