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

Side by Side Diff: remoting/host/it2me/it2me_host.cc

Issue 292093002: Switch CandidateSession to use lists rather than vectors. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix EnableVideoCodec & rebase Created 6 years, 7 months 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/host/chromoting_host.cc ('k') | remoting/protocol/connection_to_host.cc » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/host/it2me/it2me_host.h" 5 #include "remoting/host/it2me/it2me_host.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "base/synchronization/waitable_event.h" 9 #include "base/synchronization/waitable_event.h"
10 #include "base/threading/platform_thread.h" 10 #include "base/threading/platform_thread.h"
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 host_context_->ui_task_runner())); 205 host_context_->ui_task_runner()));
206 host_->AddStatusObserver(this); 206 host_->AddStatusObserver(this);
207 log_to_server_.reset( 207 log_to_server_.reset(
208 new LogToServer(host_->AsWeakPtr(), ServerLogEntry::IT2ME, 208 new LogToServer(host_->AsWeakPtr(), ServerLogEntry::IT2ME,
209 signal_strategy_.get(), directory_bot_jid_)); 209 signal_strategy_.get(), directory_bot_jid_));
210 210
211 // Disable audio by default. 211 // Disable audio by default.
212 // TODO(sergeyu): Add UI to enable it. 212 // TODO(sergeyu): Add UI to enable it.
213 scoped_ptr<protocol::CandidateSessionConfig> protocol_config = 213 scoped_ptr<protocol::CandidateSessionConfig> protocol_config =
214 protocol::CandidateSessionConfig::CreateDefault(); 214 protocol::CandidateSessionConfig::CreateDefault();
215 protocol::CandidateSessionConfig::DisableAudioChannel(protocol_config.get()); 215 protocol_config->DisableAudioChannel();
216 216
217 host_->set_protocol_config(protocol_config.Pass()); 217 host_->set_protocol_config(protocol_config.Pass());
218 218
219 // Create event logger. 219 // Create event logger.
220 host_event_logger_ = 220 host_event_logger_ =
221 HostEventLogger::Create(host_->AsWeakPtr(), kApplicationName); 221 HostEventLogger::Create(host_->AsWeakPtr(), kApplicationName);
222 222
223 // Connect signaling and start the host. 223 // Connect signaling and start the host.
224 signal_strategy_->Connect(); 224 signal_strategy_->Connect();
225 host_->Start(xmpp_server_config_.username); 225 host_->Start(xmpp_server_config_.username);
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
465 ChromotingHostContext* context, 465 ChromotingHostContext* context,
466 scoped_refptr<base::SingleThreadTaskRunner> task_runner, 466 scoped_refptr<base::SingleThreadTaskRunner> task_runner,
467 base::WeakPtr<It2MeHost::Observer> observer, 467 base::WeakPtr<It2MeHost::Observer> observer,
468 const XmppSignalStrategy::XmppServerConfig& xmpp_server_config, 468 const XmppSignalStrategy::XmppServerConfig& xmpp_server_config,
469 const std::string& directory_bot_jid) { 469 const std::string& directory_bot_jid) {
470 return new It2MeHost( 470 return new It2MeHost(
471 context, task_runner, observer, xmpp_server_config, directory_bot_jid); 471 context, task_runner, observer, xmpp_server_config, directory_bot_jid);
472 } 472 }
473 473
474 } // namespace remoting 474 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/host/chromoting_host.cc ('k') | remoting/protocol/connection_to_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698