chrome/renderer/resources/renderer_resources.grd - Issue 171763004: Remove pp_ifdef from resource files in chrome/browser and chrome/renderer.

Side by Side Diff: chrome/renderer/resources/renderer_resources.grd

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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/renderer/resources/plugin_placeholders.css ('k') | no next file » | no next file with comments »

OLD	NEW
1 <?xml version="1.0" encoding="UTF-8"?>	1 <?xml version="1.0" encoding="UTF-8"?>

2 <!-- This comment is only here because changes to resources are not picked up	2 <!-- This comment is only here because changes to resources are not picked up

3 without changes to the corresponding grd file. fb9 -->	3 without changes to the corresponding grd file. fb9 -->

4 <grit latest_public_release="0" current_release="1">	4 <grit latest_public_release="0" current_release="1">

5 <outputs>	5 <outputs>

6 <output filename="grit/renderer_resources.h" type="rc_header" context="defau lt_100_percent">	6 <output filename="grit/renderer_resources.h" type="rc_header" context="defau lt_100_percent">

7 <emit emit_type='prepend'></emit>	7 <emit emit_type='prepend'></emit>

8 </output>	8 </output>

9 <output filename="renderer_resources_100_percent.pak" type="data_package" co ntext="default_100_percent" />	9 <output filename="renderer_resources_100_percent.pak" type="data_package" co ntext="default_100_percent" />

10 <output filename="renderer_resources_200_percent.pak" type="data_package" co ntext="default_200_percent" />	10 <output filename="renderer_resources_200_percent.pak" type="data_package" co ntext="default_200_percent" />

11 </outputs>	11 </outputs>

12 <release seq="1">	12 <release seq="1">

13 <structures fallback_to_low_resolution="true">	13 <structures fallback_to_low_resolution="true">

14 <structure type="chrome_scaled_image" name="IDR_SAD_WEBVIEW" file="common\ webview-crash.png" />	14 <structure type="chrome_scaled_image" name="IDR_SAD_WEBVIEW" file="common\ webview-crash.png" />

15 <structure type="chrome_scaled_image" name="IDR_SAD_PLUGIN" file="common\s adplugin.png" />	15 <structure type="chrome_scaled_image" name="IDR_SAD_PLUGIN" file="common\s adplugin.png" />

16 </structures>	16 </structures>

17 <includes>	17 <includes>

18 <if expr="is_android">	18 <if expr="is_android">

19 <include name="IDR_MOBILE_YOUTUBE_PLUGIN_HTML" file="mobile_youtube_plug in.html" flattenhtml="true" type="BINDATA" />	19 <include name="IDR_MOBILE_YOUTUBE_PLUGIN_HTML" file="mobile_youtube_plug in.html" flattenhtml="true" type="BINDATA" />

20 </if>	20 </if>

21 <include name="IDR_BLOCKED_PLUGIN_HTML" file="blocked_plugin.html" flatten html="true" type="BINDATA" />	21 <include name="IDR_BLOCKED_PLUGIN_HTML" file="blocked_plugin.html" flatten html="true" type="BINDATA" />

22 <include name="IDR_CLICK_TO_PLAY_PLUGIN_HTML" file="click_to_play_plugin.h tml" flattenhtml="true" type="BINDATA" />	22 <include name="IDR_CLICK_TO_PLAY_PLUGIN_HTML" file="click_to_play_plugin.h tml" flattenhtml="true" type="BINDATA" />

23 <include name="IDR_DISABLED_PLUGIN_HTML" file="disabled_plugin.html" flatt enhtml="true" type="BINDATA" />	23 <include name="IDR_DISABLED_PLUGIN_HTML" file="disabled_plugin.html" flatt enhtml="true" type="BINDATA" />

24 <include name="IDR_ERROR_APP_HTML" file="error_app.html" flattenhtml="true " type="BINDATA" />	24 <include name="IDR_ERROR_APP_HTML" file="error_app.html" flattenhtml="true " type="BINDATA" />

25 <include name="IDR_NET_ERROR_HTML" file="neterror.html" flattenhtml="true" type="BINDATA" />	25 <include name="IDR_NET_ERROR_HTML" file="neterror.html" flattenhtml="true" type="BINDATA" />

26	26

27 <!-- Extension libraries. -->	27 <!-- Extension libraries. -->

28 <if expr="pp_ifdef('enable_extensions')">	28 <if expr="enable_extensions">

29 <!-- Custom bindings for extension APIs. -->	29 <!-- Custom bindings for extension APIs. -->

30 <include name="IDR_AD_VIEW_DENY_JS" file="extensions\ad_view_deny.js" ty pe="BINDATA" />	30 <include name="IDR_AD_VIEW_DENY_JS" file="extensions\ad_view_deny.js" ty pe="BINDATA" />

31 <include name="IDR_AD_VIEW_JS" file="extensions\ad_view.js" type="BINDAT A" />	31 <include name="IDR_AD_VIEW_JS" file="extensions\ad_view.js" type="BINDAT A" />

32 <include name="IDR_APP_CUSTOM_BINDINGS_JS" file="extensions\app_custom_b indings.js" type="BINDATA" />	32 <include name="IDR_APP_CUSTOM_BINDINGS_JS" file="extensions\app_custom_b indings.js" type="BINDATA" />

33 <include name="IDR_APP_RUNTIME_CUSTOM_BINDINGS_JS" file="extensions\app_ runtime_custom_bindings.js" type="BINDATA" />	33 <include name="IDR_APP_RUNTIME_CUSTOM_BINDINGS_JS" file="extensions\app_ runtime_custom_bindings.js" type="BINDATA" />

34 <include name="IDR_APP_WINDOW_CUSTOM_BINDINGS_JS" file="extensions\app_w indow_custom_bindings.js" type="BINDATA" />	34 <include name="IDR_APP_WINDOW_CUSTOM_BINDINGS_JS" file="extensions\app_w indow_custom_bindings.js" type="BINDATA" />

35 <include name="IDR_BINDING_JS" file="extensions\binding.js" type="BINDAT A" />	35 <include name="IDR_BINDING_JS" file="extensions\binding.js" type="BINDAT A" />

36 <include name="IDR_BLUETOOTH_CUSTOM_BINDINGS_JS" file="extensions\blueto oth_custom_bindings.js" type="BINDATA" />	36 <include name="IDR_BLUETOOTH_CUSTOM_BINDINGS_JS" file="extensions\blueto oth_custom_bindings.js" type="BINDATA" />

37 <include name="IDR_BROWSER_ACTION_CUSTOM_BINDINGS_JS" file="extensions\b rowser_action_custom_bindings.js" type="BINDATA" />	37 <include name="IDR_BROWSER_ACTION_CUSTOM_BINDINGS_JS" file="extensions\b rowser_action_custom_bindings.js" type="BINDATA" />

38 <include name="IDR_CAST_STREAMING_RTP_STREAM_CUSTOM_BINDINGS_JS" file="e xtensions\cast_streaming_rtp_stream_custom_bindings.js" type="BINDATA" />	38 <include name="IDR_CAST_STREAMING_RTP_STREAM_CUSTOM_BINDINGS_JS" file="e xtensions\cast_streaming_rtp_stream_custom_bindings.js" type="BINDATA" />

(...skipping 64 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
103 <include name="IDR_WEB_VIEW_REQUEST_CUSTOM_BINDINGS_JS" file="extensions \webview_request_custom_bindings.js" type="BINDATA" />	103 <include name="IDR_WEB_VIEW_REQUEST_CUSTOM_BINDINGS_JS" file="extensions \webview_request_custom_bindings.js" type="BINDATA" />

104	104

105 <!-- Platform app support. -->	105 <!-- Platform app support. -->

106 <include name="IDR_PLATFORM_APP_CSS" file="extensions\platform_app.css" type="BINDATA" />	106 <include name="IDR_PLATFORM_APP_CSS" file="extensions\platform_app.css" type="BINDATA" />

107 <include name="IDR_PLATFORM_APP_JS" file="extensions\platform_app.js" ty pe="BINDATA" />	107 <include name="IDR_PLATFORM_APP_JS" file="extensions\platform_app.js" ty pe="BINDATA" />

108 <include name="IDR_INJECT_APP_TITLEBAR_JS" file="extensions\inject_app_t itlebar.js" type="BINDATA" />	108 <include name="IDR_INJECT_APP_TITLEBAR_JS" file="extensions\inject_app_t itlebar.js" type="BINDATA" />

109 </if>	109 </if>

110 </includes>	110 </includes>

111 </release>	111 </release>

112 </grit>	112 </grit>

OLD	NEW