Rename Desktop->RootWindow.

ui/aura_shell/workspace/workspace_manager.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/workspace/workspace_manager.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
-#include "ui/aura/desktop.h"
+#include "ui/aura/root_window.h"
 #include "ui/aura/screen_aura.h"
 #include "ui/aura/window.h"
 #include "ui/aura_shell/workspace/workspace.h"
 #include "ui/aura_shell/workspace/workspace_observer.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/compositor/layer_animator.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/transform.h"
 
 namespace {
@@ skipping 208 matching lines @@
   UpdateContentsView();
 
   FOR_EACH_OBSERVER(WorkspaceObserver, observers_,
                     ActiveWorkspaceChanged(this, old));
 }
 
 gfx::Rect WorkspaceManager::GetWorkAreaBounds(
     const gfx::Rect& workspace_bounds) {
   gfx::Rect bounds = workspace_bounds;
   bounds.Inset(
-      aura::Desktop::GetInstance()->screen()->work_area_insets());
+      aura::RootWindow::GetInstance()->screen()->work_area_insets());
   return bounds;
 }
 
 // Returns the index of the workspace that contains the |window|.
 int WorkspaceManager::GetWorkspaceIndexContaining(aura::Window* window) const {
   for (Workspaces::const_iterator i = workspaces_.begin();
        i != workspaces_.end();
        ++i) {
     if ((*i)->Contains(window))
       return i - workspaces_.begin();
@@ skipping 15 matching lines @@
     ui::Transform transform;
     transform.SetTranslateX(-active_workspace_->bounds().x());
     ui::LayerAnimator::ScopedSettings settings(
         contents_view_->layer()->GetAnimator());
     contents_view_->SetTransform(transform);
   }
 }
 
 }  // namespace internal
 }  // namespace aura_shell