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

Index: extensions/common/manifest_handlers/default_locale_handler.cc

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

index debb664ef6c9c55e25507771fbff11d776648945..47fde82d647a757c06bd04dc16363c6920187aee 100644

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

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

@@ -4,9 +4,10 @@

#include "extensions/common/manifest_handlers/default_locale_handler.h"

+#include <memory>

#include "base/files/file_enumerator.h"

#include "base/files/file_util.h"

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

#include "base/strings/string_util.h"

#include "base/strings/stringprintf.h"

#include "base/strings/utf_string_conversions.h"

@@ -37,7 +38,7 @@ DefaultLocaleHandler::~DefaultLocaleHandler() {

}

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

- scoped_ptr<LocaleInfo> info(new LocaleInfo);

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

if (!extension->manifest()->GetString(keys::kDefaultLocale,

&info->default_locale) ||

!l10n_util::IsValidLocaleSyntax(info->default_locale)) {

« no previous file with comments | « extensions/common/manifest_handlers/csp_info.cc ('k') | extensions/common/manifest_handlers/externally_connectable.h » ('j') | no next file with comments »