Make GetRootWindow() return a Window instead of a RootWindow.

ash/shell_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/shell.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/ash_switches.h"
@@ skipping 36 matching lines @@
 }
 
 aura::Window* GetAlwaysOnTopContainer() {
   return Shell::GetContainer(
       Shell::GetPrimaryRootWindow(),
       internal::kShellWindowId_AlwaysOnTopContainer);
 }
 
 // Expect ALL the containers!
 void ExpectAllContainers() {
-  aura::RootWindow* root_window = Shell::GetPrimaryRootWindow();
+  aura::Window* root_window = Shell::GetPrimaryRootWindow();
   EXPECT_TRUE(Shell::GetContainer(
       root_window, internal::kShellWindowId_DesktopBackgroundContainer));
   EXPECT_TRUE(Shell::GetContainer(
       root_window, internal::kShellWindowId_DefaultContainer));
   EXPECT_TRUE(Shell::GetContainer(
       root_window, internal::kShellWindowId_AlwaysOnTopContainer));
   EXPECT_TRUE(Shell::GetContainer(
       root_window, internal::kShellWindowId_PanelContainer));
   EXPECT_TRUE(Shell::GetContainer(
       root_window, internal::kShellWindowId_ShelfContainer));
@@ skipping 322 matching lines @@
   Shell* shell = Shell::GetInstance();
   Shell::TestApi test_api(shell);
 
   // We start with the usual window containers.
   ExpectAllContainers();
   // Launcher is visible.
   ShelfWidget* launcher_widget = Launcher::ForPrimaryDisplay()->shelf_widget();
   EXPECT_TRUE(launcher_widget->IsVisible());
   // Launcher is at bottom-left of screen.
   EXPECT_EQ(0, launcher_widget->GetWindowBoundsInScreen().x());
-  EXPECT_EQ(Shell::GetPrimaryRootWindow()->GetHostSize().height(),
-            launcher_widget->GetWindowBoundsInScreen().bottom());
+  EXPECT_EQ(
+      Shell::GetPrimaryRootWindow()->GetDispatcher()->GetHostSize().height(),
+      launcher_widget->GetWindowBoundsInScreen().bottom());
   // We have a desktop background but not a bare layer.
   // TODO (antrim): enable once we find out why it fails component build.
   //  internal::DesktopBackgroundWidgetController* background =
   //      Shell::GetPrimaryRootWindow()->
   //          GetProperty(internal::kWindowDesktopComponent);
   //  EXPECT_TRUE(background);
   //  EXPECT_TRUE(background->widget());
   //  EXPECT_FALSE(background->layer());
 
   // Create a normal window.  It is not maximized.
@@ skipping 63 matching lines @@
 TEST_F(ShellTest, ToggleAutoHide) {
   scoped_ptr<aura::Window> window(new aura::Window(NULL));
   window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL);
   window->SetType(aura::client::WINDOW_TYPE_NORMAL);
   window->Init(ui::LAYER_TEXTURED);
   ParentWindowInPrimaryRootWindow(window.get());
   window->Show();
   wm::ActivateWindow(window.get());
 
   Shell* shell = Shell::GetInstance();
-  aura::RootWindow* root_window = Shell::GetPrimaryRootWindow();
+  aura::Window* root_window = Shell::GetPrimaryRootWindow();
   shell->SetShelfAutoHideBehavior(ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS,
                                   root_window);
   EXPECT_EQ(ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS,
             shell->GetShelfAutoHideBehavior(root_window));
   shell->SetShelfAutoHideBehavior(ash::SHELF_AUTO_HIDE_BEHAVIOR_NEVER,
                                   root_window);
   EXPECT_EQ(ash::SHELF_AUTO_HIDE_BEHAVIOR_NEVER,
             shell->GetShelfAutoHideBehavior(root_window));
   window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MAXIMIZED);
   EXPECT_EQ(ash::SHELF_AUTO_HIDE_BEHAVIOR_NEVER,
@@ skipping 36 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(ShellTest2);
 };
 
 TEST_F(ShellTest2, DontCrashWhenWindowDeleted) {
   window_.reset(new aura::Window(NULL));
   window_->Init(ui::LAYER_NOT_DRAWN);
 }
 
 }  // namespace ash