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

Unified Diff: ash/drag_drop/drag_drop_controller_unittest.cc

Issue 37733003: Make GetRootWindow() return a Window instead of a RootWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 2 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/display/screen_position_controller.cc ('k') | ash/drag_drop/drag_drop_tracker.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/drag_drop/drag_drop_controller_unittest.cc
diff --git a/ash/drag_drop/drag_drop_controller_unittest.cc b/ash/drag_drop/drag_drop_controller_unittest.cc
index fd26f3704b41d1219a53f66a71169da656606805..fa4f2bcde2afe4a4c8b50002caebdb136ecf9736 100644
--- a/ash/drag_drop/drag_drop_controller_unittest.cc
+++ b/ash/drag_drop/drag_drop_controller_unittest.cc
@@ -283,7 +283,8 @@ void DispatchGesture(ui::EventType gesture_type, gfx::Point location) {
ui::EventTimeForNow(),
ui::GestureEventDetails(gesture_type, 0, 0),
1);
- Shell::GetPrimaryRootWindow()->DispatchGestureEvent(&gesture_event);
+ Shell::GetPrimaryRootWindow()->GetDispatcher()->DispatchGestureEvent(
+ &gesture_event);
}
bool IsGestureEventType(ui::EventType type) {
@@ -762,8 +763,8 @@ TEST_F(DragDropControllerTest, SyntheticEventsDuringDragDrop) {
gfx::Point mouse_move_location = drag_view->bounds().CenterPoint();
ui::MouseEvent mouse_move(ui::ET_MOUSE_MOVED, mouse_move_location,
mouse_move_location, 0);
- Shell::GetPrimaryRootWindow()->AsRootWindowHostDelegate()->OnHostMouseEvent(
- &mouse_move);
+ Shell::GetPrimaryRootWindow()->GetDispatcher()->AsRootWindowHostDelegate()->
+ OnHostMouseEvent(&mouse_move);
}
generator.ReleaseLeftButton();
« no previous file with comments | « ash/display/screen_position_controller.cc ('k') | ash/drag_drop/drag_drop_tracker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698