diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-17 20:10:34 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-17 20:10:34 +0000 |
| commit | e73bd78073df416f9bc1f9633ef6b55fc1362d5e (patch) | |
| tree | a13f744560deebaff1de463c16fd1df46c95916e /ash/shell_unittest.cc | |
| parent | f4dda48296102f4401ecf82c6dbd91c706cb6ecd (diff) | |
| download | chromium_src-e73bd78073df416f9bc1f9633ef6b55fc1362d5e.zip chromium_src-e73bd78073df416f9bc1f9633ef6b55fc1362d5e.tar.gz chromium_src-e73bd78073df416f9bc1f9633ef6b55fc1362d5e.tar.bz2 | |
Provide a RootWindow instance getter on the shell, in preparation for removing RootWindow::GetInstance().
http://crbug.com/112131
TEST=compiles
Review URL: https://chromiumcodereview.appspot.com/9395038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122561 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell_unittest.cc')
| -rw-r--r-- | ash/shell_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ash/shell_unittest.cc b/ash/shell_unittest.cc index 9782fbd..076ff99 100644 --- a/ash/shell_unittest.cc +++ b/ash/shell_unittest.cc @@ -349,7 +349,7 @@ TEST_F(ShellTest, MAYBE_ChangeWindowMode) { EXPECT_TRUE(launcher_widget->IsVisible()); // Launcher is at bottom-left of screen. EXPECT_EQ(0, launcher_widget->GetWindowScreenBounds().x()); - EXPECT_EQ(RootWindow::GetInstance()->GetHostSize().height(), + EXPECT_EQ(Shell::GetRootWindow()->GetHostSize().height(), launcher_widget->GetWindowScreenBounds().bottom()); // We have a desktop background but not a bare layer. EXPECT_TRUE(shell->root_window_layout_->background_widget()); @@ -391,7 +391,7 @@ TEST_F(ShellTest, MAYBE_ChangeWindowMode) { EXPECT_TRUE(launcher_widget->IsVisible()); // Launcher is at bottom-left of screen. EXPECT_EQ(0, launcher_widget->GetWindowScreenBounds().x()); - EXPECT_EQ(RootWindow::GetInstance()->GetHostSize().height(), + EXPECT_EQ(Shell::GetRootWindow()->GetHostSize().height(), launcher_widget->GetWindowScreenBounds().bottom()); // Desktop background is back. EXPECT_TRUE(shell->root_window_layout_->background_widget()); @@ -409,7 +409,7 @@ TEST_F(ShellTest, ResizeRootWindow) { Shell::GetInstance()->set_dynamic_window_mode(true); // Switching to a small screen enables compact window mode. - RootWindow::GetInstance()->SetHostSize(gfx::Size(1024, 768)); + Shell::GetRootWindow()->SetHostSize(gfx::Size(1024, 768)); EXPECT_TRUE(Shell::GetInstance()->IsWindowModeCompact()); // Launcher is hidden. @@ -417,7 +417,7 @@ TEST_F(ShellTest, ResizeRootWindow) { EXPECT_FALSE(launcher_widget->IsVisible()); // Switching to a large screen disables compact window mode. - RootWindow::GetInstance()->SetHostSize(gfx::Size(1920, 1080)); + Shell::GetRootWindow()->SetHostSize(gfx::Size(1920, 1080)); EXPECT_FALSE(Shell::GetInstance()->IsWindowModeCompact()); // Launcher is in the bottom-left corner of window. |