athena/screen_lock/screen_lock_manager_base.cc - Issue 653563004: NULL -> nullptr under athena/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: athena/screen_lock/screen_lock_manager_base.cc

Issue 653563004: NULL -> nullptr under athena/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master

Patch Set: Created 6 years, 2 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:

Index: athena/screen_lock/screen_lock_manager_base.cc

diff --git a/athena/screen_lock/screen_lock_manager_base.cc b/athena/screen_lock/screen_lock_manager_base.cc

index 80a847b09d135b8ef27831ad5600ab6275e3a6d8..abd221b7e4a5af98d5dd4a3064a8e40a80892470 100644

--- a/athena/screen_lock/screen_lock_manager_base.cc

+++ b/athena/screen_lock/screen_lock_manager_base.cc

@@ -9,7 +9,7 @@

namespace athena {

namespace {

-ScreenLockManager* instance = NULL;

+ScreenLockManager* instance = nullptr;

} // namespace

@@ -20,7 +20,7 @@ ScreenLockManagerBase::ScreenLockManagerBase() {

ScreenLockManagerBase::~ScreenLockManagerBase() {

DCHECK_EQ(instance, this);

- instance = NULL;

+ instance = nullptr;

}

// static