extensions/common/manifest_handlers/file_handler_info.cc - 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/file_handler_info.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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « extensions/common/manifest_handlers/externally_connectable.cc ('k') | extensions/common/manifest_handlers/icons_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/common/manifest_handlers/file_handler_info.cc

diff --git a/extensions/common/manifest_handlers/file_handler_info.cc b/extensions/common/manifest_handlers/file_handler_info.cc

index c95a5e4687410c5c562f162ef80f2b7148ea36dd..68ef8322fc6a3e8178d644032a867512ca0bac4c 100644

--- a/extensions/common/manifest_handlers/file_handler_info.cc

+++ b/extensions/common/manifest_handlers/file_handler_info.cc

@@ -6,7 +6,8 @@

#include <stddef.h>

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

+#include <memory>

#include "base/strings/string_number_conversions.h"

#include "base/strings/stringprintf.h"

#include "base/strings/utf_string_conversions.h"

@@ -134,7 +135,7 @@ bool LoadFileHandler(const std::string& handler_id,

}

bool FileHandlersParser::Parse(Extension* extension, base::string16* error) {

- scoped_ptr<FileHandlers> info(new FileHandlers);

+ std::unique_ptr<FileHandlers> info(new FileHandlers);

const base::DictionaryValue* all_handlers = NULL;

if (!extension->manifest()->GetDictionary(keys::kFileHandlers,

&all_handlers)) {