chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm - 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/cocoa/ssl_client_certificate_selector_cocoa.mm

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/cocoa/ssl_client_certificate_selector_cocoa.h ('k') | chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa_browsertest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm

diff --git a/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm b/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm

index 4a06708658991c08caf84bad9eb6f45abc8f42d2..02d348bf69b43cb777e2cc8444449f5e9d471dc2 100644

--- a/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm

+++ b/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm

@@ -49,7 +49,7 @@ class SSLClientAuthObserverCocoaBridge : public SSLClientAuthObserver,

SSLClientAuthObserverCocoaBridge(

const content::BrowserContext* browser_context,

net::SSLCertRequestInfo* cert_request_info,

- scoped_ptr<content::ClientCertificateDelegate> delegate,

+ std::unique_ptr<content::ClientCertificateDelegate> delegate,

SSLClientCertificateSelectorCocoa* controller)

: SSLClientAuthObserver(browser_context,

cert_request_info,

@@ -80,7 +80,7 @@ namespace chrome {

void ShowSSLClientCertificateSelector(

content::WebContents* contents,

net::SSLCertRequestInfo* cert_request_info,

- scoped_ptr<content::ClientCertificateDelegate> delegate) {

+ std::unique_ptr<content::ClientCertificateDelegate> delegate) {

DCHECK_CURRENTLY_ON(BrowserThread::UI);

// Not all WebContentses can show modal dialogs.

@@ -109,8 +109,9 @@ void ShowSSLClientCertificateSelector(

- (id)initWithBrowserContext:(const content::BrowserContext*)browserContext

certRequestInfo:(net::SSLCertRequestInfo*)certRequestInfo

- delegate:(scoped_ptr<content::ClientCertificateDelegate>)

- delegate {

+ delegate:

+ (std::unique_ptr<content::ClientCertificateDelegate>)

+ delegate {

DCHECK(browserContext);

DCHECK(certRequestInfo);

if ((self = [super init])) {