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

Side by Side Diff: remoting/host/client_session.h

Issue 810133003: replace NULL->nullptr in src/remoting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 | « remoting/host/chromoting_host_unittest.cc ('k') | remoting/host/client_session.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 #ifndef REMOTING_HOST_CLIENT_SESSION_H_ 5 #ifndef REMOTING_HOST_CLIENT_SESSION_H_
6 #define REMOTING_HOST_CLIENT_SESSION_H_ 6 #define REMOTING_HOST_CLIENT_SESSION_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 base::OneShotTimer<ClientSession> max_duration_timer_; 212 base::OneShotTimer<ClientSession> max_duration_timer_;
213 213
214 scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner_; 214 scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner_;
215 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner_; 215 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner_;
216 scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner_; 216 scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner_;
217 scoped_refptr<base::SingleThreadTaskRunner> video_encode_task_runner_; 217 scoped_refptr<base::SingleThreadTaskRunner> video_encode_task_runner_;
218 scoped_refptr<base::SingleThreadTaskRunner> network_task_runner_; 218 scoped_refptr<base::SingleThreadTaskRunner> network_task_runner_;
219 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_; 219 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_;
220 220
221 // Schedulers for audio and video capture. 221 // Schedulers for audio and video capture.
222 // |video_scheduler_| may be NULL if the video channel is not required - see 222 // |video_scheduler_| may be nullptr if the video channel is not required -
223 // ResetVideoPipeline(). 223 // see ResetVideoPipeline().
224 scoped_refptr<AudioScheduler> audio_scheduler_; 224 scoped_refptr<AudioScheduler> audio_scheduler_;
225 scoped_refptr<VideoScheduler> video_scheduler_; 225 scoped_refptr<VideoScheduler> video_scheduler_;
226 226
227 // The set of all capabilities supported by the client. 227 // The set of all capabilities supported by the client.
228 scoped_ptr<std::string> client_capabilities_; 228 scoped_ptr<std::string> client_capabilities_;
229 229
230 // The set of all capabilities supported by the host. 230 // The set of all capabilities supported by the host.
231 std::string host_capabilities_; 231 std::string host_capabilities_;
232 232
233 // The set of all capabilities negotiated between client and host. 233 // The set of all capabilities negotiated between client and host.
(...skipping 22 matching lines...) Expand all
256 // Used to disable callbacks to |this| once DisconnectSession() has been 256 // Used to disable callbacks to |this| once DisconnectSession() has been
257 // called. 257 // called.
258 base::WeakPtrFactory<ClientSessionControl> weak_factory_; 258 base::WeakPtrFactory<ClientSessionControl> weak_factory_;
259 259
260 DISALLOW_COPY_AND_ASSIGN(ClientSession); 260 DISALLOW_COPY_AND_ASSIGN(ClientSession);
261 }; 261 };
262 262
263 } // namespace remoting 263 } // namespace remoting
264 264
265 #endif // REMOTING_HOST_CLIENT_SESSION_H_ 265 #endif // REMOTING_HOST_CLIENT_SESSION_H_
OLDNEW
« no previous file with comments | « remoting/host/chromoting_host_unittest.cc ('k') | remoting/host/client_session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698