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

Unified Diff: remoting/host/linux/x11_util.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
Index: remoting/host/linux/x11_util.cc
diff --git a/remoting/host/linux/x11_util.cc b/remoting/host/linux/x11_util.cc
index 88935e255c3e250c072294b551c6c6f49157a4a7..8857a6a86f181fe65b3cde00988af6d40c7a5284 100644
--- a/remoting/host/linux/x11_util.cc
+++ b/remoting/host/linux/x11_util.cc
@@ -8,7 +8,7 @@
namespace remoting {
-static ScopedXErrorHandler* g_handler = NULL;
+static ScopedXErrorHandler* g_handler = nullptr;
ScopedXErrorHandler::ScopedXErrorHandler(const Handler& handler):
handler_(handler),
@@ -17,13 +17,13 @@ ScopedXErrorHandler::ScopedXErrorHandler(const Handler& handler):
// where a mix of ScopedXErrorHandler and raw XSetErrorHandler calls are used,
// and it disallows nested ScopedXErrorHandlers on the same thread, despite
// these being perfectly safe.
- DCHECK(g_handler == NULL);
+ DCHECK(g_handler == nullptr);
g_handler = this;
previous_handler_ = XSetErrorHandler(HandleXErrors);
}
ScopedXErrorHandler::~ScopedXErrorHandler() {
- g_handler = NULL;
+ g_handler = nullptr;
XSetErrorHandler(previous_handler_);
}
@@ -37,7 +37,7 @@ ScopedXErrorHandler::Handler ScopedXErrorHandler::Ignore() {
}
int ScopedXErrorHandler::HandleXErrors(Display* display, XErrorEvent* error) {
- DCHECK(g_handler != NULL);
+ DCHECK(g_handler != nullptr);
g_handler->ok_ = false;
g_handler->handler_.Run(display, error);
return 0;
« no previous file with comments | « remoting/host/it2me/it2me_native_messaging_host_unittest.cc ('k') | remoting/host/linux/x_server_clipboard.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698