Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #include <windows.h> | 5 #include <windows.h> |
| 6 #include <msi.h> | 6 #include <msi.h> |
| 7 #include <shellapi.h> | 7 #include <shellapi.h> |
| 8 #include <shlobj.h> | 8 #include <shlobj.h> |
| 9 | 9 |
| 10 #include <string> | 10 #include <string> |
| (...skipping 621 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 632 const InstallationState& original_state, | 632 const InstallationState& original_state, |
| 633 const CommandLine& cmd_line, | 633 const CommandLine& cmd_line, |
| 634 const MasterPreferences& prefs, | 634 const MasterPreferences& prefs, |
| 635 const InstallerState& installer_state, | 635 const InstallerState& installer_state, |
| 636 installer::ArchiveType* archive_type, | 636 installer::ArchiveType* archive_type, |
| 637 bool* delegated_to_existing) { | 637 bool* delegated_to_existing) { |
| 638 DCHECK(archive_type); | 638 DCHECK(archive_type); |
| 639 const bool system_install = installer_state.system_install(); | 639 const bool system_install = installer_state.system_install(); |
| 640 installer::InstallStatus install_status = installer::UNKNOWN_STATUS; | 640 installer::InstallStatus install_status = installer::UNKNOWN_STATUS; |
| 641 | 641 |
| 642 // Drop to background processing mode if the process was started below the | |
| 643 // normal process priority class. | |
| 644 VLOG_IF(1, installer::AdjustProcessPriority()) | |
|
cpu_(ooo_6.6-7.5)
2013/06/03 19:43:02
I am always scared of calling actuall code inside
grt (UTC plus 2)
2013/06/03 20:13:18
Done.
| |
| 645 << "Entered background processing mode."; | |
| 646 | |
| 642 // For install the default location for chrome.packed.7z is in current | 647 // For install the default location for chrome.packed.7z is in current |
| 643 // folder, so get that value first. | 648 // folder, so get that value first. |
| 644 base::FilePath archive(cmd_line.GetProgram().DirName().Append( | 649 base::FilePath archive(cmd_line.GetProgram().DirName().Append( |
| 645 installer::kChromeCompressedArchive)); | 650 installer::kChromeCompressedArchive)); |
| 646 | 651 |
| 647 // If --install-archive is given, get the user specified value | 652 // If --install-archive is given, get the user specified value |
| 648 if (cmd_line.HasSwitch(installer::switches::kInstallArchive)) { | 653 if (cmd_line.HasSwitch(installer::switches::kInstallArchive)) { |
| 649 archive = cmd_line.GetSwitchValuePath( | 654 archive = cmd_line.GetSwitchValuePath( |
| 650 installer::switches::kInstallArchive); | 655 installer::switches::kInstallArchive); |
| 651 } | 656 } |
| (...skipping 1075 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1727 if (!(installer_state.is_msi() && is_uninstall)) | 1732 if (!(installer_state.is_msi() && is_uninstall)) |
| 1728 // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT | 1733 // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT |
| 1729 // to pass through, since this is only returned on uninstall which is | 1734 // to pass through, since this is only returned on uninstall which is |
| 1730 // never invoked directly by Google Update. | 1735 // never invoked directly by Google Update. |
| 1731 return_code = InstallUtil::GetInstallReturnCode(install_status); | 1736 return_code = InstallUtil::GetInstallReturnCode(install_status); |
| 1732 | 1737 |
| 1733 VLOG(1) << "Installation complete, returning: " << return_code; | 1738 VLOG(1) << "Installation complete, returning: " << return_code; |
| 1734 | 1739 |
| 1735 return return_code; | 1740 return return_code; |
| 1736 } | 1741 } |
| OLD | NEW |