diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-03 17:55:11 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-03 17:55:11 +0000 |
| commit | fc8a93cffe0b43320cc502a1bc909114f163c989 (patch) | |
| tree | ef85428c7d9096dcfe43d6fbdd2800da74927c29 /chrome/app/chrome_exe.rc | |
| parent | d98341cd129fb8e3f146e74c7453d0dba4a28521 (diff) | |
| download | chromium_src-fc8a93cffe0b43320cc502a1bc909114f163c989.zip chromium_src-fc8a93cffe0b43320cc502a1bc909114f163c989.tar.gz chromium_src-fc8a93cffe0b43320cc502a1bc909114f163c989.tar.bz2 | |
Win: Fix wrong default icon being shown on chrome.exe.
BUG=42977
TEST=build official exe, look at it in explorer
Review URL: http://codereview.chromium.org/1736029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46241 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/chrome_exe.rc')
| -rw-r--r-- | chrome/app/chrome_exe.rc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/app/chrome_exe.rc b/chrome/app/chrome_exe.rc index 962dad1..2defc986 100644 --- a/chrome/app/chrome_exe.rc +++ b/chrome/app/chrome_exe.rc @@ -59,14 +59,15 @@ END // Icon // -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. +// The application icon should: have the lowest ID, be placed first, and its +// resource name should be alphabetically less than the name of any other icon +// resource (http://msdn.microsoft.com/en-us/library/ms997538.aspx). #if defined(GOOGLE_CHROME_BUILD) IDR_MAINFRAME ICON "theme\google_chrome\chrome.ico" IDR_MAINFRAME_2 ICON "theme\google_chrome\chrome2.ico" IDR_MAINFRAME_3 ICON "theme\google_chrome\chrome3.ico" IDR_MAINFRAME_4 ICON "theme\google_chrome\chrome4.ico" -IDI_SXS ICON "theme\google_chrome\chrome_sxs.ico" +IDR_SXS ICON "theme\google_chrome\chrome_sxs.ico" #else IDR_MAINFRAME ICON "theme\chromium\chromium.ico" #endif |