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

Unified Diff: remoting/protocol/connection_to_host.cc

Issue 14308012: Fixed missing CONNECTED state transition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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/protocol/connection_to_host.cc
diff --git a/remoting/protocol/connection_to_host.cc b/remoting/protocol/connection_to_host.cc
index f778bb086aa25fa666fb6680ec90feaf1e61007a..cfa778b7651f941ad2dbfacb4342b5460b0a50bc 100644
--- a/remoting/protocol/connection_to_host.cc
+++ b/remoting/protocol/connection_to_host.cc
@@ -166,6 +166,8 @@ void ConnectionToHost::OnSessionStateChange(
break;
case Session::AUTHENTICATED:
+ SetState(AUTHENTICATED, OK);
+
control_dispatcher_.reset(new ClientControlDispatcher());
control_dispatcher_->Init(
session_.get(), session_->config().control_config(),
@@ -192,8 +194,6 @@ void ConnectionToHost::OnSessionStateChange(
base::Unretained(this)));
audio_reader_->set_audio_stub(audio_stub_);
}
-
- SetState(AUTHENTICATED, OK);
break;
case Session::CLOSED:
@@ -260,7 +260,7 @@ void ConnectionToHost::NotifyIfChannelsReady() {
session_->config().is_audio_enabled()) {
return;
}
- if (state_ != CONNECTING)
+ if (state_ != AUTHENTICATED)
return;
// Start forwarding clipboard and input events.
« 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