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

Unified Diff: chrome/installer/setup/update_active_setup_version_work_item.h

Issue 1231973002: Force restoration of Chrome's shortcuts when Active Setup kicks in in response to a major OS upgrad… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@a4_use_as_workitem
Patch Set: Move improvements to install_util_unittest.cc to a follow-up CL. 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/setup_util_unittest.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/update_active_setup_version_work_item.h
diff --git a/chrome/installer/setup/update_active_setup_version_work_item.h b/chrome/installer/setup/update_active_setup_version_work_item.h
index 03aec4435a39142a29dd21db47cc1dab9fc4fc65..bb962aca87a098e8791fa459c91bdc59402d49c1 100644
--- a/chrome/installer/setup/update_active_setup_version_work_item.h
+++ b/chrome/installer/setup/update_active_setup_version_work_item.h
@@ -15,6 +15,18 @@
// on demand. This WorkItem is only viable on machine-wide installs.
class UpdateActiveSetupVersionWorkItem : public WorkItem {
public:
+ // The components of the Active Setup Version entry, in order.
+ enum VersionComponent {
+ // The major version.
+ MAJOR,
+ // Unused component, always 0 for now.
+ UNUSED1,
+ // Number of OS upgrades handled since original install.
+ OS_UPGRADES,
+ // Unused component, always 0 for now.
+ UNUSED2,
+ };
+
// The operation to be performed by this UpdateActiveSetupVersionWorkItem.
enum Operation {
// Update (or install if not present) the Active Setup "Version" in the
@@ -36,18 +48,6 @@ class UpdateActiveSetupVersionWorkItem : public WorkItem {
void Rollback() override;
private:
- // The components of the Active Setup Version entry, in order.
- enum ActiveSetupVersionComponent {
- // The major version.
- MAJOR,
- // Unused component, always 0 for now.
- UNUSED1,
- // Number of OS upgrades handled since original install.
- OS_UPGRADES,
- // Unused component, always 0 for now.
- UNUSED2,
- };
-
// Returns the updated Active Setup version to be used based on the
// |existing_version|.
base::string16 GetUpdatedActiveSetupVersion(
« no previous file with comments | « chrome/installer/setup/setup_util_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698