| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 // | 4 // |
| 5 // This file contains the definitions of the installer functions that build | 5 // This file contains the definitions of the installer functions that build |
| 6 // the WorkItemList used to install the application. | 6 // the WorkItemList used to install the application. |
| 7 | 7 |
| 8 #include "chrome/installer/setup/install_worker.h" | 8 #include "chrome/installer/setup/install_worker.h" |
| 9 | 9 |
| 10 #include <shlobj.h> | 10 #include <shlobj.h> |
| (...skipping 674 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 685 install_list->AddDeleteTreeWorkItem(old_archive, temp_path) | 685 install_list->AddDeleteTreeWorkItem(old_archive, temp_path) |
| 686 ->set_ignore_failure(true); | 686 ->set_ignore_failure(true); |
| 687 } | 687 } |
| 688 | 688 |
| 689 // Delete any new_chrome.exe if present (we will end up creating a new one | 689 // Delete any new_chrome.exe if present (we will end up creating a new one |
| 690 // if required) and then copy chrome.exe | 690 // if required) and then copy chrome.exe |
| 691 FilePath new_chrome_exe(target_path.Append(installer::kChromeNewExe)); | 691 FilePath new_chrome_exe(target_path.Append(installer::kChromeNewExe)); |
| 692 | 692 |
| 693 install_list->AddDeleteTreeWorkItem(new_chrome_exe, temp_path); | 693 install_list->AddDeleteTreeWorkItem(new_chrome_exe, temp_path); |
| 694 | 694 |
| 695 if (installer_state.is_chrome_frame_running()) { | 695 if (installer_state.IsChromeFrameRunning(original_state)) { |
| 696 VLOG(1) << "Chrome Frame in use. Copying to new_chrome.exe"; | 696 VLOG(1) << "Chrome Frame in use. Copying to new_chrome.exe"; |
| 697 install_list->AddCopyTreeWorkItem( | 697 install_list->AddCopyTreeWorkItem( |
| 698 src_path.Append(installer::kChromeExe).value(), | 698 src_path.Append(installer::kChromeExe).value(), |
| 699 new_chrome_exe.value(), | 699 new_chrome_exe.value(), |
| 700 temp_path.value(), | 700 temp_path.value(), |
| 701 WorkItem::ALWAYS); | 701 WorkItem::ALWAYS); |
| 702 } else { | 702 } else { |
| 703 install_list->AddCopyTreeWorkItem( | 703 install_list->AddCopyTreeWorkItem( |
| 704 src_path.Append(installer::kChromeExe).value(), | 704 src_path.Append(installer::kChromeExe).value(), |
| 705 target_path.Append(installer::kChromeExe).value(), | 705 target_path.Append(installer::kChromeExe).value(), |
| (...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1201 } else { | 1201 } else { |
| 1202 DCHECK(operation == REMOVE_COMMAND); | 1202 DCHECK(operation == REMOVE_COMMAND); |
| 1203 work_item_list->AddDeleteRegKeyWorkItem(installer_state.root_key(), | 1203 work_item_list->AddDeleteRegKeyWorkItem(installer_state.root_key(), |
| 1204 cmd_key)->set_log_message( | 1204 cmd_key)->set_log_message( |
| 1205 "removing quick-enable-cf command"); | 1205 "removing quick-enable-cf command"); |
| 1206 } | 1206 } |
| 1207 } | 1207 } |
| 1208 } | 1208 } |
| 1209 | 1209 |
| 1210 } // namespace installer | 1210 } // namespace installer |
| OLD | NEW |