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

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

Issue 10957016: Ensuring Google Update at user-level is installed alongside App Host, for the quick-enable App Host… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixing nits. Created 8 years, 2 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 10
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 // of Chrome Frame. 69 // of Chrome Frame.
70 CONFLICTING_CHANNEL_EXISTS, // 39. A multi-install product on a different 70 CONFLICTING_CHANNEL_EXISTS, // 39. A multi-install product on a different
71 // update channel exists. 71 // update channel exists.
72 READY_MODE_REQUIRES_CHROME, // 40. Chrome Frame in ready-mode requires Chrome 72 READY_MODE_REQUIRES_CHROME, // 40. Chrome Frame in ready-mode requires Chrome
73 APP_HOST_REQUIRES_MULTI_INSTALL, // 41. --multi-install was missing from the 73 APP_HOST_REQUIRES_MULTI_INSTALL, // 41. --multi-install was missing from the
74 // command line. 74 // command line.
75 APPLY_DIFF_PATCH_FAILED, // 42. Failed to apply a diff patch. 75 APPLY_DIFF_PATCH_FAILED, // 42. Failed to apply a diff patch.
76 INCONSISTENT_UPDATE_POLICY, // 43. Inconsistent update policy GP settings. 76 INCONSISTENT_UPDATE_POLICY, // 43. Inconsistent update policy GP settings.
77 APP_HOST_REQUIRES_USER_LEVEL, // 44. --system-level is forbidden. 77 APP_HOST_REQUIRES_USER_LEVEL, // 44. --system-level is forbidden.
78 APP_HOST_REQUIRES_BINARIES, // 45. No Chrome binaries at either level. 78 APP_HOST_REQUIRES_BINARIES, // 45. No Chrome binaries at either level.
79 INSTALL_OF_GOOGLE_UPDATE_FAILED, // 46. Failed to install Google Update.
79 // Friendly reminder: note the COMPILE_ASSERT below. 80 // Friendly reminder: note the COMPILE_ASSERT below.
80 }; 81 };
81 82
82 83
83 // Existing InstallStatus values must not change. Always add to the end. 84 // Existing InstallStatus values must not change. Always add to the end.
84 COMPILE_ASSERT(installer::APP_HOST_REQUIRES_BINARIES == 45, 85 COMPILE_ASSERT(installer::INSTALL_OF_GOOGLE_UPDATE_FAILED == 46,
85 dont_change_enum); 86 dont_change_enum);
86 87
87 // The type of an update archive. 88 // The type of an update archive.
88 enum ArchiveType { 89 enum ArchiveType {
89 UNKNOWN_ARCHIVE_TYPE, // Unknown or uninitialized. 90 UNKNOWN_ARCHIVE_TYPE, // Unknown or uninitialized.
90 FULL_ARCHIVE_TYPE, // Full chrome.7z archive. 91 FULL_ARCHIVE_TYPE, // Full chrome.7z archive.
91 INCREMENTAL_ARCHIVE_TYPE // Incremental or differential archive. 92 INCREMENTAL_ARCHIVE_TYPE // Incremental or differential archive.
92 }; 93 };
93 94
94 // Stages of an installation reported through Google Update on failure. 95 // Stages of an installation reported through Google Update on failure.
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 extern const char kChromeSxS[]; 136 extern const char kChromeSxS[];
136 extern const char kConfigureUserSettings[]; 137 extern const char kConfigureUserSettings[];
137 extern const char kCreateAllShortcuts[]; 138 extern const char kCreateAllShortcuts[];
138 extern const char kCriticalUpdateVersion[]; 139 extern const char kCriticalUpdateVersion[];
139 extern const char kDeleteProfile[]; 140 extern const char kDeleteProfile[];
140 extern const char kDisableLogging[]; 141 extern const char kDisableLogging[];
141 extern const char kDoNotLaunchChrome[]; 142 extern const char kDoNotLaunchChrome[];
142 extern const char kDoNotRegisterForUpdateLaunch[]; 143 extern const char kDoNotRegisterForUpdateLaunch[];
143 extern const char kDoNotRemoveSharedItems[]; 144 extern const char kDoNotRemoveSharedItems[];
144 extern const char kEnableLogging[]; 145 extern const char kEnableLogging[];
146 extern const char kEnsureGoogleUpdatePresent[];
145 extern const char kForceUninstall[]; 147 extern const char kForceUninstall[];
146 extern const char kInstallArchive[]; 148 extern const char kInstallArchive[];
147 extern const char kInstallerData[]; 149 extern const char kInstallerData[];
148 extern const char kLogFile[]; 150 extern const char kLogFile[];
149 extern const char kMakeChromeDefault[]; 151 extern const char kMakeChromeDefault[];
150 extern const char kMsi[]; 152 extern const char kMsi[];
151 extern const char kMultiInstall[]; 153 extern const char kMultiInstall[];
152 extern const char kNewSetupExe[]; 154 extern const char kNewSetupExe[];
153 extern const char kOnOsUpgrade[]; 155 extern const char kOnOsUpgrade[];
154 extern const char kRegisterChromeBrowser[]; 156 extern const char kRegisterChromeBrowser[];
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 extern const wchar_t kChromeChannelCanary[]; 223 extern const wchar_t kChromeChannelCanary[];
222 extern const wchar_t kChromeChannelDev[]; 224 extern const wchar_t kChromeChannelDev[];
223 extern const wchar_t kChromeChannelBeta[]; 225 extern const wchar_t kChromeChannelBeta[];
224 extern const wchar_t kChromeChannelStable[]; 226 extern const wchar_t kChromeChannelStable[];
225 227
226 extern const size_t kMaxAppModelIdLength; 228 extern const size_t kMaxAppModelIdLength;
227 229
228 } // namespace installer 230 } // namespace installer
229 231
230 #endif // CHROME_INSTALLER_UTIL_UTIL_CONSTANTS_H_ 232 #endif // CHROME_INSTALLER_UTIL_UTIL_CONSTANTS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698