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

Unified Diff: remoting/host/local_input_monitor_x11.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/local_input_monitor_win.cc ('k') | remoting/host/mac/me2me_preference_pane.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/local_input_monitor_x11.cc
diff --git a/remoting/host/local_input_monitor_x11.cc b/remoting/host/local_input_monitor_x11.cc
index 1da192f0a50abca11db0d66a6ab99ce87d11b0ae..9e410f8fdba9629159a47e520ee9c5871e11bfca 100644
--- a/remoting/host/local_input_monitor_x11.cc
+++ b/remoting/host/local_input_monitor_x11.cc
@@ -125,14 +125,14 @@ LocalInputMonitorX11::Core::Core(
client_session_control_(client_session_control),
alt_pressed_(false),
ctrl_pressed_(false),
- display_(NULL),
- x_record_display_(NULL),
+ display_(nullptr),
+ x_record_display_(nullptr),
x_record_context_(0) {
DCHECK(caller_task_runner_->BelongsToCurrentThread());
DCHECK(client_session_control_.get());
- x_record_range_[0] = NULL;
- x_record_range_[1] = NULL;
+ x_record_range_[0] = nullptr;
+ x_record_range_[1] = nullptr;
}
void LocalInputMonitorX11::Core::Start() {
@@ -170,8 +170,8 @@ void LocalInputMonitorX11::Core::StartOnInputThread() {
// and both channels are used from a separate thread, we'll need to duplicate
// them with something like the following:
// XOpenDisplay(DisplayString(display));
- display_ = XOpenDisplay(NULL);
- x_record_display_ = XOpenDisplay(NULL);
+ display_ = XOpenDisplay(nullptr);
+ x_record_display_ = XOpenDisplay(nullptr);
if (!display_ || !x_record_display_) {
LOG(ERROR) << "Couldn't open X display";
return;
@@ -245,11 +245,11 @@ void LocalInputMonitorX11::Core::StopOnInputThread() {
if (x_record_range_[0]) {
XFree(x_record_range_[0]);
- x_record_range_[0] = NULL;
+ x_record_range_[0] = nullptr;
}
if (x_record_range_[1]) {
XFree(x_record_range_[1]);
- x_record_range_[1] = NULL;
+ x_record_range_[1] = nullptr;
}
if (x_record_context_) {
XRecordFreeContext(x_record_display_, x_record_context_);
@@ -257,11 +257,11 @@ void LocalInputMonitorX11::Core::StopOnInputThread() {
}
if (x_record_display_) {
XCloseDisplay(x_record_display_);
- x_record_display_ = NULL;
+ x_record_display_ = nullptr;
}
if (display_) {
XCloseDisplay(display_);
- display_ = NULL;
+ display_ = nullptr;
}
}
« no previous file with comments | « remoting/host/local_input_monitor_win.cc ('k') | remoting/host/mac/me2me_preference_pane.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698