athena/activity/activity_factory.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/activity/activity_factory.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/activity/activity_factory.cc

diff --git a/athena/activity/activity_factory.cc b/athena/activity/activity_factory.cc

index 2507281eef19f8cdb2799ed1a7d5dc2f76ce1a51..dbaa77d49e5f6d84f3fa3b22d9aff05f2c586129 100644

--- a/athena/activity/activity_factory.cc

+++ b/athena/activity/activity_factory.cc

@@ -10,8 +10,7 @@ namespace athena {

namespace {

-ActivityFactory* instance = NULL;

+ActivityFactory* instance = nullptr;

}

// static

@@ -30,7 +29,7 @@ ActivityFactory* ActivityFactory::Get() {

void ActivityFactory::Shutdown() {

DCHECK(instance);

delete instance;

- instance = NULL;

+ instance = nullptr;

}

} // namespace athena

« no previous file with comments | « no previous file | athena/activity/activity_manager_impl.cc » ('j') | no next file with comments »