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

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

Issue 1638733002: Fix crash on It2Me host. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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
« no previous file with comments | « no previous file | no next file » | 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 <stddef.h> 7 #include <stddef.h>
8 8
9 #include <utility> 9 #include <utility>
10 10
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 } 236 }
237 237
238 scoped_refptr<protocol::TransportContext> transport_context = 238 scoped_refptr<protocol::TransportContext> transport_context =
239 new protocol::TransportContext( 239 new protocol::TransportContext(
240 signal_strategy_.get(), 240 signal_strategy_.get(),
241 make_scoped_ptr(new protocol::ChromiumPortAllocatorFactory( 241 make_scoped_ptr(new protocol::ChromiumPortAllocatorFactory(
242 host_context_->url_request_context_getter())), 242 host_context_->url_request_context_getter())),
243 network_settings, protocol::TransportRole::SERVER); 243 network_settings, protocol::TransportRole::SERVER);
244 244
245 scoped_ptr<protocol::SessionManager> session_manager( 245 scoped_ptr<protocol::SessionManager> session_manager(
246 new protocol::JingleSessionManager(signal_strategy.get())); 246 new protocol::JingleSessionManager(signal_strategy_.get()));
247 247
248 scoped_ptr<protocol::CandidateSessionConfig> protocol_config = 248 scoped_ptr<protocol::CandidateSessionConfig> protocol_config =
249 protocol::CandidateSessionConfig::CreateDefault(); 249 protocol::CandidateSessionConfig::CreateDefault();
250 // Disable audio by default. 250 // Disable audio by default.
251 // TODO(sergeyu): Add UI to enable it. 251 // TODO(sergeyu): Add UI to enable it.
252 protocol_config->DisableAudioChannel(); 252 protocol_config->DisableAudioChannel();
253 session_manager->set_protocol_config(std::move(protocol_config)); 253 session_manager->set_protocol_config(std::move(protocol_config));
254 254
255 // Create the host. 255 // Create the host.
256 host_.reset(new ChromotingHost( 256 host_.reset(new ChromotingHost(
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
492 scoped_ptr<It2MeConfirmationDialogFactory> confirmation_dialog_factory( 492 scoped_ptr<It2MeConfirmationDialogFactory> confirmation_dialog_factory(
493 new It2MeConfirmationDialogFactory()); 493 new It2MeConfirmationDialogFactory());
494 scoped_ptr<PolicyWatcher> policy_watcher = 494 scoped_ptr<PolicyWatcher> policy_watcher =
495 PolicyWatcher::Create(policy_service_, context->file_task_runner()); 495 PolicyWatcher::Create(policy_service_, context->file_task_runner());
496 return new It2MeHost(std::move(context), std::move(policy_watcher), 496 return new It2MeHost(std::move(context), std::move(policy_watcher),
497 std::move(confirmation_dialog_factory), observer, 497 std::move(confirmation_dialog_factory), observer,
498 xmpp_server_config, directory_bot_jid); 498 xmpp_server_config, directory_bot_jid);
499 } 499 }
500 500
501 } // namespace remoting 501 } // namespace remoting
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698