chrome/browser/browser_resources.grd - Issue 2501913002: Change the NaCl loader and broker processes to use the ServiceManager.

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

Issue 2501913002: Change the NaCl loader and broker processes to use the ServiceManager. (Closed)

Patch Set: Created 4 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

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" output_all_resource_defines= "false">	2 <grit latest_public_release="0" current_release="1" output_all_resource_defines= "false">

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 591 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
602 <if expr="not is_android and not is_ios">	602 <if expr="not is_android and not is_ios">

603 <include name="IDR_IME_WINDOW_CLOSE" file="resources\input_ime\ime_windo w_close.png" type="BINDATA" />	603 <include name="IDR_IME_WINDOW_CLOSE" file="resources\input_ime\ime_windo w_close.png" type="BINDATA" />

604 <include name="IDR_IME_WINDOW_CLOSE_C" file="resources\input_ime\ime_win dow_close_click.png" type="BINDATA" />	604 <include name="IDR_IME_WINDOW_CLOSE_C" file="resources\input_ime\ime_win dow_close_click.png" type="BINDATA" />

605 <include name="IDR_IME_WINDOW_CLOSE_H" file="resources\input_ime\ime_win dow_close_hover.png" type="BINDATA" />	605 <include name="IDR_IME_WINDOW_CLOSE_H" file="resources\input_ime\ime_win dow_close_hover.png" type="BINDATA" />

606 </if>	606 </if>

607 <include name="IDR_CHROME_CONTENT_BROWSER_MANIFEST_OVERLAY" file="${root_g en_dir}\chrome_content_browser_manifest_overlay.json" use_base_dir="false" type= "BINDATA" />	607 <include name="IDR_CHROME_CONTENT_BROWSER_MANIFEST_OVERLAY" file="${root_g en_dir}\chrome_content_browser_manifest_overlay.json" use_base_dir="false" type= "BINDATA" />

608 <include name="IDR_CHROME_CONTENT_GPU_MANIFEST_OVERLAY" file="chrome_conte nt_gpu_manifest_overlay.json" type="BINDATA" />	608 <include name="IDR_CHROME_CONTENT_GPU_MANIFEST_OVERLAY" file="chrome_conte nt_gpu_manifest_overlay.json" type="BINDATA" />

609 <include name="IDR_CHROME_CONTENT_PLUGIN_MANIFEST_OVERLAY" file="chrome_co ntent_plugin_manifest_overlay.json" type="BINDATA" />	609 <include name="IDR_CHROME_CONTENT_PLUGIN_MANIFEST_OVERLAY" file="chrome_co ntent_plugin_manifest_overlay.json" type="BINDATA" />

610 <include name="IDR_CHROME_CONTENT_RENDERER_MANIFEST_OVERLAY" file="chrome_ content_renderer_manifest_overlay.json" type="BINDATA" />	610 <include name="IDR_CHROME_CONTENT_RENDERER_MANIFEST_OVERLAY" file="chrome_ content_renderer_manifest_overlay.json" type="BINDATA" />

611 <include name="IDR_CHROME_CONTENT_UTILITY_MANIFEST_OVERLAY" file="chrome_c ontent_utility_manifest_overlay.json" type="BINDATA" />	611 <include name="IDR_CHROME_CONTENT_UTILITY_MANIFEST_OVERLAY" file="chrome_c ontent_utility_manifest_overlay.json" type="BINDATA" />

	612 <include name="IDR_NACL_LOADER_MANIFEST" file="../../components/nacl/loade r/nacl_loader_manifest.json" type="BINDATA" />

	613 <if expr="is_win">

	614 <include name="IDR_NACL_BROKER_MANIFEST" file="../../components/nacl/bro ker/nacl_broker_manifest.json" type="BINDATA" />

	615 </if>

612 </includes>	616 </includes>

613 </release>	617 </release>

614 </grit>	618 </grit>

OLD	NEW

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