Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(30)

Unified Diff: chrome/browser/resources/options2/options.html

Issue 10381064: Remove the gyp flag for registerProtocolHandler. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: move include Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..25e3ba73842e3fd797fe36881ad40596a059bf18 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">
@@ -117,6 +115,7 @@
<include src="autofill_edit_creditcard_overlay.html">
<include src="content_settings_exceptions_area.html">
<include src="cookies_view.html">
+ <include src="handler_options.html">
<include src="language_add_language_overlay.html">
<if expr="pp_ifdef('chromeos')">
<include src="chromeos/internet_detail.html">
@@ -129,9 +128,6 @@
<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>
<if expr="not is_win and not is_macosx">
<include src="certificate_restore_overlay.html">
<include src="certificate_backup_overlay.html">
« no previous file with comments | « chrome/browser/resources/options2/content_settings.html ('k') | chrome/browser/resources/options2/options_bundle.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698