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/ash.gyp | |
| 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/ash.gyp')
| -rw-r--r-- | ash/ash.gyp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/ash/ash.gyp b/ash/ash.gyp index 5990655..3e48455 100644 --- a/ash/ash.gyp +++ b/ash/ash.gyp @@ -373,8 +373,6 @@ 'wm/window_cycle_controller.h', 'wm/window_cycle_list.cc', 'wm/window_cycle_list.h', - 'wm/window_modality_controller.cc', - 'wm/window_modality_controller.h', 'wm/window_properties.cc', 'wm/window_properties.h', 'wm/window_resizer.cc', @@ -459,10 +457,6 @@ 'sources': [ 'test/ash_test_base.cc', 'test/ash_test_base.h', - 'test/capture_tracking_view.cc', - 'test/capture_tracking_view.h', - 'test/child_modal_window.cc', - 'test/child_modal_window.h', 'test/cursor_manager_test_api.cc', 'test/cursor_manager_test_api.h', 'test/launcher_view_test_api.cc', @@ -506,6 +500,7 @@ '../ui/ui.gyp:ui_resources', '../ui/ui.gyp:ui_test_support', '../ui/views/views.gyp:views', + '../ui/views/views.gyp:views_test_support', '../ui/views/views.gyp:views_examples_with_content_lib', '../ui/views/views.gyp:views_with_content_test_support', 'ash', @@ -642,7 +637,6 @@ '../ui/views/views.gyp:views_test_support', 'ash', 'ash_resources', - 'test_support_ash', ], 'sources': [ 'shell/app_list.cc', |