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

Unified Diff: remoting/host/cast_video_capturer_adapter.cc

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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/cast_extension_session.cc ('k') | remoting/host/chromeos/aura_desktop_capturer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/cast_video_capturer_adapter.cc
diff --git a/remoting/host/cast_video_capturer_adapter.cc b/remoting/host/cast_video_capturer_adapter.cc
index ddf0264617a181f971d86d8715e6beb90620feff..37d36fe418e2aff939503b12009fcae0a4b01704 100644
--- a/remoting/host/cast_video_capturer_adapter.cc
+++ b/remoting/host/cast_video_capturer_adapter.cc
@@ -28,7 +28,7 @@ CastVideoCapturerAdapter::~CastVideoCapturerAdapter() {
webrtc::SharedMemory* CastVideoCapturerAdapter::CreateSharedMemory(
size_t size) {
- return NULL;
+ return nullptr;
}
void CastVideoCapturerAdapter::OnCaptureCompleted(webrtc::DesktopFrame* frame) {
@@ -163,7 +163,7 @@ void CastVideoCapturerAdapter::Stop() {
capture_timer_.reset();
- SetCaptureFormat(NULL);
+ SetCaptureFormat(nullptr);
SetCaptureState(cricket::CS_STOPPED);
VLOG(1) << "CastVideoCapturerAdapter stopped.";
« no previous file with comments | « remoting/host/cast_extension_session.cc ('k') | remoting/host/chromeos/aura_desktop_capturer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698