Remove the gyp flag for registerProtocolHandler.

chrome/browser/resources/options2/options.html

Index: chrome/browser/resources/options2/options.html
diff --git a/chrome/browser/resources/options2/options.html b/chrome/browser/resources/options2/options.html
index e2b67f5284d58f2125f74d7832b147fcfb03f2e1..50741cb05e9c95c97f5a2feb3dd28f48ebd43482 100644
--- a/chrome/browser/resources/options2/options.html
+++ b/chrome/browser/resources/options2/options.html
@@ -20,9 +20,7 @@
 <link rel="stylesheet" href="content_settings.css">
 <link rel="stylesheet" href="cookies_view.css">
 <link rel="stylesheet" href="font_settings.css">
-<if expr="pp_ifdef('enable_register_protocol_handler')">
-  <link rel="stylesheet" href="handler_options.css">
-</if>
+<link rel="stylesheet" href="handler_options.css">
 <link rel="stylesheet" href="home_page_overlay.css">
 <link rel="stylesheet" href="import_data_overlay.css">
 <link rel="stylesheet" href="instant_confirm_overlay.css">
@@ -129,9 +127,7 @@
   <if expr="pp_ifdef('chromeos') and pp_ifdef('use_virtual_keyboard')">
     <include src="chromeos/virtual_keyboard.html">
   </if>
-  <if expr="pp_ifdef('enable_register_protocol_handler')">
-    <include src="handler_options.html">
-  </if>
+  <include src="handler_options.html">

[James Hawkins, 2012/05/09 19:24:27]

nit: Move this up to ~line 117-118.

   <if expr="not is_win and not is_macosx">
     <include src="certificate_restore_overlay.html">
     <include src="certificate_backup_overlay.html">