Activate windows in topmost containers when a window is hidden.

ash/wm/activation_controller.h

 // Copyright (c) 2012 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.
 
 #ifndef ASH_WM_ACTIVATION_CONTROLLER_H_
 #define ASH_WM_ACTIVATION_CONTROLLER_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 31 matching lines @@
   virtual void OnWindowVisibilityChanged(aura::Window* window,
                                          bool visible) OVERRIDE;
   virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;
 
   // Overridden from aura::EnvObserver:
   virtual void OnWindowInitialized(aura::Window* window) OVERRIDE;
 
   // Overridden from aura::RootWindowObserver:
   virtual void OnWindowFocused(aura::Window* window) OVERRIDE;
 
-  void set_default_container_for_test(aura::Window* window) {
-    default_container_for_test_ = window;
-  }
-
  private:
   // Shifts activation to the next window, ignoring |window|.
   void ActivateNextWindow(aura::Window* window);
 
   // Returns the next window that should be activated, ignoring |ignore|.
   aura::Window* GetTopmostWindowToActivate(aura::Window* ignore) const;
 
+  // Returns the next window that should be activated in |container| ignoring
+  // the window |ignore|.
+  aura::Window* GetTopmostWindowToActivateInContainer(
+      aura::Window* container,
+      aura::Window* ignore) const;
+
   // True inside ActivateWindow(). Used to prevent recursion of focus
   // change notifications causing activation.
   bool updating_activation_;
 
-  // For tests that are not running with a Shell instance,
-  // ActivationController's attempts to locate the next active window in
-  // GetTopmostWindowToActivate() will crash, so we provide this way for such
-  // tests to specify a default container.
-  aura::Window* default_container_for_test_;
-
   DISALLOW_COPY_AND_ASSIGN(ActivationController);
 };
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_WM_ACTIVATION_CONTROLLER_H_