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

ash/wm/lock_state_controller.cc

 // Copyright 2013 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/lock_state_controller.h"
 
 #include "ash/ash_switches.h"
 #include "ash/cancel_mode.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/session_state_animator.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/timer/timer.h"
 #include "ui/aura/root_window.h"
 #include "ui/compositor/layer_animation_sequence.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/views/corewm/compound_event_filter.h"
 
 #if defined(OS_CHROMEOS)
 #include "base/sys_info.h"
 #endif
 
 namespace ash {
 
 namespace {
 
 aura::Window* GetBackground() {
-  aura::RootWindow* root_window = Shell::GetPrimaryRootWindow();
+  aura::Window* root_window = Shell::GetPrimaryRootWindow();
   return Shell::GetContainer(root_window,
       internal::kShellWindowId_DesktopBackgroundContainer);
 }
 
 bool IsBackgroundHidden() {
   return !GetBackground()->IsVisible();
 }
 
 void ShowBackground() {
   ui::ScopedLayerAnimationSettings settings(
@@ skipping 108 matching lines @@
 }
 
 LockStateController::LockStateController()
     : animator_(new internal::SessionStateAnimator()),
       login_status_(user::LOGGED_IN_NONE),
       system_is_locked_(false),
       shutting_down_(false),
       shutdown_after_lock_(false),
       animating_lock_(false),
       can_cancel_lock_animation_(false) {
-  Shell::GetPrimaryRootWindow()->AddRootWindowObserver(this);
+  Shell::GetPrimaryRootWindow()->GetDispatcher()->AddRootWindowObserver(this);
 }
 
 LockStateController::~LockStateController() {
-  Shell::GetPrimaryRootWindow()->RemoveRootWindowObserver(this);
+  Shell::GetPrimaryRootWindow()->GetDispatcher()->RemoveRootWindowObserver(
+      this);
 }
 
 void LockStateController::SetDelegate(LockStateControllerDelegate* delegate) {
   delegate_.reset(delegate);
 }
 
 void LockStateController::AddObserver(LockStateObserver* observer) {
   observers_.AddObserver(observer);
 }
 
@@ skipping 474 matching lines @@
       unlocked_properties_->background_is_hidden) {
     animator_->StartAnimationWithObserver(
         internal::SessionStateAnimator::DESKTOP_BACKGROUND,
         internal::SessionStateAnimator::ANIMATION_FADE_OUT,
         speed,
         observer);
   }
 }
 
 }  // namespace ash