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

Unified Diff: remoting/protocol/jingle_session_manager.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/protocol/jingle_session.cc ('k') | remoting/protocol/jingle_session_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/jingle_session_manager.cc
diff --git a/remoting/protocol/jingle_session_manager.cc b/remoting/protocol/jingle_session_manager.cc
index 1adef6fcef20efd224e8555f0a87cd73aefdaeca..16cd369c81b189bc4207e11bceb4d7b5b46f341a 100644
--- a/remoting/protocol/jingle_session_manager.cc
+++ b/remoting/protocol/jingle_session_manager.cc
@@ -23,8 +23,8 @@ namespace protocol {
JingleSessionManager::JingleSessionManager(
scoped_ptr<TransportFactory> transport_factory)
: transport_factory_(transport_factory.Pass()),
- signal_strategy_(NULL),
- listener_(NULL),
+ signal_strategy_(nullptr),
+ listener_(nullptr),
ready_(false) {
}
@@ -63,11 +63,11 @@ void JingleSessionManager::Close() {
// Close() can be called only after all sessions are destroyed.
DCHECK(sessions_.empty());
- listener_ = NULL;
+ listener_ = nullptr;
if (signal_strategy_) {
signal_strategy_->RemoveListener(this);
- signal_strategy_ = NULL;
+ signal_strategy_ = nullptr;
}
}
« no previous file with comments | « remoting/protocol/jingle_session.cc ('k') | remoting/protocol/jingle_session_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698