summaryrefslogtreecommitdiffstats
path: root/remoting/client/jingle_host_connection.h
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-24 21:08:35 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-24 21:08:35 +0000
commit8922bdbce7e19faf46604138b6bf0e5276f1db3c (patch)
tree74cc718706f2dcee7cd4eff96f507dbcb2db472b /remoting/client/jingle_host_connection.h
parent476f1c53ebdd8a5ddcadef5c34123f5492887176 (diff)
downloadchromium_src-8922bdbce7e19faf46604138b6bf0e5276f1db3c.zip
chromium_src-8922bdbce7e19faf46604138b6bf0e5276f1db3c.tar.gz
chromium_src-8922bdbce7e19faf46604138b6bf0e5276f1db3c.tar.bz2
Implemented chromotocol configuration negotiation.
Renamed "events" to "event". BUG=None TEST=None Review URL: http://codereview.chromium.org/3988002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63693 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/client/jingle_host_connection.h')
-rw-r--r--remoting/client/jingle_host_connection.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/remoting/client/jingle_host_connection.h b/remoting/client/jingle_host_connection.h
index 1701b5b..a72d8a9 100644
--- a/remoting/client/jingle_host_connection.h
+++ b/remoting/client/jingle_host_connection.h
@@ -55,7 +55,8 @@ class JingleHostConnection : public HostConnection,
// Callback for ChromotingServer.
void OnNewChromotocolConnection(
- ChromotingConnection* connection, bool* accept);
+ ChromotingConnection* connection,
+ ChromotingServer::NewConnectionResponse* response);
// Callback for ChromotingConnection.
void OnConnectionStateChange(ChromotingConnection::State state);
@@ -83,7 +84,7 @@ class JingleHostConnection : public HostConnection,
scoped_refptr<ChromotingServer> chromotocol_server_;
scoped_refptr<ChromotingConnection> connection_;
- EventsStreamWriter events_writer_;
+ EventStreamWriter event_writer_;
VideoStreamReader video_reader_;
HostEventCallback* event_callback_;