Rename Desktop->RootWindow.

ui/aura_shell/stacking_controller.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/stacking_controller.h"
 
 #include "ui/aura/client/aura_constants.h"
-#include "ui/aura/desktop.h"
+#include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/aura_shell/always_on_top_controller.h"
 #include "ui/aura_shell/shell.h"
 #include "ui/aura_shell/shell_window_ids.h"
 
 namespace aura_shell {
 namespace internal {
 namespace {
 
 aura::Window* GetContainer(int id) {
@@ skipping 11 matching lines @@
 bool IsWindowModal(aura::Window* window) {
   return window->transient_parent() && window->GetIntProperty(aura::kModalKey);
 }
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // StackingController, public:
 
 StackingController::StackingController() {
-  aura::Desktop::GetInstance()->SetStackingClient(this);
+  aura::RootWindow::GetInstance()->SetStackingClient(this);
 }
 
 StackingController::~StackingController() {
 }
 
 void StackingController::Init() {
   always_on_top_controller_.reset(new internal::AlwaysOnTopController);
   always_on_top_controller_->SetContainers(
       GetContainer(internal::kShellWindowId_DefaultContainer),
       GetContainer(internal::kShellWindowId_AlwaysOnTopContainer));
@@ skipping 84 matching lines @@
   if (window_container_id < lock_container_id)
     container = GetContainer(internal::kShellWindowId_ModalContainer);
   else
     container = GetContainer(internal::kShellWindowId_LockModalContainer);
 
   return container;
 }
 
 }  // namespace internal
 }  // namespace aura_shell