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

Unified Diff: chrome/browser/resources/options/options_bundle.js

Issue 171763004: Remove pp_ifdef from resource files in chrome/browser and chrome/renderer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 10 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
« no previous file with comments | « chrome/browser/resources/options/options.js ('k') | chrome/browser/resources/options/sync_section.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/options/options_bundle.js
diff --git a/chrome/browser/resources/options/options_bundle.js b/chrome/browser/resources/options/options_bundle.js
index 2fa052e24f2ecb85a422d927217e0ad838861754..26375b3d914744928cacd668e4641c01679edeb5 100644
--- a/chrome/browser/resources/options/options_bundle.js
+++ b/chrome/browser/resources/options/options_bundle.js
@@ -14,7 +14,7 @@
<include src="pref_ui.js"></include>
<include src="settings_dialog.js"></include>
<include src="settings_banner.js"></include>
-<if expr="pp_ifdef('chromeos')">
+<if expr="chromeos">
<include src="../chromeos/user_images_grid.js"></include>
// DO NOT BREAK THE FOLLOWING INCLUDE LINE INTO SEPARATE LINES!
// Even though the include line spans more than 80 characters,
@@ -48,7 +48,7 @@ var KeyboardOverlay = options.KeyboardOverlay;
var PointerOverlay = options.PointerOverlay;
var UIAccountTweaks = uiAccountTweaks.UIAccountTweaks;
</if>
-<if expr="pp_ifdef('use_nss')">
+<if expr="use_nss">
<include src="certificate_tree.js"></include>
<include src="certificate_manager.js"></include>
<include src="certificate_restore_overlay.js"></include>
@@ -80,7 +80,7 @@ var CertificateImportErrorOverlay = options.CertificateImportErrorOverlay;
<include src="cookies_view.js"></include>
<include src="factory_reset_overlay.js"></include>
<include src="font_settings.js"></include>
-<if expr="pp_ifdef('enable_google_now')">
+<if expr="enable_google_now">
<include src="geolocation_options.js"></include>
</if>
<include src="handler_options.js"></include>
@@ -115,6 +115,6 @@ var CertificateImportErrorOverlay = options.CertificateImportErrorOverlay;
<include src="../sync_setup_overlay.js"></include>
<include src="../uber/uber_utils.js"></include>
<include src="options.js"></include>
-<if expr="pp_ifdef('enable_settings_app')">
+<if expr="enable_settings_app">
<include src="options_settings_app.js"></include>
</if>
« no previous file with comments | « chrome/browser/resources/options/options.js ('k') | chrome/browser/resources/options/sync_section.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698