chrome/browser/browser_resources.grd - Issue 831813004: Get nacl building again for android

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

Issue 831813004: Get nacl building again for android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove process launcher change Created 5 years, 11 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

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

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

3 <outputs>	3 <outputs>

4 <output filename="grit/browser_resources.h" type="rc_header">	4 <output filename="grit/browser_resources.h" type="rc_header">

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

6 </output>	6 </output>

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

8 </outputs>	8 </outputs>

9 <release seq="1">	9 <release seq="1">

10 <structures>	10 <structures>

(...skipping 63 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
74 <structure name="IDR_NEW_OOBE_JS" file="resources\chromeos\login\new\oob e.js" flattenhtml="true" type="chrome_html" />	74 <structure name="IDR_NEW_OOBE_JS" file="resources\chromeos\login\new\oob e.js" flattenhtml="true" type="chrome_html" />

75 </if>	75 </if>

76 <structure name="IDR_READER_OUT_OF_DATE_HTML" file="resources\reader_out_o f_date.html" flattenhtml="true" type="chrome_html" />	76 <structure name="IDR_READER_OUT_OF_DATE_HTML" file="resources\reader_out_o f_date.html" flattenhtml="true" type="chrome_html" />

77 <structure name="IDR_SECURITY_INTERSTITIAL_HTML" file="resources\security_ warnings\interstitial_v2.html" flattenhtml="true" type="chrome_html" />	77 <structure name="IDR_SECURITY_INTERSTITIAL_HTML" file="resources\security_ warnings\interstitial_v2.html" flattenhtml="true" type="chrome_html" />

78 </structures>	78 </structures>

79 <includes>	79 <includes>

80 <if expr="is_win">	80 <if expr="is_win">

81 <include name="IDR_ABOUT_CONFLICTS_HTML" file="resources\about_conflicts .html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />	81 <include name="IDR_ABOUT_CONFLICTS_HTML" file="resources\about_conflicts .html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />

82 <include name="IDR_ABOUT_CONFLICTS_JS" file="resources\about_conflicts.j s" type="BINDATA" />	82 <include name="IDR_ABOUT_CONFLICTS_JS" file="resources\about_conflicts.j s" type="BINDATA" />

83 </if>	83 </if>

84 <if expr="not is_android">	84 <if expr="enable_plugins">

85 <include name="IDR_ABOUT_FLASH_HTML" file="resources\about_flash.html" f lattenhtml="true" allowexternalscript="true" type="BINDATA" />	85 <include name="IDR_ABOUT_FLASH_HTML" file="resources\about_flash.html" f lattenhtml="true" allowexternalscript="true" type="BINDATA" />

86 <include name="IDR_ABOUT_FLASH_JS" file="resources\about_flash.js" type= "BINDATA" />	86 <include name="IDR_ABOUT_FLASH_JS" file="resources\about_flash.js" type= "BINDATA" />

87 </if>	87 </if>

88 <include name="IDR_ABOUT_MEMORY_JS" file="resources\about_memory.js" flatt enhtml="true" type="BINDATA" />	88 <include name="IDR_ABOUT_MEMORY_JS" file="resources\about_memory.js" flatt enhtml="true" type="BINDATA" />

89 <if expr="not disable_nacl">	89 <if expr="not disable_nacl">

90 <include name="IDR_ABOUT_NACL_HTML" file="resources\about_nacl.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />	90 <include name="IDR_ABOUT_NACL_HTML" file="resources\about_nacl.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />

91 <include name="IDR_ABOUT_NACL_CSS" file="resources\about_nacl.css" flatt enhtml="true" type="chrome_html" />	91 <include name="IDR_ABOUT_NACL_CSS" file="resources\about_nacl.css" flatt enhtml="true" type="chrome_html" />

92 <include name="IDR_ABOUT_NACL_JS" file="resources\about_nacl.js" type="B INDATA" />	92 <include name="IDR_ABOUT_NACL_JS" file="resources\about_nacl.js" type="B INDATA" />

93 </if>	93 </if>

94 <include name="IDR_ABOUT_STATS_HTML" file="resources\about_stats.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />	94 <include name="IDR_ABOUT_STATS_HTML" file="resources\about_stats.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />

(...skipping 346 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
441 <include name="IDR_CANGJIE_MANIFEST" file="resources\chromeos\input_me thod\cangjie_manifest.json" type="BINDATA" />	441 <include name="IDR_CANGJIE_MANIFEST" file="resources\chromeos\input_me thod\cangjie_manifest.json" type="BINDATA" />

442 <include name="IDR_MOZC_MANIFEST" file="resources\chromeos\input_metho d\mozc_manifest.json" type="BINDATA" />	442 <include name="IDR_MOZC_MANIFEST" file="resources\chromeos\input_metho d\mozc_manifest.json" type="BINDATA" />

443 </if>	443 </if>

444 <include name="IDR_HANGUL_MANIFEST" file="resources\chromeos\input_metho d\hangul_manifest.json" type="BINDATA" />	444 <include name="IDR_HANGUL_MANIFEST" file="resources\chromeos\input_metho d\hangul_manifest.json" type="BINDATA" />

445 <include name="IDR_BRAILLE_MANIFEST" file="resources\chromeos\braille_im e\manifest.json" type="BINDATA" />	445 <include name="IDR_BRAILLE_MANIFEST" file="resources\chromeos\braille_im e\manifest.json" type="BINDATA" />

446 </if>	446 </if>

447 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p roxy\manifest.json" type="BINDATA" />	447 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p roxy\manifest.json" type="BINDATA" />

448 </includes>	448 </includes>

449 </release>	449 </release>

450 </grit>	450 </grit>

OLD	NEW

« no previous file with comments | « no previous file | chrome/browser/nacl_host/nacl_browser_delegate_impl.h » ('j') | chrome/browser/nacl_host/nacl_browser_delegate_impl.h » ('J')