chrome/browser/ui/webui/options/certificate_manager_handler.cc - Issue 1865213004: Convert //chrome/browser/ui 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: chrome/browser/ui/webui/options/certificate_manager_handler.cc

Issue 1865213004: Convert //chrome/browser/ui 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 | « chrome/browser/ui/webui/options/certificate_manager_handler.h ('k') | chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/certificate_manager_handler.cc

diff --git a/chrome/browser/ui/webui/options/certificate_manager_handler.cc b/chrome/browser/ui/webui/options/certificate_manager_handler.cc

index 5dbd6451cf80de247a74e2af7934447a05341194..bc53b77092f01499824b0e2f5f68fc046e989553 100644

--- a/chrome/browser/ui/webui/options/certificate_manager_handler.cc

+++ b/chrome/browser/ui/webui/options/certificate_manager_handler.cc

@@ -1077,7 +1077,7 @@ void CertificateManagerHandler::Delete(const base::ListValue* args) {

}

void CertificateManagerHandler::OnCertificateManagerModelCreated(

- scoped_ptr<CertificateManagerModel> model) {

+ std::unique_ptr<CertificateManagerModel> model) {

certificate_manager_model_ = std::move(model);

CertificateManagerModelReady();

}

@@ -1122,7 +1122,7 @@ void CertificateManagerHandler::PopulateTree(

const net::CertificateList& web_trust_certs) {

const std::string tree_name = tab_name + "-tree";

- scoped_ptr<icu::Collator> collator;

+ std::unique_ptr<icu::Collator> collator;

UErrorCode error = U_ZERO_ERROR;

collator.reset(

icu::Collator::createInstance(