diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-25 00:41:50 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-25 00:41:50 +0000 |
| commit | 42713f747e45ec2d4d754f449ba8a0edf5deffe6 (patch) | |
| tree | a278abbd3cf1496c36793168ab27a0d43eb6cd55 /ash/wm/screen_dimmer_unittest.cc | |
| parent | 07f1c36a10e6a5dffb01ea324bc8ca8d11b9653f (diff) | |
| download | chromium_src-42713f747e45ec2d4d754f449ba8a0edf5deffe6.zip chromium_src-42713f747e45ec2d4d754f449ba8a0edf5deffe6.tar.gz chromium_src-42713f747e45ec2d4d754f449ba8a0edf5deffe6.tar.bz2 | |
Rename GetRootWindow() -> GetPrimaryRootWindow()
BUG=123160
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10442017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138950 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/screen_dimmer_unittest.cc')
| -rw-r--r-- | ash/wm/screen_dimmer_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ash/wm/screen_dimmer_unittest.cc b/ash/wm/screen_dimmer_unittest.cc index 8b7b58f..ecc6cd5 100644 --- a/ash/wm/screen_dimmer_unittest.cc +++ b/ash/wm/screen_dimmer_unittest.cc @@ -44,7 +44,7 @@ TEST_F(ScreenDimmerTest, DimAndUndim) { // of the root's children. dimmer_->SetDimming(true); ASSERT_TRUE(test_api_->layer() != NULL); - ui::Layer* root_layer = Shell::GetInstance()->GetRootWindow()->layer(); + ui::Layer* root_layer = Shell::GetPrimaryRootWindow()->layer(); ASSERT_TRUE(!root_layer->children().empty()); EXPECT_EQ(test_api_->layer(), root_layer->children().back()); EXPECT_TRUE(test_api_->layer()->visible()); @@ -63,14 +63,14 @@ TEST_F(ScreenDimmerTest, ResizeLayer) { dimmer_->SetDimming(true); ui::Layer* dimming_layer = test_api_->layer(); ASSERT_TRUE(dimming_layer != NULL); - ui::Layer* root_layer = Shell::GetInstance()->GetRootWindow()->layer(); + ui::Layer* root_layer = Shell::GetPrimaryRootWindow()->layer(); EXPECT_EQ(gfx::Rect(root_layer->bounds().size()).ToString(), dimming_layer->bounds().ToString()); // When we resize the root window, the dimming layer should be resized to // match. gfx::Size kNewSize(400, 300); - Shell::GetInstance()->GetRootWindow()->SetHostSize(kNewSize); + Shell::GetPrimaryRootWindow()->SetHostSize(kNewSize); EXPECT_EQ(kNewSize.ToString(), dimming_layer->bounds().size().ToString()); } |