| Index: extensions/common/manifest.cc
|
| diff --git a/extensions/common/manifest.cc b/extensions/common/manifest.cc
|
| index f072488b7e16bd28cfa6142ea140462a4db4c3bf..8ce24a49ee6dfbd06515461e6c24db5dfcb4002a 100644
|
| --- a/extensions/common/manifest.cc
|
| +++ b/extensions/common/manifest.cc
|
| @@ -117,10 +117,10 @@ Manifest::Manifest(Location location, scoped_ptr<base::DictionaryValue> value)
|
| } else if (value_->HasKey(keys::kExport)) {
|
| type_ = TYPE_SHARED_MODULE;
|
| } else if (value_->HasKey(keys::kApp)) {
|
| - if (value_->Get(keys::kWebURLs, NULL) ||
|
| - value_->Get(keys::kLaunchWebURL, NULL)) {
|
| + if (value_->Get(keys::kWebURLs, nullptr) ||
|
| + value_->Get(keys::kLaunchWebURL, nullptr)) {
|
| type_ = TYPE_HOSTED_APP;
|
| - } else if (value_->Get(keys::kPlatformAppBackground, NULL)) {
|
| + } else if (value_->Get(keys::kPlatformAppBackground, nullptr)) {
|
| type_ = TYPE_PLATFORM_APP;
|
| } else {
|
| type_ = TYPE_LEGACY_PACKAGED_APP;
|
| @@ -153,7 +153,7 @@ bool Manifest::ValidateManifest(
|
| feature_names.begin();
|
| feature_name != feature_names.end(); ++feature_name) {
|
| // Use Get instead of HasKey because the former uses path expansion.
|
| - if (!value_->Get(*feature_name, NULL))
|
| + if (!value_->Get(*feature_name, nullptr))
|
| continue;
|
|
|
| Feature* feature = manifest_feature_provider->GetFeature(*feature_name);
|
| @@ -181,7 +181,7 @@ bool Manifest::HasKey(const std::string& key) const {
|
| }
|
|
|
| bool Manifest::HasPath(const std::string& path) const {
|
| - base::Value* ignored = NULL;
|
| + base::Value* ignored = nullptr;
|
| return CanAccessPath(path) && value_->Get(path, &ignored);
|
| }
|
|
|
|
|