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

Unified Diff: ash/sticky_keys/sticky_keys_unittest.cc

Issue 184903003: Window ownership -> WindowTreeHost (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 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 | « ash/sticky_keys/sticky_keys_overlay_unittest.cc ('k') | ash/test/ash_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/sticky_keys/sticky_keys_unittest.cc
diff --git a/ash/sticky_keys/sticky_keys_unittest.cc b/ash/sticky_keys/sticky_keys_unittest.cc
index 0b3202cdb32a75ac4f42f3ed5b0b46faa823c555..6da0984063b4f21746605a410544285ea8f3c335 100644
--- a/ash/sticky_keys/sticky_keys_unittest.cc
+++ b/ash/sticky_keys/sticky_keys_unittest.cc
@@ -794,8 +794,8 @@ TEST_F(StickyKeysTest, KeyEventDispatchImpl) {
// Test the actual key event dispatch implementation.
EventBuffer buffer;
ScopedVector<ui::Event> events;
- aura::WindowEventDispatcher* dispatcher = Shell::GetPrimaryRootWindow()
- ->GetDispatcher();
+ aura::WindowEventDispatcher* dispatcher =
+ Shell::GetPrimaryRootWindow()->GetHost()->dispatcher();
Shell::GetInstance()->AddPreTargetHandler(&buffer);
Shell::GetInstance()->sticky_keys_controller()->Enable(true);
@@ -834,8 +834,8 @@ TEST_F(StickyKeysTest, MouseEventDispatchImpl) {
// Test the actual sticky mouse event dispatch implementation.
EventBuffer buffer;
ScopedVector<ui::Event> events;
- aura::WindowEventDispatcher* dispatcher = Shell::GetPrimaryRootWindow()
- ->GetDispatcher();
+ aura::WindowEventDispatcher* dispatcher =
+ Shell::GetPrimaryRootWindow()->GetHost()->dispatcher();
Shell::GetInstance()->AddPreTargetHandler(&buffer);
Shell::GetInstance()->sticky_keys_controller()->Enable(true);
@@ -871,8 +871,8 @@ TEST_F(StickyKeysTest, MouseWheelEventDispatchImpl) {
// Test the actual mouse wheel event dispatch implementation.
EventBuffer buffer;
ScopedVector<ui::Event> events;
- aura::WindowEventDispatcher* dispatcher = Shell::GetPrimaryRootWindow()
- ->GetDispatcher();
+ aura::WindowEventDispatcher* dispatcher =
+ Shell::GetPrimaryRootWindow()->GetHost()->dispatcher();
Shell::GetInstance()->AddPreTargetHandler(&buffer);
Shell::GetInstance()->sticky_keys_controller()->Enable(true);
« no previous file with comments | « ash/sticky_keys/sticky_keys_overlay_unittest.cc ('k') | ash/test/ash_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698