diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-07 21:02:59 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-07 21:02:59 +0000 |
| commit | 87b0d82e3a7323306b3a5b7c94a01226ab601254 (patch) | |
| tree | 54f9d25c8e9e71ba1fb2bdbbfad23d7e94f46190 /views/views.gyp | |
| parent | 39944f52a7d6495574b27443f9d935a76c5d488a (diff) | |
| download | chromium_src-87b0d82e3a7323306b3a5b7c94a01226ab601254.zip chromium_src-87b0d82e3a7323306b3a5b7c94a01226ab601254.tar.gz chromium_src-87b0d82e3a7323306b3a5b7c94a01226ab601254.tar.bz2 | |
Changes the way windows are parented when their parent is set to NULL.. Adds a DesktopDelegate interface implemented by the aura client. The implementor handles parenting of windows when their parent is set to NULL, and also figures out how to activate windows.. Replaces Desktop::default_parent() with this. Requires adjusting some of the tests and adding a TestDesktopDelegate implementation that reconstructs what default_parent did.BUG=noneTEST=existing unit tests
Review URL: http://codereview.chromium.org/8194004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104558 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/views.gyp')
| -rw-r--r-- | views/views.gyp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/views/views.gyp b/views/views.gyp index 8c1ef7c..d71f21e 100644 --- a/views/views.gyp +++ b/views/views.gyp @@ -602,6 +602,8 @@ '../ui/gfx/compositor/test_compositor.h', '../ui/gfx/compositor/test_texture.cc', '../ui/gfx/compositor/test_texture.h', + '../ui/aura/test_desktop_delegate.cc', + '../ui/aura/test_desktop_delegate.h', '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', @@ -656,6 +658,11 @@ ['exclude', 'controls/table/table_view_unittest.cc'], ['exclude', 'controls/tabbed_pane/tabbed_pane_unittest.cc'], ], + }, { + 'sources/': [ + ['exclude', '../ui/aura/test_desktop_delegate.cc'], + ['exclude', '../ui/aura/test_desktop_delegate.h'], + ], }], ['OS!="mac"', { 'dependencies': [ |