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

chrome/installer/util/chrome_app_host_operations.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/installer/util/chrome_app_host_operations.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 109 matching lines @@
     ShellUtil::ShortcutProperties* properties) const {
   if (!properties->has_target())
     properties->set_target(target_exe);
 
   if (!properties->has_arguments()) {
     CommandLine app_host_args(CommandLine::NO_PROGRAM);
     app_host_args.AppendSwitch(::switches::kShowAppList);
     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;
     string16 suffix;
     ShellUtil::GetUserSpecificRegistrySuffix(&suffix);
     string16 base_app_id(dist->GetBaseAppId());
     base_app_id.append(suffix);
     components.push_back(base_app_id);
     properties->set_app_id(ShellUtil::BuildAppModelId(components));
   }
 }
 
 }  // namespace installer