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

Unified Diff: remoting/host/sas_injector_win.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/sas_injector.h ('k') | remoting/host/setup/daemon_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/sas_injector_win.cc
diff --git a/remoting/host/sas_injector_win.cc b/remoting/host/sas_injector_win.cc
index eb48ed29e18a18e24611104bd39d34523a8fa852..53e98b1a797a61530364a91f4ad1ea8323288a5e 100644
--- a/remoting/host/sas_injector_win.cc
+++ b/remoting/host/sas_injector_win.cc
@@ -131,7 +131,7 @@ class SasInjectorXp : public SasInjector {
virtual bool InjectSas() override;
};
-SasInjectorWin::SasInjectorWin() : send_sas_(NULL) {
+SasInjectorWin::SasInjectorWin() : send_sas_(nullptr) {
}
SasInjectorWin::~SasInjectorWin() {
@@ -148,7 +148,7 @@ bool SasInjectorWin::InjectSas() {
}
sas_dll_.Reset(base::LoadNativeLibrary(dir_path.Append(kSasDllFileName),
- NULL));
+ nullptr));
}
if (!sas_dll_.is_valid()) {
LOG(ERROR) << "Failed to load '" << kSasDllFileName << "'";
@@ -156,11 +156,11 @@ bool SasInjectorWin::InjectSas() {
}
// Get the pointer to sas!SendSAS().
- if (send_sas_ == NULL) {
+ if (send_sas_ == nullptr) {
send_sas_ = reinterpret_cast<SendSasFunc>(
sas_dll_.GetFunctionPointer(kSendSasName));
}
- if (send_sas_ == NULL) {
+ if (send_sas_ == nullptr) {
LOG(ERROR) << "Failed to retrieve the address of '" << kSendSasName
<< "()'";
return false;
« no previous file with comments | « remoting/host/sas_injector.h ('k') | remoting/host/setup/daemon_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698