Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7189)

Unified Diff: chrome/installer/setup/install_worker.cc

Issue 10889028: Install a user-level Start Menu shortcut for every user on system-installs through Active Setup (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments + exit code + create shell notify Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/installer/setup/install_worker.cc
diff --git a/chrome/installer/setup/install_worker.cc b/chrome/installer/setup/install_worker.cc
index 43ce81a1676efa5126c00999bd3bd8c73bbfaafc..f2da798bf86be5c28d9c7676cf9574508f0b5d65 100644
--- a/chrome/installer/setup/install_worker.cc
+++ b/chrome/installer/setup/install_worker.cc
@@ -47,6 +47,18 @@
using base::win::RegKey;
+namespace {
+
+// This is not the Chrome version. To have Active Setup (a method Chrome
grt (UTC plus 2) 2012/09/01 03:20:28 please reword the comment so that it begins by tel
gab 2012/09/01 22:28:40 Done.
+// registers for on Windows for it to call setup at user login on system-level
+// installs) run again for users that have already run it, simply increment this
+// number.
+// Start at 23,0,0,0 because this was set to Chrome's version for a short
+// period on dev-channel of Chrome 22.
+static const wchar_t* kActiveSetupVersion = L"23,0,0,0";
grt (UTC plus 2) 2012/09/01 03:20:28 const wchar_t kActiveSetupVersion[] = L"23,0,0,0";
gab 2012/09/01 22:28:40 Done.
+
+} // namespace
+
namespace installer {
// Local helper to call AddRegisterComDllWorkItems for all DLLs in a set of
@@ -908,12 +920,8 @@ void AddInstallWorkItems(const InstallationState& original_state,
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
@@ -1263,6 +1271,8 @@ void AddActiveSetupWorkItems(const InstallerState& installer_state,
Append(installer::kSetupExe));
grt (UTC plus 2) 2012/09/01 03:20:28 please switch this to using BaseName of the curren
gab 2012/09/01 22:28:40 Done.
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);
@@ -1274,10 +1284,8 @@ void AddActiveSetupWorkItems(const InstallerState& installer_state,
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);
+ string16(kActiveSetupVersion), true);
grt (UTC plus 2) 2012/09/01 03:20:28 remove string16() since it's implicit
gab 2012/09/01 22:28:40 Done.
}
namespace {

Powered by Google App Engine
This is Rietveld 408576698