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

apps/app_host/app_host.rc

 // Microsoft Visual C++ generated resource script.
 //
 #include "app_host_resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
 #define APSTUDIO_HIDDEN_SYMBOLS
@@ skipping 12 matching lines @@
 #pragma code_page(1252)
 #endif //_WIN32
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon
 //
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_APP_HOST_MAIN  ICON  "..\\..\\chrome\\app\\theme\\app_list.ico"
+#if defined(GOOGLE_CHROME_BUILD)
+IDI_APP_HOST_MAIN ICON "..\\..\\chrome\\app\\theme\\google_chrome\\app_list.ico"

[tapted, 2013/04/09 11:38:11]

Note: The canary icon isn't here. I think that's right, since the app host and
the canary distribution are orthogonal.

[benwells, 2013/04/09 22:34:44]

Where is the canary icon then?

+#else
+IDI_APP_HOST_MAIN ICON "..\\..\\chrome\\app\\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
 /////////////////////////////////////////////////////////////////////////////