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/activation_controller_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/activation_controller_unittest.cc')
| -rw-r--r-- | ash/wm/activation_controller_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ash/wm/activation_controller_unittest.cc b/ash/wm/activation_controller_unittest.cc index ad99e02..9a1e6f1 100644 --- a/ash/wm/activation_controller_unittest.cc +++ b/ash/wm/activation_controller_unittest.cc @@ -196,7 +196,7 @@ TEST_F(ActivationControllerTest, ClickOnMenu) { EXPECT_EQ(NULL, wm::GetActiveWindow()); // Clicking on an activatable window activtes the window. - aura::test::EventGenerator generator(Shell::GetRootWindow(), w1.get()); + aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(), w1.get()); generator.ClickLeftButton(); EXPECT_TRUE(wm::IsActiveWindow(w1.get())); @@ -321,7 +321,7 @@ TEST_F(ActivationControllerTest, PreventFocusToNonActivatableWindow) { &wd, -1, gfx::Rect(50, 50), NULL)); // The RootWindow is a non-activatable parent. scoped_ptr<aura::Window> w2(aura::test::CreateTestWindowWithDelegate( - &wd, -2, gfx::Rect(50, 50), Shell::GetRootWindow())); + &wd, -2, gfx::Rect(50, 50), Shell::GetPrimaryRootWindow())); scoped_ptr<aura::Window> w21(aura::test::CreateTestWindowWithDelegate( &wd, -21, gfx::Rect(50, 50), w2.get())); @@ -362,7 +362,7 @@ TEST_F(ActivationControllerTest, CanActivateWindowIteselfTest) // The RootWindow is a non-activatable parent. scoped_ptr<aura::Window> w2(aura::test::CreateTestWindowWithDelegate( - &wd, -2, gfx::Rect(50, 50), Shell::GetRootWindow())); + &wd, -2, gfx::Rect(50, 50), Shell::GetPrimaryRootWindow())); scoped_ptr<aura::Window> w21(aura::test::CreateTestWindowWithDelegate( &wd, -21, gfx::Rect(50, 50), w2.get())); EXPECT_FALSE(wm::CanActivateWindow(w2.get())); |