Index: ui/aura/test/test_window_delegate.h |
diff --git a/ui/aura/test/test_window_delegate.h b/ui/aura/test/test_window_delegate.h |
index 1cb142a714c4748cbd00b5c47537afad2bc6b5ce..3ac8625ea2a43415d9b5268a184cf521a10416f0 100644 |
--- a/ui/aura/test/test_window_delegate.h |
+++ b/ui/aura/test/test_window_delegate.h |
@@ -20,7 +20,7 @@ namespace test { |
class TestWindowDelegate : public WindowDelegate { |
public: |
TestWindowDelegate(); |
- virtual ~TestWindowDelegate(); |
+ ~TestWindowDelegate() override; |
// Returns a TestWindowDelegate that delete itself when |
// the associated window is destroyed. |
@@ -42,24 +42,24 @@ class TestWindowDelegate : public WindowDelegate { |
void set_can_focus(bool can_focus) { can_focus_ = can_focus; } |
// Overridden from WindowDelegate: |
- virtual gfx::Size GetMinimumSize() const override; |
- virtual gfx::Size GetMaximumSize() const override; |
- virtual void OnBoundsChanged(const gfx::Rect& old_bounds, |
- const gfx::Rect& new_bounds) override; |
- virtual gfx::NativeCursor GetCursor(const gfx::Point& point) override; |
- virtual int GetNonClientComponent(const gfx::Point& point) const override; |
- virtual bool ShouldDescendIntoChildForEventHandling( |
+ gfx::Size GetMinimumSize() const override; |
+ gfx::Size GetMaximumSize() const override; |
+ void OnBoundsChanged(const gfx::Rect& old_bounds, |
+ const gfx::Rect& new_bounds) override; |
+ gfx::NativeCursor GetCursor(const gfx::Point& point) override; |
+ int GetNonClientComponent(const gfx::Point& point) const override; |
+ bool ShouldDescendIntoChildForEventHandling( |
Window* child, |
const gfx::Point& location) override; |
- virtual bool CanFocus() override; |
- virtual void OnCaptureLost() override; |
- virtual void OnPaint(gfx::Canvas* canvas) override; |
- virtual void OnDeviceScaleFactorChanged(float device_scale_factor) override; |
- virtual void OnWindowDestroying(Window* window) override; |
- virtual void OnWindowDestroyed(Window* window) override; |
- virtual void OnWindowTargetVisibilityChanged(bool visible) override; |
- virtual bool HasHitTestMask() const override; |
- virtual void GetHitTestMask(gfx::Path* mask) const override; |
+ bool CanFocus() override; |
+ void OnCaptureLost() override; |
+ void OnPaint(gfx::Canvas* canvas) override; |
+ void OnDeviceScaleFactorChanged(float device_scale_factor) override; |
+ void OnWindowDestroying(Window* window) override; |
+ void OnWindowDestroyed(Window* window) override; |
+ void OnWindowTargetVisibilityChanged(bool visible) override; |
+ bool HasHitTestMask() const override; |
+ void GetHitTestMask(gfx::Path* mask) const override; |
private: |
int window_component_; |
@@ -76,14 +76,14 @@ class TestWindowDelegate : public WindowDelegate { |
class ColorTestWindowDelegate : public TestWindowDelegate { |
public: |
explicit ColorTestWindowDelegate(SkColor color); |
- virtual ~ColorTestWindowDelegate(); |
+ ~ColorTestWindowDelegate() override; |
ui::KeyboardCode last_key_code() const { return last_key_code_; } |
// Overridden from TestWindowDelegate: |
- virtual void OnKeyEvent(ui::KeyEvent* event) override; |
- virtual void OnWindowDestroyed(Window* window) override; |
- virtual void OnPaint(gfx::Canvas* canvas) override; |
+ void OnKeyEvent(ui::KeyEvent* event) override; |
+ void OnWindowDestroyed(Window* window) override; |
+ void OnPaint(gfx::Canvas* canvas) override; |
private: |
SkColor color_; |
@@ -98,8 +98,8 @@ class MaskedWindowDelegate : public TestWindowDelegate { |
explicit MaskedWindowDelegate(const gfx::Rect mask_rect); |
// Overridden from TestWindowDelegate: |
- virtual bool HasHitTestMask() const override; |
- virtual void GetHitTestMask(gfx::Path* mask) const override; |
+ bool HasHitTestMask() const override; |
+ void GetHitTestMask(gfx::Path* mask) const override; |
private: |
gfx::Rect mask_rect_; |
@@ -113,9 +113,9 @@ class EventCountDelegate : public TestWindowDelegate { |
EventCountDelegate(); |
// Overridden from TestWindowDelegate: |
- virtual void OnKeyEvent(ui::KeyEvent* event) override; |
- virtual void OnMouseEvent(ui::MouseEvent* event) override; |
- virtual void OnGestureEvent(ui::GestureEvent* event) override; |
+ void OnKeyEvent(ui::KeyEvent* event) override; |
+ void OnMouseEvent(ui::MouseEvent* event) override; |
+ void OnGestureEvent(ui::GestureEvent* event) override; |
// Returns the counts of mouse motion events in the |
// form of "<enter> <move> <leave>". |