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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 333008: Mac: Implement about:memory. (Closed)
Patch Set: Merged ToT. Created 11 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
« no previous file with comments | « base/process_util_unittest.cc ('k') | chrome/browser/memory_details.h » ('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 <!-- 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. ek --> 3 without changes to the corresponding grd file. ek -->
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.rc" type="rc_all" /> 9 <output filename="browser_resources.rc" type="rc_all" />
10 <output filename="browser_resources.pak" type="data_package" /> 10 <output filename="browser_resources.pak" type="data_package" />
11 </outputs> 11 </outputs>
12 <release seq="1"> 12 <release seq="1">
13 <includes> 13 <includes>
14 <include name="IDR_ABOUT_PLUGINS_HTML" file="resources\about_plugins.html" type="BINDATA" /> 14 <include name="IDR_ABOUT_PLUGINS_HTML" file="resources\about_plugins.html" type="BINDATA" />
15 <include name="IDR_ABOUT_VERSION_HTML" file="resources\about_version.html" flattenhtml="true" type="BINDATA" /> 15 <include name="IDR_ABOUT_VERSION_HTML" file="resources\about_version.html" flattenhtml="true" type="BINDATA" />
16 16
17 <if expr="os == 'linux2'"> 17 <if expr="os == 'linux2'">
18 <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" />
19 </if> 19 </if>
20 20 <if expr="os == 'darwin'">
21 <if expr="os != 'linux2'"> 21 <include name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_mac.h tml" flattenhtml="true" type="BINDATA" />
22 </if>
23 <if expr="os != 'linux2' and os != 'darwin'">
22 <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" />
23 </if> 25 </if>
24 26
25 <include name="IDR_ABOUT_STATS_HTML" file="resources\about_stats.html" typ e="BINDATA" /> 27 <include name="IDR_ABOUT_STATS_HTML" file="resources\about_stats.html" typ e="BINDATA" />
26 <include name="IDR_SSL_ROAD_BLOCK_HTML" file="security\resources\ssl_roadb lock.html" flattenhtml="true" type="BINDATA" /> 28 <include name="IDR_SSL_ROAD_BLOCK_HTML" file="security\resources\ssl_roadb lock.html" flattenhtml="true" type="BINDATA" />
27 <include name="IDR_SSL_ERROR_HTML" file="security\resources\ssl_error.html " flattenhtml="true" type="BINDATA" /> 29 <include name="IDR_SSL_ERROR_HTML" file="security\resources\ssl_error.html " flattenhtml="true" type="BINDATA" />
28 <include name="IDR_NEW_TAB_THEME_CSS" file="resources\new_tab_theme.css" f lattenhtml="true" type="BINDATA" /> 30 <include name="IDR_NEW_TAB_THEME_CSS" file="resources\new_tab_theme.css" f lattenhtml="true" type="BINDATA" />
29 <include name="IDR_NEW_INCOGNITO_TAB_THEME_CSS" file="resources\new_incogn ito_tab_theme.css" flattenhtml="true" type="BINDATA" /> 31 <include name="IDR_NEW_INCOGNITO_TAB_THEME_CSS" file="resources\new_incogn ito_tab_theme.css" flattenhtml="true" type="BINDATA" />
30 <include name="IDR_NEW_NEW_TAB_HTML" file="resources\new_new_tab.html" fla ttenhtml="true" type="BINDATA" /> 32 <include name="IDR_NEW_NEW_TAB_HTML" file="resources\new_new_tab.html" fla ttenhtml="true" type="BINDATA" />
31 <include name="IDR_NEW_NEW_TAB_CSS" file="resources\new_new_tab.css" type= "BINDATA" /> 33 <include name="IDR_NEW_NEW_TAB_CSS" file="resources\new_new_tab.css" type= "BINDATA" />
(...skipping 19 matching lines...) Expand all
51 <include name="IDR_GAIA_LOGIN_HTML" file="sync\resources\gaia_login.html" flattenhtml="true" type="BINDATA" /> 53 <include name="IDR_GAIA_LOGIN_HTML" file="sync\resources\gaia_login.html" flattenhtml="true" type="BINDATA" />
52 <include name="IDR_SYNC_SETUP_FLOW_HTML" file="sync\resources\setup_flow.h tml" flattenhtml="true" type="BINDATA" /> 54 <include name="IDR_SYNC_SETUP_FLOW_HTML" file="sync\resources\setup_flow.h tml" flattenhtml="true" type="BINDATA" />
53 <include name="IDR_MERGE_AND_SYNC_HTML" file="sync\resources\merge_and_syn c.html" flattenhtml="true" type="BINDATA" /> 55 <include name="IDR_MERGE_AND_SYNC_HTML" file="sync\resources\merge_and_syn c.html" flattenhtml="true" type="BINDATA" />
54 <include name="IDR_SYNC_SETUP_DONE_HTML" file="sync\resources\setup_done.h tml" flattenhtml="true" type="BINDATA" /> 56 <include name="IDR_SYNC_SETUP_DONE_HTML" file="sync\resources\setup_done.h tml" flattenhtml="true" type="BINDATA" />
55 <include name="IDR_BLACKLIST_HTML" file="resources\privacy_blacklist_block .html" flattenhtml="true" type="BINDATA" /> 57 <include name="IDR_BLACKLIST_HTML" file="resources\privacy_blacklist_block .html" flattenhtml="true" type="BINDATA" />
56 <include name="IDR_BLACKLIST_IMAGE" file="resources\privacy_blacklist_bloc k.png" type="BINDATA" /> 58 <include name="IDR_BLACKLIST_IMAGE" file="resources\privacy_blacklist_bloc k.png" type="BINDATA" />
57 <include name="IDR_NOTIFICATION_HTML" file="resources\notification.html" t ype="BINDATA" /> 59 <include name="IDR_NOTIFICATION_HTML" file="resources\notification.html" t ype="BINDATA" />
58 </includes> 60 </includes>
59 </release> 61 </release>
60 </grit> 62 </grit>
OLDNEW
« no previous file with comments | « base/process_util_unittest.cc ('k') | chrome/browser/memory_details.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698