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

Side by Side Diff: ui/events/test/test_event_target.h

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 unified diff | Download patch
« no previous file with comments | « ui/events/test/test_event_processor.h ('k') | ui/events/x/events_x_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_EVENTS_TEST_TEST_EVENT_TARGET_H_ 5 #ifndef UI_EVENTS_TEST_TEST_EVENT_TARGET_H_
6 #define UI_EVENTS_TEST_TEST_EVENT_TARGET_H_ 6 #define UI_EVENTS_TEST_TEST_EVENT_TARGET_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 recorder_ = recorder; 47 recorder_ = recorder;
48 } 48 }
49 void set_target_name(const std::string& target_name) { 49 void set_target_name(const std::string& target_name) {
50 target_name_ = target_name; 50 target_name_ = target_name;
51 } 51 }
52 52
53 protected: 53 protected:
54 bool Contains(TestEventTarget* target) const; 54 bool Contains(TestEventTarget* target) const;
55 55
56 // EventTarget: 56 // EventTarget:
57 virtual bool CanAcceptEvent(const ui::Event& event) OVERRIDE; 57 virtual bool CanAcceptEvent(const ui::Event& event) override;
58 virtual EventTarget* GetParentTarget() OVERRIDE; 58 virtual EventTarget* GetParentTarget() override;
59 virtual scoped_ptr<EventTargetIterator> GetChildIterator() const OVERRIDE; 59 virtual scoped_ptr<EventTargetIterator> GetChildIterator() const override;
60 virtual EventTargeter* GetEventTargeter() OVERRIDE; 60 virtual EventTargeter* GetEventTargeter() override;
61 61
62 // EventHandler: 62 // EventHandler:
63 virtual void OnEvent(Event* event) OVERRIDE; 63 virtual void OnEvent(Event* event) override;
64 64
65 private: 65 private:
66 void set_parent(TestEventTarget* parent) { parent_ = parent; } 66 void set_parent(TestEventTarget* parent) { parent_ = parent; }
67 67
68 TestEventTarget* parent_; 68 TestEventTarget* parent_;
69 ScopedVector<TestEventTarget> children_; 69 ScopedVector<TestEventTarget> children_;
70 scoped_ptr<EventTargeter> targeter_; 70 scoped_ptr<EventTargeter> targeter_;
71 bool mark_events_as_handled_; 71 bool mark_events_as_handled_;
72 72
73 std::set<ui::EventType> received_; 73 std::set<ui::EventType> received_;
74 74
75 HandlerSequenceRecorder* recorder_; 75 HandlerSequenceRecorder* recorder_;
76 std::string target_name_; 76 std::string target_name_;
77 77
78 DISALLOW_COPY_AND_ASSIGN(TestEventTarget); 78 DISALLOW_COPY_AND_ASSIGN(TestEventTarget);
79 }; 79 };
80 80
81 } // namespace test 81 } // namespace test
82 } // namespace ui 82 } // namespace ui
83 83
84 #endif // UI_EVENTS_TEST_TEST_EVENT_TARGET_H_ 84 #endif // UI_EVENTS_TEST_TEST_EVENT_TARGET_H_
OLDNEW
« no previous file with comments | « ui/events/test/test_event_processor.h ('k') | ui/events/x/events_x_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698