Add default icon to app_host.exe, and use it in shortcuts during installation.

chrome/installer/util/chrome_app_host_operations.cc

Index: chrome/installer/util/chrome_app_host_operations.cc
diff --git a/chrome/installer/util/chrome_app_host_operations.cc b/chrome/installer/util/chrome_app_host_operations.cc
index 73b4056020b25e71f9850b3f50654384dff0916a..a81cad339d33ae598a74542afb8e82d514531dc1 100644
--- a/chrome/installer/util/chrome_app_host_operations.cc
+++ b/chrome/installer/util/chrome_app_host_operations.cc
@@ -127,15 +127,8 @@ void ChromeAppHostOperations::AddDefaultShortcutProperties(
     properties->set_arguments(app_host_args.GetCommandLineString());
   }
 
-  if (!properties->has_icon()) {
-    // Currently the App Launcher icon is inside chrome.exe, which we assume
-    // to be located in the same directory as app_host.exe.
-    // TODO(huangs): Cause the icon to also be embedded in app_host.exe,
-    // and then point at this (as chrome.exe is _not_ in the same folder
-    // for system-level chrome installs, or may even be uninstalled).
-    FilePath chrome_exe(target_exe.DirName().Append(kChromeExe));
-    properties->set_icon(chrome_exe, dist->GetIconIndex());
-  }
+  if (!properties->has_icon())
+    properties->set_icon(target_exe, dist->GetIconIndex());

[grt (UTC plus 2), 2012/11/13 16:19:32]

target_exe -> dist->GetIconFile()

[huangs, 2012/11/13 20:41:54]

Cannot do this, since target_exe has the full path, but GetIconFile() only
returns the bare executable name!

[grt (UTC plus 2), 2012/11/14 15:55:14]

Oh yeah, duh.

 
   if (!properties->has_app_id()) {
     std::vector<string16> components;