Rename GetRootWindow() -> GetPrimaryRootWindow()

ash/wm/activation_controller_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/activation_controller.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_activation_delegate.h"
@@ skipping 178 matching lines @@
   aura::test::TestWindowDelegate wd;
   TestActivationDelegate ad1;
   TestActivationDelegate ad2(false);
 
   scoped_ptr<aura::Window> w1(aura::test::CreateTestWindowWithDelegate(
       &wd, 1, gfx::Rect(100, 100), NULL));
   ad1.SetWindow(w1.get());
   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()));
 
   // Creates a menu that covers the transient parent.
   scoped_ptr<aura::Window> menu(aura::test::CreateTestWindowWithDelegateAndType(
       &wd, aura::client::WINDOW_TYPE_MENU, 2, gfx::Rect(100, 100), NULL));
   ad2.SetWindow(menu.get());
   w1->AddTransientChild(menu.get());
 
   // Clicking on a menu whose transient parent is active window shouldn't
@@ skipping 104 matching lines @@
 }
 
 // Verifies that we prevent all attempts to focus a child of a non-activatable
 // window from claiming focus to that window.
 TEST_F(ActivationControllerTest, PreventFocusToNonActivatableWindow) {
   aura::test::TestWindowDelegate wd;
   scoped_ptr<aura::Window> w1(aura::test::CreateTestWindowWithDelegate(
       &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()));
 
   wm::ActivateWindow(w1.get());
   EXPECT_TRUE(wm::IsActiveWindow(w1.get()));
   EXPECT_TRUE(w1->HasFocus());
 
   // Try activating |w2|. It's not a child of an activatable container, so it
   // should neither be activated nor get focus.
   wm::ActivateWindow(w2.get());
@@ skipping 20 matching lines @@
 {
   aura::test::TestWindowDelegate wd;
 
   // Normal Window
   scoped_ptr<aura::Window> w1(aura::test::CreateTestWindowWithDelegate(
       &wd, -1, gfx::Rect(50, 50), NULL));
   EXPECT_TRUE(wm::CanActivateWindow(w1.get()));
 
   // 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()));
   EXPECT_FALSE(wm::CanActivateWindow(w21.get()));
 
   // The window has a transient child.
   scoped_ptr<aura::Window> w3(aura::test::CreateTestWindowWithDelegate(
       &wd, -3, gfx::Rect(50, 50), NULL));
   scoped_ptr<aura::Window> w31(aura::test::CreateTestWindowWithDelegate(
       &wd, -31, gfx::Rect(50, 50), NULL));
@@ skipping 84 matching lines @@
   scoped_ptr<aura::Window> w1(aura::test::CreateTestWindowWithDelegate(
     &wd, -1, gfx::Rect(50, 50, 50, 50), NULL));
 
   EXPECT_TRUE(wm::CanActivateWindow(w1.get()));
   w1->layer()->SetVisible(false);
   EXPECT_TRUE(wm::CanActivateWindow(w1.get()));
 }
 
 }  // namespace test
 }  // namespace ash