Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(122)

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

Issue 10693002: HiDPI gear icon for about:memory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Reland r144395 (was reverted in r144396) Created 8 years, 5 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/resources/shared/images/2x/gear.png » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <output filename="browser_resources.rc" type="rc_all" /> 8 <output filename="browser_resources.rc" type="rc_all" />
9 </outputs> 9 </outputs>
10 <release seq="1"> 10 <release seq="1">
11 <structures>
12 <if expr="is_posix and not is_macosx">
13 <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_lin ux.html" flattenhtml="true" type="chrome_html" />
14 </if>
15 <if expr="is_macosx">
16 <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_mac .html" flattenhtml="true" type="chrome_html" />
17 </if>
18 <if expr="is_win">
19 <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory.htm l" flattenhtml="true" type="chrome_html" />
20 </if>
21 </structures>
11 <includes> 22 <includes>
12 <if expr="is_win"> 23 <if expr="is_win">
13 <include name="IDR_ABOUT_CONFLICTS_HTML" file="resources\about_conflicts .html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 24 <include name="IDR_ABOUT_CONFLICTS_HTML" file="resources\about_conflicts .html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
14 <include name="IDR_ABOUT_CONFLICTS_JS" file="resources\about_conflicts.j s" type="BINDATA" /> 25 <include name="IDR_ABOUT_CONFLICTS_JS" file="resources\about_conflicts.j s" type="BINDATA" />
15 </if> 26 </if>
16 <include name="IDR_ABOUT_FLASH_HTML" file="resources\about_flash.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" /> 27 <include name="IDR_ABOUT_FLASH_HTML" file="resources\about_flash.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />
17 <include name="IDR_ABOUT_FLASH_JS" file="resources\about_flash.js" type="B INDATA" /> 28 <include name="IDR_ABOUT_FLASH_JS" file="resources\about_flash.js" type="B INDATA" />
18 <if expr="is_posix and not is_macosx">
19 <include name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_linux .html" flattenhtml="true" type="BINDATA" />
20 </if>
21 <if expr="is_macosx">
22 <include name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_mac.h tml" flattenhtml="true" type="BINDATA" />
23 </if>
24 <if expr="is_win">
25 <include name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory.html" flattenhtml="true" type="BINDATA" />
26 </if>
27 <include name="IDR_ABOUT_MEMORY_JS" file="resources\about_memory.js" type= "BINDATA" /> 29 <include name="IDR_ABOUT_MEMORY_JS" file="resources\about_memory.js" type= "BINDATA" />
28 <include name="IDR_ABOUT_STATS_HTML" file="resources\about_stats.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" /> 30 <include name="IDR_ABOUT_STATS_HTML" file="resources\about_stats.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />
29 <include name="IDR_ABOUT_STATS_JS" file="resources\about_stats.js" type="B INDATA" /> 31 <include name="IDR_ABOUT_STATS_JS" file="resources\about_stats.js" type="B INDATA" />
30 <include name="IDR_ABOUT_VERSION_HTML" file="resources\about_version.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 32 <include name="IDR_ABOUT_VERSION_HTML" file="resources\about_version.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
31 <include name="IDR_ABOUT_VERSION_JS" file="resources\about_version.js" typ e="BINDATA" /> 33 <include name="IDR_ABOUT_VERSION_JS" file="resources\about_version.js" typ e="BINDATA" />
32 <include name="IDR_BOOKMARKS_MANIFEST" file="resources\bookmark_manager\ma nifest.json" type="BINDATA" /> 34 <include name="IDR_BOOKMARKS_MANIFEST" file="resources\bookmark_manager\ma nifest.json" type="BINDATA" />
33 <if expr="is_posix and not is_macosx"> 35 <if expr="is_posix and not is_macosx">
34 <include name="IDR_CERTIFICATE_VIEWER_HTML" file="resources\certificate_ viewer.html" type="BINDATA" /> 36 <include name="IDR_CERTIFICATE_VIEWER_HTML" file="resources\certificate_ viewer.html" type="BINDATA" />
35 <include name="IDR_CERTIFICATE_VIEWER_JS" file="resources\certificate_vi ewer.js" type="BINDATA" /> 37 <include name="IDR_CERTIFICATE_VIEWER_JS" file="resources\certificate_vi ewer.js" type="BINDATA" />
36 <include name="IDR_CERTIFICATE_VIEWER_CSS" file="resources\certificate_v iewer.css" type="BINDATA" /> 38 <include name="IDR_CERTIFICATE_VIEWER_CSS" file="resources\certificate_v iewer.css" type="BINDATA" />
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 <include name="IDR_GESTURE_CONFIG_HTML" file="resources\gesture_config.h tml" type="BINDATA" /> 223 <include name="IDR_GESTURE_CONFIG_HTML" file="resources\gesture_config.h tml" type="BINDATA" />
222 <include name="IDR_GESTURE_CONFIG_JS" file="resources\gesture_config.js" type="BINDATA" /> 224 <include name="IDR_GESTURE_CONFIG_JS" file="resources\gesture_config.js" type="BINDATA" />
223 </if> 225 </if>
224 <if expr="is_win"> 226 <if expr="is_win">
225 <include name="IDR_SET_AS_DEFAULT_BROWSER_JS" file="resources\set_as_def ault_browser.js" flattenhtml="true" type="BINDATA" /> 227 <include name="IDR_SET_AS_DEFAULT_BROWSER_JS" file="resources\set_as_def ault_browser.js" flattenhtml="true" type="BINDATA" />
226 <include name="IDR_SET_AS_DEFAULT_BROWSER_HTML" file="resources\set_as_d efault_browser.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " /> 228 <include name="IDR_SET_AS_DEFAULT_BROWSER_HTML" file="resources\set_as_d efault_browser.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " />
227 </if> 229 </if>
228 </includes> 230 </includes>
229 </release> 231 </release>
230 </grit> 232 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/shared/images/2x/gear.png » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698