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

Unified Diff: ui/views/touchui/touch_selection_controller_impl_unittest.cc

Issue 2681613002: Avoid two targeting phases in aura client-lib and EventProcessor. (Closed)
Patch Set: early return Created 3 years, 10 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/views/test/event_generator_delegate_mac.mm ('k') | ui/views/widget/root_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/touchui/touch_selection_controller_impl_unittest.cc
diff --git a/ui/views/touchui/touch_selection_controller_impl_unittest.cc b/ui/views/touchui/touch_selection_controller_impl_unittest.cc
index 83de78435dfcbedcc831465e4af30e8177811178..47430626a666c53831d0835230780f7b4bda8c54 100644
--- a/ui/views/touchui/touch_selection_controller_impl_unittest.cc
+++ b/ui/views/touchui/touch_selection_controller_impl_unittest.cc
@@ -10,6 +10,8 @@
#include "ui/aura/client/screen_position_client.h"
#include "ui/aura/test/test_cursor_client.h"
#include "ui/aura/window.h"
+#include "ui/aura/window_event_dispatcher.h"
+#include "ui/aura/window_tree_host.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/touch/touch_editing_controller.h"
#include "ui/base/ui_base_switches.h"
@@ -794,8 +796,9 @@ TEST_F(TouchSelectionControllerImplTest, HandlesStackAboveParent) {
if (IsMus())
return;
- ui::EventTarget* root = GetContext();
- ui::EventTargeter* targeter = root->GetEventTargeter();
+ aura::Window* root = GetContext();
+ ui::EventTargeter* targeter =
+ root->GetHost()->dispatcher()->GetDefaultEventTargeter();
// Create the first window containing a Views::Textfield.
CreateTextfield();
« no previous file with comments | « ui/views/test/event_generator_delegate_mac.mm ('k') | ui/views/widget/root_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698