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

Unified Diff: extensions/common/manifest_handlers/file_handler_info.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/manifest_handlers/file_handler_info.cc
diff --git a/extensions/common/manifest_handlers/file_handler_info.cc b/extensions/common/manifest_handlers/file_handler_info.cc
index 1323252cab9a385404f60689b24ab0fa405eff56..2be9582e36d3d4dfdf44b2bb31da6ad0b7c13eb4 100644
--- a/extensions/common/manifest_handlers/file_handler_info.cc
+++ b/extensions/common/manifest_handlers/file_handler_info.cc
@@ -34,7 +34,7 @@ const FileHandlersInfo* FileHandlers::GetFileHandlers(
const Extension* extension) {
FileHandlers* info = static_cast<FileHandlers*>(
extension->GetManifestData(keys::kFileHandlers));
- return info ? &info->file_handlers : NULL;
+ return info ? &info->file_handlers : nullptr;
}
FileHandlersParser::FileHandlersParser() {
@@ -53,7 +53,7 @@ bool LoadFileHandler(const std::string& handler_id,
handler.id = handler_id;
- const base::ListValue* mime_types = NULL;
+ const base::ListValue* mime_types = nullptr;
if (handler_info.HasKey(keys::kFileHandlerTypes) &&
!handler_info.GetList(keys::kFileHandlerTypes, &mime_types)) {
*error = ErrorUtils::FormatErrorMessageUTF16(
@@ -61,7 +61,7 @@ bool LoadFileHandler(const std::string& handler_id,
return false;
}
- const base::ListValue* file_extensions = NULL;
+ const base::ListValue* file_extensions = nullptr;
if (handler_info.HasKey(keys::kFileHandlerExtensions) &&
!handler_info.GetList(keys::kFileHandlerExtensions, &file_extensions)) {
*error = ErrorUtils::FormatErrorMessageUTF16(
@@ -124,7 +124,7 @@ bool LoadFileHandler(const std::string& handler_id,
bool FileHandlersParser::Parse(Extension* extension, base::string16* error) {
scoped_ptr<FileHandlers> info(new FileHandlers);
- const base::DictionaryValue* all_handlers = NULL;
+ const base::DictionaryValue* all_handlers = nullptr;
if (!extension->manifest()->GetDictionary(keys::kFileHandlers,
&all_handlers)) {
*error = base::ASCIIToUTF16(errors::kInvalidFileHandlers);
@@ -135,7 +135,7 @@ bool FileHandlersParser::Parse(Extension* extension, base::string16* error) {
for (base::DictionaryValue::Iterator iter(*all_handlers);
!iter.IsAtEnd();
iter.Advance()) {
- const base::DictionaryValue* handler = NULL;
+ const base::DictionaryValue* handler = nullptr;
if (iter.value().GetAsDictionary(&handler)) {
if (!LoadFileHandler(iter.key(),
*handler,

Powered by Google App Engine
This is Rietveld 408576698