Move WindowModalityController to CoreWm.

I left the unittest in ash still for the time being as it requires a bunch of stuff from ash too (mostly the activation logic which is still in progress for Corewm).

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

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

1 files changed, 3 insertions, 2 deletions

diff --git a/ash/shell.h b/ash/shell.h
index 4e06edd..1d25ad3 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -58,6 +58,7 @@ class CompoundEventFilter;
 class InputMethodEventFilter;
 class ShadowController;
 class VisibilityController;
+class WindowModalityController;
 }
 }
 
@@ -110,7 +111,6 @@ class SystemGestureEventFilter;
 class SystemModalContainerEventFilter;
 class TooltipController;
 class TouchObserverHUD;
-class WindowModalityController;
 class WorkspaceController;
 }
 
@@ -488,11 +488,12 @@ class ASH_EXPORT Shell : internal::SystemModalContainerEventFilterDelegate,
   scoped_ptr<aura::client::StackingClient> stacking_client_;
   scoped_ptr<internal::ActivationController> activation_controller_;
   scoped_ptr<internal::CaptureController> capture_controller_;
-  scoped_ptr<internal::WindowModalityController> window_modality_controller_;
   scoped_ptr<internal::DragDropController> drag_drop_controller_;
   scoped_ptr<internal::ResizeShadowController> resize_shadow_controller_;
   scoped_ptr<views::corewm::ShadowController> shadow_controller_;
   scoped_ptr<views::corewm::VisibilityController> visibility_controller_;
+  scoped_ptr<views::corewm::WindowModalityController>
+      window_modality_controller_;
   scoped_ptr<internal::TooltipController> tooltip_controller_;
   scoped_ptr<DesktopBackgroundController> desktop_background_controller_;
   scoped_ptr<PowerButtonController> power_button_controller_;