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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/content_resources.grd

Issue 14834011: Android: use grit target platform instead of define. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add missed pp_ifdef(android) Created 7 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
« no previous file with comments | « chrome/renderer/resources/renderer_resources.grd ('k') | ui/base/strings/app_locale_settings.grd » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_resources.grd
diff --git a/content/content_resources.grd b/content/content_resources.grd
index fa32cb439836b573917adf4af25767d70fae5ff5..bdff27e0cda95ee37451c76646913634d41795b2 100644
--- a/content/content_resources.grd
+++ b/content/content_resources.grd
@@ -31,7 +31,7 @@
<include name="IDR_RENDERER_SANDBOX_PROFILE" file="renderer/renderer.sb" type="BINDATA" />
<include name="IDR_UTILITY_SANDBOX_PROFILE" file="utility/utility.sb" type="BINDATA" />
</if>
- <if expr="not pp_ifdef('android')">
+ <if expr="not is_android">
<include name="IDR_TRACING_HTML" file="../third_party/trace-viewer/src/about_tracing.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
<include name="IDR_TRACING_JS" file="../third_party/trace-viewer/src/about_tracing.js" flattenhtml="true" type="BINDATA" />
</if>
« no previous file with comments | « chrome/renderer/resources/renderer_resources.grd ('k') | ui/base/strings/app_locale_settings.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698