chrome/browser/browser_resources.grd - Issue 4524002: First cut of the about:conflicts page, listing all DLLs loaded in the Chrome ...

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

Issue 4524002: First cut of the about:conflicts page, listing all DLLs loaded in the Chrome ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 10 years, 1 month 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

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. ete -->	3 without changes to the corresponding grd file. ete -->

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" />

11 </outputs>	11 </outputs>

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

13 <includes>	13 <includes>

	14 <if expr="os.find('win') != -1">

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

	16 </if>

14 <if expr="os == 'linux2' or os.find('bsd') != -1">	17 <if expr="os == 'linux2' or os.find('bsd') != -1">

15 <include name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_linux .html" flattenhtml="true" type="BINDATA" />	18 <include name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_linux .html" flattenhtml="true" type="BINDATA" />

16 </if>	19 </if>

17 <if expr="os == 'darwin'">	20 <if expr="os == 'darwin'">

18 <include name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_mac.h tml" flattenhtml="true" type="BINDATA" />	21 <include name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_mac.h tml" flattenhtml="true" type="BINDATA" />

19 </if>	22 </if>

20 <if expr="os != 'linux2' and os != 'darwin' and os.find('bsd') == -1">	23 <if expr="os != 'linux2' and os != 'darwin' and os.find('bsd') == -1">

21 <include name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory.html" flattenhtml="true" type="BINDATA" />	24 <include name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory.html" flattenhtml="true" type="BINDATA" />

22 </if>	25 </if>

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

(...skipping 61 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
85 <include name="IDR_TALK_APP_MANIFEST" file="resources\chat_manager\manif est.json" type="BINDATA" />	88 <include name="IDR_TALK_APP_MANIFEST" file="resources\chat_manager\manif est.json" type="BINDATA" />

86 <include name="IDR_MENU_HTML" file="resources\menu.html" flattenhtml="tr ue" type="BINDATA" />	89 <include name="IDR_MENU_HTML" file="resources\menu.html" flattenhtml="tr ue" type="BINDATA" />

87 <include name="IDR_NETWORK_MENU_CSS" file="resources\network_menu.css" f lattenhtml="true" type="BINDATA" />	90 <include name="IDR_NETWORK_MENU_CSS" file="resources\network_menu.css" f lattenhtml="true" type="BINDATA" />

88 <include name="IDR_NETWORK_MENU_JS" file="resources\network_menu.js" fla ttenhtml="true" type="BINDATA" />	91 <include name="IDR_NETWORK_MENU_JS" file="resources\network_menu.js" fla ttenhtml="true" type="BINDATA" />

89 <include name="IDR_WRENCH_MENU_JS" file="resources\wrench_menu.js" flatt enhtml="true" type="BINDATA" />	92 <include name="IDR_WRENCH_MENU_JS" file="resources\wrench_menu.js" flatt enhtml="true" type="BINDATA" />

90 <include name="IDR_WRENCH_MENU_CSS" file="resources\wrench_menu.css" fla ttenhtml="true" type="BINDATA" />	93 <include name="IDR_WRENCH_MENU_CSS" file="resources\wrench_menu.css" fla ttenhtml="true" type="BINDATA" />

91 </if>	94 </if>

92 </includes>	95 </includes>

93 </release>	96 </release>

94 </grit>	97 </grit>

OLD	NEW

« no previous file with comments | « chrome/browser/browser_about_handler.cc ('k') | chrome/browser/dom_ui/conflicts_ui.h » ('j') | chrome/browser/enumerate_modules_model_win.h » ('J')