Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(80)

Unified Diff: ash/wm/activation_controller_unittest.cc

Issue 10442017: Rename GetRootWindow() -> GetPrimaryRootWindow() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: git-try -b linux_chromeos,win_aura Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm/activation_controller.cc ('k') | ash/wm/base_layout_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/activation_controller_unittest.cc
diff --git a/ash/wm/activation_controller_unittest.cc b/ash/wm/activation_controller_unittest.cc
index ad99e02f5d4b7861d0ee7220994dcb470fb53f3e..9a1e6f15f63c0c353b18f57d2502e9897232a598 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()));
« no previous file with comments | « ash/wm/activation_controller.cc ('k') | ash/wm/base_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698