chrome/browser/browser_resources.grd - Issue 3122034: Use <if expr".."> to use a single bug report html for both Chrome and Chrome ...

Side by Side Diff: chrome/browser/browser_resources.grd

Issue 3122034: Use <if expr".."> to use a single bug report html for both Chrome and Chrome ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Included the bug_report_ui.cc change in CL. Created 10 years, 4 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 | « no previous file | chrome/browser/dom_ui/bug_report_ui.cc » ('j') | 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. eadee -->	3 without changes to the corresponding grd file. eadee -->

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/browser_resources.h" type="rc_header">	6 <output filename="grit/browser_resources.h" type="rc_header">

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

8 </output>	8 </output>

9 <output filename="browser_resources.pak" type="data_package" />	9 <output filename="browser_resources.pak" type="data_package" />

10 <output filename="browser_resources.rc" type="rc_all" />	10 <output filename="browser_resources.rc" type="rc_all" />

(...skipping 46 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
57 <include name="IDR_SYNC_CHOOSE_DATATYPES_HTML" file="sync\resources\choose _datatypes.html" flattenhtml="true" type="BINDATA" />	57 <include name="IDR_SYNC_CHOOSE_DATATYPES_HTML" file="sync\resources\choose _datatypes.html" flattenhtml="true" type="BINDATA" />

58 <include name="IDR_SYNC_SETUP_DONE_HTML" file="sync\resources\setup_done.h tml" flattenhtml="true" type="BINDATA" />	58 <include name="IDR_SYNC_SETUP_DONE_HTML" file="sync\resources\setup_done.h tml" flattenhtml="true" type="BINDATA" />

59 <include name="IDR_SYNC_SETUP_FLOW_HTML" file="sync\resources\setup_flow.h tml" flattenhtml="true" type="BINDATA" />	59 <include name="IDR_SYNC_SETUP_FLOW_HTML" file="sync\resources\setup_flow.h tml" flattenhtml="true" type="BINDATA" />

60 <include name="IDR_REMOTING_SETUP_FLOW_HTML" file="remoting\resources\remo ting_setup_flow.html" flattenhtml="true" type="BINDATA" />	60 <include name="IDR_REMOTING_SETUP_FLOW_HTML" file="remoting\resources\remo ting_setup_flow.html" flattenhtml="true" type="BINDATA" />

61 <include name="IDR_REMOTING_SETUP_DONE_HTML" file="remoting\resources\remo ting_setup_done.html" flattenhtml="true" type="BINDATA" />	61 <include name="IDR_REMOTING_SETUP_DONE_HTML" file="remoting\resources\remo ting_setup_done.html" flattenhtml="true" type="BINDATA" />

62 <include name="IDR_TRANSLATE_JS" file="resources\translate.js" type="BINDA TA" />	62 <include name="IDR_TRANSLATE_JS" file="resources\translate.js" type="BINDA TA" />

63 <include name="IDR_BUGREPORT_HTML" file="resources\bug_report.html" flatte nhtml="true" type="BINDATA" />	63 <include name="IDR_BUGREPORT_HTML" file="resources\bug_report.html" flatte nhtml="true" type="BINDATA" />

64 <include name="IDR_BUGREPORT_HTML_INVALID" file="resources\bug_report_inva lid.html" flattenhtml="true" type="BINDATA" />	64 <include name="IDR_BUGREPORT_HTML_INVALID" file="resources\bug_report_inva lid.html" flattenhtml="true" type="BINDATA" />

65 <if expr="pp_ifdef('chromeos')">	65 <if expr="pp_ifdef('chromeos')">

66 <include name="IDR_ABOUT_SYS_HTML" file="resources\about_sys.html" flatt enhtml="true" type="BINDATA" />	66 <include name="IDR_ABOUT_SYS_HTML" file="resources\about_sys.html" flatt enhtml="true" type="BINDATA" />

67 <include name="IDR_BUGREPORT_HTML_CHROMEOS" file="resources\bug_report_c ros.html" flattenhtml="true" type="BINDATA" />

68 <include name="IDR_FILEBROWSE_HTML" file="resources\filebrowse.html" fla ttenhtml="true" type="BINDATA" />	67 <include name="IDR_FILEBROWSE_HTML" file="resources\filebrowse.html" fla ttenhtml="true" type="BINDATA" />

69 <include name="IDR_HOST_REGISTRATION_PAGE_HTML" file="resources\host_reg istration_page.html" flattenhtml="true" type="BINDATA" />	68 <include name="IDR_HOST_REGISTRATION_PAGE_HTML" file="resources\host_reg istration_page.html" flattenhtml="true" type="BINDATA" />

70 <include name="IDR_MEDIAPLAYER_HTML" file="resources\mediaplayer.html" f lattenhtml="true" type="BINDATA" />	69 <include name="IDR_MEDIAPLAYER_HTML" file="resources\mediaplayer.html" f lattenhtml="true" type="BINDATA" />

71 <include name="IDR_MEDIAPLAYERPLAYLIST_HTML" file="resources\playlist.ht ml" flattenhtml="true" type="BINDATA" />	70 <include name="IDR_MEDIAPLAYERPLAYLIST_HTML" file="resources\playlist.ht ml" flattenhtml="true" type="BINDATA" />

72 <include name="IDR_OFFLINE_LOAD_HTML" file="resources\offline_load.html" flattenhtml="true" type="BINDATA" />	71 <include name="IDR_OFFLINE_LOAD_HTML" file="resources\offline_load.html" flattenhtml="true" type="BINDATA" />

73 <include name="IDR_OS_CREDITS_HTML" file="resources\about_os_credits.htm l" flattenhtml="true" type="BINDATA" />	72 <include name="IDR_OS_CREDITS_HTML" file="resources\about_os_credits.htm l" flattenhtml="true" type="BINDATA" />

74 <include name="IDR_SLIDESHOW_HTML" file="resources\slideshow.html" flatt enhtml="true" type="BINDATA" />	73 <include name="IDR_SLIDESHOW_HTML" file="resources\slideshow.html" flatt enhtml="true" type="BINDATA" />

75 </if>	74 </if>

76 </includes>	75 </includes>

77 </release>	76 </release>

78 </grit>	77 </grit>

OLD	NEW