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

Side by Side Diff: extensions/common/manifest_handlers/nacl_modules_handler.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, 2 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "extensions/common/manifest_handlers/nacl_modules_handler.h" 5 #include "extensions/common/manifest_handlers/nacl_modules_handler.h"
6 6
7 #include "base/lazy_instance.h" 7 #include "base/lazy_instance.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 13 matching lines...) Expand all
24 NaClModuleInfo::List nacl_modules_; 24 NaClModuleInfo::List nacl_modules_;
25 }; 25 };
26 26
27 } // namespace 27 } // namespace
28 28
29 // static 29 // static
30 const NaClModuleInfo::List* NaClModuleInfo::GetNaClModules( 30 const NaClModuleInfo::List* NaClModuleInfo::GetNaClModules(
31 const Extension* extension) { 31 const Extension* extension) {
32 NaClModuleData* data = static_cast<NaClModuleData*>( 32 NaClModuleData* data = static_cast<NaClModuleData*>(
33 extension->GetManifestData(keys::kNaClModules)); 33 extension->GetManifestData(keys::kNaClModules));
34 return data ? &data->nacl_modules_ : NULL; 34 return data ? &data->nacl_modules_ : nullptr;
35 } 35 }
36 36
37 NaClModulesHandler::NaClModulesHandler() { 37 NaClModulesHandler::NaClModulesHandler() {
38 } 38 }
39 39
40 NaClModulesHandler::~NaClModulesHandler() { 40 NaClModulesHandler::~NaClModulesHandler() {
41 } 41 }
42 42
43 bool NaClModulesHandler::Parse(Extension* extension, base::string16* error) { 43 bool NaClModulesHandler::Parse(Extension* extension, base::string16* error) {
44 const base::ListValue* list_value = NULL; 44 const base::ListValue* list_value = nullptr;
45 if (!extension->manifest()->GetList(keys::kNaClModules, &list_value)) { 45 if (!extension->manifest()->GetList(keys::kNaClModules, &list_value)) {
46 *error = base::ASCIIToUTF16(errors::kInvalidNaClModules); 46 *error = base::ASCIIToUTF16(errors::kInvalidNaClModules);
47 return false; 47 return false;
48 } 48 }
49 49
50 scoped_ptr<NaClModuleData> nacl_module_data(new NaClModuleData); 50 scoped_ptr<NaClModuleData> nacl_module_data(new NaClModuleData);
51 51
52 for (size_t i = 0; i < list_value->GetSize(); ++i) { 52 for (size_t i = 0; i < list_value->GetSize(); ++i) {
53 const base::DictionaryValue* module_value = NULL; 53 const base::DictionaryValue* module_value = nullptr;
54 if (!list_value->GetDictionary(i, &module_value)) { 54 if (!list_value->GetDictionary(i, &module_value)) {
55 *error = base::ASCIIToUTF16(errors::kInvalidNaClModules); 55 *error = base::ASCIIToUTF16(errors::kInvalidNaClModules);
56 return false; 56 return false;
57 } 57 }
58 58
59 // Get nacl_modules[i].path. 59 // Get nacl_modules[i].path.
60 std::string path_str; 60 std::string path_str;
61 if (!module_value->GetString(keys::kNaClModulesPath, &path_str)) { 61 if (!module_value->GetString(keys::kNaClModulesPath, &path_str)) {
62 *error = ErrorUtils::FormatErrorMessageUTF16( 62 *error = ErrorUtils::FormatErrorMessageUTF16(
63 errors::kInvalidNaClModulesPath, base::IntToString(i)); 63 errors::kInvalidNaClModulesPath, base::IntToString(i));
(...skipping 16 matching lines...) Expand all
80 80
81 extension->SetManifestData(keys::kNaClModules, nacl_module_data.release()); 81 extension->SetManifestData(keys::kNaClModules, nacl_module_data.release());
82 return true; 82 return true;
83 } 83 }
84 84
85 const std::vector<std::string> NaClModulesHandler::Keys() const { 85 const std::vector<std::string> NaClModulesHandler::Keys() const {
86 return SingleKey(keys::kNaClModules); 86 return SingleKey(keys::kNaClModules);
87 } 87 }
88 88
89 } // namespace extensions 89 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698