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

Unified Diff: extensions/common/features/base_feature_provider.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
Index: extensions/common/features/base_feature_provider.cc
diff --git a/extensions/common/features/base_feature_provider.cc b/extensions/common/features/base_feature_provider.cc
index 97f87bedb34f278dc732cb4b1fb6fdf8ff09b888..9169634d860e1f5843a24b9614e2d8591cd37dd7 100644
--- a/extensions/common/features/base_feature_provider.cc
+++ b/extensions/common/features/base_feature_provider.cc
@@ -50,7 +50,7 @@ BaseFeatureProvider::BaseFeatureProvider(const base::DictionaryValue& root,
std::string parent_name = JoinString(split, '.');
split.pop_back();
if (root.HasKey(parent_name)) {
- const base::DictionaryValue* parent = NULL;
+ const base::DictionaryValue* parent = nullptr;
CHECK(root.GetDictionaryWithoutPathExpansion(parent_name, &parent));
parse_stack.push(std::make_pair(parent_name, parent));
bool no_parent = false;
@@ -135,18 +135,18 @@ Feature* BaseFeatureProvider::GetFeature(const std::string& name) const {
if (iter != features_.end())
return iter->second.get();
else
- return NULL;
+ return nullptr;
}
Feature* BaseFeatureProvider::GetParent(Feature* feature) const {
CHECK(feature);
if (feature->no_parent())
- return NULL;
+ return nullptr;
std::vector<std::string> split;
base::SplitString(feature->name(), '.', &split);
if (split.size() < 2)
- return NULL;
+ return nullptr;
split.pop_back();
return GetFeature(JoinString(split, '.'));
}

Powered by Google App Engine
This is Rietveld 408576698