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

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

Issue 1549493004: Use std::move() instead of .Pass() in remoting/host (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_not_pass
Patch Set: Created 4 years, 12 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 <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 ChromotingHost::ChromotingHost( 62 ChromotingHost::ChromotingHost(
63 DesktopEnvironmentFactory* desktop_environment_factory, 63 DesktopEnvironmentFactory* desktop_environment_factory,
64 scoped_ptr<protocol::SessionManager> session_manager, 64 scoped_ptr<protocol::SessionManager> session_manager,
65 scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner, 65 scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner,
66 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, 66 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
67 scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner, 67 scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner,
68 scoped_refptr<base::SingleThreadTaskRunner> video_encode_task_runner, 68 scoped_refptr<base::SingleThreadTaskRunner> video_encode_task_runner,
69 scoped_refptr<base::SingleThreadTaskRunner> network_task_runner, 69 scoped_refptr<base::SingleThreadTaskRunner> network_task_runner,
70 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) 70 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner)
71 : desktop_environment_factory_(desktop_environment_factory), 71 : desktop_environment_factory_(desktop_environment_factory),
72 session_manager_(session_manager.Pass()), 72 session_manager_(std::move(session_manager)),
73 audio_task_runner_(audio_task_runner), 73 audio_task_runner_(audio_task_runner),
74 input_task_runner_(input_task_runner), 74 input_task_runner_(input_task_runner),
75 video_capture_task_runner_(video_capture_task_runner), 75 video_capture_task_runner_(video_capture_task_runner),
76 video_encode_task_runner_(video_encode_task_runner), 76 video_encode_task_runner_(video_encode_task_runner),
77 network_task_runner_(network_task_runner), 77 network_task_runner_(network_task_runner),
78 ui_task_runner_(ui_task_runner), 78 ui_task_runner_(ui_task_runner),
79 started_(false), 79 started_(false),
80 login_backoff_(&kDefaultBackoffPolicy), 80 login_backoff_(&kDefaultBackoffPolicy),
81 enable_curtaining_(false), 81 enable_curtaining_(false),
82 weak_factory_(this) { 82 weak_factory_(this) {
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 status_observers_.RemoveObserver(observer); 125 status_observers_.RemoveObserver(observer);
126 } 126 }
127 127
128 void ChromotingHost::AddExtension(scoped_ptr<HostExtension> extension) { 128 void ChromotingHost::AddExtension(scoped_ptr<HostExtension> extension) {
129 extensions_.push_back(extension.release()); 129 extensions_.push_back(extension.release());
130 } 130 }
131 131
132 void ChromotingHost::SetAuthenticatorFactory( 132 void ChromotingHost::SetAuthenticatorFactory(
133 scoped_ptr<protocol::AuthenticatorFactory> authenticator_factory) { 133 scoped_ptr<protocol::AuthenticatorFactory> authenticator_factory) {
134 DCHECK(CalledOnValidThread()); 134 DCHECK(CalledOnValidThread());
135 session_manager_->set_authenticator_factory(authenticator_factory.Pass()); 135 session_manager_->set_authenticator_factory(std::move(authenticator_factory));
136 } 136 }
137 137
138 void ChromotingHost::SetEnableCurtaining(bool enable) { 138 void ChromotingHost::SetEnableCurtaining(bool enable) {
139 DCHECK(network_task_runner_->BelongsToCurrentThread()); 139 DCHECK(network_task_runner_->BelongsToCurrentThread());
140 140
141 if (enable_curtaining_ == enable) 141 if (enable_curtaining_ == enable)
142 return; 142 return;
143 143
144 enable_curtaining_ = enable; 144 enable_curtaining_ = enable;
145 desktop_environment_factory_->SetEnableCurtaining(enable_curtaining_); 145 desktop_environment_factory_->SetEnableCurtaining(enable_curtaining_);
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 new protocol::WebrtcConnectionToClient(make_scoped_ptr(session))); 274 new protocol::WebrtcConnectionToClient(make_scoped_ptr(session)));
275 } else { 275 } else {
276 connection.reset(new protocol::IceConnectionToClient( 276 connection.reset(new protocol::IceConnectionToClient(
277 make_scoped_ptr(session), video_encode_task_runner_)); 277 make_scoped_ptr(session), video_encode_task_runner_));
278 } 278 }
279 279
280 // Create a ClientSession object. 280 // Create a ClientSession object.
281 ClientSession* client = new ClientSession( 281 ClientSession* client = new ClientSession(
282 this, audio_task_runner_, input_task_runner_, video_capture_task_runner_, 282 this, audio_task_runner_, input_task_runner_, video_capture_task_runner_,
283 video_encode_task_runner_, network_task_runner_, ui_task_runner_, 283 video_encode_task_runner_, network_task_runner_, ui_task_runner_,
284 connection.Pass(), desktop_environment_factory_, max_session_duration_, 284 std::move(connection), desktop_environment_factory_,
285 pairing_registry_, extensions_.get()); 285 max_session_duration_, pairing_registry_, extensions_.get());
286 286
287 clients_.push_back(client); 287 clients_.push_back(client);
288 } 288 }
289 289
290 void ChromotingHost::DisconnectAllClients() { 290 void ChromotingHost::DisconnectAllClients() {
291 DCHECK(CalledOnValidThread()); 291 DCHECK(CalledOnValidThread());
292 292
293 while (!clients_.empty()) { 293 while (!clients_.empty()) {
294 size_t size = clients_.size(); 294 size_t size = clients_.size();
295 clients_.front()->DisconnectSession(protocol::OK); 295 clients_.front()->DisconnectSession(protocol::OK);
296 CHECK_EQ(clients_.size(), size - 1); 296 CHECK_EQ(clients_.size(), size - 1);
297 } 297 }
298 } 298 }
299 299
300 } // namespace remoting 300 } // namespace remoting
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698