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

Unified Diff: ui/views/test/event_generator_delegate_mac.mm

Issue 1119423003: Refactors away method implementations in ui::EventTargeter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Refactors ui::EventTargeter (rebased) Created 5 years, 6 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/test/test_event_targeter.cc ('k') | ui/views/view_targeter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 5bd4537be5bbb4bdfbe4f8257bfd9f4d158f01fb..4e4a32b2237f48ba26faa325af59c772801eabf5 100644
--- a/ui/views/test/event_generator_delegate_mac.mm
+++ b/ui/views/test/event_generator_delegate_mac.mm
@@ -236,7 +236,7 @@ class EventGeneratorDelegateMac : public ui::EventTarget,
// Overridden from ui::EventTarget:
bool CanAcceptEvent(const ui::Event& event) override { return true; }
- ui::EventTarget* GetParentTarget() override { return NULL; }
+ ui::EventTarget* GetParentTarget() override { return nullptr; }
scoped_ptr<ui::EventTargetIterator> GetChildIterator() const override;
ui::EventTargeter* GetEventTargeter() override { return this; }
@@ -254,6 +254,16 @@ class EventGeneratorDelegateMac : public ui::EventTarget,
// Overridden from ui::EventDispatcherDelegate (via ui::EventProcessor):
bool CanDispatchToTarget(EventTarget* target) override { return true; }
+ // Overridden from ui::EventTargeter:
+ ui::EventTarget* FindTargetForEvent(ui::EventTarget* root,
+ ui::Event* event) override {
+ return root;
+ }
+ ui::EventTarget* FindNextBestTarget(ui::EventTarget* previous_target,
+ ui::Event* event) override {
+ return nullptr;
+ }
+
// Overridden from ui::test::EventGeneratorDelegate:
void SetContext(ui::test::EventGenerator* owner,
gfx::NativeWindow root_window,
@@ -290,7 +300,7 @@ class EventGeneratorDelegateMac : public ui::EventTarget,
DISALLOW_COPY_AND_ASSIGN(EventGeneratorDelegateMac);
};
-EventGeneratorDelegateMac::EventGeneratorDelegateMac() : owner_(NULL) {
+EventGeneratorDelegateMac::EventGeneratorDelegateMac() : owner_(nullptr) {
DCHECK(!ui::test::EventGenerator::default_delegate);
ui::test::EventGenerator::default_delegate = this;
// Install a fake "edit" menu. This is normally provided by Chrome's
@@ -318,12 +328,12 @@ EventGeneratorDelegateMac::EventGeneratorDelegateMac() : owner_(NULL) {
EventGeneratorDelegateMac::~EventGeneratorDelegateMac() {
DCHECK_EQ(this, ui::test::EventGenerator::default_delegate);
- ui::test::EventGenerator::default_delegate = NULL;
+ ui::test::EventGenerator::default_delegate = nullptr;
}
scoped_ptr<ui::EventTargetIterator>
EventGeneratorDelegateMac::GetChildIterator() const {
- // Return NULL to dispatch all events to the result of GetRootTarget().
+ // Return nullptr to dispatch all events to the result of GetRootTarget().
return nullptr;
}
« no previous file with comments | « ui/events/test/test_event_targeter.cc ('k') | ui/views/view_targeter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698