Rename Desktop->RootWindow.

ui/aura_shell/default_container_layout_manager_unittest.cc

 // Copyright (c) 2011 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 "ui/aura_shell/default_container_layout_manager.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_vector.h"
 #include "ui/aura/client/aura_constants.h"
-#include "ui/aura/desktop.h"
+#include "ui/aura/root_window.h"
 #include "ui/aura/screen_aura.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/window.h"
 #include "ui/aura_shell/workspace/workspace.h"
 #include "ui/aura_shell/workspace/workspace_manager.h"
 #include "ui/aura_shell/workspace_controller.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/views/widget/native_widget_aura.h"
 
 namespace aura_shell {
 namespace test {
 
 namespace {
 
 using views::Widget;
 using aura_shell::internal::DefaultContainerLayoutManager;
 
 class DefaultContainerLayoutManagerTest : public aura::test::AuraTestBase {
  public:
   DefaultContainerLayoutManagerTest() : layout_manager_(NULL) {}
   virtual ~DefaultContainerLayoutManagerTest() {}
 
   virtual void SetUp() OVERRIDE {
     aura::test::AuraTestBase::SetUp();
-    aura::Desktop* desktop = aura::Desktop::GetInstance();
+    aura::RootWindow* root_window = aura::RootWindow::GetInstance();
     container_.reset(
-        CreateTestWindow(gfx::Rect(0, 0, 500, 400), desktop));
+        CreateTestWindow(gfx::Rect(0, 0, 500, 400), root_window));
     workspace_controller_.reset(
         new aura_shell::internal::WorkspaceController(container_.get()));
     layout_manager_ = new DefaultContainerLayoutManager(
         workspace_controller_->workspace_manager());
     container_->SetLayoutManager(layout_manager_);
 
-    desktop->SetHostSize(gfx::Size(500, 400));
+    root_window->SetHostSize(gfx::Size(500, 400));
   }
 
   aura::Window* CreateTestWindowWithType(const gfx::Rect& bounds,
                                          aura::Window* parent,
                                          aura::WindowType type) {
     aura::Window* window = new aura::Window(NULL);
     window->SetType(type);
     window->Init(ui::Layer::LAYER_HAS_NO_TEXTURE);
     window->SetBounds(bounds);
     window->Show();
@@ skipping 103 matching lines @@
   popup->SetBounds(gfx::Rect(0, 0, 1000, 1000));
   EXPECT_EQ("0,0 1000x1000", popup->bounds().ToString());
 }
 
 // Make sure a window with a transient parent isn't resized by the layout
 // manager.
 TEST_F(DefaultContainerLayoutManagerTest, IgnoreTransient) {
   scoped_ptr<aura::Window> window(new aura::Window(NULL));
   window->SetType(aura::WINDOW_TYPE_NORMAL);
   window->Init(ui::Layer::LAYER_HAS_NO_TEXTURE);
-  aura::Desktop::GetInstance()->AddTransientChild(window.get());
+  aura::RootWindow::GetInstance()->AddTransientChild(window.get());
   window->SetBounds(gfx::Rect(0, 0, 200, 200));
   window->Show();
   window->SetParent(container());
 
   EXPECT_EQ("0,0 200x200", window->bounds().ToString());
 }
 
 TEST_F(DefaultContainerLayoutManagerTest, Fullscreen) {
   scoped_ptr<aura::Window> w(
       CreateTestWindow(gfx::Rect(0, 0, 100, 100), container()));
@@ skipping 78 matching lines @@
   // restore bounds not change the bounds of the window.
   gfx::Rect new_bounds(50, 50, 50, 50);
   Maximize(w.get());
   w->SetBounds(new_bounds);
   EXPECT_EQ(work_area_bounds.ToString(), w->bounds().ToString());
   Restore(w.get());
   EXPECT_EQ(ui::SHOW_STATE_NORMAL, GetShowState(w.get()));
   EXPECT_EQ(50, w->bounds().height());
 }
 
-// Tests that fullscreen windows get resized after desktop is resized.
-TEST_F(DefaultContainerLayoutManagerTest, FullscreenAfterDesktopResize) {
+// Tests that fullscreen windows get resized after root window is resized.
+TEST_F(DefaultContainerLayoutManagerTest, FullscreenAfterRootWindowResize) {
   scoped_ptr<aura::Window> w1(CreateTestWindow(gfx::Rect(300, 400),
                                                container()));
   gfx::Rect window_bounds = w1->GetTargetBounds();
   gfx::Rect fullscreen_bounds =
       workspace_manager()->FindBy(w1.get())->bounds();
 
   w1->Show();
   EXPECT_EQ(window_bounds.ToString(), w1->bounds().ToString());
 
   Fullscreen(w1.get());
   EXPECT_EQ(fullscreen_bounds.ToString(), w1->bounds().ToString());
 
-  // Resize the desktop.
-  aura::Desktop* desktop = aura::Desktop::GetInstance();
-  gfx::Size new_desktop_size = desktop->GetHostSize();
-  new_desktop_size.Enlarge(100, 200);
-  desktop->OnHostResized(new_desktop_size);
+  // Resize the root window.
+  aura::RootWindow* root_window = aura::RootWindow::GetInstance();
+  gfx::Size new_root_window_size = root_window->GetHostSize();
+  new_root_window_size.Enlarge(100, 200);
+  root_window->OnHostResized(new_root_window_size);
 
   gfx::Rect new_fullscreen_bounds =
       workspace_manager()->FindBy(w1.get())->bounds();
   EXPECT_NE(fullscreen_bounds.size().ToString(),
             new_fullscreen_bounds.size().ToString());
 
   EXPECT_EQ(new_fullscreen_bounds.ToString(),
             w1->GetTargetBounds().ToString());
 
   Restore(w1.get());
 
   // The following test does not pass due to crbug.com/102413.
   // TODO(oshima): Re-enable this once the bug is fixed.
   // EXPECT_EQ(window_bounds.size().ToString(),
   //           w1->GetTargetBounds().size().ToString());
 }
 
-// Tests that maximized windows get resized after desktop is resized.
-TEST_F(DefaultContainerLayoutManagerTest, MaximizeAfterDesktopResize) {
+// Tests that maximized windows get resized after root_window is resized.
+TEST_F(DefaultContainerLayoutManagerTest, MaximizeAfterRootWindowResize) {
   scoped_ptr<aura::Window> w1(CreateTestWindow(gfx::Rect(300, 400),
                                                container()));
   gfx::Rect window_bounds = w1->GetTargetBounds();
   gfx::Rect work_area_bounds =
       workspace_manager()->FindBy(w1.get())->GetWorkAreaBounds();
 
   w1->Show();
   EXPECT_EQ(window_bounds.ToString(), w1->bounds().ToString());
 
   Maximize(w1.get());
   EXPECT_EQ(work_area_bounds.ToString(), w1->bounds().ToString());
 
-  // Resize the desktop.
-  aura::Desktop* desktop = aura::Desktop::GetInstance();
-  gfx::Size new_desktop_size = desktop->GetHostSize();
-  new_desktop_size.Enlarge(100, 200);
-  desktop->OnHostResized(new_desktop_size);
+  // Resize the root window.
+  aura::RootWindow* root_window = aura::RootWindow::GetInstance();
+  gfx::Size new_root_window_size = root_window->GetHostSize();
+  new_root_window_size.Enlarge(100, 200);
+  root_window->OnHostResized(new_root_window_size);
 
   gfx::Rect new_work_area_bounds =
       workspace_manager()->FindBy(w1.get())->bounds();
   EXPECT_NE(work_area_bounds.size().ToString(),
             new_work_area_bounds.size().ToString());
 
   EXPECT_EQ(new_work_area_bounds.ToString(),
             w1->GetTargetBounds().ToString());
 
   Restore(w1.get());
   // The following test does not pass due to crbug.com/102413.
   // TODO(oshima): Re-enable this once the bug is fixed.
   // EXPECT_EQ(window_bounds.size().ToString(),
   //           w1->GetTargetBounds().size().ToString());
 }
 
 }  // namespace test
 }  // namespace aura_shell