diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-11 00:12:39 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-11 00:12:39 +0000 |
| commit | 7b0f750bf7b0ccd2f0962817bab1460342d113e9 (patch) | |
| tree | 89809ac408028af8ecff717caf7673e33bdd0dc7 /ash/wm/window_animations_unittest.cc | |
| parent | 7208e05ab641d7dbc83bfc2bf202d2ece0445a74 (diff) | |
| download | chromium_src-7b0f750bf7b0ccd2f0962817bab1460342d113e9.zip chromium_src-7b0f750bf7b0ccd2f0962817bab1460342d113e9.tar.gz chromium_src-7b0f750bf7b0ccd2f0962817bab1460342d113e9.tar.bz2 | |
Change GetContainer to take a root window
Update the use of GetContainer to use the correct root window.
BUG=123160
TEST=no functional change. all tests must pass.
Review URL: https://chromiumcodereview.appspot.com/10540076
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141384 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/window_animations_unittest.cc')
| -rw-r--r-- | ash/wm/window_animations_unittest.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/ash/wm/window_animations_unittest.cc b/ash/wm/window_animations_unittest.cc index 9628db2..bf51c1e 100644 --- a/ash/wm/window_animations_unittest.cc +++ b/ash/wm/window_animations_unittest.cc @@ -23,7 +23,8 @@ typedef ash::test::AshTestBase WindowAnimationsTest; TEST_F(WindowAnimationsTest, HideShow) { aura::Window* default_container = - ash::Shell::GetInstance()->GetContainer( + ash::Shell::GetContainer( + Shell::GetPrimaryRootWindow(), internal::kShellWindowId_DefaultContainer); scoped_ptr<aura::Window> window( aura::test::CreateTestWindowWithId(0, default_container)); @@ -60,7 +61,8 @@ TEST_F(WindowAnimationsTest, HideShow) { TEST_F(WindowAnimationsTest, ShowHide) { aura::Window* default_container = - ash::Shell::GetInstance()->GetContainer( + ash::Shell::GetContainer( + Shell::GetPrimaryRootWindow(), internal::kShellWindowId_DefaultContainer); scoped_ptr<aura::Window> window( aura::test::CreateTestWindowWithId(0, default_container)); @@ -97,7 +99,8 @@ TEST_F(WindowAnimationsTest, ShowHide) { TEST_F(WindowAnimationsTest, LayerTargetVisibility) { aura::Window* default_container = - ash::Shell::GetInstance()->GetContainer( + ash::Shell::GetContainer( + Shell::GetPrimaryRootWindow(), internal::kShellWindowId_DefaultContainer); scoped_ptr<aura::Window> window( aura::test::CreateTestWindowWithId(0, default_container)); @@ -113,7 +116,8 @@ TEST_F(WindowAnimationsTest, LayerTargetVisibility) { TEST_F(WindowAnimationsTest, CrossFadeToBounds) { Window* default_container = - ash::Shell::GetInstance()->GetContainer( + ash::Shell::GetContainer( + Shell::GetPrimaryRootWindow(), internal::kShellWindowId_DefaultContainer); scoped_ptr<Window> window( aura::test::CreateTestWindowWithId(0, default_container)); |