OLD | NEW |
---|---|
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "remoting/protocol/jingle_connection_to_host.h" | 5 #include "remoting/protocol/jingle_connection_to_host.h" |
6 | 6 |
7 #include "base/callback.h" | 7 #include "base/callback.h" |
8 #include "base/message_loop.h" | 8 #include "base/message_loop.h" |
9 #include "remoting/base/constants.h" | 9 #include "remoting/base/constants.h" |
10 #include "remoting/jingle_glue/jingle_thread.h" | 10 #include "remoting/jingle_glue/jingle_thread.h" |
11 #include "remoting/proto/auth.pb.h" | 11 #include "remoting/proto/auth.pb.h" |
12 #include "remoting/protocol/client_message_dispatcher.h" | 12 #include "remoting/protocol/client_message_dispatcher.h" |
13 #include "remoting/protocol/client_stub.h" | 13 #include "remoting/protocol/client_stub.h" |
14 #include "remoting/protocol/input_sender.h" | 14 #include "remoting/protocol/input_sender.h" |
15 #include "remoting/protocol/jingle_session_manager.h" | 15 #include "remoting/protocol/jingle_session_manager.h" |
16 #include "remoting/protocol/video_reader.h" | 16 #include "remoting/protocol/video_reader.h" |
17 #include "remoting/protocol/video_stub.h" | 17 #include "remoting/protocol/video_stub.h" |
18 #include "remoting/protocol/util.h" | 18 #include "remoting/protocol/util.h" |
19 | 19 |
20 namespace remoting { | 20 namespace remoting { |
21 namespace protocol { | 21 namespace protocol { |
22 | 22 |
23 JingleConnectionToHost::JingleConnectionToHost(JingleThread* thread) | 23 JingleConnectionToHost::JingleConnectionToHost(JingleThread* thread) |
24 : thread_(thread), | 24 : thread_(thread), |
25 control_reader_(new MessageReader()), | |
Sergey Ulanov
2011/01/25 22:26:53
Just remove control_reader_
| |
25 event_callback_(NULL), | 26 event_callback_(NULL), |
26 dispatcher_(new ClientMessageDispatcher()) { | 27 dispatcher_(new ClientMessageDispatcher()) { |
27 } | 28 } |
28 | 29 |
29 JingleConnectionToHost::~JingleConnectionToHost() { | 30 JingleConnectionToHost::~JingleConnectionToHost() { |
30 } | 31 } |
31 | 32 |
32 void JingleConnectionToHost::Connect(const std::string& username, | 33 void JingleConnectionToHost::Connect(const std::string& username, |
33 const std::string& auth_token, | 34 const std::string& auth_token, |
34 const std::string& host_jid, | 35 const std::string& host_jid, |
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
173 break; | 174 break; |
174 } | 175 } |
175 } | 176 } |
176 | 177 |
177 MessageLoop* JingleConnectionToHost::message_loop() { | 178 MessageLoop* JingleConnectionToHost::message_loop() { |
178 return thread_->message_loop(); | 179 return thread_->message_loop(); |
179 } | 180 } |
180 | 181 |
181 } // namespace protocol | 182 } // namespace protocol |
182 } // namespace remoting | 183 } // namespace remoting |
OLD | NEW |