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..c1b743ef0199d0216f6d4ffdcf15bb11b43c4bcd 100644 |
--- a/chrome/installer/setup/install_worker.cc |
+++ b/chrome/installer/setup/install_worker.cc |
@@ -908,12 +908,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 |
@@ -1274,10 +1270,13 @@ 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); |
+ // This is not the Chrome version. To have Active Setup run again for users |
+ // that have already ran it, simply increase this number. |
grt (UTC plus 2)
2012/08/29 17:07:06
ran -> run
gab
2012/08/29 21:53:00
Done.
|
+ // 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"; |
robertshield
2012/08/29 16:59:30
Please move this to the top of the file, also expl
gab
2012/08/29 21:53:00
Done.
|
list->AddSetRegValueWorkItem(root, active_setup_path, L"Version", |
- comma_separated_version, true); |
+ string16(kActiveSetupVersion), true); |
} |
namespace { |