Chromium Code Reviews| 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 735 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 746 src_path.Append(installer::kChromeExe).value(), | 746 src_path.Append(installer::kChromeExe).value(), |
| 747 target_path.Append(installer::kChromeExe).value(), | 747 target_path.Append(installer::kChromeExe).value(), |
| 748 temp_path.value(), | 748 temp_path.value(), |
| 749 WorkItem::NEW_NAME_IF_IN_USE, | 749 WorkItem::NEW_NAME_IF_IN_USE, |
| 750 new_chrome_exe.value()); | 750 new_chrome_exe.value()); |
| 751 } | 751 } |
| 752 | 752 |
| 753 // Extra executable for 64 bit systems. | 753 // Extra executable for 64 bit systems. |
| 754 // NOTE: We check for "not disabled" so that if the API call fails, we play it | 754 // NOTE: We check for "not disabled" so that if the API call fails, we play it |
| 755 // safe and copy the executable anyway. | 755 // safe and copy the executable anyway. |
| 756 // NOTE: the file wow_helper.exe is only needed for Vista and below. | |
| 756 if (base::win::OSInfo::GetInstance()->wow64_status() != | 757 if (base::win::OSInfo::GetInstance()->wow64_status() != |
| 757 base::win::OSInfo::WOW64_DISABLED) { | 758 base::win::OSInfo::WOW64_DISABLED && |
| 759 base::win::GetVersion() <= base::win::VERSION_VISTA) { | |
|
grt (UTC plus 2)
2012/01/31 21:27:56
I think you're about to shave a yak. Server 2008
arthurhsu
2012/01/31 22:07:35
Please refer to Ricardo's reply. BTW, I copied th
grt (UTC plus 2)
2012/02/01 02:12:17
Cool, thanks for the confirmation, Ricardo.
| |
| 758 install_list->AddMoveTreeWorkItem( | 760 install_list->AddMoveTreeWorkItem( |
| 759 src_path.Append(installer::kWowHelperExe).value(), | 761 src_path.Append(installer::kWowHelperExe).value(), |
| 760 target_path.Append(installer::kWowHelperExe).value(), | 762 target_path.Append(installer::kWowHelperExe).value(), |
| 761 temp_path.value(), | 763 temp_path.value(), |
| 762 WorkItem::ALWAYS_MOVE); | 764 WorkItem::ALWAYS_MOVE); |
| 763 } | 765 } |
| 764 | 766 |
| 765 // In the past, we copied rather than moved for system level installs so that | 767 // In the past, we copied rather than moved for system level installs so that |
| 766 // the permissions of %ProgramFiles% would be picked up. Now that |temp_path| | 768 // the permissions of %ProgramFiles% would be picked up. Now that |temp_path| |
| 767 // is in %ProgramFiles% for system level installs (and in %LOCALAPPDATA% | 769 // is in %ProgramFiles% for system level installs (and in %LOCALAPPDATA% |
| (...skipping 487 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1255 } else { | 1257 } else { |
| 1256 DCHECK(operation == REMOVE_COMMAND); | 1258 DCHECK(operation == REMOVE_COMMAND); |
| 1257 work_item_list->AddDeleteRegKeyWorkItem(installer_state.root_key(), | 1259 work_item_list->AddDeleteRegKeyWorkItem(installer_state.root_key(), |
| 1258 cmd_key)->set_log_message( | 1260 cmd_key)->set_log_message( |
| 1259 "removing quick-enable-cf command"); | 1261 "removing quick-enable-cf command"); |
| 1260 } | 1262 } |
| 1261 } | 1263 } |
| 1262 } | 1264 } |
| 1263 | 1265 |
| 1264 } // namespace installer | 1266 } // namespace installer |
| OLD | NEW |