Re-disable the intents options UI in the branch. Add hook for UI back in the gypi file.

BUG=None
TEST=None

Review URL: https://chromiumcodereview.appspot.com/9567040

git-svn-id: svn://svn.chromium.org/chrome/branches/1025/src@124728 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 16 insertions, 11 deletions

diff --git a/build/common.gypi b/build/common.gypi
index 86bbba7..d937e71 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -207,8 +207,12 @@
       # Enable navigator.registerProtocolHandler and supporting UI.
       'enable_register_protocol_handler%': 1,
 
-      # Enable Web Intents and supporting UI.
-      'enable_web_intents%': 0,
+      # Enable Web Intents
+      '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,
@@ -427,6 +431,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
@@ -901,8 +906,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', {
diff --git a/chrome/browser/resources/options/options.html b/chrome/browser/resources/options/options.html
index cfd82ff..8ded164 100644
--- a/chrome/browser/resources/options/options.html
+++ b/chrome/browser/resources/options/options.html
@@ -30,7 +30,7 @@
   <link rel="stylesheet" href="handler_options.css">
 </if>
 <link rel="stylesheet" href="import_data_overlay.css">
-<if expr="pp_ifdef('enable_web_intents')">
+<if expr="pp_ifdef('enable_web_intents_tag')">
   <link rel="stylesheet" href="intents_view.css">
 </if>
 <link rel="stylesheet" href="language_options.css">
@@ -175,7 +175,7 @@
              <if expr="pp_ifdef('enable_register_protocol_handler')">
                <include src="handler_options.html">
              </if>
-             <if expr="pp_ifdef('enable_web_intents')">
+             <if expr="pp_ifdef('enable_web_intents_tag')">
                <include src="intents_view.html">
              </if>
              <include src="content_settings_exceptions_area.html">
diff --git a/chrome/browser/resources/options/options_bundle.js b/chrome/browser/resources/options/options_bundle.js
index 0298858..d156edb 100644
--- a/chrome/browser/resources/options/options_bundle.js
+++ b/chrome/browser/resources/options/options_bundle.js
@@ -76,7 +76,7 @@
 </if>
 <include src="import_data_overlay.js"></include>
 <include src="instant_confirm_overlay.js"></include>
-<if expr="pp_ifdef('enable_web_intents')">
+<if expr="pp_ifdef('enable_web_intents_tag')">
   <include src="intents_list.js"></include>
   <include src="intents_view.js"></include>
 </if>
diff --git a/chrome/browser/resources/options2/content_settings.html b/chrome/browser/resources/options2/content_settings.html
index bd21b0c..ba62d90 100644
--- a/chrome/browser/resources/options2/content_settings.html
+++ b/chrome/browser/resources/options2/content_settings.html
@@ -246,7 +246,7 @@
       </div>
     </section>
     <!-- Intent registration filter tab contents -->
-    <if expr="pp_ifdef('enable_web_intents')">
+    <if expr="pp_ifdef('enable_web_intents_tag')">
       <section id="intents-section">
       <h3 i18n-content="intentsTabLabel" class="content-settings-header"></h3>
         <div>
diff --git a/chrome/browser/resources/options2/options.html b/chrome/browser/resources/options2/options.html
index 1a332ed..e99ad52 100644
--- a/chrome/browser/resources/options2/options.html
+++ b/chrome/browser/resources/options2/options.html
@@ -29,7 +29,7 @@
   <link rel="stylesheet" href="handler_options.css">
 </if>
 <link rel="stylesheet" href="import_data_overlay.css">
-<if expr="pp_ifdef('enable_web_intents')">
+<if expr="pp_ifdef('enable_web_intents_tag')">
   <link rel="stylesheet" href="intents_view.css">
 </if>
 <link rel="stylesheet" href="language_options.css">
@@ -172,7 +172,7 @@
              <if expr="pp_ifdef('enable_register_protocol_handler')">
                <include src="handler_options.html">
              </if>
-             <if expr="pp_ifdef('enable_web_intents')">
+             <if expr="pp_ifdef('enable_web_intents_tag')">
                <include src="intents_view.html">
              </if>
              <include src="content_settings_exceptions_area.html">
diff --git a/chrome/browser/resources/options2/options_bundle.js b/chrome/browser/resources/options2/options_bundle.js
index dc930ba..9b22548 100644
--- a/chrome/browser/resources/options2/options_bundle.js
+++ b/chrome/browser/resources/options2/options_bundle.js
@@ -77,7 +77,7 @@
 <include src="home_page_overlay.js"></include>
 <include src="import_data_overlay.js"></include>
 <include src="instant_confirm_overlay.js"></include>
-<if expr="pp_ifdef('enable_web_intents')">
+<if expr="pp_ifdef('enable_web_intents_tag')">
   <include src="intents_list.js"></include>
   <include src="intents_view.js"></include>
 </if>