diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-05 21:47:49 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-05 21:47:49 +0000 |
| commit | 75cf085b056a041258b6bf39301d92c3cb992a66 (patch) | |
| tree | c08916df0a35d7fc3b5be892727934de4882ab82 /chrome/app/theme | |
| parent | db57d47b93d1bd4a7388a503b3e09856029396c0 (diff) | |
| download | chromium_src-75cf085b056a041258b6bf39301d92c3cb992a66.zip chromium_src-75cf085b056a041258b6bf39301d92c3cb992a66.tar.gz chromium_src-75cf085b056a041258b6bf39301d92c3cb992a66.tar.bz2 | |
Fix the chrome app icon on windows
(and also the icon for the default plugin window).
MSVS's resource compiler can only compile resources of the same
type from a single .rc file, so we can't have ICON types scattered
across rc files. This change moves all the icon files out of
theme_resources.rc and puts them in chrome_dll.rc. This worked
in the past because these were different dlls.
This has the side benefit of not including the ico files in
the linux/mac builds.
BUG=26600
Review URL: http://codereview.chromium.org/361031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31131 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/theme')
| -rw-r--r-- | chrome/app/theme/theme_resources.grd | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd index 1be7e73..a3ce0e5 100644 --- a/chrome/app/theme/theme_resources.grd +++ b/chrome/app/theme/theme_resources.grd @@ -118,30 +118,6 @@ <include name="IDR_APP_DROPARROW" file="app_droparrow.png" type="BINDATA" /> <include name="IDR_LOCK" file="lock_small.png" type="BINDATA" /> <include name="IDR_WARNING" file="alert_small.png" type="BINDATA" /> - <include name="IDR_THROBBER_01" file="vista_frame_throbber_01.ico" type="ICON" /> - <include name="IDR_THROBBER_02" file="vista_frame_throbber_02.ico" type="ICON" /> - <include name="IDR_THROBBER_03" file="vista_frame_throbber_03.ico" type="ICON" /> - <include name="IDR_THROBBER_04" file="vista_frame_throbber_04.ico" type="ICON" /> - <include name="IDR_THROBBER_05" file="vista_frame_throbber_05.ico" type="ICON" /> - <include name="IDR_THROBBER_06" file="vista_frame_throbber_06.ico" type="ICON" /> - <include name="IDR_THROBBER_07" file="vista_frame_throbber_07.ico" type="ICON" /> - <include name="IDR_THROBBER_08" file="vista_frame_throbber_08.ico" type="ICON" /> - <include name="IDR_THROBBER_09" file="vista_frame_throbber_09.ico" type="ICON" /> - <include name="IDR_THROBBER_10" file="vista_frame_throbber_10.ico" type="ICON" /> - <include name="IDR_THROBBER_11" file="vista_frame_throbber_11.ico" type="ICON" /> - <include name="IDR_THROBBER_12" file="vista_frame_throbber_12.ico" type="ICON" /> - <include name="IDR_THROBBER_13" file="vista_frame_throbber_13.ico" type="ICON" /> - <include name="IDR_THROBBER_14" file="vista_frame_throbber_14.ico" type="ICON" /> - <include name="IDR_THROBBER_15" file="vista_frame_throbber_15.ico" type="ICON" /> - <include name="IDR_THROBBER_16" file="vista_frame_throbber_16.ico" type="ICON" /> - <include name="IDR_THROBBER_17" file="vista_frame_throbber_17.ico" type="ICON" /> - <include name="IDR_THROBBER_18" file="vista_frame_throbber_18.ico" type="ICON" /> - <include name="IDR_THROBBER_19" file="vista_frame_throbber_19.ico" type="ICON" /> - <include name="IDR_THROBBER_20" file="vista_frame_throbber_20.ico" type="ICON" /> - <include name="IDR_THROBBER_21" file="vista_frame_throbber_21.ico" type="ICON" /> - <include name="IDR_THROBBER_22" file="vista_frame_throbber_22.ico" type="ICON" /> - <include name="IDR_THROBBER_23" file="vista_frame_throbber_23.ico" type="ICON" /> - <include name="IDR_THROBBER_24" file="vista_frame_throbber_24.ico" type="ICON" /> <include name="IDR_STOP" file="stop.png" type="BINDATA" /> <include name="IDR_STOP_NOBORDER" file="stop_noborder.png" type="BINDATA" /> <include name="IDR_STOP_NOBORDER_CENTER" file="stop_noborder_center.png" type="BINDATA" /> |