extensions/common/api/sockets/sockets_manifest_permission.h - Issue 1908953003: Convert //extensions/{common,shell} from scoped_ptr to std::unique_ptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: extensions/common/api/sockets/sockets_manifest_permission.h

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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « extensions/common/api/sockets/sockets_manifest_handler.cc ('k') | extensions/common/api/sockets/sockets_manifest_permission.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/common/api/sockets/sockets_manifest_permission.h

diff --git a/extensions/common/api/sockets/sockets_manifest_permission.h b/extensions/common/api/sockets/sockets_manifest_permission.h

index 555795769a027886fb290e146f9452b6a97bece5..3d1b92c693c5cf00d4d1eff5499a7d2f8298308a 100644

--- a/extensions/common/api/sockets/sockets_manifest_permission.h

+++ b/extensions/common/api/sockets/sockets_manifest_permission.h

@@ -31,7 +31,7 @@ class SocketsManifestPermission : public ManifestPermission {

// Tries to construct the info based on |value|, as it would have appeared in

// the manifest. Sets |error| and returns an empty scoped_ptr on failure.

- static scoped_ptr<SocketsManifestPermission> FromValue(

+ static std::unique_ptr<SocketsManifestPermission> FromValue(

const base::Value& value,

base::string16* error);

@@ -45,7 +45,7 @@ class SocketsManifestPermission : public ManifestPermission {

std::string id() const override;

PermissionIDSet GetPermissions() const override;

bool FromValue(const base::Value* value) override;

- scoped_ptr<base::Value> ToValue() const override;

+ std::unique_ptr<base::Value> ToValue() const override;

ManifestPermission* Diff(const ManifestPermission* rhs) const override;

ManifestPermission* Union(const ManifestPermission* rhs) const override;

ManifestPermission* Intersect(const ManifestPermission* rhs) const override;