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

Unified Diff: remoting/host/setup/me2me_native_messaging_host.cc

Issue 2207153004: Fixing a hang in the native messaging hosts on Windows (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Adding a comment describing why we need to cancel the pending read operation on Windows. Created 4 years, 4 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 | « remoting/host/native_messaging/native_messaging_reader_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/setup/me2me_native_messaging_host.cc
diff --git a/remoting/host/setup/me2me_native_messaging_host.cc b/remoting/host/setup/me2me_native_messaging_host.cc
index 975b9136a9f0ac2bc9b2b16a6d71b529994b81cd..2af5b66da2c4154e8238184a1e29e13ca4ba30f5 100644
--- a/remoting/host/setup/me2me_native_messaging_host.cc
+++ b/remoting/host/setup/me2me_native_messaging_host.cc
@@ -193,8 +193,9 @@ void Me2MeNativeMessagingHost::ProcessClearPairedClients(
DCHECK(task_runner()->BelongsToCurrentThread());
if (needs_elevation_) {
- if (!DelegateToElevatedHost(std::move(message)))
+ if (!DelegateToElevatedHost(std::move(message))) {
SendBooleanResult(std::move(response), false);
+ }
return;
}
@@ -213,8 +214,9 @@ void Me2MeNativeMessagingHost::ProcessDeletePairedClient(
DCHECK(task_runner()->BelongsToCurrentThread());
if (needs_elevation_) {
- if (!DelegateToElevatedHost(std::move(message)))
+ if (!DelegateToElevatedHost(std::move(message))) {
SendBooleanResult(std::move(response), false);
+ }
return;
}
@@ -284,8 +286,9 @@ void Me2MeNativeMessagingHost::ProcessUpdateDaemonConfig(
DCHECK(task_runner()->BelongsToCurrentThread());
if (needs_elevation_) {
- if (!DelegateToElevatedHost(std::move(message)))
+ if (!DelegateToElevatedHost(std::move(message))) {
SendAsyncResult(std::move(response), DaemonController::RESULT_FAILED);
+ }
return;
}
@@ -344,8 +347,9 @@ void Me2MeNativeMessagingHost::ProcessStartDaemon(
DCHECK(task_runner()->BelongsToCurrentThread());
if (needs_elevation_) {
- if (!DelegateToElevatedHost(std::move(message)))
+ if (!DelegateToElevatedHost(std::move(message))) {
SendAsyncResult(std::move(response), DaemonController::RESULT_FAILED);
+ }
return;
}
@@ -374,8 +378,9 @@ void Me2MeNativeMessagingHost::ProcessStopDaemon(
DCHECK(task_runner()->BelongsToCurrentThread());
if (needs_elevation_) {
- if (!DelegateToElevatedHost(std::move(message)))
+ if (!DelegateToElevatedHost(std::move(message))) {
SendAsyncResult(std::move(response), DaemonController::RESULT_FAILED);
+ }
return;
}
@@ -588,9 +593,6 @@ void Me2MeNativeMessagingHost::EnsureElevatedHostCreated() {
binary, parent_window_handle_,
/*elevate_process=*/true, &read_handle, &write_handle);
if (result != PROCESS_LAUNCH_RESULT_SUCCESS) {
- if (result != PROCESS_LAUNCH_RESULT_CANCELLED) {
- OnError(std::string());
- }
return;
}
« no previous file with comments | « remoting/host/native_messaging/native_messaging_reader_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698