diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-15 17:20:38 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-15 17:20:38 +0000 |
| commit | 80274b9223df35c52f4c535cab6cc67938e98953 (patch) | |
| tree | 0a255074fcd83d225ed09f48ed1ce3ed4ed292fc /chrome/installer/setup | |
| parent | fe84b910e02f66451d9b746d03f761aedfa39032 (diff) | |
| download | chromium_src-80274b9223df35c52f4c535cab6cc67938e98953.zip chromium_src-80274b9223df35c52f4c535cab6cc67938e98953.tar.gz chromium_src-80274b9223df35c52f4c535cab6cc67938e98953.tar.bz2 | |
Cause new_chrome.exe to always be written if Chrome Frame is in use, resulting in updates being deferred.
BUG=88589
TEST=NONE
Review URL: http://codereview.chromium.org/7353030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92706 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/setup')
| -rw-r--r-- | chrome/installer/setup/install_worker.cc | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/chrome/installer/setup/install_worker.cc b/chrome/installer/setup/install_worker.cc index 94c191c..717a869 100644 --- a/chrome/installer/setup/install_worker.cc +++ b/chrome/installer/setup/install_worker.cc @@ -667,10 +667,22 @@ void AddInstallWorkItems(const InstallationState& original_state, FilePath new_chrome_exe(target_path.Append(installer::kChromeNewExe)); install_list->AddDeleteTreeWorkItem(new_chrome_exe, temp_path); - install_list->AddCopyTreeWorkItem( - src_path.Append(installer::kChromeExe).value(), - target_path.Append(installer::kChromeExe).value(), - temp_path.value(), WorkItem::NEW_NAME_IF_IN_USE, new_chrome_exe.value()); + + if (installer_state.is_chrome_frame_running()) { + VLOG(1) << "Chrome Frame in use. Copying to new_chrome.exe"; + install_list->AddCopyTreeWorkItem( + src_path.Append(installer::kChromeExe).value(), + new_chrome_exe.value(), + temp_path.value(), + WorkItem::ALWAYS); + } else { + install_list->AddCopyTreeWorkItem( + src_path.Append(installer::kChromeExe).value(), + target_path.Append(installer::kChromeExe).value(), + temp_path.value(), + WorkItem::NEW_NAME_IF_IN_USE, + new_chrome_exe.value()); + } // Extra executable for 64 bit systems. // NOTE: We check for "not disabled" so that if the API call fails, we play it |