extensions/common/manifest_handlers/externally_connectable.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/manifest_handlers/externally_connectable.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/manifest_handlers/default_locale_handler.cc ('k') | extensions/common/manifest_handlers/externally_connectable.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/common/manifest_handlers/externally_connectable.h

diff --git a/extensions/common/manifest_handlers/externally_connectable.h b/extensions/common/manifest_handlers/externally_connectable.h

index ab3b2b5fb02c3412ac4c596d8f454d2d453c34c4..9f524a8446f99eaa8de659ab58fed27816e847eb 100644

--- a/extensions/common/manifest_handlers/externally_connectable.h

+++ b/extensions/common/manifest_handlers/externally_connectable.h

@@ -5,11 +5,11 @@

#ifndef EXTENSIONS_COMMON_MANIFEST_HANDLERS_EXTERNALLY_CONNECTABLE_H_

#define EXTENSIONS_COMMON_MANIFEST_HANDLERS_EXTERNALLY_CONNECTABLE_H_

+#include <memory>

#include <string>

#include <vector>

#include "base/macros.h"

-#include "base/memory/scoped_ptr.h"

#include "extensions/common/extension.h"

#include "extensions/common/install_warning.h"

#include "extensions/common/manifest_handler.h"

@@ -56,7 +56,7 @@ struct ExternallyConnectableInfo : public Extension::ManifestData {

// 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<ExternallyConnectableInfo> FromValue(

+ static std::unique_ptr<ExternallyConnectableInfo> FromValue(

const base::Value& value,

bool allow_all_urls,

std::vector<InstallWarning>* install_warnings,