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

Unified Diff: ash/wm/root_window_event_filter_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/wm/activation_controller_unittest.cc ('k') | ash/wm/system_modal_container_layout_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/root_window_event_filter_unittest.cc
===================================================================
--- ash/wm/root_window_event_filter_unittest.cc (revision 122697)
+++ ash/wm/root_window_event_filter_unittest.cc (working copy)
@@ -98,7 +98,7 @@
SK_ColorGRAY, -13, gfx::Rect(5, 470, 50, 50), w1.get()));
// Click on a sub-window (w121) to focus it.
- aura::test::EventGenerator generator(w121.get());
+ aura::test::EventGenerator generator(Shell::GetRootWindow(), w121.get());
generator.ClickLeftButton();
aura::internal::FocusManager* focus_manager = w121->GetFocusManager();
@@ -195,7 +195,7 @@
{
// Click on window2.
- aura::test::EventGenerator generator(w2.get());
+ aura::test::EventGenerator generator(Shell::GetRootWindow(), w2.get());
generator.ClickLeftButton();
// Window2 should have become active.
@@ -211,7 +211,7 @@
{
// Click back on window1, but set it up so w1 doesn't activate on click.
- aura::test::EventGenerator generator(w1.get());
+ aura::test::EventGenerator generator(Shell::GetRootWindow(), w1.get());
d1.set_activate(false);
generator.ClickLeftButton();
@@ -241,7 +241,7 @@
scoped_ptr<aura::Window> w11(CreateTestWindowWithDelegate(
&wd, -1, gfx::Rect(10, 10, 10, 10), w1.get()));
{
- aura::test::EventGenerator generator(w11.get());
+ aura::test::EventGenerator generator(Shell::GetRootWindow(), w11.get());
// First set the focus to the child |w11|.
generator.ClickLeftButton();
EXPECT_EQ(w11.get(), focus_manager->GetFocusedWindow());
« no previous file with comments | « ash/wm/activation_controller_unittest.cc ('k') | ash/wm/system_modal_container_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698