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

Unified Diff: chrome/installer/util/util_constants.h

Issue 10806086: Fix multi-install update regression. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressed review comments Created 8 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/util/chrome_binaries_operations.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/util/util_constants.h
diff --git a/chrome/installer/util/util_constants.h b/chrome/installer/util/util_constants.h
index 9a1da328b0b31bf8e024ad4d64edc917d8eff6e1..9cb34b7fdc962eff4e80ca51fc6f45911862707b 100644
--- a/chrome/installer/util/util_constants.h
+++ b/chrome/installer/util/util_constants.h
@@ -70,17 +70,18 @@ enum InstallStatus {
CONFLICTING_CHANNEL_EXISTS, // 39. A multi-install product on a different
// update channel exists.
READY_MODE_REQUIRES_CHROME, // 40. Chrome Frame in ready-mode requires Chrome
- REQUIRES_MULTI_INSTALL, // 41. --multi-install was missing from the
+ APP_HOST_REQUIRES_MULTI_INSTALL, // 41. --multi-install was missing from the
// command line.
APPLY_DIFF_PATCH_FAILED, // 42. Failed to apply a diff patch.
INCONSISTENT_UPDATE_POLICY, // 43. Inconsistent update policy GP settings.
+ APP_HOST_REQUIRES_USER_LEVEL, // 44. --system-level is forbidden.
+ APP_HOST_REQUIRES_BINARIES, // 45. No Chrome binaries at either level.
+ // Friendly reminder: note the COMPILE_ASSERT below.
};
-// If the following compile assert fires it means that the InstallStatus
-// enumeration changed which will break the contract between the old
-// chrome installed and the new setup.exe that is trying to upgrade.
-COMPILE_ASSERT(installer::INCONSISTENT_UPDATE_POLICY == 43,
+// Existing InstallStatus values must not change. Always add to the end.
+COMPILE_ASSERT(installer::APP_HOST_REQUIRES_BINARIES == 45,
dont_change_enum);
// The type of an update archive.
« no previous file with comments | « chrome/installer/util/chrome_binaries_operations.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698