Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(296)

Side by Side Diff: chrome/installer/util/helper.cc

Issue 10895: Add Terminate() to the Process object, have RenderProcessHost use this to avo... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 12 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/installer/setup/uninstall.cc ('k') | chrome/installer/util/run_all_unittests.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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
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
OLDNEW
« no previous file with comments | « chrome/installer/setup/uninstall.cc ('k') | chrome/installer/util/run_all_unittests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698