Chromium Code Reviews| Index: remoting/protocol/connection_to_host.h |
| diff --git a/remoting/protocol/connection_to_host.h b/remoting/protocol/connection_to_host.h |
| index 8524c726279c5ed9e53a3ae03d35acf84d947238..0e62b7014c68bb73c1c511d6123fd45e7b5aec15 100644 |
| --- a/remoting/protocol/connection_to_host.h |
| +++ b/remoting/protocol/connection_to_host.h |
| @@ -31,6 +31,8 @@ class VideoPacket; |
| namespace protocol { |
| +class AudioReader; |
| +class AudioStub; |
| class Authenticator; |
| class ClientControlDispatcher; |
| class ClientEventDispatcher; |
| @@ -74,7 +76,8 @@ class ConnectionToHost : public SignalStrategy::Listener, |
| HostEventCallback* event_callback, |
| ClientStub* client_stub, |
| ClipboardStub* clipboard_stub, |
| - VideoStub* video_stub); |
| + VideoStub* video_stub, |
| + AudioStub* audio_stub); |
| virtual void Disconnect(const base::Closure& shutdown_task); |
| @@ -117,6 +120,8 @@ class ConnectionToHost : public SignalStrategy::Listener, |
| void SetState(State state, ErrorCode error); |
| + bool AudioEnabled(); |
|
Wez
2012/06/22 18:29:53
nit: Get rid of this and replace the call-sites wi
kxing
2012/06/22 19:12:31
Done.
|
| + |
| bool allow_nat_traversal_; |
| std::string host_jid_; |
| @@ -129,12 +134,14 @@ class ConnectionToHost : public SignalStrategy::Listener, |
| ClientStub* client_stub_; |
| ClipboardStub* clipboard_stub_; |
| VideoStub* video_stub_; |
| + AudioStub* audio_stub_; |
| scoped_ptr<SignalStrategy> signal_strategy_; |
| scoped_ptr<SessionManager> session_manager_; |
| scoped_ptr<Session> session_; |
| scoped_ptr<VideoReader> video_reader_; |
| + scoped_ptr<AudioReader> audio_reader_; |
| scoped_ptr<ClientControlDispatcher> control_dispatcher_; |
| scoped_ptr<ClientEventDispatcher> event_dispatcher_; |
| ClipboardFilter clipboard_forwarder_; |