diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-24 19:03:35 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-24 19:03:35 +0000 |
| commit | e599f013a02b6d9c3d9da611da4e1e769478147e (patch) | |
| tree | 0ac73160104096279e64381de777d54a04b98f85 /build | |
| parent | 40943691e3ca7ccff9dc14ff6fbb71adaa25ac23 (diff) | |
| download | chromium_src-e599f013a02b6d9c3d9da611da4e1e769478147e.zip chromium_src-e599f013a02b6d9c3d9da611da4e1e769478147e.tar.gz chromium_src-e599f013a02b6d9c3d9da611da4e1e769478147e.tar.bz2 | |
Add support for GYP_DEFINES aura_wm=1 which also defines views_compositor=1.
This build flag will control which set of native types views builds with on various platforms.
Also fixes mouse event handling in the demo app so that the window can be moved.
http://crbug.com/84070
TEST=none
Review URL: http://codereview.chromium.org/7717015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98086 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/build/common.gypi b/build/common.gypi index c8c37bd..525bdeb 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -42,6 +42,9 @@ # Whether the compositor is enabled on views. 'views_compositor%': 0, + + # Whether or not we are building with the Aura window manager. + 'aura_wm%': 0, }, # Copy conditionally-set variables out one scope. 'chromeos%': '<(chromeos)', @@ -49,6 +52,7 @@ 'touchui%': '<(touchui)', 'webui_dialogs%': '<(webui_dialogs)', 'views_compositor%': '<(views_compositor)', + 'aura_wm%': '<(aura_wm)', # Compute the architecture that we're building on. 'conditions': [ @@ -81,6 +85,11 @@ ['touchui==1', { 'webui_dialogs%': 1, }], + + # Use the views compositor when using the Aura window manager. + ['aura_wm==1', { + 'views_compositor%': 1, + }], ], }, @@ -92,6 +101,7 @@ 'toolkit_views%': '<(toolkit_views)', 'toolkit_uses_pure_views%': '<(toolkit_uses_pure_views)', 'views_compositor%': '<(views_compositor)', + 'aura_wm%': '<(aura_wm)', # We used to provide a variable for changing how libraries were built. # This variable remains until we can clean up all the users. @@ -285,6 +295,7 @@ 'toolkit_views%': '<(toolkit_views)', 'toolkit_uses_pure_views%': '<(toolkit_uses_pure_views)', 'views_compositor%': '<(views_compositor)', + 'aura_wm%': '<(aura_wm)', 'os_posix%': '<(os_posix)', 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 'use_skia%': '<(use_skia)', @@ -775,6 +786,9 @@ ['views_compositor==1', { 'defines': ['VIEWS_COMPOSITOR=1'], }], + ['aura_wm==1', { + 'defines': ['AURA_WM=1'], + }], ['chromeos==1', { 'defines': ['OS_CHROMEOS=1'], }], |