extensions/common/permissions/permission_set.cc - Issue 598173003: Run clang-modernize -use-nullptr over src/extensions/.

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: extensions/common/permissions/permission_set.cc

Issue 598173003: Run clang-modernize -use-nullptr over src/extensions/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

« extensions/browser/api/bluetooth/bluetooth_apitest.cc ('K') | « extensions/common/permissions/permission_message_util.cc ('k') | extensions/common/permissions/permissions_data.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/common/permissions/permission_set.cc

diff --git a/extensions/common/permissions/permission_set.cc b/extensions/common/permissions/permission_set.cc

index ee21137fcdcba4e481e5ad0a8a9364552ed7d084..c3290ed9dfb8d6a3e30a20a214ae0257678c912c 100644

--- a/extensions/common/permissions/permission_set.cc

+++ b/extensions/common/permissions/permission_set.cc

@@ -53,8 +53,8 @@ PermissionSet* PermissionSet::CreateDifference(

const PermissionSet* set1,

const PermissionSet* set2) {

scoped_refptr<PermissionSet> empty = new PermissionSet();

- const PermissionSet* set1_safe = (set1 == NULL) ? empty.get() : set1;

- const PermissionSet* set2_safe = (set2 == NULL) ? empty.get() : set2;

+ const PermissionSet* set1_safe = (set1 == nullptr) ? empty.get() : set1;

+ const PermissionSet* set2_safe = (set2 == nullptr) ? empty.get() : set2;

APIPermissionSet apis;

APIPermissionSet::Difference(set1_safe->apis(), set2_safe->apis(), &apis);

@@ -83,8 +83,8 @@ PermissionSet* PermissionSet::CreateIntersection(

const PermissionSet* set1,

const PermissionSet* set2) {

scoped_refptr<PermissionSet> empty = new PermissionSet();

- const PermissionSet* set1_safe = (set1 == NULL) ? empty.get() : set1;

- const PermissionSet* set2_safe = (set2 == NULL) ? empty.get() : set2;

+ const PermissionSet* set1_safe = (set1 == nullptr) ? empty.get() : set1;

+ const PermissionSet* set2_safe = (set2 == nullptr) ? empty.get() : set2;

APIPermissionSet apis;

APIPermissionSet::Intersection(set1_safe->apis(), set2_safe->apis(), &apis);

@@ -113,8 +113,8 @@ PermissionSet* PermissionSet::CreateUnion(

const PermissionSet* set1,

const PermissionSet* set2) {

scoped_refptr<PermissionSet> empty = new PermissionSet();

- const PermissionSet* set1_safe = (set1 == NULL) ? empty.get() : set1;

- const PermissionSet* set2_safe = (set2 == NULL) ? empty.get() : set2;

+ const PermissionSet* set1_safe = (set1 == nullptr) ? empty.get() : set1;

+ const PermissionSet* set2_safe = (set2 == nullptr) ? empty.get() : set2;

APIPermissionSet apis;

APIPermissionSet::Union(set1_safe->apis(), set2_safe->apis(), &apis);

@@ -185,7 +185,7 @@ bool PermissionSet::HasAPIPermission(const std::string& permission_name) const {

}

bool PermissionSet::CheckAPIPermission(APIPermission::ID permission) const {

- return CheckAPIPermissionWithParam(permission, NULL);

+ return CheckAPIPermissionWithParam(permission, nullptr);

}

bool PermissionSet::CheckAPIPermissionWithParam(