From fc8a93cffe0b43320cc502a1bc909114f163c989 Mon Sep 17 00:00:00 2001 From: "mattm@chromium.org" Date: Mon, 3 May 2010 17:55:11 +0000 Subject: 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 --- chrome/app/chrome_dll.rc | 2 +- chrome/app/chrome_dll_resource.h | 2 +- chrome/app/chrome_exe.rc | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) (limited to 'chrome/app') diff --git a/chrome/app/chrome_dll.rc b/chrome/app/chrome_dll.rc index 07d9073..3235ba3 100644 --- a/chrome/app/chrome_dll.rc +++ b/chrome/app/chrome_dll.rc @@ -192,7 +192,7 @@ END #if defined(GOOGLE_CHROME_BUILD) IDR_MAINFRAME ICON "theme\google_chrome\chrome.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 diff --git a/chrome/app/chrome_dll_resource.h b/chrome/app/chrome_dll_resource.h index def0110..1f220c5 100644 --- a/chrome/app/chrome_dll_resource.h +++ b/chrome/app/chrome_dll_resource.h @@ -37,7 +37,7 @@ #define IDI_THROBBER_22 123 #define IDI_THROBBER_23 124 #define IDI_THROBBER_24 125 -#define IDI_SXS 126 +#define IDR_SXS 126 // Values around 1600 are used by installer/setup/build/ 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 -- cgit v1.1