diff options
| author | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-24 00:32:29 +0000 |
|---|---|---|
| committer | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-24 00:32:29 +0000 |
| commit | 7c233302e1f674178b5da4b40ca1ff8c2b80fe7b (patch) | |
| tree | 2a2a9759987c6eeb7896483ee7519a09775dc009 /build | |
| parent | 7529fa0d91b4c70c87d4306077d1cdee6f8370a2 (diff) | |
| download | chromium_src-7c233302e1f674178b5da4b40ca1ff8c2b80fe7b.zip chromium_src-7c233302e1f674178b5da4b40ca1ff8c2b80fe7b.tar.gz chromium_src-7c233302e1f674178b5da4b40ca1ff8c2b80fe7b.tar.bz2 | |
First pass on intents options UI.
Copies the cookies view handler for intents.
Add pass-throughs to grit for flag.
Optionalize intents options page JS/CSS.
Fix up data model to read title. Working test.
R=jhawkins@chromium.org
BUG=None
TEST=*Intents*
Review URL: http://codereview.chromium.org/7624012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97955 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 89824b3..8ff7f27 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -316,6 +316,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, @@ -705,6 +706,10 @@ 'grit_defines': ['-D', 'enable_register_protocol_handler'], }], + ['enable_web_intents==1', { + 'grit_defines': ['-D', 'enable_web_intents'], + }], + ['asan==1', { 'clang%': 1, }], @@ -921,6 +926,11 @@ 'ENABLE_REGISTER_PROTOCOL_HANDLER=1', ], }], + ['enable_web_intents==1', { + 'defines': [ + 'ENABLE_INTENTS=1', + ], + }], ], # conditions for 'target_defaults' 'target_conditions': [ ['chromium_code==0', { |