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

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: include <utility> 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 <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <utility>
10 11
11 #include "base/bind.h" 12 #include "base/bind.h"
12 #include "base/callback.h" 13 #include "base/callback.h"
13 #include "base/command_line.h" 14 #include "base/command_line.h"
14 #include "build/build_config.h" 15 #include "build/build_config.h"
15 #include "jingle/glue/thread_wrapper.h" 16 #include "jingle/glue/thread_wrapper.h"
16 #include "remoting/base/constants.h" 17 #include "remoting/base/constants.h"
17 #include "remoting/base/logging.h" 18 #include "remoting/base/logging.h"
18 #include "remoting/host/chromoting_host_context.h" 19 #include "remoting/host/chromoting_host_context.h"
19 #include "remoting/host/desktop_environment.h" 20 #include "remoting/host/desktop_environment.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 ChromotingHost::ChromotingHost( 65 ChromotingHost::ChromotingHost(
65 DesktopEnvironmentFactory* desktop_environment_factory, 66 DesktopEnvironmentFactory* desktop_environment_factory,
66 scoped_ptr<protocol::SessionManager> session_manager, 67 scoped_ptr<protocol::SessionManager> session_manager,
67 scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner, 68 scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner,
68 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, 69 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
69 scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner, 70 scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner,
70 scoped_refptr<base::SingleThreadTaskRunner> video_encode_task_runner, 71 scoped_refptr<base::SingleThreadTaskRunner> video_encode_task_runner,
71 scoped_refptr<base::SingleThreadTaskRunner> network_task_runner, 72 scoped_refptr<base::SingleThreadTaskRunner> network_task_runner,
72 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) 73 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner)
73 : desktop_environment_factory_(desktop_environment_factory), 74 : desktop_environment_factory_(desktop_environment_factory),
74 session_manager_(session_manager.Pass()), 75 session_manager_(std::move(session_manager)),
75 audio_task_runner_(audio_task_runner), 76 audio_task_runner_(audio_task_runner),
76 input_task_runner_(input_task_runner), 77 input_task_runner_(input_task_runner),
77 video_capture_task_runner_(video_capture_task_runner), 78 video_capture_task_runner_(video_capture_task_runner),
78 video_encode_task_runner_(video_encode_task_runner), 79 video_encode_task_runner_(video_encode_task_runner),
79 network_task_runner_(network_task_runner), 80 network_task_runner_(network_task_runner),
80 ui_task_runner_(ui_task_runner), 81 ui_task_runner_(ui_task_runner),
81 started_(false), 82 started_(false),
82 login_backoff_(&kDefaultBackoffPolicy), 83 login_backoff_(&kDefaultBackoffPolicy),
83 enable_curtaining_(false), 84 enable_curtaining_(false),
84 weak_factory_(this) { 85 weak_factory_(this) {
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 status_observers_.RemoveObserver(observer); 128 status_observers_.RemoveObserver(observer);
128 } 129 }
129 130
130 void ChromotingHost::AddExtension(scoped_ptr<HostExtension> extension) { 131 void ChromotingHost::AddExtension(scoped_ptr<HostExtension> extension) {
131 extensions_.push_back(extension.release()); 132 extensions_.push_back(extension.release());
132 } 133 }
133 134
134 void ChromotingHost::SetAuthenticatorFactory( 135 void ChromotingHost::SetAuthenticatorFactory(
135 scoped_ptr<protocol::AuthenticatorFactory> authenticator_factory) { 136 scoped_ptr<protocol::AuthenticatorFactory> authenticator_factory) {
136 DCHECK(CalledOnValidThread()); 137 DCHECK(CalledOnValidThread());
137 session_manager_->set_authenticator_factory(authenticator_factory.Pass()); 138 session_manager_->set_authenticator_factory(std::move(authenticator_factory));
138 } 139 }
139 140
140 void ChromotingHost::SetEnableCurtaining(bool enable) { 141 void ChromotingHost::SetEnableCurtaining(bool enable) {
141 DCHECK(network_task_runner_->BelongsToCurrentThread()); 142 DCHECK(network_task_runner_->BelongsToCurrentThread());
142 143
143 if (enable_curtaining_ == enable) 144 if (enable_curtaining_ == enable)
144 return; 145 return;
145 146
146 enable_curtaining_ = enable; 147 enable_curtaining_ = enable;
147 desktop_environment_factory_->SetEnableCurtaining(enable_curtaining_); 148 desktop_environment_factory_->SetEnableCurtaining(enable_curtaining_);
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 new protocol::WebrtcConnectionToClient(make_scoped_ptr(session))); 277 new protocol::WebrtcConnectionToClient(make_scoped_ptr(session)));
277 } else { 278 } else {
278 connection.reset(new protocol::IceConnectionToClient( 279 connection.reset(new protocol::IceConnectionToClient(
279 make_scoped_ptr(session), video_encode_task_runner_)); 280 make_scoped_ptr(session), video_encode_task_runner_));
280 } 281 }
281 282
282 // Create a ClientSession object. 283 // Create a ClientSession object.
283 ClientSession* client = new ClientSession( 284 ClientSession* client = new ClientSession(
284 this, audio_task_runner_, input_task_runner_, video_capture_task_runner_, 285 this, audio_task_runner_, input_task_runner_, video_capture_task_runner_,
285 video_encode_task_runner_, network_task_runner_, ui_task_runner_, 286 video_encode_task_runner_, network_task_runner_, ui_task_runner_,
286 connection.Pass(), desktop_environment_factory_, max_session_duration_, 287 std::move(connection), desktop_environment_factory_,
287 pairing_registry_, extensions_.get()); 288 max_session_duration_, pairing_registry_, extensions_.get());
288 289
289 clients_.push_back(client); 290 clients_.push_back(client);
290 } 291 }
291 292
292 void ChromotingHost::DisconnectAllClients() { 293 void ChromotingHost::DisconnectAllClients() {
293 DCHECK(CalledOnValidThread()); 294 DCHECK(CalledOnValidThread());
294 295
295 while (!clients_.empty()) { 296 while (!clients_.empty()) {
296 size_t size = clients_.size(); 297 size_t size = clients_.size();
297 clients_.front()->DisconnectSession(protocol::OK); 298 clients_.front()->DisconnectSession(protocol::OK);
298 CHECK_EQ(clients_.size(), size - 1); 299 CHECK_EQ(clients_.size(), size - 1);
299 } 300 }
300 } 301 }
301 302
302 } // namespace remoting 303 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/host/chromeos/skia_bitmap_desktop_frame.cc ('k') | remoting/host/chromoting_host_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698