Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(266)

Unified Diff: ui/events/event_dispatcher_unittest.cc

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/events/event.h ('k') | ui/events/event_processor_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/event_dispatcher_unittest.cc
diff --git a/ui/events/event_dispatcher_unittest.cc b/ui/events/event_dispatcher_unittest.cc
index 248784a8870c67c552a5d425475a630acd08cd9c..415add72daf01392d05589b8ca3dcbb0421dfeb6 100644
--- a/ui/events/event_dispatcher_unittest.cc
+++ b/ui/events/event_dispatcher_unittest.cc
@@ -38,19 +38,19 @@ class TestTarget : public EventTarget {
private:
// Overridden from EventTarget:
- virtual bool CanAcceptEvent(const ui::Event& event) OVERRIDE {
+ virtual bool CanAcceptEvent(const ui::Event& event) override {
return true;
}
- virtual EventTarget* GetParentTarget() OVERRIDE {
+ virtual EventTarget* GetParentTarget() override {
return parent_;
}
- virtual scoped_ptr<EventTargetIterator> GetChildIterator() const OVERRIDE {
+ virtual scoped_ptr<EventTargetIterator> GetChildIterator() const override {
return scoped_ptr<EventTargetIterator>();
}
- virtual EventTargeter* GetEventTargeter() OVERRIDE {
+ virtual EventTargeter* GetEventTargeter() override {
return NULL;
}
@@ -94,7 +94,7 @@ class TestEventHandler : public EventHandler {
private:
// Overridden from EventHandler:
- virtual void OnEvent(Event* event) OVERRIDE {
+ virtual void OnEvent(Event* event) override {
ui::EventHandler::OnEvent(event);
ReceivedEvent(event);
SetStatusOnEvent(event);
@@ -141,7 +141,7 @@ class EventHandlerDestroyDispatcherDelegate : public TestEventHandler {
virtual ~EventHandlerDestroyDispatcherDelegate() {}
private:
- virtual void ReceivedEvent(Event* event) OVERRIDE {
+ virtual void ReceivedEvent(Event* event) override {
TestEventHandler::ReceivedEvent(event);
delete dispatcher_delegate_;
}
@@ -158,7 +158,7 @@ class InvalidateTargetEventHandler : public TestEventHandler {
virtual ~InvalidateTargetEventHandler() {}
private:
- virtual void ReceivedEvent(Event* event) OVERRIDE {
+ virtual void ReceivedEvent(Event* event) override {
TestEventHandler::ReceivedEvent(event);
TestTarget* target = static_cast<TestTarget*>(event->target());
target->set_valid(false);
@@ -186,7 +186,7 @@ class EventHandlerDestroyer : public TestEventHandler {
}
private:
- virtual void ReceivedEvent(Event* event) OVERRIDE {
+ virtual void ReceivedEvent(Event* event) override {
TestEventHandler::ReceivedEvent(event);
delete to_destroy_;
to_destroy_ = NULL;
@@ -215,7 +215,7 @@ class TestEventDispatcher : public EventDispatcherDelegate {
private:
// Overridden from EventDispatcherDelegate:
- virtual bool CanDispatchToTarget(EventTarget* target) OVERRIDE {
+ virtual bool CanDispatchToTarget(EventTarget* target) override {
TestTarget* test_target = static_cast<TestTarget*>(target);
return test_target->valid();
}
« no previous file with comments | « ui/events/event.h ('k') | ui/events/event_processor_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698