Eliminates all ash dependencies from WindowModalityController.

ui/aura/test/test_activation_client.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 UI_AURA_TEST_TEST_ACTIVATION_CLIENT_H_
 #define UI_AURA_TEST_TEST_ACTIVATION_CLIENT_H_
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "ui/aura/client/activation_client.h"
@@ skipping 13 matching lines @@
   explicit TestActivationClient(RootWindow* root_window);
   virtual ~TestActivationClient();
 
   // Overridden from client::ActivationClient:
   virtual void AddObserver(client::ActivationChangeObserver* observer) OVERRIDE;
   virtual void RemoveObserver(
       client::ActivationChangeObserver* observer) OVERRIDE;
   virtual void ActivateWindow(Window* window) OVERRIDE;
   virtual void DeactivateWindow(Window* window) OVERRIDE;
   virtual Window* GetActiveWindow() OVERRIDE;
+  virtual Window* GetActivatableWindow(Window* window) OVERRIDE;
   virtual bool OnWillFocusWindow(Window* window,
                                  const ui::Event* event) OVERRIDE;
   virtual bool CanActivateWindow(Window* window) const OVERRIDE;
 
   // Overridden from WindowObserver:
   virtual void OnWindowDestroyed(Window* window) OVERRIDE;
 
  private:
   void RemoveActiveWindow(Window* window);
 
   // This class explicitly does NOT store the active window in a window property
   // to make sure that ActivationChangeObserver is not treated as part of the
   // aura API. Assumptions to that end will cause tests that use this client to
   // fail.
   std::vector<Window*> active_windows_;
 
   ObserverList<client::ActivationChangeObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(TestActivationClient);
 };
 
 }  // namespace test
 }  // namespace aura
 
 #endif  // UI_AURA_TEST_TEST_ACTIVATION_CLIENT_H_