Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2745)

Unified Diff: build/common.gypi

Issue 9271084: Revert 119306 - Turn web intents build flag on. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/content_settings/host_content_settings_map.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index a4deacae86837f15bcfb9e1323406307ec1a4816..8d5f422484f5e4b387b1fc740a23b426ba0cc8bd 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
@@ -924,8 +930,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', {
« no previous file with comments | « no previous file | chrome/browser/content_settings/host_content_settings_map.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698