| 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(
|
|
|