| Index: athena/wm/split_view_controller.cc
|
| diff --git a/athena/wm/split_view_controller.cc b/athena/wm/split_view_controller.cc
|
| index 6d3374358ab13e8130e1e1eef5371d1e6ad96c71..d95825a83505f0c81079e372a46953950e7538ca 100644
|
| --- a/athena/wm/split_view_controller.cc
|
| +++ b/athena/wm/split_view_controller.cc
|
| @@ -58,7 +58,7 @@ class StaticViewTargeterDelegate : public views::ViewTargeterDelegate {
|
| public:
|
| explicit StaticViewTargeterDelegate(views::View* target) : target_(target) {}
|
|
|
| - virtual ~StaticViewTargeterDelegate() {}
|
| + ~StaticViewTargeterDelegate() override {}
|
|
|
| private:
|
| // views::ViewTargeterDelegate:
|
| @@ -87,13 +87,13 @@ class PriorityWindowTargeter : public aura::WindowTargeter,
|
| window_->AddObserver(this);
|
| }
|
|
|
| - virtual ~PriorityWindowTargeter() {
|
| + ~PriorityWindowTargeter() override {
|
| window_->RemoveObserver(this);
|
| }
|
|
|
| private:
|
| // aura::WindowTargeter:
|
| - virtual ui::EventTarget* FindTargetForLocatedEvent(
|
| + ui::EventTarget* FindTargetForLocatedEvent(
|
| ui::EventTarget* root,
|
| ui::LocatedEvent* event) override {
|
| if (!window_ || (event->type() != ui::ET_TOUCH_PRESSED))
|
| @@ -130,7 +130,7 @@ class PriorityWindowTargeter : public aura::WindowTargeter,
|
| }
|
|
|
| // aura::WindowObserver:
|
| - virtual void OnWindowDestroying(aura::Window* window) override {
|
| + void OnWindowDestroying(aura::Window* window) override {
|
| DCHECK_EQ(window, window_);
|
| window_->RemoveObserver(this);
|
| window_ = NULL;
|
|
|