| Index: chrome/browser/ui/ash/launcher/app_window_launcher_controller.h
|
| diff --git a/chrome/browser/ui/ash/launcher/app_window_launcher_controller.h b/chrome/browser/ui/ash/launcher/app_window_launcher_controller.h
|
| index 4ff452ee8cd88af197cb8e7e39cebde026a28a8c..a4993dc21c39a0336ce085be09aedf77b78c1faf 100644
|
| --- a/chrome/browser/ui/ash/launcher/app_window_launcher_controller.h
|
| +++ b/chrome/browser/ui/ash/launcher/app_window_launcher_controller.h
|
| @@ -59,8 +59,10 @@ class AppWindowLauncherController
|
| void OnWindowDestroying(aura::Window* window) override;
|
|
|
| // Overriden from 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;
|
|
|
| protected:
|
| // Registers a app window with the shelf and this object.
|
|
|