Rename Desktop->RootWindow.

ui/aura_shell/modal_container_layout_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/modal_container_layout_manager.h"
 
 #include "base/bind.h"
 #include "ui/aura/client/aura_constants.h"
-#include "ui/aura/desktop.h"
 #include "ui/aura/event.h"
+#include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/aura_shell/modality_event_filter.h"
 #include "ui/aura_shell/shell.h"
 #include "ui/aura_shell/stacking_controller.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/compositor/layer_animator.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
@@ skipping 138 matching lines @@
   params.parent = container_;
   params.bounds = gfx::Rect(0, 0, container_->bounds().width(),
                             container_->bounds().height());
   modal_screen_->Init(params);
   modal_screen_->GetNativeView()->SetName(
       "ModalContainerLayoutManager.ModalScreen");
   modal_screen_->SetContentsView(new ScreenView);
   modal_screen_->GetNativeView()->layer()->SetOpacity(0.0f);
   modal_screen_->GetNativeView()->layer()->GetAnimator()->AddObserver(this);
 
-  Shell::GetInstance()->AddDesktopEventFilter(modality_filter_.get());
+  Shell::GetInstance()->AddRootWindowEventFilter(modality_filter_.get());
 
   ui::LayerAnimator::ScopedSettings settings(
       modal_screen_->GetNativeView()->layer()->GetAnimator());
   modal_screen_->Show();
   modal_screen_->GetNativeView()->layer()->SetOpacity(0.5f);
   container_->StackChildAtTop(modal_screen_->GetNativeView());
 }
 
 void ModalContainerLayoutManager::DestroyModalScreen() {
   modal_screen_->GetNativeView()->layer()->GetAnimator()->RemoveObserver(this);
   modal_screen_->Close();
   modal_screen_ = NULL;
 }
 
 void ModalContainerLayoutManager::HideModalScreen() {
-  Shell::GetInstance()->RemoveDesktopEventFilter(modality_filter_.get());
+  Shell::GetInstance()->RemoveRootWindowEventFilter(modality_filter_.get());
   ui::LayerAnimator::ScopedSettings settings(
       modal_screen_->GetNativeView()->layer()->GetAnimator());
   modal_screen_->GetNativeView()->layer()->SetOpacity(0.0f);
 }
 
 }  // namespace internal
 }  // namespace aura_shell