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

Side by Side Diff: chrome/common/extensions/permissions/api_permission_set.h

Issue 11419224: Add missing (and remove superfluous) 'explicit' from constructors. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase + remove non-straightforward changes Created 7 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « chrome/common/extensions/permissions/api_permission.h ('k') | chrome/nacl/nacl_ipc_adapter.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef CHROME_COMMON_EXTENSIONS_PERMISSIONS_API_PERMISSION_SET_H_ 5 #ifndef CHROME_COMMON_EXTENSIONS_PERMISSIONS_API_PERMISSION_SET_H_
6 #define CHROME_COMMON_EXTENSIONS_PERMISSIONS_API_PERMISSION_SET_H_ 6 #define CHROME_COMMON_EXTENSIONS_PERMISSIONS_API_PERMISSION_SET_H_
7 7
8 #include <iterator> 8 #include <iterator>
9 #include <map> 9 #include <map>
10 10
11 #include "base/memory/linked_ptr.h" 11 #include "base/memory/linked_ptr.h"
12 #include "chrome/common/extensions/permissions/api_permission.h" 12 #include "chrome/common/extensions/permissions/api_permission.h"
13 13
14 namespace base { 14 namespace base {
15 class ListValue; 15 class ListValue;
16 } // namespace base 16 } // namespace base
17 17
18 namespace extensions { 18 namespace extensions {
19 19
20 class Extension; 20 class Extension;
21 21
22 typedef std::map<APIPermission::ID, 22 typedef std::map<APIPermission::ID,
23 linked_ptr<APIPermission> > APIPermissionMap; 23 linked_ptr<APIPermission> > APIPermissionMap;
24 24
25 class APIPermissionSet { 25 class APIPermissionSet {
26 public: 26 public:
27 class const_iterator : 27 class const_iterator :
28 public std::iterator<std::input_iterator_tag, const APIPermission*> { 28 public std::iterator<std::input_iterator_tag, const APIPermission*> {
29 public: 29 public:
30 const_iterator(const APIPermissionMap::const_iterator& it); 30 explicit const_iterator(const APIPermissionMap::const_iterator& it);
31 const_iterator(const const_iterator& ids_it); 31 const_iterator(const const_iterator& ids_it);
32 32
33 const_iterator& operator++() { 33 const_iterator& operator++() {
34 ++it_; 34 ++it_;
35 return *this; 35 return *this;
36 } 36 }
37 37
38 const_iterator operator++(int) { 38 const_iterator operator++(int) {
39 const_iterator tmp(it_++); 39 const_iterator tmp(it_++);
40 return tmp; 40 return tmp;
(...skipping 23 matching lines...) Expand all
64 64
65 APIPermissionSet(const APIPermissionSet& set); 65 APIPermissionSet(const APIPermissionSet& set);
66 66
67 ~APIPermissionSet(); 67 ~APIPermissionSet();
68 68
69 const_iterator begin() const { 69 const_iterator begin() const {
70 return const_iterator(map().begin()); 70 return const_iterator(map().begin());
71 } 71 }
72 72
73 const_iterator end() const { 73 const_iterator end() const {
74 return map().end(); 74 return const_iterator(map().end());
75 } 75 }
76 76
77 const_iterator find(APIPermission::ID id) const { 77 const_iterator find(APIPermission::ID id) const {
78 return map().find(id); 78 return const_iterator(map().find(id));
79 } 79 }
80 80
81 const APIPermissionMap& map() const { 81 const APIPermissionMap& map() const {
82 return map_; 82 return map_;
83 } 83 }
84 84
85 APIPermissionMap& map() { 85 APIPermissionMap& map() {
86 return map_; 86 return map_;
87 } 87 }
88 88
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 string16* error, 149 string16* error,
150 std::vector<std::string>* unhandled_permissions); 150 std::vector<std::string>* unhandled_permissions);
151 151
152 private: 152 private:
153 APIPermissionMap map_; 153 APIPermissionMap map_;
154 }; 154 };
155 155
156 } // namespace extensions 156 } // namespace extensions
157 157
158 #endif // CHROME_COMMON_EXTENSIONS_PERMISSIONS_API_PERMISSION_SET_H_ 158 #endif // CHROME_COMMON_EXTENSIONS_PERMISSIONS_API_PERMISSION_SET_H_
OLDNEW
« no previous file with comments | « chrome/common/extensions/permissions/api_permission.h ('k') | chrome/nacl/nacl_ipc_adapter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698