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

Side by Side Diff: extensions/common/api/sockets/sockets_manifest_data.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/api/sockets/sockets_manifest_data.h" 5 #include "extensions/common/api/sockets/sockets_manifest_data.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "extensions/common/api/sockets/sockets_manifest_permission.h" 9 #include "extensions/common/api/sockets/sockets_manifest_permission.h"
10 #include "extensions/common/manifest_constants.h" 10 #include "extensions/common/manifest_constants.h"
11 11
12 namespace extensions { 12 namespace extensions {
13 13
14 SocketsManifestData::SocketsManifestData( 14 SocketsManifestData::SocketsManifestData(
15 scoped_ptr<SocketsManifestPermission> permission) 15 std::unique_ptr<SocketsManifestPermission> permission)
16 : permission_(std::move(permission)) { 16 : permission_(std::move(permission)) {
17 DCHECK(permission_); 17 DCHECK(permission_);
18 } 18 }
19 19
20 SocketsManifestData::~SocketsManifestData() {} 20 SocketsManifestData::~SocketsManifestData() {}
21 21
22 // static 22 // static
23 SocketsManifestData* SocketsManifestData::Get(const Extension* extension) { 23 SocketsManifestData* SocketsManifestData::Get(const Extension* extension) {
24 return static_cast<SocketsManifestData*>( 24 return static_cast<SocketsManifestData*>(
25 extension->GetManifestData(manifest_keys::kSockets)); 25 extension->GetManifestData(manifest_keys::kSockets));
26 } 26 }
27 27
28 // static 28 // static
29 bool SocketsManifestData::CheckRequest( 29 bool SocketsManifestData::CheckRequest(
30 const Extension* extension, 30 const Extension* extension,
31 const content::SocketPermissionRequest& request) { 31 const content::SocketPermissionRequest& request) {
32 const SocketsManifestData* data = SocketsManifestData::Get(extension); 32 const SocketsManifestData* data = SocketsManifestData::Get(extension);
33 if (data) 33 if (data)
34 return data->permission()->CheckRequest(extension, request); 34 return data->permission()->CheckRequest(extension, request);
35 35
36 return false; 36 return false;
37 } 37 }
38 38
39 // static 39 // static
40 scoped_ptr<SocketsManifestData> SocketsManifestData::FromValue( 40 std::unique_ptr<SocketsManifestData> SocketsManifestData::FromValue(
41 const base::Value& value, 41 const base::Value& value,
42 base::string16* error) { 42 base::string16* error) {
43 scoped_ptr<SocketsManifestPermission> permission = 43 std::unique_ptr<SocketsManifestPermission> permission =
44 SocketsManifestPermission::FromValue(value, error); 44 SocketsManifestPermission::FromValue(value, error);
45 if (!permission) 45 if (!permission)
46 return scoped_ptr<SocketsManifestData>(); 46 return std::unique_ptr<SocketsManifestData>();
47 47
48 return scoped_ptr<SocketsManifestData>( 48 return std::unique_ptr<SocketsManifestData>(
49 new SocketsManifestData(std::move(permission))); 49 new SocketsManifestData(std::move(permission)));
50 } 50 }
51 51
52 } // namespace extensions 52 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/common/api/sockets/sockets_manifest_data.h ('k') | extensions/common/api/sockets/sockets_manifest_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698