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

Unified Diff: ash/wm/system_modal_container_layout_manager_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/root_window_event_filter_unittest.cc ('k') | ash/wm/toplevel_window_event_filter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/system_modal_container_layout_manager_unittest.cc
===================================================================
--- ash/wm/system_modal_container_layout_manager_unittest.cc (revision 122697)
+++ ash/wm/system_modal_container_layout_manager_unittest.cc (working copy)
@@ -141,7 +141,7 @@
EXPECT_TRUE(IsActiveWindow(t1));
// Attempting to click the parent should result in no activation change.
- aura::test::EventGenerator e1(parent.get());
+ aura::test::EventGenerator e1(Shell::GetRootWindow(), parent.get());
e1.ClickLeftButton();
EXPECT_TRUE(IsActiveWindow(t1));
@@ -156,7 +156,7 @@
EXPECT_EQ(GetModalContainer(), t2->parent());
// t2 should still be active, even after clicking on t1.
- aura::test::EventGenerator e2(t1);
+ aura::test::EventGenerator e2(Shell::GetRootWindow(), t1);
e2.ClickLeftButton();
EXPECT_TRUE(IsActiveWindow(t2));
@@ -189,7 +189,7 @@
EXPECT_TRUE(IsActiveWindow(transient.get()));
// Attempting to click the parent should result in no activation change.
- aura::test::EventGenerator e1(parent.get());
+ aura::test::EventGenerator e1(Shell::GetRootWindow(), parent.get());
e1.ClickLeftButton();
EXPECT_TRUE(IsActiveWindow(transient.get()));
@@ -202,7 +202,7 @@
EXPECT_TRUE(IsActiveWindow(parent.get()));
// Attempting to click unrelated should activate it.
- aura::test::EventGenerator e2(unrelated.get());
+ aura::test::EventGenerator e2(Shell::GetRootWindow(), unrelated.get());
e2.ClickLeftButton();
EXPECT_TRUE(IsActiveWindow(unrelated.get()));
}
@@ -213,7 +213,7 @@
EventTestWindow* main_delegate = new EventTestWindow(false);
scoped_ptr<aura::Window> main(main_delegate->OpenTestWindow(NULL));
EXPECT_TRUE(IsActiveWindow(main.get()));
- aura::test::EventGenerator e1(main.get());
+ aura::test::EventGenerator e1(Shell::GetRootWindow(), main.get());
e1.ClickLeftButton();
EXPECT_EQ(1, main_delegate->mouse_presses());
« no previous file with comments | « ash/wm/root_window_event_filter_unittest.cc ('k') | ash/wm/toplevel_window_event_filter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698