Index: ui/views/test/event_generator_delegate_mac.mm |
diff --git a/ui/views/test/event_generator_delegate_mac.mm b/ui/views/test/event_generator_delegate_mac.mm |
index db94d341f82511a1a6c5039c281c00f89c00de3e..d156aa5d4af42f9381c6e21c5329ec1a1861814c 100644 |
--- a/ui/views/test/event_generator_delegate_mac.mm |
+++ b/ui/views/test/event_generator_delegate_mac.mm |
@@ -243,47 +243,47 @@ class EventGeneratorDelegateMac : public ui::EventTarget, |
} |
// Overridden from ui::EventTarget: |
- virtual bool CanAcceptEvent(const ui::Event& event) OVERRIDE { return true; } |
- virtual ui::EventTarget* GetParentTarget() OVERRIDE { return NULL; } |
- virtual scoped_ptr<ui::EventTargetIterator> GetChildIterator() const OVERRIDE; |
- virtual ui::EventTargeter* GetEventTargeter() OVERRIDE { |
+ virtual bool CanAcceptEvent(const ui::Event& event) override { return true; } |
+ virtual ui::EventTarget* GetParentTarget() override { return NULL; } |
+ virtual scoped_ptr<ui::EventTargetIterator> GetChildIterator() const override; |
+ virtual ui::EventTargeter* GetEventTargeter() override { |
return this; |
} |
// Overridden from ui::EventHandler (via ui::EventTarget): |
- virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; |
+ virtual void OnMouseEvent(ui::MouseEvent* event) override; |
// Overridden from ui::EventSource: |
- virtual ui::EventProcessor* GetEventProcessor() OVERRIDE { return this; } |
+ virtual ui::EventProcessor* GetEventProcessor() override { return this; } |
// Overridden from ui::EventProcessor: |
- virtual ui::EventTarget* GetRootTarget() OVERRIDE { return this; } |
+ virtual ui::EventTarget* GetRootTarget() override { return this; } |
// Overridden from ui::EventDispatcherDelegate (via ui::EventProcessor): |
- virtual bool CanDispatchToTarget(EventTarget* target) OVERRIDE { |
+ virtual bool CanDispatchToTarget(EventTarget* target) override { |
return true; |
} |
// Overridden from ui::test::EventGeneratorDelegate: |
virtual void SetContext(ui::test::EventGenerator* owner, |
gfx::NativeWindow root_window, |
- gfx::NativeWindow window) OVERRIDE; |
- virtual ui::EventTarget* GetTargetAt(const gfx::Point& location) OVERRIDE { |
+ gfx::NativeWindow window) override; |
+ virtual ui::EventTarget* GetTargetAt(const gfx::Point& location) override { |
return this; |
} |
- virtual ui::EventSource* GetEventSource(ui::EventTarget* target) OVERRIDE { |
+ virtual ui::EventSource* GetEventSource(ui::EventTarget* target) override { |
return this; |
} |
virtual gfx::Point CenterOfTarget( |
- const ui::EventTarget* target) const OVERRIDE; |
- virtual gfx::Point CenterOfWindow(gfx::NativeWindow window) const OVERRIDE; |
+ const ui::EventTarget* target) const override; |
+ virtual gfx::Point CenterOfWindow(gfx::NativeWindow window) const override; |
virtual void ConvertPointFromTarget(const ui::EventTarget* target, |
- gfx::Point* point) const OVERRIDE {} |
+ gfx::Point* point) const override {} |
virtual void ConvertPointToTarget(const ui::EventTarget* target, |
- gfx::Point* point) const OVERRIDE {} |
+ gfx::Point* point) const override {} |
virtual void ConvertPointFromHost(const ui::EventTarget* hosted_target, |
- gfx::Point* point) const OVERRIDE {} |
+ gfx::Point* point) const override {} |
private: |
friend struct DefaultSingletonTraits<EventGeneratorDelegateMac>; |