Revert 114095 - Move the concept of Activation to the Shell.

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/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/window_util.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"
 
 namespace aura_shell {
 namespace internal {
 
 namespace {
@@ skipping 94 matching lines @@
 
 void ModalContainerLayoutManager::OnLayerAnimationScheduled(
     const ui::LayerAnimationSequence* sequence) {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ModalContainerLayoutManager, ModalityEventFilter::Delegate implementation:
 
 bool ModalContainerLayoutManager::CanWindowReceiveEvents(
     aura::Window* window) {
-  return GetActivatableWindow(window) == modal_window();
+  return StackingController::GetActivatableWindow(window) == modal_window();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ModalContainerLayoutManager, private:
 
 void ModalContainerLayoutManager::AddModalWindow(aura::Window* window) {
   modal_windows_.push_back(window);
   CreateModalScreen();
+  container_->StackChildAtTop(window);
+  window->Activate();
 }
 
 void ModalContainerLayoutManager::RemoveModalWindow(aura::Window* window) {
   aura::Window::Windows::iterator it =
       std::find(modal_windows_.begin(), modal_windows_.end(), window);
   if (it != modal_windows_.end())
     modal_windows_.erase(it);
 
   if (modal_windows_.empty())
     HideModalScreen();
   else
-    aura_shell::ActivateWindow(modal_window());
+    modal_window()->Activate();
 }
 
 void ModalContainerLayoutManager::CreateModalScreen() {
   if (modal_screen_)
     return;
   modal_screen_ = new views::Widget;
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_CONTROL);
   params.parent = container_;
   params.bounds = gfx::Rect(0, 0, container_->bounds().width(),
                             container_->bounds().height());
@@ skipping 21 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