diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-19 04:45:00 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-19 04:45:00 +0000 |
| commit | 9557ef13eb27fb806fc1a79e7268cb131ff14201 (patch) | |
| tree | d18327b7f02925625cd7fc3278e2ce6494bfac1e /ash/wm/window_modality_controller_unittest.cc | |
| parent | 49d89f8b55b2e802d40cb9bf7e8a7051924839aa (diff) | |
| download | chromium_src-9557ef13eb27fb806fc1a79e7268cb131ff14201.zip chromium_src-9557ef13eb27fb806fc1a79e7268cb131ff14201.tar.gz chromium_src-9557ef13eb27fb806fc1a79e7268cb131ff14201.tar.bz2 | |
Change EventGenerator to take a RootWindow at construction instead of just assuming one via RootWindow::GetInstance().
http://crbug.com/112131
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9421016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122716 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/window_modality_controller_unittest.cc')
| -rw-r--r-- | ash/wm/window_modality_controller_unittest.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ash/wm/window_modality_controller_unittest.cc b/ash/wm/window_modality_controller_unittest.cc index 5ec3005..c813ef6 100644 --- a/ash/wm/window_modality_controller_unittest.cc +++ b/ash/wm/window_modality_controller_unittest.cc @@ -4,6 +4,7 @@ #include "ash/wm/window_modality_controller.h" +#include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "ash/wm/window_util.h" #include "ui/aura/client/aura_constants.h" @@ -184,7 +185,8 @@ TEST_F(WindowModalityControllerTest, Events) { { // Clicking a point within w1 should activate that window. - aura::test::EventGenerator generator(gfx::Point(10, 10)); + aura::test::EventGenerator generator(Shell::GetRootWindow(), + gfx::Point(10, 10)); generator.ClickLeftButton(); EXPECT_TRUE(IsActiveWindow(w1.get())); } @@ -193,7 +195,8 @@ TEST_F(WindowModalityControllerTest, Events) { { // Clicking a point within w1 should activate w11. - aura::test::EventGenerator generator(gfx::Point(10, 10)); + aura::test::EventGenerator generator(Shell::GetRootWindow(), + gfx::Point(10, 10)); generator.ClickLeftButton(); EXPECT_TRUE(IsActiveWindow(w11.get())); } |