summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-02 18:46:20 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-02 18:46:20 +0000
commit0bbec1fd7a1db9865dc10902840272c5213e0daf (patch)
treed43811e97b0aed89b10c3ae17529c09d62a4d310 /chrome/app
parent6ce7abc518969dfa1699a71ae87fda611012abd9 (diff)
downloadchromium_src-0bbec1fd7a1db9865dc10902840272c5213e0daf.zip
chromium_src-0bbec1fd7a1db9865dc10902840272c5213e0daf.tar.gz
chromium_src-0bbec1fd7a1db9865dc10902840272c5213e0daf.tar.bz2
Revert "Very temporary fix for theme bug where adding more..." (r37458).
Now that we have a proper fix (r37722), we should revert this short term hack (which didn't work in the end anyway). BUG=33416 TEST=none Review URL: http://codereview.chromium.org/562015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37852 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/theme/theme_resources.grd4
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index 14652a7..5d0d8e4 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -10,8 +10,6 @@
<output filename="grit/theme_resources_map.cc" type="resource_map_source" />
</outputs>
<release seq="1">
- <!-- IF YOU ADD A RESOURCE MAKE SURE TO ADD IT TO THE END!!!!! (At least
- until http://crbug.com/33416 is fixed) -->
<includes>
<include name="IDR_BACK" file="back.png" type="BINDATA" />
<include name="IDR_BACK_NOBORDER" file="back_noborder.png" type="BINDATA" />
@@ -220,6 +218,7 @@
<include name="IDR_INFOBAR_THEME" file="infobar_theme.png" type="BINDATA" />
<include name="IDR_INFOBAR_PLUGIN_CRASHED" file="infobar_plugin_crashed.png" type="BINDATA" />
<include name="IDR_INFOBAR_MULTIPLE_DOWNLOADS" file="infobar_multiple_downloads.png" type="BINDATA" />
+ <include name="IDR_INFOBAR_TRANSLATE" file="infobar_translate.png" type="BINDATA" />
<include name="IDR_MENU_MARKER" file="menu_marker.png" type="BINDATA" />
<include name="IDR_FROZEN_TAB_ICON" file="frozen_tab.png" type="BINDATA" />
<include name="IDR_UPDATE_AVAILABLE" file="update_available.png" type="BINDATA" />
@@ -449,7 +448,6 @@
<include name="IDR_THEME_FRAME_INACTIVE" file="theme_frame_default_inactive.png" type="BINDATA" />
</if>
- <include name="IDR_INFOBAR_TRANSLATE" file="infobar_translate.png" type="BINDATA" />
</includes>
</release>
</grit>