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

Side by Side Diff: chrome/installer/util/util_constants.h

Issue 7111012: Return a new error code for multi-install updates if Group Policy settings blocking... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/installer/util/prebuild/create_string_rc.py ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 // 4 //
5 // Defines all install related constants that need to be used by Chrome as 5 // Defines all install related constants that need to be used by Chrome as
6 // well as Chrome Installer. 6 // well as Chrome Installer.
7 7
8 #ifndef CHROME_INSTALLER_UTIL_UTIL_CONSTANTS_H_ 8 #ifndef CHROME_INSTALLER_UTIL_UTIL_CONSTANTS_H_
9 #define CHROME_INSTALLER_UTIL_UTIL_CONSTANTS_H_ 9 #define CHROME_INSTALLER_UTIL_UTIL_CONSTANTS_H_
10 #pragma once 10 #pragma once
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 READY_MODE_TEMP_OPT_OUT_FAILED, // 37. Failed to temporarily opt-out of 67 READY_MODE_TEMP_OPT_OUT_FAILED, // 37. Failed to temporarily opt-out of
68 // Chrome Frame. 68 // Chrome Frame.
69 READY_MODE_END_TEMP_OPT_OUT_FAILED, // 38. Failed to end temporary opt-out 69 READY_MODE_END_TEMP_OPT_OUT_FAILED, // 38. Failed to end temporary opt-out
70 // of Chrome Frame. 70 // of Chrome Frame.
71 CONFLICTING_CHANNEL_EXISTS, // 39. A multi-install product on a different 71 CONFLICTING_CHANNEL_EXISTS, // 39. A multi-install product on a different
72 // update channel exists. 72 // update channel exists.
73 READY_MODE_REQUIRES_CHROME, // 40. Chrome Frame in ready-mode requires Chrome 73 READY_MODE_REQUIRES_CHROME, // 40. Chrome Frame in ready-mode requires Chrome
74 REQUIRES_MULTI_INSTALL, // 41. --multi-install was missing from the 74 REQUIRES_MULTI_INSTALL, // 41. --multi-install was missing from the
75 // command line. 75 // command line.
76 APPLY_DIFF_PATCH_FAILED, // 42. Failed to apply a diff patch. 76 APPLY_DIFF_PATCH_FAILED, // 42. Failed to apply a diff patch.
77 INCONSISTENT_UPDATE_POLICY, // 43. Inconsistent update policy GP settings.
77 }; 78 };
78 79
79 80
80 // If the following compile assert fires it means that the InstallStatus 81 // If the following compile assert fires it means that the InstallStatus
81 // enumeration changed which will break the contract between the old 82 // enumeration changed which will break the contract between the old
82 // chrome installed and the new setup.exe that is trying to upgrade. 83 // chrome installed and the new setup.exe that is trying to upgrade.
83 COMPILE_ASSERT(installer::CONFLICTING_CHANNEL_EXISTS == 39, 84 COMPILE_ASSERT(installer::INCONSISTENT_UPDATE_POLICY == 43,
84 dont_change_enum); 85 dont_change_enum);
85 86
86 // The type of an update archive. 87 // The type of an update archive.
87 enum ArchiveType { 88 enum ArchiveType {
88 UNKNOWN_ARCHIVE_TYPE, // Unknown or uninitialized. 89 UNKNOWN_ARCHIVE_TYPE, // Unknown or uninitialized.
89 FULL_ARCHIVE_TYPE, // Full chrome.7z archive. 90 FULL_ARCHIVE_TYPE, // Full chrome.7z archive.
90 INCREMENTAL_ARCHIVE_TYPE // Incremental or differential archive. 91 INCREMENTAL_ARCHIVE_TYPE // Incremental or differential archive.
91 }; 92 };
92 93
93 // Stages of an installation reported through Google Update on failure. 94 // Stages of an installation reported through Google Update on failure.
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 extern const wchar_t kInstallerResultUIString[]; 194 extern const wchar_t kInstallerResultUIString[];
194 extern const wchar_t kInstallerSuccessLaunchCmdLine[]; 195 extern const wchar_t kInstallerSuccessLaunchCmdLine[];
195 196
196 // Product options. 197 // Product options.
197 extern const wchar_t kOptionMultiInstall[]; 198 extern const wchar_t kOptionMultiInstall[];
198 extern const wchar_t kOptionReadyMode[]; 199 extern const wchar_t kOptionReadyMode[];
199 200
200 } // namespace installer 201 } // namespace installer
201 202
202 #endif // CHROME_INSTALLER_UTIL_UTIL_CONSTANTS_H_ 203 #endif // CHROME_INSTALLER_UTIL_UTIL_CONSTANTS_H_
OLDNEW
« no previous file with comments | « chrome/installer/util/prebuild/create_string_rc.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698