diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-02 00:00:23 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-02 00:00:23 +0000 |
| commit | 0c2dc0166fd24ae0ede00035a95a7dbfe2777b72 (patch) | |
| tree | 69584fc9b2e99be226ea53ee7f7a0176be439e7c /ash/shell.cc | |
| parent | df2d1010ff9843074a84d33830a40d628c271bc2 (diff) | |
| download | chromium_src-0c2dc0166fd24ae0ede00035a95a7dbfe2777b72.zip chromium_src-0c2dc0166fd24ae0ede00035a95a7dbfe2777b72.tar.gz chromium_src-0c2dc0166fd24ae0ede00035a95a7dbfe2777b72.tar.bz2 | |
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
Diffstat (limited to 'ash/shell.cc')
| -rw-r--r-- | ash/shell.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index 2cf7c5a..909a12f 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -60,7 +60,6 @@ #include "ash/wm/video_detector.h" #include "ash/wm/window_animations.h" #include "ash/wm/window_cycle_controller.h" -#include "ash/wm/window_modality_controller.h" #include "ash/wm/window_properties.h" #include "ash/wm/window_util.h" #include "ash/wm/workspace_controller.h" @@ -87,6 +86,7 @@ #include "ui/views/corewm/input_method_event_filter.h" #include "ui/views/corewm/shadow_controller.h" #include "ui/views/corewm/visibility_controller.h" +#include "ui/views/corewm/window_modality_controller.h" #include "ui/views/focus/focus_manager_factory.h" #include "ui/views/widget/native_widget_aura.h" #include "ui/views/widget/widget.h" @@ -508,7 +508,8 @@ void Shell::Init() { visibility_controller_.reset(new AshVisibilityController); drag_drop_controller_.reset(new internal::DragDropController); user_action_client_.reset(delegate_->CreateUserActionClient()); - window_modality_controller_.reset(new internal::WindowModalityController); + window_modality_controller_.reset( + new views::corewm::WindowModalityController); AddPreTargetHandler(window_modality_controller_.get()); magnification_controller_.reset( |