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

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

Issue 10537084: TabContentsWrapper -> TabContents, part 28. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 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 | « no previous file | chrome/browser/ssl/ssl_browser_tests.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ssl/ssl_add_cert_handler.cc
diff --git a/chrome/browser/ssl/ssl_add_cert_handler.cc b/chrome/browser/ssl/ssl_add_cert_handler.cc
index 740088f3130a69b333ca2eecd5005e4cff2558ab..4cae2d45e4385ccd19ab7c03e884e0d34567ce19 100644
--- a/chrome/browser/ssl/ssl_add_cert_handler.cc
+++ b/chrome/browser/ssl/ssl_add_cert_handler.cc
@@ -7,7 +7,7 @@
#include "base/bind.h"
#include "chrome/browser/tab_contents/tab_contents_ssl_helper.h"
#include "chrome/browser/tab_contents/tab_util.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/resource_request_info.h"
#include "content/public/browser/web_contents.h"
@@ -94,9 +94,8 @@ void SSLAddCertHandler::CallVerifyClientCertificateError(int cert_error) {
if (!tab)
return;
- TabContentsWrapper* wrapper =
- TabContentsWrapper::GetCurrentWrapperForContents(tab);
- wrapper->ssl_helper()->OnVerifyClientCertificateError(this, cert_error);
+ TabContents* tab_contents = TabContents::FromWebContents(tab);
+ tab_contents->ssl_helper()->OnVerifyClientCertificateError(this, cert_error);
}
void SSLAddCertHandler::CallAddClientCertificate(bool add_cert,
@@ -106,14 +105,13 @@ void SSLAddCertHandler::CallAddClientCertificate(bool add_cert,
if (!tab)
return;
- TabContentsWrapper* wrapper =
- TabContentsWrapper::GetCurrentWrapperForContents(tab);
+ TabContents* tab_contents = TabContents::FromWebContents(tab);
if (add_cert) {
if (cert_error == net::OK) {
- wrapper->ssl_helper()->OnAddClientCertificateSuccess(this);
+ tab_contents->ssl_helper()->OnAddClientCertificateSuccess(this);
} else {
- wrapper->ssl_helper()->OnAddClientCertificateError(this, cert_error);
+ tab_contents->ssl_helper()->OnAddClientCertificateError(this, cert_error);
}
}
- wrapper->ssl_helper()->OnAddClientCertificateFinished(this);
+ tab_contents->ssl_helper()->OnAddClientCertificateFinished(this);
}
« no previous file with comments | « no previous file | chrome/browser/ssl/ssl_browser_tests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698