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

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

Issue 606473002: Remove implicit HANDLE conversions from chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove spurious file and fix indent (+rebase) Created 6 years, 2 months 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
« no previous file with comments | « chrome/installer/setup/uninstall.cc ('k') | chrome/installer/util/installer_state_unittest.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) 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/util/google_update_util.h" 5 #include "chrome/installer/util/google_update_util.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/files/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 // Returns false if command execution fails to execute, or times out. 88 // Returns false if command execution fails to execute, or times out.
89 bool LaunchProcessAndWaitWithTimeout(const base::string16& cmd_string, 89 bool LaunchProcessAndWaitWithTimeout(const base::string16& cmd_string,
90 base::TimeDelta timeout) { 90 base::TimeDelta timeout) {
91 bool success = false; 91 bool success = false;
92 base::win::ScopedHandle process; 92 base::win::ScopedHandle process;
93 int exit_code = 0; 93 int exit_code = 0;
94 VLOG(0) << "Launching: " << cmd_string; 94 VLOG(0) << "Launching: " << cmd_string;
95 if (!base::LaunchProcess(cmd_string, base::LaunchOptions(), 95 if (!base::LaunchProcess(cmd_string, base::LaunchOptions(),
96 &process)) { 96 &process)) {
97 PLOG(ERROR) << "Failed to launch (" << cmd_string << ")"; 97 PLOG(ERROR) << "Failed to launch (" << cmd_string << ")";
98 } else if (!base::WaitForExitCodeWithTimeout(process, &exit_code, timeout)) { 98 } else if (!base::WaitForExitCodeWithTimeout(process.Get(), &exit_code,
99 timeout)) {
99 // The GetExitCodeProcess failed or timed-out. 100 // The GetExitCodeProcess failed or timed-out.
100 LOG(ERROR) <<"Command (" << cmd_string << ") is taking more than " 101 LOG(ERROR) <<"Command (" << cmd_string << ") is taking more than "
101 << timeout.InMilliseconds() << " milliseconds to complete."; 102 << timeout.InMilliseconds() << " milliseconds to complete.";
102 } else if (exit_code != 0) { 103 } else if (exit_code != 0) {
103 LOG(ERROR) << "Command (" << cmd_string << ") exited with code " 104 LOG(ERROR) << "Command (" << cmd_string << ") exited with code "
104 << exit_code; 105 << exit_code;
105 } else { 106 } else {
106 success = true; 107 success = true;
107 } 108 }
108 return success; 109 return success;
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 182
182 if (base::win::GetVersion() >= base::win::VERSION_VISTA && 183 if (base::win::GetVersion() >= base::win::VERSION_VISTA &&
183 base::win::UserAccountControlIsEnabled()) { 184 base::win::UserAccountControlIsEnabled()) {
184 base::LaunchElevatedProcess(cmd, launch_options, NULL); 185 base::LaunchElevatedProcess(cmd, launch_options, NULL);
185 } else { 186 } else {
186 base::LaunchProcess(cmd, launch_options, NULL); 187 base::LaunchProcess(cmd, launch_options, NULL);
187 } 188 }
188 } 189 }
189 190
190 } // namespace google_update 191 } // namespace google_update
OLDNEW
« no previous file with comments | « chrome/installer/setup/uninstall.cc ('k') | chrome/installer/util/installer_state_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698