| Index: ui/events/event.h
|
| diff --git a/ui/events/event.h b/ui/events/event.h
|
| index e970826ce38b3f6f683932f5b19a23baa5e16b4b..d774897bcf29e287165f45f317035d00a11aec9f 100644
|
| --- a/ui/events/event.h
|
| +++ b/ui/events/event.h
|
| @@ -256,12 +256,12 @@ class EVENTS_EXPORT Event {
|
| class EVENTS_EXPORT CancelModeEvent : public Event {
|
| public:
|
| CancelModeEvent();
|
| - virtual ~CancelModeEvent();
|
| + ~CancelModeEvent() override;
|
| };
|
|
|
| class EVENTS_EXPORT LocatedEvent : public Event {
|
| public:
|
| - virtual ~LocatedEvent();
|
| + ~LocatedEvent() override;
|
|
|
| float x() const { return location_.x(); }
|
| float y() const { return location_.y(); }
|
| @@ -469,7 +469,7 @@ class EVENTS_EXPORT MouseWheelEvent : public MouseEvent {
|
| const gfx::Vector2d& offset() const { return offset_; }
|
|
|
| // Overridden from LocatedEvent.
|
| - virtual void UpdateForRootTransform(
|
| + void UpdateForRootTransform(
|
| const gfx::Transform& inverted_root_transform) override;
|
|
|
| private:
|
| @@ -508,7 +508,7 @@ class EVENTS_EXPORT TouchEvent : public LocatedEvent {
|
| float angle,
|
| float force);
|
|
|
| - virtual ~TouchEvent();
|
| + ~TouchEvent() override;
|
|
|
| int touch_id() const { return touch_id_; }
|
| float radius_x() const { return radius_x_; }
|
| @@ -521,7 +521,7 @@ class EVENTS_EXPORT TouchEvent : public LocatedEvent {
|
| void set_radius_y(const float r) { radius_y_ = r; }
|
|
|
| // Overridden from LocatedEvent.
|
| - virtual void UpdateForRootTransform(
|
| + void UpdateForRootTransform(
|
| const gfx::Transform& inverted_root_transform) override;
|
|
|
| protected:
|
| @@ -615,7 +615,7 @@ class EVENTS_EXPORT KeyEvent : public Event {
|
|
|
| KeyEvent& operator=(const KeyEvent& rhs);
|
|
|
| - virtual ~KeyEvent();
|
| + ~KeyEvent() override;
|
|
|
| // TODO(erg): While we transition to mojo, we have to hack around a mismatch
|
| // in our event types. Our ui::Events don't really have all the data we need
|
| @@ -802,7 +802,7 @@ class EVENTS_EXPORT GestureEvent : public LocatedEvent {
|
| details_(model.details_) {
|
| }
|
|
|
| - virtual ~GestureEvent();
|
| + ~GestureEvent() override;
|
|
|
| const GestureEventDetails& details() const { return details_; }
|
|
|
|
|