diff options
| author | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-27 09:36:11 +0000 |
|---|---|---|
| committer | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-27 09:36:11 +0000 |
| commit | 5ffb0a4c1abc6ca5e2261d40ef19a216e86265e4 (patch) | |
| tree | dfe9bd08165762794475a41433f7d58ebdc77c8f /chrome/browser/resources | |
| parent | cd81cee36f9a7449f7a04e3015aaf74c6be5a9c0 (diff) | |
| download | chromium_src-5ffb0a4c1abc6ca5e2261d40ef19a216e86265e4.zip chromium_src-5ffb0a4c1abc6ca5e2261d40ef19a216e86265e4.tar.gz chromium_src-5ffb0a4c1abc6ca5e2261d40ef19a216e86265e4.tar.bz2 | |
Revert 119306 - Turn web intents build flag on.
Move the command-line flag to default-on.
(Revert of 119284 : https://chromiumcodereview.appspot.com/9212036)
IN CASE OF FIRE, PULL THIS HANDLE! If web intents needs
to be disabled, revert this change.
R=jhawkins@chromium.org
BUG=111135
TEST=None
Review URL: http://codereview.chromium.org/9271084
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119423 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources')
5 files changed, 7 insertions, 7 deletions
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 fcaacbb..2d504c0 100644 --- a/chrome/browser/resources/options2/options.html +++ b/chrome/browser/resources/options2/options.html @@ -28,7 +28,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"> @@ -171,7 +171,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> |