diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-10 17:02:30 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-10 17:02:30 +0000 |
| commit | 8dde7858e43270d9481a1b9c7f1e28be0b4df66d (patch) | |
| tree | eab72459c6ae667e756abee417f58458795bcd21 /chrome/installer/setup/install.cc | |
| parent | 5091d3ef82c5bd83fbb7881fbf4af6eebc20969c (diff) | |
| download | chromium_src-8dde7858e43270d9481a1b9c7f1e28be0b4df66d.zip chromium_src-8dde7858e43270d9481a1b9c7f1e28be0b4df66d.tar.gz chromium_src-8dde7858e43270d9481a1b9c7f1e28be0b4df66d.tar.bz2 | |
Correct update-while-in-use installer regression. The rename command being stored in the registry eroneously did not have --chrome-frame appended to it, so the chrome.exe <-> new_chrome.exe was broken.
Note that since Chrome Frame uses system installs, Omaha must be present on the system for upgrades to work. "Manual" upgrades while Chrome Frame is running do not work.
TEST=Upgrade installs while an old Chrome Frame is running should now correctly replace versions.
BUG=27181
Review URL: http://codereview.chromium.org/389002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31560 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/setup/install.cc')
| -rw-r--r-- | chrome/installer/setup/install.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/installer/setup/install.cc b/chrome/installer/setup/install.cc index 64fe11e..002ccf1 100644 --- a/chrome/installer/setup/install.cc +++ b/chrome/installer/setup/install.cc @@ -341,6 +341,12 @@ bool DoPostInstallTasks(HKEY reg_root, L"\" --" + installer_util::switches::kRenameChromeExe; if (reg_root == HKEY_LOCAL_MACHINE) rename_cmd = rename_cmd + L" --" + installer_util::switches::kSystemLevel; + + if (InstallUtil::IsChromeFrameProcess()) { + rename_cmd += L" --"; + rename_cmd += installer_util::switches::kChromeFrame; + } + inuse_list->AddSetRegValueWorkItem(reg_root, version_key, google_update::kRegRenameCmdField, |