Move the concept of Activation to the Shell.

ui/aura_shell/stacking_controller.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/stacking_controller.h"
 
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/aura_shell/always_on_top_controller.h"
 #include "ui/aura_shell/shell.h"
 #include "ui/aura_shell/shell_window_ids.h"
 
 namespace aura_shell {
 namespace internal {
 namespace {
 
 aura::Window* GetContainer(int id) {
   return Shell::GetInstance()->GetContainer(id);
 }
 
-// Returns true if children of |window| can be activated.
-bool SupportsChildActivation(aura::Window* window) {
-  return window->id() == kShellWindowId_DefaultContainer ||
-         window->id() == kShellWindowId_AlwaysOnTopContainer ||
-         window->id() == kShellWindowId_ModalContainer ||
-         window->id() == kShellWindowId_LockModalContainer;
-}
-
 bool IsWindowModal(aura::Window* window) {
   return window->transient_parent() && window->GetIntProperty(aura::kModalKey);
 }
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // StackingController, public:
 
 StackingController::StackingController() {
   aura::RootWindow::GetInstance()->SetStackingClient(this);
 }
 
 StackingController::~StackingController() {
 }
 
 void StackingController::Init() {
   always_on_top_controller_.reset(new internal::AlwaysOnTopController);
   always_on_top_controller_->SetContainers(
       GetContainer(internal::kShellWindowId_DefaultContainer),
       GetContainer(internal::kShellWindowId_AlwaysOnTopContainer));
 }
 
-// static
-aura::Window* StackingController::GetActivatableWindow(aura::Window* window) {
-  aura::Window* parent = window->parent();
-  aura::Window* child = window;
-  while (parent) {
-    if (SupportsChildActivation(parent))
-      return child;
-    // If |child| isn't activatable, but has transient parent, trace
-    // that path instead.
-    if (child->transient_parent())
-      return GetActivatableWindow(child->transient_parent());
-    parent = parent->parent();
-    child = child->parent();
-  }
-  return NULL;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // StackingController, aura::StackingClient implementation:
 
 void StackingController::AddChildToDefaultParent(aura::Window* window) {
   aura::Window* parent = NULL;
   switch (window->type()) {
     case aura::WINDOW_TYPE_NORMAL:
     case aura::WINDOW_TYPE_POPUP:
       if (IsWindowModal(window)) {
         parent = GetModalContainer(window);
         break;
       }
       parent = always_on_top_controller_->GetContainer(window);
       break;
     case aura::WINDOW_TYPE_MENU:
     case aura::WINDOW_TYPE_TOOLTIP:
       parent = GetContainer(internal::kShellWindowId_MenusAndTooltipsContainer);
       break;
     default:
       NOTREACHED() << "Window " << window->id()
                    << " has unhandled type " << window->type();
       break;
   }
   parent->AddChild(window);
 }
 
-bool StackingController::CanActivateWindow(aura::Window* window) const {
-  return window && SupportsChildActivation(window->parent());
-}
-
-aura::Window* StackingController::GetTopmostWindowToActivate(
-    aura::Window* ignore) const {
-  const aura::Window* container = GetContainer(kShellWindowId_DefaultContainer);
-  for (aura::Window::Windows::const_reverse_iterator i =
-           container->children().rbegin();
-       i != container->children().rend();
-       ++i) {
-    if (*i != ignore && (*i)->CanActivate())
-      return *i;
-  }
-  return NULL;
-}
-
-
 ////////////////////////////////////////////////////////////////////////////////
 // StackingController, private:
 
 aura::Window* StackingController::GetModalContainer(
     aura::Window* window) const {
   if (!IsWindowModal(window))
     return NULL;
 
   // If screen lock is not active, all modal windows are placed into the
   // normal modal container.
@@ skipping 11 matching lines @@
   if (window_container_id < lock_container_id)
     container = GetContainer(internal::kShellWindowId_ModalContainer);
   else
     container = GetContainer(internal::kShellWindowId_LockModalContainer);
 
   return container;
 }
 
 }  // namespace internal
 }  // namespace aura_shell