Move some more WM functionality down into ash.

ash/wm/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 "ash/wm/modal_container_layout_manager.h"
 
 #include "ash/wm/modality_event_filter.h"
+#include "ash/wm/window_util.h"
 #include "base/bind.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/event.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/aura_shell/shell.h"
-#include "ui/aura_shell/window_util.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"
 
 namespace aura_shell {
 namespace internal {
 
 namespace {
@@ skipping 156 matching lines @@
 
 void ModalContainerLayoutManager::HideModalScreen() {
   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