| 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 "chrome/installer/setup/setup_main.h" | 5 #include "chrome/installer/setup/setup_main.h" |
| 6 | 6 |
| 7 #include <windows.h> | 7 #include <windows.h> |
| 8 #include <msi.h> | 8 #include <msi.h> |
| 9 #include <shellapi.h> | 9 #include <shellapi.h> |
| 10 #include <shlobj.h> | 10 #include <shlobj.h> |
| (...skipping 1635 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1646 VLOG(1) << "system install is " << system_install; | 1646 VLOG(1) << "system install is " << system_install; |
| 1647 | 1647 |
| 1648 InstallationState original_state; | 1648 InstallationState original_state; |
| 1649 original_state.Initialize(); | 1649 original_state.Initialize(); |
| 1650 | 1650 |
| 1651 InstallerState installer_state; | 1651 InstallerState installer_state; |
| 1652 installer_state.Initialize(cmd_line, prefs, original_state); | 1652 installer_state.Initialize(cmd_line, prefs, original_state); |
| 1653 | 1653 |
| 1654 installer::ConfigureCrashReporting(installer_state); | 1654 installer::ConfigureCrashReporting(installer_state); |
| 1655 installer::SetInitialCrashKeys(installer_state); | 1655 installer::SetInitialCrashKeys(installer_state); |
| 1656 installer::SetCrashKeysFromCommandLine(cmd_line); |
| 1656 | 1657 |
| 1657 // Make sure the process exits cleanly on unexpected errors. | 1658 // Make sure the process exits cleanly on unexpected errors. |
| 1658 base::EnableTerminationOnHeapCorruption(); | 1659 base::EnableTerminationOnHeapCorruption(); |
| 1659 base::EnableTerminationOnOutOfMemory(); | 1660 base::EnableTerminationOnOutOfMemory(); |
| 1660 base::win::RegisterInvalidParamHandler(); | 1661 base::win::RegisterInvalidParamHandler(); |
| 1661 base::win::SetupCRT(cmd_line); | 1662 base::win::SetupCRT(cmd_line); |
| 1662 | 1663 |
| 1663 const bool is_uninstall = cmd_line.HasSwitch(installer::switches::kUninstall); | 1664 const bool is_uninstall = cmd_line.HasSwitch(installer::switches::kUninstall); |
| 1664 | 1665 |
| 1665 // Check to make sure current system is WinXP or later. If not, log | 1666 // Check to make sure current system is WinXP or later. If not, log |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1772 // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT | 1773 // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT |
| 1773 // to pass through, since this is only returned on uninstall which is | 1774 // to pass through, since this is only returned on uninstall which is |
| 1774 // never invoked directly by Google Update. | 1775 // never invoked directly by Google Update. |
| 1775 return_code = InstallUtil::GetInstallReturnCode(install_status); | 1776 return_code = InstallUtil::GetInstallReturnCode(install_status); |
| 1776 } | 1777 } |
| 1777 | 1778 |
| 1778 VLOG(1) << "Installation complete, returning: " << return_code; | 1779 VLOG(1) << "Installation complete, returning: " << return_code; |
| 1779 | 1780 |
| 1780 return return_code; | 1781 return return_code; |
| 1781 } | 1782 } |
| OLD | NEW |