Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(156)

Side by Side Diff: remoting/protocol/jingle_connection_to_host.cc

Issue 4446005: Chromoting: Rename ChromotocolConfig -> SessionConfig (Closed) Base URL: http://git.chromium.org/git/chromium.git
Patch Set: Rename candidate_config vars Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « remoting/protocol/fake_session.cc ('k') | remoting/protocol/jingle_session.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 // TODO(hclam): Remove this header once MessageDispatcher is used. 10 // TODO(hclam): Remove this header once MessageDispatcher is used.
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 protocol::JingleSessionManager* session_manager = 75 protocol::JingleSessionManager* session_manager =
76 new protocol::JingleSessionManager(thread_); 76 new protocol::JingleSessionManager(thread_);
77 // TODO(ajwong): Make this a command switch when we're more stable. 77 // TODO(ajwong): Make this a command switch when we're more stable.
78 session_manager->set_allow_local_ips(true); 78 session_manager->set_allow_local_ips(true);
79 session_manager->Init( 79 session_manager->Init(
80 jingle_client_->GetFullJid(), 80 jingle_client_->GetFullJid(),
81 jingle_client_->session_manager(), 81 jingle_client_->session_manager(),
82 NewCallback(this, &JingleConnectionToHost::OnNewSession)); 82 NewCallback(this, &JingleConnectionToHost::OnNewSession));
83 session_manager_ = session_manager; 83 session_manager_ = session_manager;
84 84
85 CandidateChromotocolConfig* candidate_config = 85 CandidateSessionConfig* candidate_config =
86 CandidateChromotocolConfig::CreateDefault(); 86 CandidateSessionConfig::CreateDefault();
87 // TODO(sergeyu): Set resolution in the |candidate_config| to the desired 87 // TODO(sergeyu): Set resolution in the |candidate_config| to the desired
88 // resolution. 88 // resolution.
89 89
90 // Initialize |session_|. 90 // Initialize |session_|.
91 session_ = session_manager_->Connect( 91 session_ = session_manager_->Connect(
92 host_jid_, candidate_config, 92 host_jid_, candidate_config,
93 NewCallback(this, &JingleConnectionToHost::OnSessionStateChange)); 93 NewCallback(this, &JingleConnectionToHost::OnSessionStateChange));
94 } 94 }
95 95
96 void JingleConnectionToHost::OnDisconnected() { 96 void JingleConnectionToHost::OnDisconnected() {
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 break; 170 break;
171 } 171 }
172 } 172 }
173 173
174 MessageLoop* JingleConnectionToHost::message_loop() { 174 MessageLoop* JingleConnectionToHost::message_loop() {
175 return thread_->message_loop(); 175 return thread_->message_loop();
176 } 176 }
177 177
178 } // namespace protocol 178 } // namespace protocol
179 } // namespace remoting 179 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/protocol/fake_session.cc ('k') | remoting/protocol/jingle_session.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698