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

Side by Side Diff: remoting/host/chromoting_host.cc

Issue 2615113005: [Chromoting] Use HostExperimentSessionPlugin in host (Closed)
Patch Set: Enable two-way control of DirectX capturer Created 3 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/chromoting_host.h" 5 #include "remoting/host/chromoting_host.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <utility> 10 #include <utility>
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 protocol::SessionConfig::Protocol::WEBRTC) { 249 protocol::SessionConfig::Protocol::WEBRTC) {
250 connection.reset(new protocol::WebrtcConnectionToClient( 250 connection.reset(new protocol::WebrtcConnectionToClient(
251 base::WrapUnique(session), transport_context_, 251 base::WrapUnique(session), transport_context_,
252 video_encode_task_runner_, audio_task_runner_)); 252 video_encode_task_runner_, audio_task_runner_));
253 } else { 253 } else {
254 connection.reset(new protocol::IceConnectionToClient( 254 connection.reset(new protocol::IceConnectionToClient(
255 base::WrapUnique(session), transport_context_, 255 base::WrapUnique(session), transport_context_,
256 video_encode_task_runner_, audio_task_runner_)); 256 video_encode_task_runner_, audio_task_runner_));
257 } 257 }
258 258
259 DesktopEnvironmentOptions options = desktop_environment_options_;
260 // TODO(zijiehe): Apply HostSessionOptions to options.
261 // Create a ClientSession object. 259 // Create a ClientSession object.
262 clients_.push_back(base::MakeUnique<ClientSession>( 260 clients_.push_back(base::MakeUnique<ClientSession>(
263 this, std::move(connection), desktop_environment_factory_, options, 261 this, std::move(connection), desktop_environment_factory_,
264 max_session_duration_, pairing_registry_, extensions_.get())); 262 desktop_environment_options_, max_session_duration_, pairing_registry_,
263 extensions_.get()));
265 } 264 }
266 265
267 } // namespace remoting 266 } // namespace remoting
OLDNEW
« no previous file with comments | « no previous file | remoting/host/client_session.h » ('j') | remoting/host/desktop_environment_options.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698