| Index: ash/shelf/shelf_layout_manager.h
|
| diff --git a/ash/shelf/shelf_layout_manager.h b/ash/shelf/shelf_layout_manager.h
|
| index 96f405ecfac0ebee053f191c04e305bde3056da3..86344471a5706848bb8fae5f7a3488663d24c7dd 100644
|
| --- a/ash/shelf/shelf_layout_manager.h
|
| +++ b/ash/shelf/shelf_layout_manager.h
|
| @@ -176,8 +176,10 @@ class ASH_EXPORT ShelfLayoutManager
|
| void OnLockStateChanged(bool locked) override;
|
|
|
| // Overriden from aura::client::ActivationChangeObserver:
|
| - void OnWindowActivated(aura::Window* gained_active,
|
| - aura::Window* lost_active) override;
|
| + void OnWindowActivated(
|
| + aura::client::ActivationChangeObserver::ActivationReason reason,
|
| + aura::Window* gained_active,
|
| + aura::Window* lost_active) override;
|
|
|
| // Overridden from ash::LockStateObserver:
|
| void OnLockStateEvent(LockStateObserver::EventType event) override;
|
|
|