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/test | |
| 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/test')
| -rw-r--r-- | ash/test/ash_test_base.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc index 46291f9..b4b39b4 100644 --- a/ash/test/ash_test_base.cc +++ b/ash/test/ash_test_base.cc @@ -30,7 +30,7 @@ void AshTestBase::SetUp() { ash::Shell::CreateInstance(delegate); helper_.SetUp(); - helper_.InitRootWindow(Shell::GetRootWindow()); + helper_.InitRootWindow(Shell::GetPrimaryRootWindow()); // Disable animations during tests. ui::LayerAnimator::set_disable_animations_for_test(true); @@ -57,7 +57,7 @@ void AshTestBase::ChangeMonitorConfig(float scale, } void AshTestBase::RunAllPendingInMessageLoop() { - helper_.RunAllPendingInMessageLoop(Shell::GetRootWindow()); + helper_.RunAllPendingInMessageLoop(Shell::GetPrimaryRootWindow()); } } // namespace test |