diff options
| author | oshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-21 19:36:45 +0000 |
|---|---|---|
| committer | oshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-21 19:36:45 +0000 |
| commit | 3f02dc593923bfb7897b2efe764151bd7a469e1a (patch) | |
| tree | d094ffc1693d9899488bd8adeaecae31d7fe514f /ui/aura/aura.gyp | |
| parent | 0dc567495088bae351da07b5d2eaf7e201c50168 (diff) | |
| download | chromium_src-3f02dc593923bfb7897b2efe764151bd7a469e1a.zip chromium_src-3f02dc593923bfb7897b2efe764151bd7a469e1a.tar.gz chromium_src-3f02dc593923bfb7897b2efe764151bd7a469e1a.tar.bz2 | |
LayoutManager controls child bounds. Added SetChildBounds and several listener methods to LayoutManager class. They will be used to implement more sophisticated behavior.
Implemented DefaultContainerLayoutManager.
Added test_support_aura component so that it can be shared
between aura and aura_shell.
Fixed component build for aura_shell_unittests
BUG=none
TEST=default_container_layout_manager_unittests.
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=106508
Review URL: http://codereview.chromium.org/8296002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106761 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/aura.gyp')
| -rw-r--r-- | ui/aura/aura.gyp | 37 |
1 files changed, 27 insertions, 10 deletions
diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp index 57fcccb..cdb9b4b 100644 --- a/ui/aura/aura.gyp +++ b/ui/aura/aura.gyp @@ -39,6 +39,7 @@ 'event_filter.h', 'focus_manager.h', 'hit_test.h', + 'layout_manager.cc', 'layout_manager.h', 'screen_aura.cc', 'screen_aura.h', @@ -54,6 +55,31 @@ ], }, { + 'target_name': 'test_support_aura', + 'type': 'static_library', + 'dependencies': [ + '../../skia/skia.gyp:skia', + '../../testing/gtest.gyp:gtest', + '../ui.gyp:ui', + 'aura', + ], + 'include_dirs': [ + '..', + ], + 'sources': [ + 'test/aura_test_base.cc', + 'test/aura_test_base.h', + 'test/event_generator.cc', + 'test/event_generator.h', + 'test/test_desktop_delegate.cc', + 'test/test_desktop_delegate.h', + '../gfx/compositor/test_compositor.cc', + '../gfx/compositor/test_compositor.h', + '../gfx/compositor/test_texture.cc', + '../gfx/compositor/test_texture.h', + ], + }, + { 'target_name': 'aura_demo', 'type': 'executable', 'dependencies': [ @@ -89,29 +115,20 @@ '../ui.gyp:gfx_resources', '../ui.gyp:ui', '../ui.gyp:ui_resources', + 'test_support_aura', 'aura', ], 'include_dirs': [ '..', ], 'sources': [ - 'test/aura_test_base.cc', - 'test/aura_test_base.h', - 'test/event_generator.cc', - 'test/event_generator.h', 'test/run_all_unittests.cc', - 'test/test_desktop_delegate.cc', - 'test/test_desktop_delegate.h', 'test/test_suite.cc', 'test/test_suite.h', 'test/test_window_delegate.cc', 'test/test_window_delegate.h', 'toplevel_window_event_filter_unittest.cc', 'window_unittest.cc', - '../gfx/compositor/test_compositor.cc', - '../gfx/compositor/test_compositor.h', - '../gfx/compositor/test_texture.cc', - '../gfx/compositor/test_texture.h', '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', ], |