Index: ash/drag_drop/drag_drop_controller_unittest.cc |
=================================================================== |
--- ash/drag_drop/drag_drop_controller_unittest.cc (revision 122697) |
+++ ash/drag_drop/drag_drop_controller_unittest.cc (working copy) |
@@ -216,7 +216,8 @@ |
AddViewToWidgetAndResize(widget.get(), drag_view); |
ui::OSExchangeData data; |
data.SetString(UTF8ToUTF16("I am being dragged")); |
- aura::test::EventGenerator generator(widget->GetNativeView()); |
+ aura::test::EventGenerator generator(Shell::GetRootWindow(), |
+ widget->GetNativeView()); |
generator.PressLeftButton(); |
int num_drags = 17; |
@@ -257,7 +258,7 @@ |
ui::OSExchangeData data; |
data.SetString(UTF8ToUTF16("I am being dragged")); |
- aura::test::EventGenerator generator; |
+ aura::test::EventGenerator generator(Shell::GetRootWindow()); |
generator.MoveMouseRelativeTo(widget->GetNativeView(), |
drag_view1->bounds().CenterPoint()); |
generator.PressLeftButton(); |
@@ -314,7 +315,8 @@ |
ui::OSExchangeData data; |
data.SetString(UTF8ToUTF16("I am being dragged")); |
- aura::test::EventGenerator generator(widget1->GetNativeView()); |
+ aura::test::EventGenerator generator(Shell::GetRootWindow(), |
+ widget1->GetNativeView()); |
generator.PressLeftButton(); |
int num_drags = drag_view1->width(); |
@@ -362,7 +364,7 @@ |
ui::OSExchangeData data; |
data.SetString(UTF8ToUTF16("I am being dragged")); |
- aura::test::EventGenerator generator; |
+ aura::test::EventGenerator generator(Shell::GetRootWindow()); |
generator.MoveMouseToCenterOf(widget->GetNativeView()); |
generator.PressLeftButton(); |
@@ -419,7 +421,8 @@ |
DragTestView* drag_view = new DragTestView; |
AddViewToWidgetAndResize(widget.get(), drag_view); |
- aura::test::EventGenerator generator(widget->GetNativeView()); |
+ aura::test::EventGenerator generator(Shell::GetRootWindow(), |
+ widget->GetNativeView()); |
ui::OSExchangeData data; |
std::string data_str("I am being dragged"); |
data.SetString(ASCIIToUTF16(data_str)); |
@@ -441,7 +444,8 @@ |
ui::OSExchangeData data; |
data.SetString(UTF8ToUTF16("I am being dragged")); |
- aura::test::EventGenerator generator(widget->GetNativeView()); |
+ aura::test::EventGenerator generator(Shell::GetRootWindow(), |
+ widget->GetNativeView()); |
generator.PressLeftButton(); |
int num_drags = 17; |
@@ -480,7 +484,8 @@ |
AddViewToWidgetAndResize(widget.get(), drag_view); |
ui::OSExchangeData data; |
data.SetString(UTF8ToUTF16("I am being dragged")); |
- aura::test::EventGenerator generator(widget->GetNativeView()); |
+ aura::test::EventGenerator generator(Shell::GetRootWindow(), |
+ widget->GetNativeView()); |
generator.PressLeftButton(); |
int num_drags = 17; |