| Index: chrome/installer/util/util_constants.h
|
| diff --git a/chrome/installer/util/util_constants.h b/chrome/installer/util/util_constants.h
|
| index bb7b6935c3a33c8db1d1fcf4a59cdb33270975a7..3f9a496a5f13a16e2281d664a1514a82dcedbcc3 100644
|
| --- a/chrome/installer/util/util_constants.h
|
| +++ b/chrome/installer/util/util_constants.h
|
| @@ -80,12 +80,14 @@ enum InstallStatus {
|
| INVALID_STATE_FOR_OPTION, // 47. A non-install option was called with an
|
| // invalid installer state.
|
| WAIT_FOR_EXISTING_FAILED, // 48. OS error waiting for existing setup.exe.
|
| + PATCH_INVALID_ARGUMENTS, // 49. The arguments of --patch were missing or
|
| + // they were invalid for any reason.
|
| // Friendly reminder: note the COMPILE_ASSERT below.
|
| };
|
|
|
|
|
| // Existing InstallStatus values must not change. Always add to the end.
|
| -COMPILE_ASSERT(installer::WAIT_FOR_EXISTING_FAILED == 48,
|
| +COMPILE_ASSERT(installer::PATCH_INVALID_ARGUMENTS == 49,
|
| dont_change_enum);
|
|
|
| // The type of an update archive.
|
| @@ -128,6 +130,7 @@ COMPILE_ASSERT(DEFERRING_TO_HIGHER_VERSION == 18,
|
| never_ever_ever_change_InstallerStage_values_bang);
|
|
|
| namespace switches {
|
| +
|
| extern const char kAutoLaunchChrome[];
|
| extern const char kChrome[];
|
| extern const char kChromeAppHostDeprecated[]; // TODO(huangs): Remove by M27.
|
| @@ -177,6 +180,11 @@ extern const char kInactiveUserToast[];
|
| extern const char kSystemLevelToast[];
|
| extern const char kExperimentGroup[];
|
| extern const char kToastResultsKey[];
|
| +extern const char kPatch[];
|
| +extern const char kInputFile[];
|
| +extern const char kPatchFile[];
|
| +extern const char kOutputFile[];
|
| +
|
| } // namespace switches
|
|
|
| extern const wchar_t kActiveSetupExe[];
|
| @@ -237,6 +245,16 @@ extern const wchar_t kChromeChannelStable[];
|
|
|
| extern const size_t kMaxAppModelIdLength;
|
|
|
| +// The range of error values for the installer, Courgette, and bsdiff is
|
| +// overlapping. These offset values disambiguate between different sets
|
| +// of errors by shifting the values up with the specified offset.
|
| +const int kCourgetteErrorOffset = 300;
|
| +const int kBsdiffErrorOffset = 600;
|
| +
|
| +// Arguments to --patch switch
|
| +extern const char kCourgette[];
|
| +extern const char kBsdiff[];
|
| +
|
| } // namespace installer
|
|
|
| #endif // CHROME_INSTALLER_UTIL_UTIL_CONSTANTS_H_
|
|
|