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

Unified Diff: remoting/host/it2me/it2me_host.cc

Issue 2040353002: [Chromoting] Fix DCHECK when shutting down It2Me host from client side (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/it2me/it2me_host.cc
diff --git a/remoting/host/it2me/it2me_host.cc b/remoting/host/it2me/it2me_host.cc
index 0afaee6fc16d39d08523dec3c0784d66b83648a3..ac19c18a09d1f618c558dbf53ed3adc94c539a3e 100644
--- a/remoting/host/it2me/it2me_host.cc
+++ b/remoting/host/it2me/it2me_host.cc
@@ -102,6 +102,12 @@ void It2MeHost::Disconnect() {
void It2MeHost::Shutdown() {
DCHECK(host_context_->network_task_runner()->BelongsToCurrentThread());
+ // Shutdown is expected to be called twice, if OnClientDisconnected has been
+ // called. See http://crbug.com/617474 for details.
Sergey Ulanov 2016/06/08 21:54:04 The link to the bug is not useful here. I would ju
Hzj_jie 2016/06/08 23:12:20 I would prefer to keep it, since the condition of
Sergey Ulanov 2016/06/08 23:26:15 Ok, then I suggest rewording: // Disconnect() may
+ if (state_ == kDisconnected) {
+ return;
+ }
+
confirmation_dialog_proxy_.reset();
host_event_logger_.reset();
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698