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/chrome_dll.rc | |
| 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/chrome_dll.rc')
| -rw-r--r-- | chrome/app/chrome_dll.rc | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/chrome/app/chrome_dll.rc b/chrome/app/chrome_dll.rc index 5a26df5..e9355a9 100644 --- a/chrome/app/chrome_dll.rc +++ b/chrome/app/chrome_dll.rc @@ -169,7 +169,7 @@ END ///////////////////////////////////////////////////////////////////////////// // -// Icon +// Icons // // This is duplicated from the .exe file to make ATL happy (it tries to load // the icon from the current module). We can perhaps work around this in the @@ -181,6 +181,34 @@ IDR_MAINFRAME ICON "theme\google_chrome\chrome.ico" IDR_MAINFRAME ICON "theme\chromium\chromium.ico" #endif +// We include these resources because all ICON types need to be in the +// same .rc file. See: +// http://www.technewsgroups.net/group/microsoft.public.dotnet.general/topic2111.aspx +IDI_THROBBER_01 ICON "theme\vista_frame_throbber_01.ico" +IDI_THROBBER_02 ICON "theme\vista_frame_throbber_02.ico" +IDI_THROBBER_03 ICON "theme\vista_frame_throbber_03.ico" +IDI_THROBBER_04 ICON "theme\vista_frame_throbber_04.ico" +IDI_THROBBER_05 ICON "theme\vista_frame_throbber_05.ico" +IDI_THROBBER_06 ICON "theme\vista_frame_throbber_06.ico" +IDI_THROBBER_07 ICON "theme\vista_frame_throbber_07.ico" +IDI_THROBBER_08 ICON "theme\vista_frame_throbber_08.ico" +IDI_THROBBER_09 ICON "theme\vista_frame_throbber_09.ico" +IDI_THROBBER_10 ICON "theme\vista_frame_throbber_10.ico" +IDI_THROBBER_11 ICON "theme\vista_frame_throbber_11.ico" +IDI_THROBBER_12 ICON "theme\vista_frame_throbber_12.ico" +IDI_THROBBER_13 ICON "theme\vista_frame_throbber_13.ico" +IDI_THROBBER_14 ICON "theme\vista_frame_throbber_14.ico" +IDI_THROBBER_15 ICON "theme\vista_frame_throbber_15.ico" +IDI_THROBBER_16 ICON "theme\vista_frame_throbber_16.ico" +IDI_THROBBER_17 ICON "theme\vista_frame_throbber_17.ico" +IDI_THROBBER_18 ICON "theme\vista_frame_throbber_18.ico" +IDI_THROBBER_19 ICON "theme\vista_frame_throbber_19.ico" +IDI_THROBBER_20 ICON "theme\vista_frame_throbber_20.ico" +IDI_THROBBER_21 ICON "theme\vista_frame_throbber_21.ico" +IDI_THROBBER_22 ICON "theme\vista_frame_throbber_22.ico" +IDI_THROBBER_23 ICON "theme\vista_frame_throbber_23.ico" +IDI_THROBBER_24 ICON "theme\vista_frame_throbber_24.ico" + ///////////////////////////////////////////////////////////////////////////// // // Dialog |