| Index: ui/views/controls/menu/menu_message_loop_aura.cc
|
| diff --git a/ui/views/controls/menu/menu_message_loop_aura.cc b/ui/views/controls/menu/menu_message_loop_aura.cc
|
| index 9ec89e9595c7bb3a0c376ccc17d2c152e034e64b..da29d9a52a518f8a2c289076a103f951ab7f3514 100644
|
| --- a/ui/views/controls/menu/menu_message_loop_aura.cc
|
| +++ b/ui/views/controls/menu/menu_message_loop_aura.cc
|
| @@ -60,8 +60,10 @@ class ActivationChangeObserverImpl
|
| ~ActivationChangeObserverImpl() override { Cleanup(); }
|
|
|
| // 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 {
|
| if (!controller_->drag_in_progress())
|
| controller_->CancelAll();
|
| }
|
|
|