Support for --quick-enable-cf in the installer.

After installing chrome with multi-install, you can run setup from the Installer folder with --quick-enable-cf to install Chrome Frame from the same location (using the same binaries).  The operation is quick since all the shared binaries are already there and only need to be registered.

NOTE: The switch needs to be coupled with --system-level for system installs and always requires --multi-install.

TEST=After installing Chrome with --multi-install, run setup from the Installer folder with --quick-enable-cf --multi-install.  For system installations also remember to include --system-level.  Chrome Frame should then be installed as well from the same folder in multi mode.
BUG=none

Review URL: http://codereview.chromium.org/6349098

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74000 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 0 deletions

diff --git a/chrome/installer/util/util_constants.h b/chrome/installer/util/util_constants.h
index 3c20cc3..997f87b 100644
--- a/chrome/installer/util/util_constants.h
+++ b/chrome/installer/util/util_constants.h
@@ -69,6 +69,8 @@ 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
+                               // command line.
 };
 
 // The type of an update archive.
@@ -82,6 +84,7 @@ namespace switches {
 extern const char kCeee[];
 extern const char kChrome[];
 extern const char kChromeFrame[];
+extern const char kChromeFrameQuickEnable[];
 extern const char kChromeFrameReadyMode[];
 extern const char kChromeFrameReadyModeOptIn[];
 extern const char kChromeFrameReadyModeTempOptOut[];