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

Unified Diff: ash/drag_drop/drag_drop_controller_unittest.cc

Issue 9421016: Change EventGenerator to take a RootWindow at construction instead of just assuming one via RootWin… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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/accelerators/accelerator_filter_unittest.cc ('k') | ash/ime/input_method_event_filter_unittest.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
===================================================================
--- 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;
« no previous file with comments | « ash/accelerators/accelerator_filter_unittest.cc ('k') | ash/ime/input_method_event_filter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698