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

Unified Diff: ash/accelerators/nested_dispatcher_controller_unittest.cc

Issue 72503002: Remove some pass-thrus on RootWindow API in favor of exposing the RootWindowHost again. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 1 month 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/accelerators/accelerator_controller.cc ('k') | ash/display/display_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/accelerators/nested_dispatcher_controller_unittest.cc
diff --git a/ash/accelerators/nested_dispatcher_controller_unittest.cc b/ash/accelerators/nested_dispatcher_controller_unittest.cc
index 232ae9cf22c296786f10b207fd4555bb6edac7d3..fa9fbe081c6538278b81a4f4145d41686736d754 100644
--- a/ash/accelerators/nested_dispatcher_controller_unittest.cc
+++ b/ash/accelerators/nested_dispatcher_controller_unittest.cc
@@ -79,9 +79,10 @@ void DispatchKeyReleaseA() {
// ShouldHandle() in ui/base/accelerators/accelerator_manager.cc for details.
#if defined(OS_WIN)
MSG native_event_down = { NULL, WM_KEYDOWN, ui::VKEY_A, 0 };
- ash::Shell::GetPrimaryRootWindow()->PostNativeEvent(native_event_down);
+ ash::Shell::GetPrimaryRootWindow()->host()->PostNativeEvent(
+ native_event_down);
MSG native_event_up = { NULL, WM_KEYUP, ui::VKEY_A, 0 };
- ash::Shell::GetPrimaryRootWindow()->PostNativeEvent(native_event_up);
+ ash::Shell::GetPrimaryRootWindow()->host()->PostNativeEvent(native_event_up);
#elif defined(USE_X11)
XEvent native_event;
ui::InitXKeyEventForTesting(ui::ET_KEY_PRESSED,
@@ -90,16 +91,16 @@ void DispatchKeyReleaseA() {
&native_event);
aura::WindowEventDispatcher* dispatcher =
ash::Shell::GetPrimaryRootWindow()->GetDispatcher();
- dispatcher->PostNativeEvent(&native_event);
+ dispatcher->host()->PostNativeEvent(&native_event);
ui::InitXKeyEventForTesting(ui::ET_KEY_RELEASED,
ui::VKEY_A,
0,
&native_event);
- dispatcher->PostNativeEvent(&native_event);
+ dispatcher->host()->PostNativeEvent(&native_event);
#endif
// Send noop event to signal dispatcher to exit.
- dispatcher->PostNativeEvent(ui::CreateNoopEvent());
+ dispatcher->host()->PostNativeEvent(ui::CreateNoopEvent());
}
} // namespace
« no previous file with comments | « ash/accelerators/accelerator_controller.cc ('k') | ash/display/display_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698