Correct update-while-in-use installer regression. The rename command being st...

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
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=31560

[robertshield, 2009-11-10 16:28:43]

Reviewers: tommi,

Description:
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


Please review this at http://codereview.chromium.org/389002

SVN Base: svn://svn.chromium.org/chrome/trunk/src/

Affected files:
   M     chrome/installer/setup/install.cc


Index: chrome/installer/setup/install.cc
===================================================================
--- chrome/installer/setup/install.cc	(revision 31426)
+++ chrome/installer/setup/install.cc	(working copy)
@@ -341,6 +341,10 @@
                   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,

[tommi (sloooow) - chröme, 2009-11-10 16:52:24]

lgtm

http://codereview.chromium.org/389002/diff/1/2
File chrome/installer/setup/install.cc (right):

http://codereview.chromium.org/389002/diff/1/2#newcode344
Line 344: if (InstallUtil::IsChromeFrameProcess()) {
can you add an empty line above this one and below the closing }?

[tommi (sloooow) - chröme, 2009-11-10 16:52:45]

lgtm


http://codereview.chromium.org/389002/diff/1/2
File chrome/installer/setup/install.cc (right):

http://codereview.chromium.org/389002/diff/1/2#newcode344
Line 344: if (InstallUtil::IsChromeFrameProcess()) {
can you add an empty line above this one and below the closing }?

http://codereview.chromium.org/389002

[tommi (sloooow) - chröme, 2009-11-10 16:58:45]

lgtm


http://codereview.chromium.org/389002/diff/1/2
File chrome/installer/setup/install.cc (right):

http://codereview.chromium.org/389002/diff/1/2#newcode344
Line 344: if (InstallUtil::IsChromeFrameProcess()) {
can you add an empty line above this one and below the closing }?

http://codereview.chromium.org/389002

[robertshield, 2009-11-10 17:01:55]

http://codereview.chromium.org/389002/diff/1/2
File chrome/installer/setup/install.cc (right):

http://codereview.chromium.org/389002/diff/1/2#newcode344
Line 344: if (InstallUtil::IsChromeFrameProcess()) {
On 2009/11/10 16:52:24, tommi wrote:
> can you add an empty line above this one and below the closing }?

Done.

[robertshield, 2009-11-10 17:02:20]

http://codereview.chromium.org/389002/diff/1/2
File chrome/installer/setup/install.cc (right):

http://codereview.chromium.org/389002/diff/1/2#newcode344
Line 344: if (InstallUtil::IsChromeFrameProcess()) {
On 2009/11/10 16:52:24, tommi wrote:
> can you add an empty line above this one and below the closing }?

Done.

http://codereview.chromium.org/389002

[robertshield, 2009-11-10 17:08:18]

http://codereview.chromium.org/389002/diff/1/2
File chrome/installer/setup/install.cc (right):

http://codereview.chromium.org/389002/diff/1/2#newcode344
Line 344: if (InstallUtil::IsChromeFrameProcess()) {
On 2009/11/10 16:52:24, tommi wrote:
> can you add an empty line above this one and below the closing }?

Done.

http://codereview.chromium.org/389002