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

Side by Side Diff: extensions/common/manifest_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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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_handler.h" 5 #include "extensions/common/manifest_handler.h"
6 6
7 #include <map> 7 #include <map>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/stl_util.h" 10 #include "base/stl_util.h"
11 #include "extensions/common/extension.h" 11 #include "extensions/common/extension.h"
12 #include "extensions/common/permissions/manifest_permission.h" 12 #include "extensions/common/permissions/manifest_permission.h"
13 #include "extensions/common/permissions/manifest_permission_set.h" 13 #include "extensions/common/permissions/manifest_permission_set.h"
14 14
15 namespace extensions { 15 namespace extensions {
16 16
17 namespace { 17 namespace {
18 18
19 static base::LazyInstance<ManifestHandlerRegistry> g_registry = 19 static base::LazyInstance<ManifestHandlerRegistry> g_registry =
20 LAZY_INSTANCE_INITIALIZER; 20 LAZY_INSTANCE_INITIALIZER;
21 static ManifestHandlerRegistry* g_registry_override = NULL; 21 static ManifestHandlerRegistry* g_registry_override = nullptr;
22 22
23 ManifestHandlerRegistry* GetRegistry() { 23 ManifestHandlerRegistry* GetRegistry() {
24 if (!g_registry_override) 24 if (!g_registry_override)
25 return g_registry.Pointer(); 25 return g_registry.Pointer();
26 return g_registry_override; 26 return g_registry_override;
27 } 27 }
28 28
29 } // namespace 29 } // namespace
30 30
31 ManifestHandler::ManifestHandler() { 31 ManifestHandler::ManifestHandler() {
(...skipping 21 matching lines...) Expand all
53 } 53 }
54 54
55 void ManifestHandler::Register() { 55 void ManifestHandler::Register() {
56 linked_ptr<ManifestHandler> this_linked(this); 56 linked_ptr<ManifestHandler> this_linked(this);
57 const std::vector<std::string> keys = Keys(); 57 const std::vector<std::string> keys = Keys();
58 for (size_t i = 0; i < keys.size(); ++i) 58 for (size_t i = 0; i < keys.size(); ++i)
59 GetRegistry()->RegisterManifestHandler(keys[i], this_linked); 59 GetRegistry()->RegisterManifestHandler(keys[i], this_linked);
60 } 60 }
61 61
62 ManifestPermission* ManifestHandler::CreatePermission() { 62 ManifestPermission* ManifestHandler::CreatePermission() {
63 return NULL; 63 return nullptr;
64 } 64 }
65 65
66 ManifestPermission* ManifestHandler::CreateInitialRequiredPermission( 66 ManifestPermission* ManifestHandler::CreateInitialRequiredPermission(
67 const Extension* extension) { 67 const Extension* extension) {
68 return NULL; 68 return nullptr;
69 } 69 }
70 70
71 // static 71 // static
72 void ManifestHandler::FinalizeRegistration() { 72 void ManifestHandler::FinalizeRegistration() {
73 GetRegistry()->Finalize(); 73 GetRegistry()->Finalize();
74 } 74 }
75 75
76 // static 76 // static
77 bool ManifestHandler::IsRegistrationFinalized() { 77 bool ManifestHandler::IsRegistrationFinalized() {
78 return GetRegistry()->is_finalized_; 78 return GetRegistry()->is_finalized_;
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 if (!(*iter)->Validate(extension, error, warnings)) 165 if (!(*iter)->Validate(extension, error, warnings))
166 return false; 166 return false;
167 } 167 }
168 return true; 168 return true;
169 } 169 }
170 170
171 ManifestPermission* ManifestHandlerRegistry::CreatePermission( 171 ManifestPermission* ManifestHandlerRegistry::CreatePermission(
172 const std::string& name) { 172 const std::string& name) {
173 ManifestHandlerMap::const_iterator it = handlers_.find(name); 173 ManifestHandlerMap::const_iterator it = handlers_.find(name);
174 if (it == handlers_.end()) 174 if (it == handlers_.end())
175 return NULL; 175 return nullptr;
176 176
177 return it->second->CreatePermission(); 177 return it->second->CreatePermission();
178 } 178 }
179 179
180 void ManifestHandlerRegistry::AddExtensionInitialRequiredPermissions( 180 void ManifestHandlerRegistry::AddExtensionInitialRequiredPermissions(
181 const Extension* extension, ManifestPermissionSet* permission_set) { 181 const Extension* extension, ManifestPermissionSet* permission_set) {
182 for (ManifestHandlerMap::const_iterator it = handlers_.begin(); 182 for (ManifestHandlerMap::const_iterator it = handlers_.begin();
183 it != handlers_.end(); ++it) { 183 it != handlers_.end(); ++it) {
184 ManifestPermission* permission = 184 ManifestPermission* permission =
185 it->second->CreateInitialRequiredPermission(extension); 185 it->second->CreateInitialRequiredPermission(extension);
186 if (permission) { 186 if (permission) {
187 permission_set->insert(permission); 187 permission_set->insert(permission);
188 } 188 }
189 } 189 }
190 } 190 }
191 191
192 // static 192 // static
193 ManifestHandlerRegistry* ManifestHandlerRegistry::SetForTesting( 193 ManifestHandlerRegistry* ManifestHandlerRegistry::SetForTesting(
194 ManifestHandlerRegistry* new_registry) { 194 ManifestHandlerRegistry* new_registry) {
195 ManifestHandlerRegistry* old_registry = GetRegistry(); 195 ManifestHandlerRegistry* old_registry = GetRegistry();
196 if (new_registry != g_registry.Pointer()) 196 if (new_registry != g_registry.Pointer())
197 g_registry_override = new_registry; 197 g_registry_override = new_registry;
198 else 198 else
199 g_registry_override = NULL; 199 g_registry_override = nullptr;
200 return old_registry; 200 return old_registry;
201 } 201 }
202 202
203 void ManifestHandlerRegistry::SortManifestHandlers() { 203 void ManifestHandlerRegistry::SortManifestHandlers() {
204 std::set<ManifestHandler*> unsorted_handlers; 204 std::set<ManifestHandler*> unsorted_handlers;
205 for (ManifestHandlerMap::const_iterator iter = handlers_.begin(); 205 for (ManifestHandlerMap::const_iterator iter = handlers_.begin();
206 iter != handlers_.end(); ++iter) { 206 iter != handlers_.end(); ++iter) {
207 unsorted_handlers.insert(iter->second.get()); 207 unsorted_handlers.insert(iter->second.get());
208 } 208 }
209 209
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 unsorted_handlers.swap(next_unsorted_handlers); 241 unsorted_handlers.swap(next_unsorted_handlers);
242 } 242 }
243 243
244 // If there are any leftover unsorted handlers, they must have had 244 // If there are any leftover unsorted handlers, they must have had
245 // circular dependencies. 245 // circular dependencies.
246 CHECK_EQ(unsorted_handlers.size(), std::set<ManifestHandler*>::size_type(0)) 246 CHECK_EQ(unsorted_handlers.size(), std::set<ManifestHandler*>::size_type(0))
247 << "Extension manifest handlers have circular dependencies!"; 247 << "Extension manifest handlers have circular dependencies!";
248 } 248 }
249 249
250 } // namespace extensions 250 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698