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

Unified Diff: chrome/browser/ssl/ssl_tab_helper.cc

Issue 16290004: Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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/ssl/ssl_error_info.cc ('k') | chrome/browser/sync/glue/autofill_data_type_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ssl/ssl_tab_helper.cc
diff --git a/chrome/browser/ssl/ssl_tab_helper.cc b/chrome/browser/ssl/ssl_tab_helper.cc
index 1bb83d47187e84e48f7d3ecc0a9da1b3d8cd104c..d444a3796e2bd399907315540d96a6aeefa52b20 100644
--- a/chrome/browser/ssl/ssl_tab_helper.cc
+++ b/chrome/browser/ssl/ssl_tab_helper.cc
@@ -120,10 +120,9 @@ string16 SSLCertResultInfoBarDelegate::GetButtonLabel(
}
bool SSLCertResultInfoBarDelegate::Accept() {
- ShowCertificateViewer(
- web_contents(),
- web_contents()->GetView()->GetTopLevelNativeWindow(),
- cert_);
+ ShowCertificateViewer(web_contents(),
+ web_contents()->GetView()->GetTopLevelNativeWindow(),
+ cert_.get());
return false; // Hiding the infobar just as the dialog opens looks weird.
}
@@ -217,7 +216,7 @@ void SSLTabHelper::ShowClientCertificateRequestDialog(
void SSLTabHelper::OnVerifyClientCertificateError(
scoped_refptr<SSLAddCertHandler> handler, int error_code) {
- SSLAddCertData* add_cert_data = GetAddCertData(handler);
+ SSLAddCertData* add_cert_data = GetAddCertData(handler.get());
// Display an infobar with the error message.
// TODO(davidben): Display a more user-friendly error string.
add_cert_data->ShowInfoBar(
@@ -234,7 +233,7 @@ void SSLTabHelper::AskToAddClientCertificate(
void SSLTabHelper::OnAddClientCertificateSuccess(
scoped_refptr<SSLAddCertHandler> handler) {
- SSLAddCertData* add_cert_data = GetAddCertData(handler);
+ SSLAddCertData* add_cert_data = GetAddCertData(handler.get());
// Display an infobar to inform the user.
net::X509Certificate* cert = handler->cert();
// TODO(evanm): GetDisplayName should return UTF-16.
@@ -246,7 +245,7 @@ void SSLTabHelper::OnAddClientCertificateSuccess(
void SSLTabHelper::OnAddClientCertificateError(
scoped_refptr<SSLAddCertHandler> handler, int error_code) {
- SSLAddCertData* add_cert_data = GetAddCertData(handler);
+ SSLAddCertData* add_cert_data = GetAddCertData(handler.get());
// Display an infobar with the error message.
// TODO(davidben): Display a more user-friendly error string.
add_cert_data->ShowInfoBar(
« no previous file with comments | « chrome/browser/ssl/ssl_error_info.cc ('k') | chrome/browser/sync/glue/autofill_data_type_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698