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

Side by Side Diff: extensions/common/manifest_handlers/permissions_parser.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 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 #include "extensions/common/manifest_handlers/permissions_parser.h" 5 #include "extensions/common/manifest_handlers/permissions_parser.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 16 matching lines...) Expand all
27 #include "url/url_constants.h" 27 #include "url/url_constants.h"
28 28
29 namespace extensions { 29 namespace extensions {
30 30
31 namespace { 31 namespace {
32 32
33 namespace keys = manifest_keys; 33 namespace keys = manifest_keys;
34 namespace errors = manifest_errors; 34 namespace errors = manifest_errors;
35 35
36 struct ManifestPermissions : public Extension::ManifestData { 36 struct ManifestPermissions : public Extension::ManifestData {
37 ManifestPermissions(scoped_ptr<const PermissionSet> permissions); 37 ManifestPermissions(std::unique_ptr<const PermissionSet> permissions);
38 ~ManifestPermissions() override; 38 ~ManifestPermissions() override;
39 39
40 scoped_ptr<const PermissionSet> permissions; 40 std::unique_ptr<const PermissionSet> permissions;
41 }; 41 };
42 42
43 ManifestPermissions::ManifestPermissions( 43 ManifestPermissions::ManifestPermissions(
44 scoped_ptr<const PermissionSet> permissions) 44 std::unique_ptr<const PermissionSet> permissions)
45 : permissions(std::move(permissions)) {} 45 : permissions(std::move(permissions)) {}
46 46
47 ManifestPermissions::~ManifestPermissions() { 47 ManifestPermissions::~ManifestPermissions() {
48 } 48 }
49 49
50 // Checks whether the host |pattern| is allowed for the given |extension|, 50 // Checks whether the host |pattern| is allowed for the given |extension|,
51 // given API permissions |permissions|. 51 // given API permissions |permissions|.
52 bool CanSpecifyHostPermission(const Extension* extension, 52 bool CanSpecifyHostPermission(const Extension* extension,
53 const URLPattern& pattern, 53 const URLPattern& pattern,
54 const APIPermissionSet& permissions) { 54 const APIPermissionSet& permissions) {
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 return false; 261 return false;
262 } 262 }
263 263
264 return true; 264 return true;
265 } 265 }
266 266
267 void PermissionsParser::Finalize(Extension* extension) { 267 void PermissionsParser::Finalize(Extension* extension) {
268 ManifestHandler::AddExtensionInitialRequiredPermissions( 268 ManifestHandler::AddExtensionInitialRequiredPermissions(
269 extension, &initial_required_permissions_->manifest_permissions); 269 extension, &initial_required_permissions_->manifest_permissions);
270 270
271 scoped_ptr<const PermissionSet> required_permissions( 271 std::unique_ptr<const PermissionSet> required_permissions(
272 new PermissionSet(initial_required_permissions_->api_permissions, 272 new PermissionSet(initial_required_permissions_->api_permissions,
273 initial_required_permissions_->manifest_permissions, 273 initial_required_permissions_->manifest_permissions,
274 initial_required_permissions_->host_permissions, 274 initial_required_permissions_->host_permissions,
275 initial_required_permissions_->scriptable_hosts)); 275 initial_required_permissions_->scriptable_hosts));
276 extension->SetManifestData( 276 extension->SetManifestData(
277 keys::kPermissions, 277 keys::kPermissions,
278 new ManifestPermissions(std::move(required_permissions))); 278 new ManifestPermissions(std::move(required_permissions)));
279 279
280 scoped_ptr<const PermissionSet> optional_permissions(new PermissionSet( 280 std::unique_ptr<const PermissionSet> optional_permissions(new PermissionSet(
281 initial_optional_permissions_->api_permissions, 281 initial_optional_permissions_->api_permissions,
282 initial_optional_permissions_->manifest_permissions, 282 initial_optional_permissions_->manifest_permissions,
283 initial_optional_permissions_->host_permissions, URLPatternSet())); 283 initial_optional_permissions_->host_permissions, URLPatternSet()));
284 extension->SetManifestData( 284 extension->SetManifestData(
285 keys::kOptionalPermissions, 285 keys::kOptionalPermissions,
286 new ManifestPermissions(std::move(optional_permissions))); 286 new ManifestPermissions(std::move(optional_permissions)));
287 } 287 }
288 288
289 // static 289 // static
290 void PermissionsParser::AddAPIPermission(Extension* extension, 290 void PermissionsParser::AddAPIPermission(Extension* extension,
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 // static 332 // static
333 const PermissionSet& PermissionsParser::GetOptionalPermissions( 333 const PermissionSet& PermissionsParser::GetOptionalPermissions(
334 const Extension* extension) { 334 const Extension* extension) {
335 DCHECK(extension->GetManifestData(keys::kOptionalPermissions)); 335 DCHECK(extension->GetManifestData(keys::kOptionalPermissions));
336 return *static_cast<const ManifestPermissions*>( 336 return *static_cast<const ManifestPermissions*>(
337 extension->GetManifestData(keys::kOptionalPermissions)) 337 extension->GetManifestData(keys::kOptionalPermissions))
338 ->permissions; 338 ->permissions;
339 } 339 }
340 340
341 } // namespace extensions 341 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/common/manifest_handlers/permissions_parser.h ('k') | extensions/common/manifest_handlers/requirements_info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698