Rename GetRootWindow() -> GetPrimaryRootWindow()

ash/wm/window_modality_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/window_modality_controller.h"
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/capture_tracking_view.h"
 #include "ash/wm/window_util.h"
@@ skipping 169 matching lines @@
   aura::test::TestWindowDelegate d;
   scoped_ptr<aura::Window> w1(aura::test::CreateTestWindowWithDelegate(&d, -1,
       gfx::Rect(0, 0, 100, 100), NULL));
   scoped_ptr<aura::Window> w11(aura::test::CreateTestWindowWithDelegate(&d, -11,
       gfx::Rect(20, 20, 50, 50), NULL));
 
   w1->AddTransientChild(w11.get());
 
   {
     // Clicking a point within w1 should activate that window.
-    aura::test::EventGenerator generator(Shell::GetRootWindow(),
+    aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
                                          gfx::Point(10, 10));
     generator.ClickLeftButton();
     EXPECT_TRUE(wm::IsActiveWindow(w1.get()));
   }
 
   w11->SetProperty(aura::client::kModalKey, ui::MODAL_TYPE_WINDOW);
 
   {
     // Clicking a point within w1 should activate w11.
-    aura::test::EventGenerator generator(Shell::GetRootWindow(),
+    aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
                                          gfx::Point(10, 10));
     generator.ClickLeftButton();
     EXPECT_TRUE(wm::IsActiveWindow(w11.get()));
   }
 }
 
 // Creates windows w1 and non activatiable child w11. Creates transient window
 // w2 and adds it as a transeint child of w1. Ensures that w2 is parented to
 // the parent of w1, and that GetWindowModalTransient(w11) returns w2.
 TEST_F(WindowModalityControllerTest, GetWindowModalTransient) {
@@ skipping 31 matching lines @@
   views::Widget* widget = views::Widget::CreateWindow(NULL);
   scoped_ptr<aura::Window> widget_window(widget->GetNativeView());
   test::CaptureTrackingView* view = new test::CaptureTrackingView;
   widget->client_view()->AddChildView(view);
   widget->SetBounds(gfx::Rect(0, 0, 200, 200));
   view->SetBoundsRect(widget->client_view()->GetLocalBounds());
   widget->Show();
 
   gfx::Point center(view->width() / 2, view->height() / 2);
   views::View::ConvertPointToScreen(view, &center);
-  aura::test::EventGenerator generator(Shell::GetRootWindow(), center);
+  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(), center);
   generator.PressLeftButton();
   EXPECT_TRUE(view->got_press());
 
   views::Widget* modal_widget =
       views::Widget::CreateWindowWithParent(NULL, widget->GetNativeView());
   scoped_ptr<aura::Window> modal_window(modal_widget->GetNativeView());
   modal_window->SetProperty(aura::client::kModalKey, ui::MODAL_TYPE_WINDOW);
   test::CaptureTrackingView* modal_view = new test::CaptureTrackingView;
   modal_widget->client_view()->AddChildView(modal_view);
   modal_widget->SetBounds(gfx::Rect(50, 50, 200, 200));
@@ skipping 14 matching lines @@
   generator.PressLeftButton();
   EXPECT_TRUE(modal_view->got_press());
   EXPECT_FALSE(modal_view->got_capture_lost());
   EXPECT_FALSE(view->got_capture_lost());
   EXPECT_FALSE(view->got_press());
 }
 
 
 }  // namespace internal
 }  // namespace ash