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

Unified Diff: cloud_print/service/win/chrome_launcher.cc

Issue 606443003: Remove implicit HANDLE conversions from cloud_print. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | cloud_print/service/win/service_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cloud_print/service/win/chrome_launcher.cc
diff --git a/cloud_print/service/win/chrome_launcher.cc b/cloud_print/service/win/chrome_launcher.cc
index 25da2b82dc41a1a63da39c5771718349b67f3e4e..5dd876d30bef6b58fdde857f04c65a8fd2ca8339 100644
--- a/cloud_print/service/win/chrome_launcher.cc
+++ b/cloud_print/service/win/chrome_launcher.cc
@@ -224,7 +224,7 @@ void ChromeLauncher::Run() {
DWORD thread_id = 0;
LaunchProcess(cmd, &chrome_handle, &thread_id);
- HANDLE handles[] = {stop_event_.handle(), chrome_handle};
+ HANDLE handles[] = { stop_event_.handle(), chrome_handle.Get() };
DWORD wait_result = WAIT_TIMEOUT;
while (wait_result == WAIT_TIMEOUT) {
cloud_print::SetGoogleUpdateUsage(kGoogleUpdateId);
@@ -232,7 +232,7 @@ void ChromeLauncher::Run() {
FALSE, kUsageUpdateTimeoutMs);
}
if (wait_result == WAIT_OBJECT_0) {
- ShutdownChrome(chrome_handle, thread_id);
+ ShutdownChrome(chrome_handle.Get(), thread_id);
break;
} else if (wait_result == WAIT_OBJECT_0 + 1) {
LOG(ERROR) << "Chrome process exited.";
@@ -302,7 +302,7 @@ std::string ChromeLauncher::CreateServiceStateFile(
}
for (;;) {
- DWORD wait_result = ::WaitForSingleObject(chrome_handle, 500);
+ DWORD wait_result = ::WaitForSingleObject(chrome_handle.Get(), 500);
std::string json = ReadAndUpdateServiceState(temp_user_data.path(),
proxy_id);
if (wait_result == WAIT_OBJECT_0) {
@@ -315,7 +315,7 @@ std::string ChromeLauncher::CreateServiceStateFile(
}
if (!json.empty()) {
// Close chrome because Service State is ready.
- CloseChrome(chrome_handle, thread_id);
+ CloseChrome(chrome_handle.Get(), thread_id);
return json;
}
}
« no previous file with comments | « no previous file | cloud_print/service/win/service_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698