Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(588)

Unified Diff: chrome/browser/ui/android/ssl_client_certificate_request.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/android/login_handler_android.cc ('k') | chrome/browser/ui/android/tab_model/tab_model.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/android/ssl_client_certificate_request.cc
diff --git a/chrome/browser/ui/android/ssl_client_certificate_request.cc b/chrome/browser/ui/android/ssl_client_certificate_request.cc
index d9fd7a30ec2bf711d2965a314dffd8387d50ac32..55f5a442b941d0e33cc22315f675b913a7e6447f 100644
--- a/chrome/browser/ui/android/ssl_client_certificate_request.cc
+++ b/chrome/browser/ui/android/ssl_client_certificate_request.cc
@@ -46,7 +46,7 @@ void RecordClientCertificateKey(
void StartClientCertificateRequest(
const net::SSLCertRequestInfo* cert_request_info,
ui::WindowAndroid* window,
- scoped_ptr<content::ClientCertificateDelegate> delegate) {
+ std::unique_ptr<content::ClientCertificateDelegate> delegate) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
// Build the |key_types| JNI parameter, as a String[]
@@ -131,7 +131,7 @@ static void OnSystemRequestCompletion(
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
// Take back ownership of the delegate object.
- scoped_ptr<content::ClientCertificateDelegate> delegate(
+ std::unique_ptr<content::ClientCertificateDelegate> delegate(
reinterpret_cast<content::ClientCertificateDelegate*>(request_id));
if (encoded_chain_ref == NULL || private_key_ref == NULL) {
@@ -205,7 +205,7 @@ bool RegisterSSLClientCertificateRequestAndroid(JNIEnv* env) {
void ShowSSLClientCertificateSelector(
content::WebContents* contents,
net::SSLCertRequestInfo* cert_request_info,
- scoped_ptr<content::ClientCertificateDelegate> delegate) {
+ std::unique_ptr<content::ClientCertificateDelegate> delegate) {
ui::WindowAndroid* window = ViewAndroidHelper::FromWebContents(contents)
->GetViewAndroid()->GetWindowAndroid();
DCHECK(window);
« no previous file with comments | « chrome/browser/ui/android/login_handler_android.cc ('k') | chrome/browser/ui/android/tab_model/tab_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698