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

Side by Side Diff: ui/views/test/event_generator_delegate_mac.mm

Issue 2681613002: Avoid two targeting phases in aura client-lib and EventProcessor. (Closed)
Patch Set: early return Created 3 years, 9 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #import <Cocoa/Cocoa.h> 5 #import <Cocoa/Cocoa.h>
6 #include <stddef.h> 6 #include <stddef.h>
7 7
8 #import "base/mac/scoped_nsobject.h" 8 #import "base/mac/scoped_nsobject.h"
9 #import "base/mac/scoped_objc_class_swizzler.h" 9 #import "base/mac/scoped_objc_class_swizzler.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 // Overridden from ui::EventHandler: 258 // Overridden from ui::EventHandler:
259 void OnMouseEvent(ui::MouseEvent* event) override; 259 void OnMouseEvent(ui::MouseEvent* event) override;
260 void OnKeyEvent(ui::KeyEvent* event) override; 260 void OnKeyEvent(ui::KeyEvent* event) override;
261 void OnTouchEvent(ui::TouchEvent* event) override; 261 void OnTouchEvent(ui::TouchEvent* event) override;
262 void OnScrollEvent(ui::ScrollEvent* event) override; 262 void OnScrollEvent(ui::ScrollEvent* event) override;
263 263
264 // Overridden from ui::EventSource: 264 // Overridden from ui::EventSource:
265 ui::EventProcessor* GetEventProcessor() override { return this; } 265 ui::EventProcessor* GetEventProcessor() override { return this; }
266 266
267 // Overridden from ui::EventProcessor: 267 // Overridden from ui::EventProcessor:
268 ui::EventTarget* GetRootTarget() override { return this; } 268 ui::EventTarget* GetRootForEvent(ui::Event* event) override { return this; }
269 ui::EventTargeter* GetDefaultEventTargeter() override {
270 return this->GetEventTargeter();
271 }
269 272
270 // Overridden from ui::EventDispatcherDelegate (via ui::EventProcessor): 273 // Overridden from ui::EventDispatcherDelegate (via ui::EventProcessor):
271 bool CanDispatchToTarget(EventTarget* target) override { return true; } 274 bool CanDispatchToTarget(EventTarget* target) override { return true; }
272 275
273 // Overridden from ui::EventTargeter: 276 // Overridden from ui::EventTargeter:
274 ui::EventTarget* FindTargetForEvent(ui::EventTarget* root, 277 ui::EventTarget* FindTargetForEvent(ui::EventTarget* root,
275 ui::Event* event) override { 278 ui::Event* event) override {
276 return root; 279 return root;
277 } 280 }
278 ui::EventTarget* FindNextBestTarget(ui::EventTarget* previous_target, 281 ui::EventTarget* FindNextBestTarget(ui::EventTarget* previous_target,
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after
616 - (NSEvent*)currentEvent { 619 - (NSEvent*)currentEvent {
617 if (g_current_event) 620 if (g_current_event)
618 return g_current_event; 621 return g_current_event;
619 622
620 // Find the original implementation and invoke it. 623 // Find the original implementation and invoke it.
621 IMP original = EventGeneratorDelegateMac::GetInstance()->CurrentEventMethod(); 624 IMP original = EventGeneratorDelegateMac::GetInstance()->CurrentEventMethod();
622 return original(self, _cmd); 625 return original(self, _cmd);
623 } 626 }
624 627
625 @end 628 @end
OLDNEW
« no previous file with comments | « ui/views/bubble/bubble_window_targeter_unittest.cc ('k') | ui/views/touchui/touch_selection_controller_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698