OLD | NEW |
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 #ifndef EXTENSIONS_COMMON_PERMISSIONS_SET_DISJUNCTION_PERMISSION_H_ | 5 #ifndef EXTENSIONS_COMMON_PERMISSIONS_SET_DISJUNCTION_PERMISSION_H_ |
6 #define EXTENSIONS_COMMON_PERMISSIONS_SET_DISJUNCTION_PERMISSION_H_ | 6 #define EXTENSIONS_COMMON_PERMISSIONS_SET_DISJUNCTION_PERMISSION_H_ |
7 | 7 |
8 #include <set> | 8 #include <set> |
9 #include <string> | 9 #include <string> |
10 | 10 |
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
115 const base::Value* item_value = NULL; | 115 const base::Value* item_value = NULL; |
116 bool got_item = list->Get(i, &item_value); | 116 bool got_item = list->Get(i, &item_value); |
117 DCHECK(got_item); | 117 DCHECK(got_item); |
118 DCHECK(item_value); | 118 DCHECK(item_value); |
119 | 119 |
120 PermissionDataType data; | 120 PermissionDataType data; |
121 if (data.FromValue(item_value)) { | 121 if (data.FromValue(item_value)) { |
122 data_set_.insert(data); | 122 data_set_.insert(data); |
123 } else { | 123 } else { |
124 std::string unknown_permission; | 124 std::string unknown_permission; |
125 base::JSONWriter::Write(item_value, &unknown_permission); | 125 base::JSONWriter::Write(*item_value, &unknown_permission); |
126 if (unhandled_permissions) { | 126 if (unhandled_permissions) { |
127 unhandled_permissions->push_back(unknown_permission); | 127 unhandled_permissions->push_back(unknown_permission); |
128 } else { | 128 } else { |
129 if (error) { | 129 if (error) { |
130 *error = "Cannot parse an item from the permission list: " + | 130 *error = "Cannot parse an item from the permission list: " + |
131 unknown_permission; | 131 unknown_permission; |
132 } | 132 } |
133 return false; | 133 return false; |
134 } | 134 } |
135 } | 135 } |
(...skipping 23 matching lines...) Expand all Loading... |
159 IPC::LogParam(data_set_, log); | 159 IPC::LogParam(data_set_, log); |
160 } | 160 } |
161 | 161 |
162 protected: | 162 protected: |
163 std::set<PermissionDataType> data_set_; | 163 std::set<PermissionDataType> data_set_; |
164 }; | 164 }; |
165 | 165 |
166 } // namespace extensions | 166 } // namespace extensions |
167 | 167 |
168 #endif // EXTENSIONS_COMMON_PERMISSIONS_SET_DISJUNCTION_PERMISSION_H_ | 168 #endif // EXTENSIONS_COMMON_PERMISSIONS_SET_DISJUNCTION_PERMISSION_H_ |
OLD | NEW |