diff options
| author | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-26 22:56:39 +0000 |
|---|---|---|
| committer | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-26 22:56:39 +0000 |
| commit | 325d03405283095a8b1f315da224dbd11377488b (patch) | |
| tree | 4802ae0595dc563cfb2260bf68399b2cc9d1bed3 /build | |
| parent | ea0a505eb5076a40cbc6453fe46f028875f6b3c0 (diff) | |
| download | chromium_src-325d03405283095a8b1f315da224dbd11377488b.zip chromium_src-325d03405283095a8b1f315da224dbd11377488b.tar.gz chromium_src-325d03405283095a8b1f315da224dbd11377488b.tar.bz2 | |
Revert 119284 - Turn web intents build flag on. Move the command-line flag to default on.
Make the flag disable rather than enable web intents.
Put the options UI behind a new flag controlling functionality if the registration tag is present for web content.
IN CASE OF FIRE, PULL THIS HANDLE! If web intents needs
to be disabled, revert this change.
R=jhawkins@chromium.org
BUG=90458
TEST=None
Review URL: https://chromiumcodereview.appspot.com/9212036
TBR=gbillock@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9113095
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119306 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/build/common.gypi b/build/common.gypi index 8d5f422..a4deaca 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -220,13 +220,8 @@ # Enable navigator.registerProtocolHandler and supporting UI. 'enable_register_protocol_handler%': 1, - # 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, + # Enable Web Intents and supporting UI. + 'enable_web_intents%': 0, # Webrtc compilation is enabled by default. Set to 0 to disable. 'enable_webrtc%': 1, @@ -451,7 +446,6 @@ '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 @@ -930,8 +924,8 @@ 'grit_defines': ['-D', 'enable_register_protocol_handler'], }], - ['enable_web_intents_tag==1', { - 'grit_defines': ['-D', 'enable_web_intents_tag'], + ['enable_web_intents==1', { + 'grit_defines': ['-D', 'enable_web_intents'], }], ['asan==1', { |