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

Unified Diff: build/common.gypi

Issue 7719029: Revert 97966 : Revert 97955 - First pass on intents options UI. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Merge head Created 9 years, 4 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/app/generated_resources.grd » ('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 d5862d922ea3503c3a7c1502f0b9e06a8e67b4e1..ea0118245023771f462a39cb66760e62c2b5a2d3 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', {
« no previous file with comments | « no previous file | chrome/app/generated_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698