summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorkoz@chromium.org <koz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-26 01:30:56 +0000
committerkoz@chromium.org <koz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-26 01:30:56 +0000
commit365dd5b9e48f129f8ebd7e6bd76b1e0754885871 (patch)
tree52f249f608e10ed8d13f4c150f4d55d7a667e380 /build
parentb12f63913575aa06b3820937bc0eca8af072304e (diff)
downloadchromium_src-365dd5b9e48f129f8ebd7e6bd76b1e0754885871.zip
chromium_src-365dd5b9e48f129f8ebd7e6bd76b1e0754885871.tar.gz
chromium_src-365dd5b9e48f129f8ebd7e6bd76b1e0754885871.tar.bz2
Handler settings page.
This change implements a settings page that allows users to manage protocol handlers registered via navigator.registerProtocolHandler. tony: could you review the ProtocolHandlerRegistry stuff? estade: could you review the webui stuff? Thanks! TEST=Unit tests provided. Review URL: http://codereview.chromium.org/7033018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86762 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/common.gypi15
-rw-r--r--build/features_override.gypi5
2 files changed, 19 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi
index fbfd20b..43a1433 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -129,6 +129,9 @@
# currently only works on Linux.
'use_third_party_translations%': 0,
+ # Enable the Manage Handlers section in the settings page.
+ 'enable_register_protocol_handler%': 0,
+
# Remoting compilation is enabled by default. Set to 0 to disable.
'remoting%': 1,
@@ -228,6 +231,7 @@
'remoting%': '<(remoting)',
'p2p_apis%': '<(p2p_apis)',
'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)',
+ 'enable_register_protocol_handler%': '<(enable_register_protocol_handler)',
# The release channel that this build targets. This is used to restrict
# channel-specific build options, like which installer packages to create.
@@ -575,7 +579,11 @@
'use_ibus%': 1,
}, {
'use_ibus%': 0,
- }]
+ }],
+
+ ['enable_register_protocol_handler==1', {
+ 'grit_defines': ['-D', 'enable_register_protocol_handler'],
+ }],
],
},
'target_defaults': {
@@ -760,6 +768,11 @@
'<(DEPTH)/third_party/wtl/include',
],
}], # OS==win
+ ['enable_register_protocol_handler==1', {
+ 'defines': [
+ 'ENABLE_REGISTER_PROTOCOL_HANDLER',
+ ],
+ }],
], # conditions for 'target_defaults'
'target_conditions': [
['chromium_code==0', {
diff --git a/build/features_override.gypi b/build/features_override.gypi
index 82708ac..5798b43 100644
--- a/build/features_override.gypi
+++ b/build/features_override.gypi
@@ -119,6 +119,11 @@
'WTF_USE_WEBAUDIO_FFMPEG=1',
],
}],
+ ['enable_register_protocol_handler==1', {
+ 'feature_defines': [
+ 'ENABLE_REGISTER_PROTOCOL_HANDLER=1',
+ ],
+ }],
],
# TODO: If the need arises, create a mechanism that will intelligently
# merge the lists rather than replace one with the other. This may