diff options
| author | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-27 09:36:11 +0000 |
|---|---|---|
| committer | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-27 09:36:11 +0000 |
| commit | 5ffb0a4c1abc6ca5e2261d40ef19a216e86265e4 (patch) | |
| tree | dfe9bd08165762794475a41433f7d58ebdc77c8f /build | |
| parent | cd81cee36f9a7449f7a04e3015aaf74c6be5a9c0 (diff) | |
| download | chromium_src-5ffb0a4c1abc6ca5e2261d40ef19a216e86265e4.zip chromium_src-5ffb0a4c1abc6ca5e2261d40ef19a216e86265e4.tar.gz chromium_src-5ffb0a4c1abc6ca5e2261d40ef19a216e86265e4.tar.bz2 | |
Revert 119306 - Turn web intents build flag on.
Move the command-line flag to default-on.
(Revert of 119284 : https://chromiumcodereview.appspot.com/9212036)
IN CASE OF FIRE, PULL THIS HANDLE! If web intents needs
to be disabled, revert this change.
R=jhawkins@chromium.org
BUG=111135
TEST=None
Review URL: http://codereview.chromium.org/9271084
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119423 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/build/common.gypi b/build/common.gypi index 64b60b9..161464c 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -220,8 +220,13 @@ # Enable navigator.registerProtocolHandler and supporting UI. 'enable_register_protocol_handler%': 1, - # Enable Web Intents and supporting UI. - 'enable_web_intents%': 0, + # Enable Web Intents support in WebKit, dispatching of intents, + # and extensions Web Intents support. + 'enable_web_intents%': 1, + + # Enable Web Intents web content registration via HTML element + # and WebUI managing such registrations. + 'enable_web_intents_tag%': 0, # Webrtc compilation is enabled by default. Set to 0 to disable. 'enable_webrtc%': 1, @@ -446,6 +451,7 @@ 'order_text_section%': '<(order_text_section)', 'enable_register_protocol_handler%': '<(enable_register_protocol_handler)', 'enable_web_intents%': '<(enable_web_intents)', + 'enable_web_intents_tag%': '<(enable_web_intents_tag)', 'enable_plugin_installation%': '<(enable_plugin_installation)', 'use_canvas_skia_skia%': '<(use_canvas_skia_skia)', # Whether to build for Wayland display server @@ -920,8 +926,8 @@ 'grit_defines': ['-D', 'enable_register_protocol_handler'], }], - ['enable_web_intents==1', { - 'grit_defines': ['-D', 'enable_web_intents'], + ['enable_web_intents_tag==1', { + 'grit_defines': ['-D', 'enable_web_intents_tag'], }], ['asan==1', { |