Badge Windows profile shortcuts with multi-user avatar.

chrome/installer/util/shell_util.cc

 // Copyright (c) 2011 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 529 matching lines @@
     cleanup_needed = (*itr)->NameExistsInHKLM();
   }
   return cleanup_needed;
 }
 
 bool ShellUtil::CreateChromeDesktopShortcut(BrowserDistribution* dist,
                                             const std::wstring& chrome_exe,
                                             const std::wstring& description,
                                             const std::wstring& appended_name,
                                             const std::wstring& arguments,
+                                            const std::wstring& icon_path,
+                                            int icon_index,
                                             ShellChange shell_change,
                                             bool alternate,
                                             bool create_new) {
   std::wstring shortcut_name;
   if (!ShellUtil::GetChromeShortcutName(dist, alternate, appended_name,
                                         &shortcut_name))
     return false;
 
   bool ret = false;
   if (shell_change == ShellUtil::CURRENT_USER) {
     FilePath shortcut_path;
     // We do not want to create a desktop shortcut to Chrome in the current
     // user's desktop folder if there is already one in the "All Users"
     // desktop folder.
     bool got_system_desktop = ShellUtil::GetDesktopPath(true, &shortcut_path);
     FilePath shortcut = shortcut_path.Append(shortcut_name);
     if (!got_system_desktop || !file_util::PathExists(shortcut)) {
       // Either we couldn't query the "All Users" Desktop folder or there's
       // nothing in it, so let's continue.
       if (ShellUtil::GetDesktopPath(false, &shortcut_path)) {
         shortcut = shortcut_path.Append(shortcut_name);
         ret = ShellUtil::UpdateChromeShortcut(dist,
                                               chrome_exe,
                                               shortcut.value(),
                                               arguments,
                                               description,
+                                              icon_path,
+                                              dist->GetIconIndex(),

[grt (UTC plus 2), 2011/12/03 04:14:00]

this should be icon_index, no?

[SteveT, 2011/12/03 05:07:09]

Yup, thanks for catching that.

                                               create_new);
       }
     }
   } else if (shell_change == ShellUtil::SYSTEM_LEVEL) {
     FilePath shortcut_path;
     if (ShellUtil::GetDesktopPath(true, &shortcut_path)) {
       FilePath shortcut = shortcut_path.Append(shortcut_name);
       ret = ShellUtil::UpdateChromeShortcut(dist,
                                             chrome_exe,
                                             shortcut.value(),
                                             arguments,
                                             description,
+                                            icon_path,
+                                            dist->GetIconIndex(),

[grt (UTC plus 2), 2011/12/03 04:14:00]

same

[SteveT, 2011/12/03 05:07:09]

Done.

                                             create_new);
     }
   } else {
     NOTREACHED();
   }
   return ret;
 }
 
 bool ShellUtil::CreateChromeQuickLaunchShortcut(BrowserDistribution* dist,
                                                 const std::wstring& chrome_exe,
                                                 int shell_change,
                                                 bool create_new) {
   std::wstring shortcut_name;
   if (!ShellUtil::GetChromeShortcutName(dist, false, L"", &shortcut_name))
     return false;
 
   bool ret = true;
   // First create shortcut for the current user.
   if (shell_change & ShellUtil::CURRENT_USER) {
     std::wstring user_ql_path;
     if (ShellUtil::GetQuickLaunchPath(false, &user_ql_path)) {
       file_util::AppendToPath(&user_ql_path, shortcut_name);
       ret = ShellUtil::UpdateChromeShortcut(dist, chrome_exe, user_ql_path,
-                                            L"", L"", create_new);
+                                            L"", L"", chrome_exe,
+                                            dist->GetIconIndex(),
+                                            create_new);
     } else {
       ret = false;
     }
   }
 
   // Add a shortcut to Default User's profile so that all new user profiles
   // get it.
   if (shell_change & ShellUtil::SYSTEM_LEVEL) {
     std::wstring default_ql_path;
     if (ShellUtil::GetQuickLaunchPath(true, &default_ql_path)) {
       file_util::AppendToPath(&default_ql_path, shortcut_name);
       ret = ShellUtil::UpdateChromeShortcut(dist, chrome_exe, default_ql_path,
-                                            L"", L"", create_new) && ret;
+                                            L"", L"", chrome_exe,
+                                            dist->GetIconIndex(),
+                                            create_new) && ret;
     } else {
       ret = false;
     }
   }
 
   return ret;
 }
 
 std::wstring ShellUtil::GetChromeIcon(BrowserDistribution* dist,
                                       const std::wstring& chrome_exe) {
@@ skipping 410 matching lines @@
   }
 
   return ret;
 }
 
 bool ShellUtil::UpdateChromeShortcut(BrowserDistribution* dist,
                                      const std::wstring& chrome_exe,
                                      const std::wstring& shortcut,
                                      const std::wstring& arguments,
                                      const std::wstring& description,
+                                     const std::wstring& icon_path,
+                                     int icon_index,
                                      bool create_new) {
   std::wstring chrome_path = FilePath(chrome_exe).DirName().value();
 
   FilePath prefs_path(chrome_path);
   prefs_path = prefs_path.AppendASCII(installer::kDefaultMasterPrefs);
   installer::MasterPreferences prefs(prefs_path);
-  int icon_index = dist->GetIconIndex();
   prefs.GetInt(installer::master_preferences::kChromeShortcutIconIndex,

[grt (UTC plus 2), 2011/12/03 04:14:00]

should this pref only do anything if
FilePath::CompareEqualIgnoreCase(icon_path.value(), chrome_exe.value())?  it
doesn't seem to make any sense otherwise.

[SteveT, 2011/12/03 05:09:53]

Yup, that makes sense. I am going to check
FilePath::CompareEqualIgnoreCase(icon_path, chrome_exe) for now, since those
values come in as wstrings. This is going to make the non-windows compilers
unhappy because of the annoying StringType def in FilePath, so I'll have to
address that next...

                &icon_index);
   if (create_new) {
     return file_util::CreateShortcutLink(
         chrome_exe.c_str(),                // target
         shortcut.c_str(),                  // shortcut
         chrome_path.c_str(),               // working dir
         arguments.c_str(),                 // arguments
         description.c_str(),               // description
-        chrome_exe.c_str(),                // icon file
+        icon_path.c_str(),                 // icon file
         icon_index,                        // icon index
         dist->GetBrowserAppId().c_str());  // app id
   } else {
     return file_util::UpdateShortcutLink(
         chrome_exe.c_str(),                // target
         shortcut.c_str(),                  // shortcut
         chrome_path.c_str(),               // working dir
         arguments.c_str(),                 // arguments
         description.c_str(),               // description
-        chrome_exe.c_str(),                // icon file
+        icon_path.c_str(),                 // icon file
         icon_index,                        // icon index
         dist->GetBrowserAppId().c_str());  // app id
   }
 }