summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_installer.gypi
diff options
context:
space:
mode:
authortommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-07 18:00:05 +0000
committertommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-07 18:00:05 +0000
commit07ec3764352de9517a48a8d6817bb40e467d9777 (patch)
treee4aad1c70741d6210fc900ee8b29648d8d888044 /chrome/chrome_installer.gypi
parentfadc607b6dd990f37f88be954ee8593ba3cc6a38 (diff)
downloadchromium_src-07ec3764352de9517a48a8d6817bb40e467d9777.zip
chromium_src-07ec3764352de9517a48a8d6817bb40e467d9777.tar.gz
chromium_src-07ec3764352de9517a48a8d6817bb40e467d9777.tar.bz2
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
Diffstat (limited to 'chrome/chrome_installer.gypi')
-rw-r--r--chrome/chrome_installer.gypi2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi
index cba6d33..d818cdd 100644
--- a/chrome/chrome_installer.gypi
+++ b/chrome/chrome_installer.gypi
@@ -201,6 +201,8 @@
},
'sources': [
'installer/mini_installer/chrome.release',
+ 'installer/setup/chrome_frame_quick_enable.cc',
+ 'installer/setup/chrome_frame_quick_enable.h',
'installer/setup/chrome_frame_ready_mode.cc',
'installer/setup/chrome_frame_ready_mode.h',
'installer/setup/install.cc',