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 56ab0238360d9e398d3348d03801df36732a3168..25c0d4bc03c3fed8c098221035d613686df41447 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());
 
   if (!properties->has_app_id()) {
     std::vector<string16> components;