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

Side by Side Diff: extensions/common/permissions/permissions_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, 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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/permissions/permissions_info.h" 5 #include "extensions/common/permissions/permissions_info.h"
6 6
7 #include "base/lazy_instance.h" 7 #include "base/lazy_instance.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/stl_util.h" 9 #include "base/stl_util.h"
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
(...skipping 15 matching lines...) Expand all
26 26
27 for (size_t i = 0; i < permissions.size(); ++i) 27 for (size_t i = 0; i < permissions.size(); ++i)
28 RegisterPermission(permissions[i]); 28 RegisterPermission(permissions[i]);
29 for (size_t i = 0; i < aliases.size(); ++i) 29 for (size_t i = 0; i < aliases.size(); ++i)
30 RegisterAlias(aliases[i].name, aliases[i].alias); 30 RegisterAlias(aliases[i].name, aliases[i].alias);
31 } 31 }
32 32
33 const APIPermissionInfo* PermissionsInfo::GetByID( 33 const APIPermissionInfo* PermissionsInfo::GetByID(
34 APIPermission::ID id) const { 34 APIPermission::ID id) const {
35 IDMap::const_iterator i = id_map_.find(id); 35 IDMap::const_iterator i = id_map_.find(id);
36 return (i == id_map_.end()) ? NULL : i->second; 36 return (i == id_map_.end()) ? nullptr : i->second;
37 } 37 }
38 38
39 const APIPermissionInfo* PermissionsInfo::GetByName( 39 const APIPermissionInfo* PermissionsInfo::GetByName(
40 const std::string& name) const { 40 const std::string& name) const {
41 NameMap::const_iterator i = name_map_.find(name); 41 NameMap::const_iterator i = name_map_.find(name);
42 return (i == name_map_.end()) ? NULL : i->second; 42 return (i == name_map_.end()) ? nullptr : i->second;
43 } 43 }
44 44
45 APIPermissionSet PermissionsInfo::GetAll() const { 45 APIPermissionSet PermissionsInfo::GetAll() const {
46 APIPermissionSet permissions; 46 APIPermissionSet permissions;
47 for (IDMap::const_iterator i = id_map_.begin(); i != id_map_.end(); ++i) 47 for (IDMap::const_iterator i = id_map_.begin(); i != id_map_.end(); ++i)
48 permissions.insert(i->second->id()); 48 permissions.insert(i->second->id());
49 return permissions; 49 return permissions;
50 } 50 }
51 51
52 APIPermissionSet PermissionsInfo::GetAllByName( 52 APIPermissionSet PermissionsInfo::GetAllByName(
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 DCHECK(!ContainsKey(id_map_, permission->id())); 88 DCHECK(!ContainsKey(id_map_, permission->id()));
89 DCHECK(!ContainsKey(name_map_, permission->name())); 89 DCHECK(!ContainsKey(name_map_, permission->name()));
90 90
91 id_map_[permission->id()] = permission; 91 id_map_[permission->id()] = permission;
92 name_map_[permission->name()] = permission; 92 name_map_[permission->name()] = permission;
93 93
94 permission_count_++; 94 permission_count_++;
95 } 95 }
96 96
97 } // namespace extensions 97 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698