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

Side by Side Diff: extensions/common/permissions/api_permission_set.cc

Issue 1908953003: Convert //extensions/{common,shell} from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase? Created 4 years, 8 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/api_permission_set.h" 5 #include "extensions/common/permissions/api_permission_set.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/stl_util.h" 8 #include "base/stl_util.h"
9 #include "base/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 20 matching lines...) Expand all
31 const std::string& permission_str, 31 const std::string& permission_str,
32 const base::Value* permission_value, 32 const base::Value* permission_value,
33 APIPermissionSet::ParseSource source, 33 APIPermissionSet::ParseSource source,
34 APIPermissionSet* api_permissions, 34 APIPermissionSet* api_permissions,
35 base::string16* error, 35 base::string16* error,
36 std::vector<std::string>* unhandled_permissions) { 36 std::vector<std::string>* unhandled_permissions) {
37 37
38 const APIPermissionInfo* permission_info = 38 const APIPermissionInfo* permission_info =
39 PermissionsInfo::GetInstance()->GetByName(permission_str); 39 PermissionsInfo::GetInstance()->GetByName(permission_str);
40 if (permission_info) { 40 if (permission_info) {
41 scoped_ptr<APIPermission> permission( 41 std::unique_ptr<APIPermission> permission(
42 permission_info->CreateAPIPermission()); 42 permission_info->CreateAPIPermission());
43 if (source != APIPermissionSet::kAllowInternalPermissions && 43 if (source != APIPermissionSet::kAllowInternalPermissions &&
44 permission_info->is_internal()) { 44 permission_info->is_internal()) {
45 // An internal permission specified in permissions list is an error. 45 // An internal permission specified in permissions list is an error.
46 if (error) { 46 if (error) {
47 *error = ErrorUtils::FormatErrorMessageUTF16( 47 *error = ErrorUtils::FormatErrorMessageUTF16(
48 errors::kPermissionNotAllowedInManifest, permission_str); 48 errors::kPermissionNotAllowedInManifest, permission_str);
49 } 49 }
50 return false; 50 return false;
51 } 51 }
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 303
304 bool PermissionIDSet::empty() const { 304 bool PermissionIDSet::empty() const {
305 return permissions_.empty(); 305 return permissions_.empty();
306 } 306 }
307 307
308 PermissionIDSet::PermissionIDSet(const std::set<PermissionID>& permissions) 308 PermissionIDSet::PermissionIDSet(const std::set<PermissionID>& permissions)
309 : permissions_(permissions) { 309 : permissions_(permissions) {
310 } 310 }
311 311
312 } // namespace extensions 312 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/common/permissions/api_permission.cc ('k') | extensions/common/permissions/api_permission_set_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698