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

Unified Diff: extensions/common/extension_l10n_util.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/extension_l10n_util.cc
diff --git a/extensions/common/extension_l10n_util.cc b/extensions/common/extension_l10n_util.cc
index e60e2ec726b27564cbd3a96f0a9bdc0f85febe3e..88f26006017c992ac7a9a51dc0bea7cdd96d8230 100644
--- a/extensions/common/extension_l10n_util.cc
+++ b/extensions/common/extension_l10n_util.cc
@@ -39,7 +39,7 @@ base::DictionaryValue* LoadMessageFile(const base::FilePath& locale_path,
base::FilePath file =
locale_path.AppendASCII(locale).Append(extensions::kMessagesFilename);
JSONFileValueSerializer messages_serializer(file);
- base::Value* dictionary = messages_serializer.Deserialize(NULL, error);
+ base::Value* dictionary = messages_serializer.Deserialize(nullptr, error);
if (!dictionary) {
if (error->empty()) {
// JSONFileValueSerializer just returns NULL if file cannot be found. It
@@ -78,7 +78,7 @@ bool LocalizeManifestListValue(const std::string& key,
const extensions::MessageBundle& messages,
base::DictionaryValue* manifest,
std::string* error) {
- base::ListValue* list = NULL;
+ base::ListValue* list = nullptr;
if (!manifest->GetList(key, &list))
return true;
@@ -169,11 +169,11 @@ bool LocalizeManifest(const extensions::MessageBundle& messages,
if (!LocalizeManifestValue(keys::kOmniboxKeyword, messages, manifest, error))
return false;
- base::ListValue* file_handlers = NULL;
+ base::ListValue* file_handlers = nullptr;
if (manifest->GetList(keys::kFileBrowserHandlers, &file_handlers)) {
key.assign(keys::kFileBrowserHandlers);
for (size_t i = 0; i < file_handlers->GetSize(); i++) {
- base::DictionaryValue* handler = NULL;
+ base::DictionaryValue* handler = nullptr;
if (!file_handlers->GetDictionary(i, &handler)) {
*error = errors::kInvalidFileBrowserHandler;
return false;
@@ -185,10 +185,10 @@ bool LocalizeManifest(const extensions::MessageBundle& messages,
}
// Initialize all input_components
- base::ListValue* input_components = NULL;
+ base::ListValue* input_components = nullptr;
if (manifest->GetList(keys::kInputComponents, &input_components)) {
for (size_t i = 0; i < input_components->GetSize(); ++i) {
- base::DictionaryValue* module = NULL;
+ base::DictionaryValue* module = nullptr;
if (!input_components->GetDictionary(i, &module)) {
*error = errors::kInvalidInputComponents;
return false;
@@ -209,7 +209,7 @@ bool LocalizeManifest(const extensions::MessageBundle& messages,
return false;
// Initialize description of commmands.
- base::DictionaryValue* commands_handler = NULL;
+ base::DictionaryValue* commands_handler = nullptr;
if (manifest->GetDictionary(keys::kCommands, &commands_handler)) {
for (base::DictionaryValue::Iterator iter(*commands_handler);
!iter.IsAtEnd();
@@ -222,7 +222,7 @@ bool LocalizeManifest(const extensions::MessageBundle& messages,
}
// Initialize search_provider fields.
- base::DictionaryValue* search_provider = NULL;
+ base::DictionaryValue* search_provider = nullptr;
if (manifest->GetDictionary(keys::kOverrideSearchProvider,
&search_provider)) {
for (base::DictionaryValue::Iterator iter(*search_provider);
@@ -383,7 +383,7 @@ extensions::MessageBundle* LoadMessageCatalogs(
if (!catalog.get()) {
// If locale is valid, but messages.json is corrupted or missing, return
// an error.
- return NULL;
+ return nullptr;
} else {
catalogs.push_back(catalog);
}

Powered by Google App Engine
This is Rietveld 408576698