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

Side by Side Diff: remoting/client/chromoting_client.cc

Issue 2253233004: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 4 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 | « remoting/base/chromium_url_request.cc ('k') | remoting/client/dual_buffer_frame_consumer.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 (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/client/chromoting_client.h" 5 #include "remoting/client/chromoting_client.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/memory/ptr_util.h" 9 #include "base/memory/ptr_util.h"
10 #include "remoting/base/capabilities.h" 10 #include "remoting/base/capabilities.h"
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 240
241 bool ChromotingClient::OnSignalStrategyIncomingStanza( 241 bool ChromotingClient::OnSignalStrategyIncomingStanza(
242 const buzz::XmlElement* stanza) { 242 const buzz::XmlElement* stanza) {
243 return false; 243 return false;
244 } 244 }
245 245
246 void ChromotingClient::StartConnection() { 246 void ChromotingClient::StartConnection() {
247 DCHECK(thread_checker_.CalledOnValidThread()); 247 DCHECK(thread_checker_.CalledOnValidThread());
248 connection_->Connect( 248 connection_->Connect(
249 session_manager_->Connect( 249 session_manager_->Connect(
250 host_jid_, 250 host_jid_, base::MakeUnique<protocol::NegotiatingClientAuthenticator>(
251 base::WrapUnique(new protocol::NegotiatingClientAuthenticator( 251 NormalizeJid(signal_strategy_->GetLocalJid()),
252 NormalizeJid(signal_strategy_->GetLocalJid()), host_jid_, 252 host_jid_, client_auth_config_)),
253 client_auth_config_))),
254 transport_context_, this); 253 transport_context_, this);
255 } 254 }
256 255
257 void ChromotingClient::OnAuthenticated() { 256 void ChromotingClient::OnAuthenticated() {
258 DCHECK(thread_checker_.CalledOnValidThread()); 257 DCHECK(thread_checker_.CalledOnValidThread());
259 258
260 // Initialize the decoder. 259 // Initialize the decoder.
261 if (connection_->config().is_audio_enabled()) 260 if (connection_->config().is_audio_enabled())
262 audio_decode_scheduler_->Initialize(connection_->config()); 261 audio_decode_scheduler_->Initialize(connection_->config());
263 } 262 }
264 263
265 void ChromotingClient::OnChannelsConnected() { 264 void ChromotingClient::OnChannelsConnected() {
266 DCHECK(thread_checker_.CalledOnValidThread()); 265 DCHECK(thread_checker_.CalledOnValidThread());
267 266
268 // Negotiate capabilities with the host. 267 // Negotiate capabilities with the host.
269 VLOG(1) << "Client capabilities: " << local_capabilities_; 268 VLOG(1) << "Client capabilities: " << local_capabilities_;
270 269
271 protocol::Capabilities capabilities; 270 protocol::Capabilities capabilities;
272 capabilities.set_capabilities(local_capabilities_); 271 capabilities.set_capabilities(local_capabilities_);
273 connection_->host_stub()->SetCapabilities(capabilities); 272 connection_->host_stub()->SetCapabilities(capabilities);
274 273
275 mouse_input_scaler_.set_input_stub(connection_->input_stub()); 274 mouse_input_scaler_.set_input_stub(connection_->input_stub());
276 } 275 }
277 276
278 } // namespace remoting 277 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/base/chromium_url_request.cc ('k') | remoting/client/dual_buffer_frame_consumer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698