| 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 0d7e99aab0316301ccf752ebef6cc69cdc9b41aa..a2b76516bc49669ed793fa8e39dc4b5a97551e0b 100644
|
| --- a/ui/views/controls/menu/menu_message_loop_aura.cc
|
| +++ b/ui/views/controls/menu/menu_message_loop_aura.cc
|
| @@ -61,16 +61,16 @@ class ActivationChangeObserverImpl
|
|
|
| // aura::client::ActivationChangeObserver:
|
| virtual void OnWindowActivated(aura::Window* gained_active,
|
| - aura::Window* lost_active) OVERRIDE {
|
| + aura::Window* lost_active) override {
|
| if (!controller_->drag_in_progress())
|
| controller_->CancelAll();
|
| }
|
|
|
| // aura::WindowObserver:
|
| - virtual void OnWindowDestroying(aura::Window* window) OVERRIDE { Cleanup(); }
|
| + virtual void OnWindowDestroying(aura::Window* window) override { Cleanup(); }
|
|
|
| // ui::EventHandler:
|
| - virtual void OnCancelMode(ui::CancelModeEvent* event) OVERRIDE {
|
| + virtual void OnCancelMode(ui::CancelModeEvent* event) override {
|
| controller_->CancelAll();
|
| }
|
|
|
|
|