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

ui/aura_shell/default_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/default_container_layout_manager.h"
 
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/event.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/screen_aura.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_observer.h"
 #include "ui/aura/window_types.h"
 #include "ui/aura_shell/property_util.h"
 #include "ui/aura_shell/show_state_controller.h"
-#include "ui/aura_shell/window_util.h"
 #include "ui/aura_shell/workspace/workspace.h"
 #include "ui/aura_shell/workspace/workspace_manager.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/gfx/rect.h"
 #include "ui/views/widget/native_widget_aura.h"
 
 namespace aura_shell {
 namespace internal {
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 72 matching lines @@
   if (child->type() != aura::WINDOW_TYPE_NORMAL || child->transient_parent())
     return;
 
   if (!child->GetProperty(aura::kShowStateKey))
     child->SetIntProperty(aura::kShowStateKey, ui::SHOW_STATE_NORMAL);
 
   child->AddObserver(show_state_controller_.get());
 
   Workspace* workspace = workspace_manager_->GetActiveWorkspace();
   if (workspace) {
-    aura::Window* active = aura_shell::GetActiveWindow();
+    aura::Window* active = aura::RootWindow::GetInstance()->active_window();
     // Active window may not be in the default container layer.
     if (!workspace->Contains(active))
       active = NULL;
     if (workspace->AddWindowAfter(child, active))
       return;
   }
   // Create new workspace if new |child| doesn't fit to current workspace.
   Workspace* new_workspace = workspace_manager_->CreateWorkspace();
   new_workspace->AddWindowAfter(child, NULL);
   new_workspace->Activate();
@@ skipping 60 matching lines @@
       adjusted_bounds = workspace->bounds();
     // Don't
     if (child->GetTargetBounds() == adjusted_bounds)
       return;
   }
   SetChildBoundsDirect(child, adjusted_bounds);
 }
 
 }  // namespace internal
 }  // namespace aura_shell