Update App Launcher icons, splitting for Chromium, Chrome, Canary.

chrome/app/chrome_exe.rc

 // Microsoft Visual C++ generated resource script.
 //
 #include "chrome_exe_resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
 #define APSTUDIO_HIDDEN_SYMBOLS
@@ skipping 28 matching lines @@
 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"
 // The SXS icon must have an index of 4, the constant is used in Chrome code to
 // identify it.
 IDR_SXS                 ICON                    "theme\google_chrome\chrome_sxs.ico"
 #else
 IDR_MAINFRAME           ICON                    "theme\chromium\chromium.ico"
 #endif
+
 // Icon for the App Lancher. Named with a leading X to keep the name
 // alphabetically after IDR_SXS.
-// The SXS icon must have an index of 5 for Chrome and 1 for Chromium, these
-// constants are used in Chrome code to identify it.
-IDR_X_APP_LIST          ICON                    "theme\\app_list.ico"
+#if defined(GOOGLE_CHROME_BUILD)
+// The App Launcher icon must have an index of 5 in Chrome, and 6 for SXS.
+IDR_X_APP_LIST          ICON                    "theme\\google_chrome\\app_list.ico"
+IDR_X_APP_LIST_SXS      ICON                    "theme\\google_chrome\\app_list_sxs.ico"
+#else
+// The App Launcher icon must have an index of 1 for Chromium.
+IDR_X_APP_LIST          ICON                    "theme\\chromium\\app_list.ico"
+#endif
 
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // GOOGLEUPDATEAPPLICATIONCOMMANDS is a "well-known" marker resource defined
 // by Omaha. Executables must both be signed by Google and contain the marker
 // in order to expose application commands.
 //
 #define IDR_GOOGLE_UPDATE_APP_COMMANDS_MARKUP 1
 
 IDR_GOOGLE_UPDATE_APP_COMMANDS_MARKUP GOOGLEUPDATEAPPLICATIONCOMMANDS { 1L }
 
 
 #endif    // English (U.S.) resources
 /////////////////////////////////////////////////////////////////////////////