Fixed missing CONNECTED state transition.

Previously, the state stansition was CONNECTING->CONNECTED, but r194079 introduced the AUTHENTICATED state without updating the expectation in ConnectionToHost::NotifyIfChannelsReady

BUG=231997

Review URL: https://codereview.chromium.org/14308012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194488 0039d316-1c4b-4281-b951-d872f2087c98
parent 79fec5fd
...@@ -166,6 +166,8 @@ void ConnectionToHost::OnSessionStateChange( ...@@ -166,6 +166,8 @@ void ConnectionToHost::OnSessionStateChange(
break; break;
case Session::AUTHENTICATED: case Session::AUTHENTICATED:
SetState(AUTHENTICATED, OK);
control_dispatcher_.reset(new ClientControlDispatcher()); control_dispatcher_.reset(new ClientControlDispatcher());
control_dispatcher_->Init( control_dispatcher_->Init(
session_.get(), session_->config().control_config(), session_.get(), session_->config().control_config(),
...@@ -192,8 +194,6 @@ void ConnectionToHost::OnSessionStateChange( ...@@ -192,8 +194,6 @@ void ConnectionToHost::OnSessionStateChange(
base::Unretained(this))); base::Unretained(this)));
audio_reader_->set_audio_stub(audio_stub_); audio_reader_->set_audio_stub(audio_stub_);
} }
SetState(AUTHENTICATED, OK);
break; break;
case Session::CLOSED: case Session::CLOSED:
...@@ -260,7 +260,7 @@ void ConnectionToHost::NotifyIfChannelsReady() { ...@@ -260,7 +260,7 @@ void ConnectionToHost::NotifyIfChannelsReady() {
session_->config().is_audio_enabled()) { session_->config().is_audio_enabled()) {
return; return;
} }
if (state_ != CONNECTING) if (state_ != AUTHENTICATED)
return; return;
// Start forwarding clipboard and input events. // Start forwarding clipboard and input events.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment