Index: ui/views/view.h |
diff --git a/ui/views/view.h b/ui/views/view.h |
index 5ae0c025b1efe0123ff731183817698fce027c0f..a38f3ce3fd8090fd01eefa9549806a01f30da62d 100644 |
--- a/ui/views/view.h |
+++ b/ui/views/view.h |
@@ -145,7 +145,7 @@ class VIEWS_EXPORT View : public ui::LayerDelegate, |
// Creation and lifetime ----------------------------------------------------- |
View(); |
- virtual ~View(); |
+ ~View() override; |
// By default a View is owned by its parent unless specified otherwise here. |
void set_owned_by_client() { owned_by_client_ = true; } |
@@ -714,19 +714,19 @@ class VIEWS_EXPORT View : public ui::LayerDelegate, |
ViewTargeter* targeter() const { return targeter_.get(); } |
// Overridden from ui::EventTarget: |
- virtual bool CanAcceptEvent(const ui::Event& event) override; |
- virtual ui::EventTarget* GetParentTarget() override; |
- virtual scoped_ptr<ui::EventTargetIterator> GetChildIterator() const override; |
- virtual ui::EventTargeter* GetEventTargeter() override; |
- virtual void ConvertEventToTarget(ui::EventTarget* target, |
- ui::LocatedEvent* event) override; |
+ bool CanAcceptEvent(const ui::Event& event) override; |
+ ui::EventTarget* GetParentTarget() override; |
+ scoped_ptr<ui::EventTargetIterator> GetChildIterator() const override; |
+ ui::EventTargeter* GetEventTargeter() override; |
+ void ConvertEventToTarget(ui::EventTarget* target, |
+ ui::LocatedEvent* event) override; |
// Overridden from ui::EventHandler: |
- virtual void OnKeyEvent(ui::KeyEvent* event) override; |
- virtual void OnMouseEvent(ui::MouseEvent* event) override; |
- virtual void OnScrollEvent(ui::ScrollEvent* event) override; |
- virtual void OnTouchEvent(ui::TouchEvent* event) override final; |
- virtual void OnGestureEvent(ui::GestureEvent* event) override; |
+ void OnKeyEvent(ui::KeyEvent* event) override; |
+ void OnMouseEvent(ui::MouseEvent* event) override; |
+ void OnScrollEvent(ui::ScrollEvent* event) override; |
+ void OnTouchEvent(ui::TouchEvent* event) final; |
+ void OnGestureEvent(ui::GestureEvent* event) override; |
// Accelerators -------------------------------------------------------------- |
@@ -744,12 +744,12 @@ class VIEWS_EXPORT View : public ui::LayerDelegate, |
virtual void ResetAccelerators(); |
// Overridden from AcceleratorTarget: |
- virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) override; |
+ bool AcceleratorPressed(const ui::Accelerator& accelerator) override; |
// Returns whether accelerators are enabled for this view. Accelerators are |
// enabled if the containing widget is visible and the view is enabled() and |
// IsDrawn() |
- virtual bool CanHandleAccelerators() const override; |
+ bool CanHandleAccelerators() const override; |
// Focus --------------------------------------------------------------------- |
@@ -1117,11 +1117,10 @@ class VIEWS_EXPORT View : public ui::LayerDelegate, |
void UpdateChildLayerBounds(const gfx::Vector2d& offset); |
// Overridden from ui::LayerDelegate: |
- virtual void OnPaintLayer(gfx::Canvas* canvas) override; |
- virtual void OnDelegatedFrameDamage( |
- const gfx::Rect& damage_rect_in_dip) override; |
- virtual void OnDeviceScaleFactorChanged(float device_scale_factor) override; |
- virtual base::Closure PrepareForLayerBoundsChange() override; |
+ void OnPaintLayer(gfx::Canvas* canvas) override; |
+ void OnDelegatedFrameDamage(const gfx::Rect& damage_rect_in_dip) override; |
+ void OnDeviceScaleFactorChanged(float device_scale_factor) override; |
+ base::Closure PrepareForLayerBoundsChange() override; |
// Finds the layer that this view paints to (it may belong to an ancestor |
// view), then reorders the immediate children of that layer to match the |