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/shell_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/shell_unittest.cc')
-rw-r--r-- | ash/shell_unittest.cc | 81 |
1 files changed, 44 insertions, 37 deletions
diff --git a/ash/shell_unittest.cc b/ash/shell_unittest.cc index 59d17c7..a5e7939 100644 --- a/ash/shell_unittest.cc +++ b/ash/shell_unittest.cc @@ -33,44 +33,46 @@ views::Widget* CreateTestWindow(const views::Widget::InitParams& params) { } aura::Window* GetDefaultContainer() { - return Shell::GetInstance()->GetContainer( - ash::internal::kShellWindowId_DefaultContainer); + return Shell::GetContainer( + Shell::GetPrimaryRootWindow(), + internal::kShellWindowId_DefaultContainer); } aura::Window* GetAlwaysOnTopContainer() { - return Shell::GetInstance()->GetContainer( - ash::internal::kShellWindowId_AlwaysOnTopContainer); + return Shell::GetContainer( + Shell::GetPrimaryRootWindow(), + internal::kShellWindowId_AlwaysOnTopContainer); } // Expect ALL the containers! void ExpectAllContainers() { - Shell* shell = Shell::GetInstance(); - EXPECT_TRUE( - shell->GetContainer(internal::kShellWindowId_DesktopBackgroundContainer)); - EXPECT_TRUE( - shell->GetContainer(internal::kShellWindowId_DefaultContainer)); - EXPECT_TRUE( - shell->GetContainer(internal::kShellWindowId_AlwaysOnTopContainer)); - EXPECT_TRUE( - shell->GetContainer(internal::kShellWindowId_PanelContainer)); - EXPECT_TRUE( - shell->GetContainer(internal::kShellWindowId_LauncherContainer)); - EXPECT_TRUE( - shell->GetContainer(internal::kShellWindowId_SystemModalContainer)); - EXPECT_TRUE( - shell->GetContainer(internal::kShellWindowId_LockScreenContainer)); - EXPECT_TRUE( - shell->GetContainer(internal::kShellWindowId_LockSystemModalContainer)); - EXPECT_TRUE( - shell->GetContainer(internal::kShellWindowId_StatusContainer)); - EXPECT_TRUE( - shell->GetContainer(internal::kShellWindowId_MenuContainer)); - EXPECT_TRUE(shell->GetContainer( - internal::kShellWindowId_DragImageAndTooltipContainer)); - EXPECT_TRUE( - shell->GetContainer(internal::kShellWindowId_SettingBubbleContainer)); - EXPECT_TRUE( - shell->GetContainer(internal::kShellWindowId_OverlayContainer)); + aura::RootWindow* root_window = Shell::GetPrimaryRootWindow(); + EXPECT_TRUE(Shell::GetContainer( + root_window, internal::kShellWindowId_DesktopBackgroundContainer)); + EXPECT_TRUE(Shell::GetContainer( + root_window, internal::kShellWindowId_DefaultContainer)); + EXPECT_TRUE(Shell::GetContainer( + root_window, internal::kShellWindowId_AlwaysOnTopContainer)); + EXPECT_TRUE(Shell::GetContainer( + root_window, internal::kShellWindowId_PanelContainer)); + EXPECT_TRUE(Shell::GetContainer( + root_window, internal::kShellWindowId_LauncherContainer)); + EXPECT_TRUE(Shell::GetContainer( + root_window, internal::kShellWindowId_SystemModalContainer)); + EXPECT_TRUE(Shell::GetContainer( + root_window, internal::kShellWindowId_LockScreenContainer)); + EXPECT_TRUE(Shell::GetContainer( + root_window, internal::kShellWindowId_LockSystemModalContainer)); + EXPECT_TRUE(Shell::GetContainer( + root_window, internal::kShellWindowId_StatusContainer)); + EXPECT_TRUE(Shell::GetContainer( + root_window, internal::kShellWindowId_MenuContainer)); + EXPECT_TRUE(Shell::GetContainer( + root_window, internal::kShellWindowId_DragImageAndTooltipContainer)); + EXPECT_TRUE(Shell::GetContainer( + root_window, internal::kShellWindowId_SettingBubbleContainer)); + EXPECT_TRUE(Shell::GetContainer( + root_window, internal::kShellWindowId_OverlayContainer)); } void TestCreateWindow(views::Widget::InitParams::Type type, @@ -186,8 +188,9 @@ TEST_F(ShellTest, CreateModalWindow) { modal_widget->Show(); // It should be in modal container. - aura::Window* modal_container = Shell::GetInstance()->GetContainer( - ash::internal::kShellWindowId_SystemModalContainer); + aura::Window* modal_container = Shell::GetContainer( + Shell::GetPrimaryRootWindow(), + internal::kShellWindowId_SystemModalContainer); EXPECT_EQ(modal_container, modal_widget->GetNativeWindow()->parent()); modal_widget->Close(); @@ -207,13 +210,15 @@ TEST_F(ShellTest, CreateLockScreenModalWindow) { // Create a LockScreen window. views::Widget* lock_widget = CreateTestWindow(widget_params); - ash::Shell::GetInstance()->GetContainer( + ash::Shell::GetContainer( + Shell::GetPrimaryRootWindow(), ash::internal::kShellWindowId_LockScreenContainer)-> AddChild(lock_widget->GetNativeView()); lock_widget->Show(); // It should be in LockScreen container. - aura::Window* lock_screen = Shell::GetInstance()->GetContainer( + aura::Window* lock_screen = Shell::GetContainer( + Shell::GetPrimaryRootWindow(), ash::internal::kShellWindowId_LockScreenContainer); EXPECT_EQ(lock_screen, lock_widget->GetNativeWindow()->parent()); @@ -223,7 +228,8 @@ TEST_F(ShellTest, CreateLockScreenModalWindow) { lock_modal_widget->Show(); // It should be in LockScreen modal container. - aura::Window* lock_modal_container = Shell::GetInstance()->GetContainer( + aura::Window* lock_modal_container = Shell::GetContainer( + Shell::GetPrimaryRootWindow(), ash::internal::kShellWindowId_LockSystemModalContainer); EXPECT_EQ(lock_modal_container, lock_modal_widget->GetNativeWindow()->parent()); @@ -234,7 +240,8 @@ TEST_F(ShellTest, CreateLockScreenModalWindow) { modal_widget->Show(); // It should be in non-LockScreen modal container. - aura::Window* modal_container = Shell::GetInstance()->GetContainer( + aura::Window* modal_container = Shell::GetContainer( + Shell::GetPrimaryRootWindow(), ash::internal::kShellWindowId_SystemModalContainer); EXPECT_EQ(modal_container, modal_widget->GetNativeWindow()->parent()); |