| 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 1093 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1104 system_level_cmd.SetProgram(system_exe_path); | 1104 system_level_cmd.SetProgram(system_exe_path); |
| 1105 | 1105 |
| 1106 base::FilePath first_run_sentinel; | 1106 base::FilePath first_run_sentinel; |
| 1107 InstallUtil::GetSentinelFilePath( | 1107 InstallUtil::GetSentinelFilePath( |
| 1108 chrome::kFirstRunSentinel, dist, &first_run_sentinel); | 1108 chrome::kFirstRunSentinel, dist, &first_run_sentinel); |
| 1109 if (base::PathExists(first_run_sentinel)) { | 1109 if (base::PathExists(first_run_sentinel)) { |
| 1110 // If the Chrome being self-destructed has already undergone First Run, | 1110 // If the Chrome being self-destructed has already undergone First Run, |
| 1111 // trigger Active Setup and make sure the system-level Chrome doesn't go | 1111 // trigger Active Setup and make sure the system-level Chrome doesn't go |
| 1112 // through first run. | 1112 // through first run. |
| 1113 trigger_active_setup = true; | 1113 trigger_active_setup = true; |
| 1114 system_level_cmd.AppendSwitch(::switches::kNoFirstRun); | 1114 system_level_cmd.AppendSwitch(::switches::kCancelFirstRun); |
| 1115 } | 1115 } |
| 1116 } | 1116 } |
| 1117 } | 1117 } |
| 1118 if (installer_state.FindProduct(BrowserDistribution::CHROME_BINARIES)) { | 1118 if (installer_state.FindProduct(BrowserDistribution::CHROME_BINARIES)) { |
| 1119 // Chrome Binaries should be last; if something else is cancelled, they | 1119 // Chrome Binaries should be last; if something else is cancelled, they |
| 1120 // should stay. | 1120 // should stay. |
| 1121 DCHECK(products[products.size() - 1]->is_chrome_binaries()); | 1121 DCHECK(products[products.size() - 1]->is_chrome_binaries()); |
| 1122 } | 1122 } |
| 1123 | 1123 |
| 1124 installer::InstallStatus install_status = installer::UNINSTALL_SUCCESSFUL; | 1124 installer::InstallStatus install_status = installer::UNINSTALL_SUCCESSFUL; |
| (...skipping 671 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1796 if (!(installer_state.is_msi() && is_uninstall)) | 1796 if (!(installer_state.is_msi() && is_uninstall)) |
| 1797 // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT | 1797 // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT |
| 1798 // to pass through, since this is only returned on uninstall which is | 1798 // to pass through, since this is only returned on uninstall which is |
| 1799 // never invoked directly by Google Update. | 1799 // never invoked directly by Google Update. |
| 1800 return_code = InstallUtil::GetInstallReturnCode(install_status); | 1800 return_code = InstallUtil::GetInstallReturnCode(install_status); |
| 1801 | 1801 |
| 1802 VLOG(1) << "Installation complete, returning: " << return_code; | 1802 VLOG(1) << "Installation complete, returning: " << return_code; |
| 1803 | 1803 |
| 1804 return return_code; | 1804 return return_code; |
| 1805 } | 1805 } |
| OLD | NEW |