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

Unified Diff: remoting/host/clipboard_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/clipboard_win.cc ('k') | remoting/host/config_file_watcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/clipboard_x11.cc
diff --git a/remoting/host/clipboard_x11.cc b/remoting/host/clipboard_x11.cc
index fa046391b396b2060e7fdf969cbcb9008f111f6a..dc0bd988c5924cd4fda404f4a5559e46368de82d 100644
--- a/remoting/host/clipboard_x11.cc
+++ b/remoting/host/clipboard_x11.cc
@@ -52,7 +52,7 @@ class ClipboardX11 : public Clipboard,
};
ClipboardX11::ClipboardX11()
- : display_(NULL) {
+ : display_(nullptr) {
}
ClipboardX11::~ClipboardX11() {
@@ -62,7 +62,7 @@ ClipboardX11::~ClipboardX11() {
void ClipboardX11::Start(
scoped_ptr<protocol::ClipboardStub> client_clipboard) {
// TODO(lambroslambrou): Share the X connection with InputInjector.
- display_ = XOpenDisplay(NULL);
+ display_ = XOpenDisplay(nullptr);
if (!display_) {
LOG(ERROR) << "Couldn't open X display";
return;
@@ -93,7 +93,7 @@ void ClipboardX11::Stop() {
if (display_) {
XCloseDisplay(display_);
- display_ = NULL;
+ display_ = nullptr;
}
}
« no previous file with comments | « remoting/host/clipboard_win.cc ('k') | remoting/host/config_file_watcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698