| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 | 6 |
| 7 #include "base/file_util.h" | 7 #include "base/file_util.h" |
| 8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
| 9 #include "base/process_util.h" | 9 #include "base/process_util.h" |
| 10 #include "base/scoped_ptr.h" | 10 #include "base/scoped_ptr.h" |
| (...skipping 21 matching lines...) Expand all Loading... |
| 32 } | 32 } |
| 33 | 33 |
| 34 return install_path; | 34 return install_path; |
| 35 } | 35 } |
| 36 | 36 |
| 37 bool installer::LaunchChrome(bool system_install) { | 37 bool installer::LaunchChrome(bool system_install) { |
| 38 std::wstring chrome_exe(L"\""); | 38 std::wstring chrome_exe(L"\""); |
| 39 chrome_exe.append(installer::GetChromeInstallPath(system_install)); | 39 chrome_exe.append(installer::GetChromeInstallPath(system_install)); |
| 40 file_util::AppendToPath(&chrome_exe, installer_util::kChromeExe); | 40 file_util::AppendToPath(&chrome_exe, installer_util::kChromeExe); |
| 41 chrome_exe.append(L"\""); | 41 chrome_exe.append(L"\""); |
| 42 return process_util::LaunchApp(chrome_exe, false, false, NULL); | 42 return base::LaunchApp(chrome_exe, false, false, NULL); |
| 43 } | 43 } |
| 44 | 44 |
| 45 bool installer::LaunchChromeAndWaitForResult(bool system_install, | 45 bool installer::LaunchChromeAndWaitForResult(bool system_install, |
| 46 const std::wstring& options, | 46 const std::wstring& options, |
| 47 int32* exit_code) { | 47 int32* exit_code) { |
| 48 std::wstring chrome_exe(installer::GetChromeInstallPath(system_install)); | 48 std::wstring chrome_exe(installer::GetChromeInstallPath(system_install)); |
| 49 if (chrome_exe.empty()) | 49 if (chrome_exe.empty()) |
| 50 return false; | 50 return false; |
| 51 file_util::AppendToPath(&chrome_exe, installer_util::kChromeExe); | 51 file_util::AppendToPath(&chrome_exe, installer_util::kChromeExe); |
| 52 | 52 |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 104 chrome_dll_path)); | 104 chrome_dll_path)); |
| 105 item->Do(); | 105 item->Do(); |
| 106 } | 106 } |
| 107 } | 107 } |
| 108 ret = FindNextFile(file_handle, &find_file_data); | 108 ret = FindNextFile(file_handle, &find_file_data); |
| 109 } | 109 } |
| 110 | 110 |
| 111 FindClose(file_handle); | 111 FindClose(file_handle); |
| 112 } | 112 } |
| 113 | 113 |
| OLD | NEW |