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

Unified Diff: ui/views/bubble/bubble_window_targeter_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/events/test/test_event_processor.cc ('k') | ui/views/test/event_generator_delegate_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/bubble/bubble_window_targeter_unittest.cc
diff --git a/ui/views/bubble/bubble_window_targeter_unittest.cc b/ui/views/bubble/bubble_window_targeter_unittest.cc
index 3533ad2fb38e06b6334c1493da8d965696758253..975d68e82db843e6e03303d00902d41d56e5b048 100644
--- a/ui/views/bubble/bubble_window_targeter_unittest.cc
+++ b/ui/views/bubble/bubble_window_targeter_unittest.cc
@@ -7,6 +7,7 @@
#include "base/macros.h"
#include "ui/aura/window.h"
#include "ui/aura/window_event_dispatcher.h"
+#include "ui/aura/window_tree_host.h"
#include "ui/events/event_utils.h"
#include "ui/views/bubble/bubble_border.h"
#include "ui/views/bubble/bubble_dialog_delegate.h"
@@ -87,8 +88,9 @@ class BubbleWindowTargeterTest : public ViewsTestBase {
};
TEST_F(BubbleWindowTargeterTest, HitTest) {
- ui::EventTarget* root = bubble_widget()->GetNativeWindow()->GetRootWindow();
- ui::EventTargeter* targeter = root->GetEventTargeter();
+ aura::Window* root = bubble_widget()->GetNativeWindow()->GetRootWindow();
+ ui::EventTargeter* targeter =
+ root->GetHost()->dispatcher()->GetDefaultEventTargeter();
aura::Window* bubble_window = bubble_widget()->GetNativeWindow();
gfx::Rect bubble_bounds = bubble_window->GetBoundsInRootWindow();
« no previous file with comments | « ui/events/test/test_event_processor.cc ('k') | ui/views/test/event_generator_delegate_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698