diff options
author | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-18 17:28:50 +0000 |
---|---|---|
committer | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-18 17:28:50 +0000 |
commit | 3fa441d238ffa7b2cfbc4c7b623f8cb00b7c18ea (patch) | |
tree | 84794a37e500c230cb702d38aed4f3363afe755f /build/common.gypi | |
parent | 97fe97e78d76db3c5a0ee7c1baa06d1fcd082a1a (diff) | |
download | chromium_src-3fa441d238ffa7b2cfbc4c7b623f8cb00b7c18ea.zip chromium_src-3fa441d238ffa7b2cfbc4c7b623f8cb00b7c18ea.tar.gz chromium_src-3fa441d238ffa7b2cfbc4c7b623f8cb00b7c18ea.tar.bz2 |
Aura under Linux is enabled with:
'use_aura': 1,
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7850026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101704 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/common.gypi')
-rw-r--r-- | build/common.gypi | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/build/common.gypi b/build/common.gypi index f5b5bc1..f060eb5 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -21,6 +21,9 @@ # Whether we're building a ChromeOS build. 'chromeos%': 0, + # Whether we are using Views Toolkit + 'toolkit_views%': 0, + # Whether the Views toolkit can use its Pure form when available # or if it must only use GTK (the default at the moment). # This is an intermediate step until all of Views is 'Pure', @@ -64,21 +67,21 @@ # Set default value of toolkit_views on for Windows, Chrome OS, # Touch and PureView. - ['OS=="win" or chromeos==1 or touchui==1 or use_only_pure_views==1', { + ['OS=="win" or chromeos==1 or touchui==1 or use_only_pure_views==1 or use_aura==1', { 'toolkit_views%': 1, }, { 'toolkit_views%': 0, }], - # Views are always Pure in Touch case. - ['touchui==1', { + # Views are always Pure in Touch and Aura case. + ['touchui==1 or use_aura==1', { 'use_only_pure_views%': 1, }, { 'use_only_pure_views%': 0, }], # Use WebUI dialogs in TouchUI and PureView builds. - ['touchui==1 or use_only_pure_views==1', { + ['touchui==1 or use_only_pure_views==1 or use_aura==1', { 'webui_dialogs%': 1, }], @@ -271,7 +274,7 @@ }], # Enable WebUI TaskManager only on Chrome OS, Touch or PureView. - ['chromeos==1 or touchui==1 or use_only_pure_views==1', { + ['chromeos==1 or touchui==1 or use_only_pure_views==1 or use_aura==1', { 'webui_task_manager%': 1, }, { 'webui_task_manager%': 0, |