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