Chromium Code Reviews Chromium Code Reviews
Issue 2292293002:
Add installer::SetupSingleton. (Closed)
| Index: chrome/installer/util/util_constants.h |
| diff --git a/chrome/installer/util/util_constants.h b/chrome/installer/util/util_constants.h |
| index d664b0031a1d369983b6738d396974635b06090a..5cb1049ccd93c2dd33cb8dddfae8243fc8c7ad78 100644 |
| --- a/chrome/installer/util/util_constants.h |
| +++ b/chrome/installer/util/util_constants.h |
| @@ -17,45 +17,45 @@ namespace installer { |
| // value in a comment for posterity's sake, but take the liberty of removing the |
| // old doc string. |
| enum InstallStatus { |
| - FIRST_INSTALL_SUCCESS = 0, // First install of Chrome succeeded. |
| - INSTALL_REPAIRED = 1, // Same version reinstalled for repair. |
| - NEW_VERSION_UPDATED = 2, // Chrome successfully updated to new version. |
| + FIRST_INSTALL_SUCCESS = 0, // First install of Chrome succeeded. |
| + INSTALL_REPAIRED = 1, // Same version reinstalled for repair. |
| + NEW_VERSION_UPDATED = 2, // Chrome successfully updated to new version. |
| EXISTING_VERSION_LAUNCHED = 3, // No work done; launched existing Chrome. |
| - HIGHER_VERSION_EXISTS = 4, // Higher version of Chrome already exists |
| + HIGHER_VERSION_EXISTS = 4, // Higher version of Chrome already exists |
| USER_LEVEL_INSTALL_EXISTS = 5, // User level install already exists. |
| SYSTEM_LEVEL_INSTALL_EXISTS = 6, // Machine level install already exists. |
| - INSTALL_FAILED = 7, // Install/update failed. |
| - SETUP_PATCH_FAILED = 8, // Failed to patch setup.exe. |
| - OS_NOT_SUPPORTED = 9, // Current OS not supported. |
| - OS_ERROR = 10, // OS API call failed. |
| - TEMP_DIR_FAILED = 11, // Unable to get Temp directory. |
| - UNCOMPRESSION_FAILED = 12, // Failed to uncompress Chrome archive. |
| - INVALID_ARCHIVE = 13, // Something wrong with the installer archive. |
| - INSUFFICIENT_RIGHTS = 14, // User trying system level install is not Admin. |
| + INSTALL_FAILED = 7, // Install/update failed. |
| + SETUP_PATCH_FAILED = 8, // Failed to patch setup.exe. |
| + OS_NOT_SUPPORTED = 9, // Current OS not supported. |
| + OS_ERROR = 10, // OS API call failed. |
| + TEMP_DIR_FAILED = 11, // Unable to get Temp directory. |
| + UNCOMPRESSION_FAILED = 12, // Failed to uncompress Chrome archive. |
| + INVALID_ARCHIVE = 13, // Something wrong with the installer archive. |
| + INSUFFICIENT_RIGHTS = 14, // User trying system level install is not Admin. |
| CHROME_NOT_INSTALLED = 15, // Chrome not installed (returned in case of |
| // uninstall). |
| - CHROME_RUNNING = 16, // Chrome currently running (when trying to |
| + CHROME_RUNNING = 16, // Chrome currently running (when trying to |
| // uninstall). |
| - UNINSTALL_CONFIRMED = 17, // User has confirmed Chrome uninstall. |
| + UNINSTALL_CONFIRMED = 17, // User has confirmed Chrome uninstall. |
| UNINSTALL_DELETE_PROFILE = 18, // User okayed uninstall and profile deletion. |
| - UNINSTALL_SUCCESSFUL = 19, // Chrome successfully uninstalled. |
| - UNINSTALL_FAILED = 20, // Chrome uninstallation failed. |
| - UNINSTALL_CANCELLED = 21, // User cancelled Chrome uninstallation. |
| - UNKNOWN_STATUS = 22, // Unknown status (this should never happen). |
| - RENAME_SUCCESSFUL = 23, // Rename of new_chrome.exe to chrome.exe worked. |
| - RENAME_FAILED = 24, // Rename of new_chrome.exe failed. |
| - EULA_REJECTED = 25, // EULA dialog was not accepted by user. |
| - EULA_ACCEPTED = 26, // EULA dialog was accepted by user. |
| + UNINSTALL_SUCCESSFUL = 19, // Chrome successfully uninstalled. |
| + UNINSTALL_FAILED = 20, // Chrome uninstallation failed. |
| + UNINSTALL_CANCELLED = 21, // User cancelled Chrome uninstallation. |
| + UNKNOWN_STATUS = 22, // Unknown status (this should never happen). |
| + RENAME_SUCCESSFUL = 23, // Rename of new_chrome.exe to chrome.exe worked. |
| + RENAME_FAILED = 24, // Rename of new_chrome.exe failed. |
| + EULA_REJECTED = 25, // EULA dialog was not accepted by user. |
| + EULA_ACCEPTED = 26, // EULA dialog was accepted by user. |
| EULA_ACCEPTED_OPT_IN = 27, // EULA accepted with the crash option selected. |
| - INSTALL_DIR_IN_USE = 28, // Installation directory is in use by another |
| + INSTALL_DIR_IN_USE = 28, // Installation directory is in use by another |
| // process |
| UNINSTALL_REQUIRES_REBOOT = 29, // Uninstallation required a reboot. |
| - IN_USE_UPDATED = 30, // Chrome successfully updated but old version |
| - // running. |
| + IN_USE_UPDATED = 30, // Chrome successfully updated but old version |
| + // running. |
| SAME_VERSION_REPAIR_FAILED = 31, // Chrome repair failed as Chrome was |
| // running. |
| - REENTRY_SYS_UPDATE = 32, // Setup has been re-launched as the interactive |
| - // user. |
| + REENTRY_SYS_UPDATE = 32, // Setup has been re-launched as the interactive |
| + // user. |
| SXS_OPTION_NOT_SUPPORTED = 33, // The chrome-sxs option provided does not |
| // work with other command line options. |
| // NON_MULTI_INSTALLATION_EXISTS = 34, |
| @@ -74,26 +74,29 @@ enum InstallStatus { |
| INVALID_STATE_FOR_OPTION = 47, // A non-install option was called with an |
| // invalid installer state. |
| // WAIT_FOR_EXISTING_FAILED = 48, |
| - PATCH_INVALID_ARGUMENTS = 49, // The arguments of --patch were missing or |
| - // they were invalid for any reason. |
| + PATCH_INVALID_ARGUMENTS = 49, // The arguments of --patch were missing or |
| + // they were invalid for any reason. |
| DIFF_PATCH_SOURCE_MISSING = 50, // No previous version archive found for |
| // differential update. |
| - UNUSED_BINARIES = 51, // No multi-install products to update. The |
| - // binaries will be uninstalled if they are not |
| - // in use. |
| + UNUSED_BINARIES = 51, // No multi-install products to update. The |
| + // binaries will be uninstalled if they are not |
|
grt (UTC plus 2)
2016/09/01 21:22:41
gah, this is ugly, please ignore "git cl format" a
fdoray
2016/09/06 17:29:39
Done.
|
| + // in use. |
| UNUSED_BINARIES_UNINSTALLED = 52, // The binaries were uninstalled. |
| - UNSUPPORTED_OPTION = 53, // An unsupported legacy option was given. |
| - CPU_NOT_SUPPORTED = 54, // Current OS not supported |
| - REENABLE_UPDATES_SUCCEEDED = 55, // Autoupdates are now enabled. |
| - REENABLE_UPDATES_FAILED = 56, // Autoupdates could not be enabled. |
| - UNPACKING_FAILED = 57, // Unpacking the (possibly patched) uncompressed |
| - // archive failed. |
| - IN_USE_DOWNGRADE = 58, // Successfully downgrade chrome but current |
| - // version is still running. |
| + UNSUPPORTED_OPTION = 53, // An unsupported legacy option was given. |
| + CPU_NOT_SUPPORTED = 54, // Current OS not supported |
| + REENABLE_UPDATES_SUCCEEDED = 55, // Autoupdates are now enabled. |
| + REENABLE_UPDATES_FAILED = 56, // Autoupdates could not be enabled. |
| + UNPACKING_FAILED = 57, // Unpacking the (possibly patched) uncompressed |
| + // archive failed. |
| + IN_USE_DOWNGRADE = 58, // Successfully downgrade chrome but current |
| + // version is still running. |
| OLD_VERSION_DOWNGRADE = 59, // Successfully downgrade chrome to an older |
| // version. |
| + SETUP_SINGLETON_ACQUISITION_FAILED = 60, // The setup process could not |
| + // acquire the exclusive right to |
| + // modify the Chrome installation. |
| - MAX_INSTALL_STATUS = 60, // Bump this out to make space for new results. |
| + MAX_INSTALL_STATUS = 61, // Bump this out to make space for new results. |
| }; |
| // The type of an update archive. |
