diff options
| author | jamiewalch@chromium.org <jamiewalch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-16 23:48:35 +0000 |
|---|---|---|
| committer | jamiewalch@chromium.org <jamiewalch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-16 23:48:35 +0000 |
| commit | 668a790154d55e843fc565c17a76e9fd9a69e53c (patch) | |
| tree | 08d40dfad8166e0fddcc9ba44827c641df170523 /remoting | |
| parent | 79fec5fdc9e9ba34b282b45b67b65c87668372ae (diff) | |
| download | chromium_src-668a790154d55e843fc565c17a76e9fd9a69e53c.zip chromium_src-668a790154d55e843fc565c17a76e9fd9a69e53c.tar.gz chromium_src-668a790154d55e843fc565c17a76e9fd9a69e53c.tar.bz2 | |
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
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/protocol/connection_to_host.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/remoting/protocol/connection_to_host.cc b/remoting/protocol/connection_to_host.cc index f778bb0..cfa778b 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. |