Eliminates all ash dependencies from WindowModalityController.

This is in preparation for moving it to corewm so this code can be shared with desktop-aura.

This required moving GetActivatableWindow to ActivationClient (instead of ash-specific ActivationController) and consolidating the modal parent property.

For a subsequent CL: moving the test's dependencies (ChildModalWindow, CaptureTrackingView) from ash/test to views/test.

http://crbug.com/158115
R=rouslan@chromium.org
Review URL: https://codereview.chromium.org/11418224

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

3 files changed, 8 insertions, 0 deletions

diff --git a/ui/aura/client/activation_client.h b/ui/aura/client/activation_client.h
index 23656e6..94314b6 100644
--- a/ui/aura/client/activation_client.h
+++ b/ui/aura/client/activation_client.h
@@ -35,6 +35,9 @@ class AURA_EXPORT ActivationClient {
   // Retrieves the active window, or NULL if there is none.
   virtual Window* GetActiveWindow() = 0;
 
+  // Retrieves the activatable window for |window|, or NULL if there is none.
+  virtual Window* GetActivatableWindow(Window* window) = 0;
+
   // Invoked prior to |window| getting focus as a result of the |event|. |event|
   // may be NULL. Returning false blocks |window| from getting focus.
   virtual bool OnWillFocusWindow(Window* window, const ui::Event* event) = 0;
diff --git a/ui/aura/test/test_activation_client.cc b/ui/aura/test/test_activation_client.cc
index 78e36ad..ecb97fd 100644
--- a/ui/aura/test/test_activation_client.cc
+++ b/ui/aura/test/test_activation_client.cc
@@ -69,6 +69,10 @@ Window* TestActivationClient::GetActiveWindow() {
   return active_windows_.back();
 }
 
+Window* TestActivationClient::GetActivatableWindow(Window* window) {
+  return NULL;
+}
+
 bool TestActivationClient::OnWillFocusWindow(Window* window,
                                              const ui::Event* event) {
   return true;
diff --git a/ui/aura/test/test_activation_client.h b/ui/aura/test/test_activation_client.h
index 2bfe884..f8da361d 100644
--- a/ui/aura/test/test_activation_client.h
+++ b/ui/aura/test/test_activation_client.h
@@ -31,6 +31,7 @@ class TestActivationClient : public client::ActivationClient,
   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;