Install a user-level Start Menu shortcut for every user on system-installs through Active Setup

chrome/installer/setup/install_worker.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 contains the definitions of the installer functions that build
 // the WorkItemList used to install the application.
 
 #include "chrome/installer/setup/install_worker.h"
 
 #include <oaidl.h>
@@ skipping 29 matching lines @@
 #include "chrome/installer/util/l10n_string_util.h"
 #include "chrome/installer/util/product.h"
 #include "chrome/installer/util/set_reg_value_work_item.h"
 #include "chrome/installer/util/shell_util.h"
 #include "chrome/installer/util/util_constants.h"
 #include "chrome/installer/util/work_item_list.h"
 #include "chrome_frame/chrome_tab.h"
 
 using base::win::RegKey;
 
+namespace {
+
+// The version identifying the work done by setup.exe --configure-user-settings
+// on user login by way of Active Setup.  Increase this value if the work done
+// in setup_main.cc's handling of kConfigureUserSettings changes and should be
+// executed again for all users.
+const wchar_t* kActiveSetupVersion = L"23,0,0,0";

[grt (UTC plus 2), 2012/09/02 14:18:19]

please make this an array rather than a pointer.  const wchar_t* loses
information (the length of the string).  a std::string can potentially be
initialized from an array without searching for the string terminator.  i don't
know for certain if MS's implementation does, but on principal i don't like the
information loss here.

[gab, 2012/09/02 16:15:12]

Agreed 100%. Done.

+
+}  // namespace
+
 namespace installer {
 
 // Local helper to call AddRegisterComDllWorkItems for all DLLs in a set of
 // products managed by a given package.
 void AddRegisterComDllWorkItemsForPackage(const InstallerState& installer_state,
                                           const Version* old_version,
                                           const Version& new_version,
                                           WorkItemList* work_item_list) {
   // First collect the list of DLLs to be registered from each product.
   std::vector<FilePath> com_dll_list;
@@ skipping 841 matching lines @@
 
     AddUninstallShortcutWorkItems(installer_state, setup_path, new_version,
                                   install_list, *product);
 
     AddVersionKeyWorkItems(root, product->distribution(), new_version,
                            add_language_identifier, install_list);
 
     AddDelegateExecuteWorkItems(installer_state, src_path, new_version,
                                 *product, install_list);
 
-// TODO(gab): This is only disabled for M22 as the shortcut CL using Active
-// Setup will not make it in M22.
-#if 0
     AddActiveSetupWorkItems(installer_state, new_version, *product,
                             install_list);
-#endif
   }
 
   // Add any remaining work items that involve special settings for
   // each product.
   AddProductSpecificWorkItems(original_state, installer_state, setup_path,
                               new_version, install_list);
 
   // Copy over brand, usagestats, and other values.
   AddGoogleUpdateWorkItems(original_state, installer_state, install_list);
 
@@ skipping 303 matching lines @@
   } else {
     VLOG(1) << "Adding unregistration items for DelegateExecute verb handler.";
 
     list->AddDeleteRegKeyWorkItem(root, delegate_execute_path);
     list->AddDeleteRegKeyWorkItem(root, typelib_path);
     list->AddDeleteRegKeyWorkItem(root, interface_path);
   }
 }
 
 void AddActiveSetupWorkItems(const InstallerState& installer_state,
+                             const FilePath& setup_path,
                              const Version& new_version,
                              const Product& product,
                              WorkItemList* list) {
   DCHECK(installer_state.operation() != InstallerState::UNINSTALL);
   BrowserDistribution* distribution = product.distribution();
 
   if (!product.is_chrome() || !installer_state.system_install()) {
     const char* install_level =
         installer_state.system_install() ? "system" : "user";
     VLOG(1) << "No Active Setup processing to do for " << install_level
             << "-level " << distribution->GetAppShortCutName();
     return;
   }
 
   const HKEY root = HKEY_LOCAL_MACHINE;
   const string16 active_setup_path(GetActiveSetupPath(distribution));
 
   VLOG(1) << "Adding registration items for Active Setup.";
   list->AddCreateRegKeyWorkItem(root, active_setup_path);
   list->AddSetRegValueWorkItem(root, active_setup_path, L"",
                                distribution->GetAppShortCutName(), true);
 
   CommandLine cmd(installer_state.GetInstallerDirectory(new_version).
-      Append(installer::kSetupExe));
+      Append(setup_path.BaseName()));
   cmd.AppendSwitch(installer::switches::kConfigureUserSettings);
   cmd.AppendSwitch(installer::switches::kVerboseLogging);
+  cmd.AppendSwitch(installer::switches::kSystemLevel);
+  product.AppendProductFlags(&cmd);
   list->AddSetRegValueWorkItem(root, active_setup_path, L"StubPath",
                                cmd.GetCommandLineString(), true);
 
   // TODO(grt): http://crbug.com/75152 Write a reference to a localized
   // resource.
   list->AddSetRegValueWorkItem(root, active_setup_path, L"Localized Name",
                                distribution->GetAppShortCutName(), true);
 
   list->AddSetRegValueWorkItem(root, active_setup_path, L"IsInstalled",
                                static_cast<DWORD>(1U), true);
 
-  string16 comma_separated_version(ASCIIToUTF16(new_version.GetString()));
-  ReplaceChars(comma_separated_version, L".", L",", &comma_separated_version);
   list->AddSetRegValueWorkItem(root, active_setup_path, L"Version",
-                               comma_separated_version, true);
+                               kActiveSetupVersion, true);
 }
 
 namespace {
 
 enum ElevationPolicyId {
   CURRENT_ELEVATION_POLICY,
   OLD_ELEVATION_POLICY,
 };
 
 // Although the UUID of the ChromeFrame class is used for the "current" value,
@@ skipping 296 matching lines @@
                                  machine_state,
                                  setup_path,
                                  new_version,
                                  work_item_list,
                                  false,  // have_child_product
                                  cmd_line,
                                  kCmdQuickEnableApplicationHost);
 }
 
 }  // namespace installer