Activate windows in higher containers if they exist.

BUG=116239
TEST=Open a system modal dialog, lock and unlock the screen. The system modal dialog should get focus back.

Review URL: https://chromiumcodereview.appspot.com/9568045

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124867 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 10 deletions

diff --git a/ash/wm/activation_controller.h b/ash/wm/activation_controller.h
index 6292add..b798b66 100644
--- a/ash/wm/activation_controller.h
+++ b/ash/wm/activation_controller.h
@@ -49,10 +49,6 @@ class ASH_EXPORT ActivationController
   // 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);
@@ -60,16 +56,16 @@ class ASH_EXPORT ActivationController
   // 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);
 };