| 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>
|
|
|