summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-18 16:30:21 +0000
committerjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-18 16:30:21 +0000
commitbbf766da1c0f63259d1b0d236c44cd1111659cc9 (patch)
tree8b567c0430d4a777f1c82de6a0f9517cdcf68295
parentdf918b15d2c150795a586d9f8c57e1bcd070d8a8 (diff)
downloadchromium_src-bbf766da1c0f63259d1b0d236c44cd1111659cc9.zip
chromium_src-bbf766da1c0f63259d1b0d236c44cd1111659cc9.tar.gz
chromium_src-bbf766da1c0f63259d1b0d236c44cd1111659cc9.tar.bz2
Web Intents: Remove the directory-level exclusions.
BUG=none TEST=none R=gbillock Review URL: https://chromiumcodereview.appspot.com/10410002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137874 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--build/common.gypi3
-rw-r--r--chrome/chrome_browser.gypi6
-rw-r--r--chrome/chrome_tests.gypi6
3 files changed, 1 insertions, 14 deletions
diff --git a/build/common.gypi b/build/common.gypi
index 3cc9053..c2618d1 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -254,8 +254,7 @@
# Whether one-click signin is enabled or not.
'enable_one_click_signin%': 0,
- # Enable Web Intents support in WebKit, dispatching of intents,
- # and extensions Web Intents support.
+ # Enable Web Intents support in WebKit.
'enable_web_intents%': 1,
# Enable Chrome browser extensions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 6182965..10d5add 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -4492,12 +4492,6 @@
['exclude', '^browser/notifications/'],
],
}],
- ['enable_web_intents==0', {
- 'sources/': [
- ['exclude', '^browser/intents'],
- ['exclude', '^browser/ui/intents'],
- ],
- }],
['enable_themes==0', {
'sources!': [
'browser/sync/glue/theme_change_processor.cc',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index baf060c..2422f33 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2055,12 +2055,6 @@
['exclude', '^browser/notifications/'],
],
}],
- ['enable_web_intents==0', {
- 'sources/': [
- ['exclude', '^browser/intents'],
- ['exclude', '^browser/ui/intents'],
- ],
- }],
['safe_browsing==1', {
'defines': [
'ENABLE_SAFE_BROWSING',