summaryrefslogtreecommitdiffstats
path: root/remoting/protocol
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-24 18:19:01 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-24 18:19:01 +0000
commitf3560c815bcfb50c57f6bab44874d46b4d50b8e1 (patch)
treec5463158d4936a26961d6ca226691dd005a7f717 /remoting/protocol
parent7fc96c8b734fc9bc8152329d99e8ee3f3de14a65 (diff)
downloadchromium_src-f3560c815bcfb50c57f6bab44874d46b4d50b8e1.zip
chromium_src-f3560c815bcfb50c57f6bab44874d46b4d50b8e1.tar.gz
chromium_src-f3560c815bcfb50c57f6bab44874d46b4d50b8e1.tar.bz2
Fix incorrect ready state events.
BUG=138607 Review URL: https://chromiumcodereview.appspot.com/10817026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148148 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol')
-rw-r--r--remoting/protocol/connection_to_host.cc2
-rw-r--r--remoting/protocol/libjingle_transport_factory.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/remoting/protocol/connection_to_host.cc b/remoting/protocol/connection_to_host.cc
index 144c1fc..906f63f 100644
--- a/remoting/protocol/connection_to_host.cc
+++ b/remoting/protocol/connection_to_host.cc
@@ -217,7 +217,7 @@ void ConnectionToHost::OnSessionChannelReady(const std::string& channel_name,
not_ready_channels_.insert(channel_name);
}
- event_callback_->OnConnectionReady(ready);
+ event_callback_->OnConnectionReady(not_ready_channels_.empty());
}
ConnectionToHost::State ConnectionToHost::state() const {
diff --git a/remoting/protocol/libjingle_transport_factory.cc b/remoting/protocol/libjingle_transport_factory.cc
index afe66e7..ca441af 100644
--- a/remoting/protocol/libjingle_transport_factory.cc
+++ b/remoting/protocol/libjingle_transport_factory.cc
@@ -243,7 +243,7 @@ void LibjingleStreamTransport::OnRouteChange(
void LibjingleStreamTransport::OnWritableState(
cricket::TransportChannel* channel) {
- event_handler_->OnTransportReady(this, !channel->writable());
+ event_handler_->OnTransportReady(this, channel->writable());
}
void LibjingleStreamTransport::OnTcpConnected(int result) {