| Index: ash/drag_drop/drag_drop_controller.h
|
| diff --git a/ash/drag_drop/drag_drop_controller.h b/ash/drag_drop/drag_drop_controller.h
|
| index 7f20401b25127bd58b49bed82aa5a643c4682b15..fba69372e682b98439c5528d57abd83ab1663b4d 100644
|
| --- a/ash/drag_drop/drag_drop_controller.h
|
| +++ b/ash/drag_drop/drag_drop_controller.h
|
| @@ -49,22 +49,22 @@ class ASH_EXPORT DragDropController
|
| aura::Window* source_window,
|
| const gfx::Point& root_location,
|
| int operation,
|
| - ui::DragDropTypes::DragEventSource source) OVERRIDE;
|
| + ui::DragDropTypes::DragEventSource source) override;
|
| virtual void DragUpdate(aura::Window* target,
|
| - const ui::LocatedEvent& event) OVERRIDE;
|
| + const ui::LocatedEvent& event) override;
|
| virtual void Drop(aura::Window* target,
|
| - const ui::LocatedEvent& event) OVERRIDE;
|
| - virtual void DragCancel() OVERRIDE;
|
| - virtual bool IsDragDropInProgress() OVERRIDE;
|
| + const ui::LocatedEvent& event) override;
|
| + virtual void DragCancel() override;
|
| + virtual bool IsDragDropInProgress() override;
|
|
|
| // Overridden from ui::EventHandler:
|
| - virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
|
| - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
|
| - virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
|
| - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
|
| + virtual void OnKeyEvent(ui::KeyEvent* event) override;
|
| + virtual void OnMouseEvent(ui::MouseEvent* event) override;
|
| + virtual void OnTouchEvent(ui::TouchEvent* event) override;
|
| + virtual void OnGestureEvent(ui::GestureEvent* event) override;
|
|
|
| // Overridden from aura::WindowObserver.
|
| - virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE;
|
| + virtual void OnWindowDestroyed(aura::Window* window) override;
|
|
|
| protected:
|
| // Helper method to create a LinearAnimation object that will run the drag
|
| @@ -82,9 +82,9 @@ class ASH_EXPORT DragDropController
|
| friend class ash::test::DragDropControllerTest;
|
|
|
| // Overridden from gfx::AnimationDelegate:
|
| - virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE;
|
| - virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
|
| - virtual void AnimationCanceled(const gfx::Animation* animation) OVERRIDE;
|
| + virtual void AnimationEnded(const gfx::Animation* animation) override;
|
| + virtual void AnimationProgressed(const gfx::Animation* animation) override;
|
| + virtual void AnimationCanceled(const gfx::Animation* animation) override;
|
|
|
| // Helper method to start drag widget flying back animation.
|
| void StartCanceledAnimation(int animation_duration_ms);
|
|
|