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

Unified Diff: remoting/host/local_input_monitor_mac.mm

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/linux/x_server_clipboard_unittest.cc ('k') | remoting/host/local_input_monitor_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/local_input_monitor_mac.mm
diff --git a/remoting/host/local_input_monitor_mac.mm b/remoting/host/local_input_monitor_mac.mm
index d4256587df6a9b9bef908c6edff2c6086d0d6716..e3bd3d55987fedbaf577af7d5a673a8a025b3653 100644
--- a/remoting/host/local_input_monitor_mac.mm
+++ b/remoting/host/local_input_monitor_mac.mm
@@ -86,7 +86,7 @@ static CGEventRef LocalMouseMoved(CGEventTapProxy proxy, CGEventType type,
webrtc::DesktopVector mousePos(cgMousePos.x, cgMousePos.y);
[static_cast<LocalInputMonitorManager*>(context) localMouseMoved:mousePos];
}
- return NULL;
+ return nullptr;
}
@implementation LocalInputMonitorManager
@@ -111,7 +111,7 @@ static CGEventRef LocalMouseMoved(CGEventTapProxy proxy, CGEventType type,
1 << kCGEventMouseMoved, LocalMouseMoved, self));
if (mouseMachPort_) {
mouseRunLoopSource_ = CFMachPortCreateRunLoopSource(
- NULL, mouseMachPort_, 0);
+ nullptr, mouseMachPort_, 0);
CFRunLoopAddSource(
CFRunLoopGetMain(), mouseRunLoopSource_, kCFRunLoopCommonModes);
} else {
@@ -138,7 +138,7 @@ static CGEventRef LocalMouseMoved(CGEventTapProxy proxy, CGEventType type,
GTMCarbonEventDispatcherHandler* handler =
[GTMCarbonEventDispatcherHandler sharedEventDispatcherHandler];
[handler unregisterHotKey:hotKey_];
- hotKey_ = NULL;
+ hotKey_ = nullptr;
}
if (mouseRunLoopSource_) {
CFMachPortInvalidate(mouseMachPort_);
@@ -146,7 +146,7 @@ static CGEventRef LocalMouseMoved(CGEventTapProxy proxy, CGEventType type,
CFRunLoopGetMain(), mouseRunLoopSource_, kCFRunLoopCommonModes);
CFRelease(mouseRunLoopSource_);
mouseMachPort_.reset(0);
- mouseRunLoopSource_ = NULL;
+ mouseRunLoopSource_ = nullptr;
}
}
« no previous file with comments | « remoting/host/linux/x_server_clipboard_unittest.cc ('k') | remoting/host/local_input_monitor_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698