diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-27 04:18:59 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-27 04:18:59 +0000 |
| commit | 18bb30ff182dd255f9abaee22fdd0691c28b5e26 (patch) | |
| tree | 8a14ff4f852e5f94ef460897c30e57aa0fea409d /chrome/browser/browser_resources.grd | |
| parent | 32c24ae8784a169cf4bd333882cab59f00307a18 (diff) | |
| download | chromium_src-18bb30ff182dd255f9abaee22fdd0691c28b5e26.zip chromium_src-18bb30ff182dd255f9abaee22fdd0691c28b5e26.tar.gz chromium_src-18bb30ff182dd255f9abaee22fdd0691c28b5e26.tar.bz2 | |
Revert 144395 (triggers http://crbug.com/134796)
- HiDPI gear icon for about:memory
BUG=134372
TEST=visual
TBR=avi,flackr
Review URL: https://chromiumcodereview.appspot.com/10693002
TBR=thakis@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144396 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_resources.grd')
| -rw-r--r-- | chrome/browser/browser_resources.grd | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd index e778c21..b24eee1 100644 --- a/chrome/browser/browser_resources.grd +++ b/chrome/browser/browser_resources.grd @@ -8,17 +8,6 @@ <output filename="browser_resources.rc" type="rc_all" /> </outputs> <release seq="1"> - <structures> - <if expr="is_posix and not is_macosx"> - <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_linux.html" flattenhtml="true" type="chrome_html" /> - </if> - <if expr="is_macosx"> - <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_mac.html" flattenhtml="true" type="chrome_html" /> - </if> - <if expr="is_win"> - <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory.html" flattenhtml="true" type="chrome_html" /> - </if> - </structures> <includes> <if expr="is_win"> <include name="IDR_ABOUT_CONFLICTS_HTML" file="resources\about_conflicts.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> @@ -26,6 +15,15 @@ </if> <include name="IDR_ABOUT_FLASH_HTML" file="resources\about_flash.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> <include name="IDR_ABOUT_FLASH_JS" file="resources\about_flash.js" type="BINDATA" /> + <if expr="is_posix and not is_macosx"> + <include name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_linux.html" flattenhtml="true" type="BINDATA" /> + </if> + <if expr="is_macosx"> + <include name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_mac.html" flattenhtml="true" type="BINDATA" /> + </if> + <if expr="is_win"> + <include name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory.html" flattenhtml="true" type="BINDATA" /> + </if> <include name="IDR_ABOUT_MEMORY_JS" file="resources\about_memory.js" type="BINDATA" /> <include name="IDR_ABOUT_STATS_HTML" file="resources\about_stats.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> <include name="IDR_ABOUT_STATS_JS" file="resources\about_stats.js" type="BINDATA" /> |