| Index: ash/wm/dock/docked_window_layout_manager.h
|
| diff --git a/ash/wm/dock/docked_window_layout_manager.h b/ash/wm/dock/docked_window_layout_manager.h
|
| index aad88047c25dd0b3d17c04baef0bd63cc0de5383..980554c8b305063f4a39ec7eb2d36b219e66e2bf 100644
|
| --- a/ash/wm/dock/docked_window_layout_manager.h
|
| +++ b/ash/wm/dock/docked_window_layout_manager.h
|
| @@ -179,8 +179,10 @@ class ASH_EXPORT DockedWindowLayoutManager
|
| void OnWindowDestroying(aura::Window* window) override;
|
|
|
| // 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;
|
|
|
| private:
|
| class ShelfWindowObserver;
|
|
|