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

chrome/installer/util/shell_util.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.
 //
 // This file defines functions that integrate Chrome in Windows shell. These
 // functions can be used by Chrome as well as Chrome installer. All of the
 // work is done by the local functions defined in anonymous namespace in
 // this class.
 
 #include "chrome/installer/util/shell_util.h"
@@ skipping 197 matching lines @@
     return GetBrowserClientKey(dist, suffix).append(L"\\Capabilities");
   }
 
   // This method returns a list of all the registry entries that
   // are needed to register this installation's ProgId and AppId.
   // These entries need to be registered in HKLM prior to Win8.
   static void GetProgIdEntries(BrowserDistribution* dist,
                                const string16& chrome_exe,
                                const string16& suffix,
                                ScopedVector<RegistryEntry>* entries) {
-    string16 icon_path(ShellUtil::GetChromeIcon(dist, chrome_exe));
+    string16 icon_path(ShellUtil::GetIconString(chrome_exe,
+                                                dist->GetIconIndex()));
     string16 open_cmd(ShellUtil::GetChromeShellOpenCmd(chrome_exe));
     string16 delegate_command(ShellUtil::GetChromeDelegateCommand(chrome_exe));
     // For user-level installs: entries for the app id and DelegateExecute verb
     // handler will be in HKCU; thus we do not need a suffix on those entries.
     string16 app_id(
         ShellUtil::GetBrowserModelId(
             dist, InstallUtil::IsPerUserInstall(chrome_exe.c_str())));
     string16 delegate_guid;
     bool set_delegate_execute =
         IsChromeMetroSupported() &&
@@ skipping 109 matching lines @@
   // This method returns a list of the registry entries required to register
   // this installation in "RegisteredApplications" on Windows (to appear in
   // Default Programs, StartMenuInternet, etc.).
   // These entries need to be registered in HKLM prior to Win8.
   // If |suffix| is not empty, these entries are guaranteed to be unique on this
   // machine.
   static void GetShellIntegrationEntries(BrowserDistribution* dist,
                                          const string16& chrome_exe,
                                          const string16& suffix,
                                          ScopedVector<RegistryEntry>* entries) {
-    const string16 icon_path(ShellUtil::GetChromeIcon(dist, chrome_exe));
+    const string16 icon_path(
+        ShellUtil::GetIconString(chrome_exe, dist->GetIconIndex()));
     const string16 quoted_exe_path(L"\"" + chrome_exe + L"\"");
 
     // Register for the Start Menu "Internet" link (pre-Win7).
     const string16 start_menu_entry(GetBrowserClientKey(dist, suffix));
     // Register Chrome's display name.
     // TODO(grt): http://crbug.com/75152 Also set LocalizedString; see
     // http://msdn.microsoft.com/en-us/library/windows/desktop/cc144109(v=VS.85).aspx#registering_the_display_name
     entries->push_back(new RegistryEntry(
         start_menu_entry, dist->GetAppShortCutName()));
     // Register the "open" verb for launching Chrome via the "Internet" link.
@@ skipping 129 matching lines @@
     string16 html_prog_id(GetBrowserProgId(suffix));
     for (int i = 0; ShellUtil::kFileAssociations[i] != NULL; i++) {
       string16 ext_key(ShellUtil::kRegClasses);
       ext_key.push_back(FilePath::kSeparators[0]);
       ext_key.append(ShellUtil::kFileAssociations[i]);
       entries->push_back(new RegistryEntry(ext_key, html_prog_id));
     }
 
     // Protocols associations.
     string16 chrome_open = ShellUtil::GetChromeShellOpenCmd(chrome_exe);
-    string16 chrome_icon = ShellUtil::GetChromeIcon(dist, chrome_exe);
+    string16 chrome_icon = ShellUtil::GetIconString(chrome_exe,
+                                                    dist->GetIconIndex());
     for (int i = 0; ShellUtil::kBrowserProtocolAssociations[i] != NULL; i++) {
       GetXPStyleUserProtocolEntries(ShellUtil::kBrowserProtocolAssociations[i],
                                     chrome_icon, chrome_open, entries);
     }
 
     // start->Internet shortcut.
     string16 start_menu(ShellUtil::kRegStartMenuInternet);
     string16 app_name = dist->GetBaseAppName() + suffix;
     entries->push_back(new RegistryEntry(start_menu, app_name));
   }
@@ skipping 379 matching lines @@
 
 // Associates Chrome with |protocol| in the registry. This should not be
 // required on Vista+ but since some applications still read these registry
 // keys directly, we have to do this on Vista+ as well.
 // See http://msdn.microsoft.com/library/aa767914.aspx for more details.
 bool RegisterChromeAsDefaultProtocolClientXPStyle(BrowserDistribution* dist,
                                                   const string16& chrome_exe,
                                                   const string16& protocol) {
   ScopedVector<RegistryEntry> entries;
   const string16 chrome_open(ShellUtil::GetChromeShellOpenCmd(chrome_exe));
-  const string16 chrome_icon(ShellUtil::GetChromeIcon(dist, chrome_exe));
+  const string16 chrome_icon(
+      ShellUtil::GetIconString(chrome_exe, dist->GetIconIndex()));
   RegistryEntry::GetXPStyleUserProtocolEntries(protocol, chrome_icon,
                                                chrome_open, &entries);
   // Change the default protocol handler for current user.
   if (!AddRegistryEntries(HKEY_CURRENT_USER, entries)) {
     LOG(ERROR) << "Could not make Chrome default protocol client (XP).";
     return false;
   }
 
   return true;
 }
@@ skipping 404 matching lines @@
     ret = base::win::TaskbarPinShortcutLink(chosen_path->value().c_str());
     if (!ret) {
       LOG(ERROR) << "The shorcut at " << chosen_path->value()
                  << " was created, but the taskbar pin failed.";
     }
   }
 
   return ret;
 }
 
-string16 ShellUtil::GetChromeIcon(BrowserDistribution* dist,
-                                  const string16& chrome_exe) {
-  string16 chrome_icon(chrome_exe);
-  chrome_icon.append(L",");
-  chrome_icon.append(base::IntToString16(dist->GetIconIndex()));
-  return chrome_icon;
+string16 ShellUtil::GetIconString(const string16& icon_path,
+                                  int icon_index) {
+  string16 resource_string(icon_path);

[gab, 2012/11/14 21:34:34]

s/resource_string/icon_string

[huangs, 2012/11/14 21:57:01]

Done.

+  resource_string.append(L",");
+  resource_string.append(base::IntToString16(icon_index));
+  return resource_string;
 }
 
 string16 ShellUtil::GetChromeShellOpenCmd(const string16& chrome_exe) {
   return L"\"" + chrome_exe + L"\" -- \"%1\"";
 }
 
 string16 ShellUtil::GetChromeDelegateCommand(const string16& chrome_exe) {
   return L"\"" + chrome_exe + L"\" -- %*";
 }
 
@@ skipping 615 matching lines @@
     // are any left...).
     if (free_bits >= 8 && next_byte_index < size) {
       free_bits -= 8;
       bit_stream += bytes[next_byte_index++] << free_bits;
     }
   }
 
   DCHECK_EQ(ret.length(), encoded_length);
   return ret;
 }