diff options
| author | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-25 23:02:07 +0000 |
|---|---|---|
| committer | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-25 23:02:07 +0000 |
| commit | 41ed4e87b6462632feee5f5fcd376cc23ecbc15d (patch) | |
| tree | 4c627407c06c7d09861c3bb744e1afa990197b83 /build | |
| parent | 9f47b5d47974d06ebbdaba0cfb6dc2abd5609f42 (diff) | |
| download | chromium_src-41ed4e87b6462632feee5f5fcd376cc23ecbc15d.zip chromium_src-41ed4e87b6462632feee5f5fcd376cc23ecbc15d.tar.gz chromium_src-41ed4e87b6462632feee5f5fcd376cc23ecbc15d.tar.bz2 | |
Revert 97966 : Revert 97955 - First pass on intents options UI.
Original review URL: http://codereview.chromium.org/7624012
R=groby@chromium.org,vandebo@chromium.org
BUG=none
TEST=*Intents*
Review URL: http://codereview.chromium.org/7719029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98340 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/build/common.gypi b/build/common.gypi index d5862d9..ea01182 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -327,6 +327,7 @@ 'asan%': '<(asan)', 'enable_register_protocol_handler%': '<(enable_register_protocol_handler)', 'enable_smooth_scrolling%': '<(enable_smooth_scrolling)', + 'enable_web_intents%': '<(enable_web_intents)', # Whether to build for Wayland display server 'use_wayland%': 0, @@ -716,6 +717,10 @@ 'grit_defines': ['-D', 'enable_register_protocol_handler'], }], + ['enable_web_intents==1', { + 'grit_defines': ['-D', 'enable_web_intents'], + }], + ['asan==1', { 'clang%': 1, }], @@ -935,6 +940,11 @@ 'ENABLE_REGISTER_PROTOCOL_HANDLER=1', ], }], + ['enable_web_intents==1', { + 'defines': [ + 'ENABLE_INTENTS=1', + ], + }], ], # conditions for 'target_defaults' 'target_conditions': [ ['chromium_code==0', { |