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

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

Issue 1223933005: Make use of the new UpdateActiveSetupVersionWorkItem. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@a3_cleanup_unused_param
Patch Set: merge up to r338517 Created 5 years, 5 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
« no previous file with comments | « chrome/installer/setup/install.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/setup/install_worker.cc
diff --git a/chrome/installer/setup/install_worker.cc b/chrome/installer/setup/install_worker.cc
index 1f2e966d1d1cb33d0381d527c2e85e02a10256a9..d8376cc75aec4410574059c39183e2bf8164090f 100644
--- a/chrome/installer/setup/install_worker.cc
+++ b/chrome/installer/setup/install_worker.cc
@@ -32,6 +32,7 @@
#include "chrome/installer/setup/install.h"
#include "chrome/installer/setup/setup_constants.h"
#include "chrome/installer/setup/setup_util.h"
+#include "chrome/installer/setup/update_active_setup_version_work_item.h"
#include "chrome/installer/util/app_registration_data.h"
#include "chrome/installer/util/browser_distribution.h"
#include "chrome/installer/util/callback_work_item.h"
@@ -57,12 +58,6 @@ namespace installer {
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"43,0,0,0";
-
// Although the UUID of the ChromeFrame class is used for the "current" value,
// this is done only as a convenience; there is no need for the GUID of the Low
// Rights policies to match the ChromeFrame class's GUID. Hence, it is safe to
@@ -1457,12 +1452,8 @@ void AddActiveSetupWorkItems(const InstallerState& installer_state,
static_cast<DWORD>(1U),
true);
- list->AddSetRegValueWorkItem(root,
- active_setup_path,
- WorkItem::kWow64Default,
- L"Version",
- kActiveSetupVersion,
- true);
+ list->AddWorkItem(new UpdateActiveSetupVersionWorkItem(
+ active_setup_path, UpdateActiveSetupVersionWorkItem::UPDATE));
}
void AddDeleteOldIELowRightsPolicyWorkItems(
« no previous file with comments | « chrome/installer/setup/install.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698