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

chrome/browser/shell_integration_win.cc

Index: chrome/browser/shell_integration_win.cc
diff --git a/chrome/browser/shell_integration_win.cc b/chrome/browser/shell_integration_win.cc
index 32790758ac80e8dca1611102a0d4ba660584e21b..cc03f2b0b91bfdbc324185f72b8649461c19e10d 100644
--- a/chrome/browser/shell_integration_win.cc
+++ b/chrome/browser/shell_integration_win.cc
@@ -434,11 +434,8 @@ string16 ShellIntegration::GetChromiumIconPath() {
     return string16();
   }
 
-  string16 icon_path(app_path.value());
-  icon_path.push_back(',');
-  icon_path += base::IntToString16(
-      BrowserDistribution::GetDistribution()->GetIconIndex());
-  return icon_path;
+  return ShellUtil::GetChromeIcon(BrowserDistribution::GetDistribution(),
+                                  app_path.value());

[gab, 2012/11/13 14:15:12]

If this call is going to be used this way (i.e. to get non-Chrome icons); it
should at least by renamed to something more generic.

I also feel it shouldn't take a distribution just to get the icon index out of
it, taking the icon index directly makes more sense to me.

Maybe something like "string16 GetResourcePath(FilePath resource_path, int
resource_index);" since this applies to more than just icons?

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

Done, calling it GetResourceString() per F2F.  Also, passing resource_path as a
string instead of FilePath, since many callers only have chrome_exe as string.

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

What resource types other than icons are typically addressed by "path,index"
strings?  If the answer is "none", then I think this fn should have Icon in the
name.

[grt (UTC plus 2), 2012/11/14 18:31:09]

ping

[huangs, 2012/11/14 20:35:55]

Yeah, GetIconString() sounds more appropriate.  Also changed parameter + local
variable names.

 }
 
 void ShellIntegration::MigrateChromiumShortcuts() {