| Index: trunk/src/ui/views/widget/widget_unittest.cc
|
| ===================================================================
|
| --- trunk/src/ui/views/widget/widget_unittest.cc (revision 236092)
|
| +++ trunk/src/ui/views/widget/widget_unittest.cc (working copy)
|
| @@ -1309,8 +1309,8 @@
|
| const gfx::Rect screen_bounds(widget->GetWindowBoundsInScreen());
|
| ui::MouseEvent move_event(ui::ET_MOUSE_MOVED, screen_bounds.CenterPoint(),
|
| screen_bounds.CenterPoint(), 0);
|
| - aura::WindowTreeHostDelegate* rwhd =
|
| - widget->GetNativeWindow()->GetDispatcher()->AsWindowTreeHostDelegate();
|
| + aura::RootWindowHostDelegate* rwhd =
|
| + widget->GetNativeWindow()->GetDispatcher()->AsRootWindowHostDelegate();
|
| rwhd->OnHostMouseEvent(&move_event);
|
| if (last_event_type == ui::ET_MOUSE_ENTERED)
|
| return;
|
| @@ -2014,7 +2014,7 @@
|
| cursor_location_main,
|
| ui::EF_NONE);
|
| top_level_widget.GetNativeView()->GetDispatcher()->
|
| - AsWindowTreeHostDelegate()->OnHostMouseEvent(&move_main);
|
| + AsRootWindowHostDelegate()->OnHostMouseEvent(&move_main);
|
|
|
| EXPECT_EQ(1, widget_view->GetEventCount(ui::ET_MOUSE_ENTERED));
|
| widget_view->ResetCounts();
|
| @@ -2040,7 +2040,7 @@
|
| cursor_location_dialog,
|
| ui::EF_NONE);
|
| top_level_widget.GetNativeView()->GetDispatcher()->
|
| - AsWindowTreeHostDelegate()->OnHostMouseEvent(&mouse_down_dialog);
|
| + AsRootWindowHostDelegate()->OnHostMouseEvent(&mouse_down_dialog);
|
| EXPECT_EQ(1, dialog_widget_view->GetEventCount(ui::ET_MOUSE_PRESSED));
|
|
|
| // Send a mouse move message to the main window. It should not be received by
|
| @@ -2051,7 +2051,7 @@
|
| cursor_location_main2,
|
| ui::EF_NONE);
|
| top_level_widget.GetNativeView()->GetDispatcher()->
|
| - AsWindowTreeHostDelegate()->OnHostMouseEvent(&mouse_down_main);
|
| + AsRootWindowHostDelegate()->OnHostMouseEvent(&mouse_down_main);
|
| EXPECT_EQ(0, widget_view->GetEventCount(ui::ET_MOUSE_MOVED));
|
|
|
| modal_dialog_widget->CloseNow();
|
|
|