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

Unified Diff: chrome/browser/ui/cocoa/ssl_client_certificate_selector.mm

Issue 10534093: TabContentsWrapper -> TabContents, part 37. (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
Index: chrome/browser/ui/cocoa/ssl_client_certificate_selector.mm
diff --git a/chrome/browser/ui/cocoa/ssl_client_certificate_selector.mm b/chrome/browser/ui/cocoa/ssl_client_certificate_selector.mm
index fe359ba71c7795f04893cf729dd28c67c9e81f86..bc9d01477a50c6247716e1a4e4a97e90d1ef86c9 100644
--- a/chrome/browser/ui/cocoa/ssl_client_certificate_selector.mm
+++ b/chrome/browser/ui/cocoa/ssl_client_certificate_selector.mm
@@ -16,7 +16,7 @@
#include "base/utf_string_conversions.h"
#include "chrome/browser/ssl/ssl_client_auth_observer.h"
#import "chrome/browser/ui/cocoa/constrained_window_mac.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 "grit/generated_resources.h"
#include "net/base/ssl_cert_request_info.h"
@@ -28,7 +28,7 @@ using content::BrowserThread;
@interface SFChooseIdentityPanel (SystemPrivate)
// A system-private interface that dismisses a panel whose sheet was started by
-// beginSheetForWindow:modalDelegate:didEndSelector:contextInfo:identities:message:
+// -beginSheetForWindow:modalDelegate:didEndSelector:contextInfo:identities:message:
// as though the user clicked the button identified by returnCode. Verified
// present in 10.5, 10.6, and 10.7.
- (void)_dismissWithCode:(NSInteger)code;
@@ -54,7 +54,7 @@ class NotificationProxy;
certRequestInfo:(net::SSLCertRequestInfo*)certRequestInfo
callback:(const base::Callback<void(net::X509Certificate*)>&)callback;
- (void)onNotification;
-- (void)displayDialog:(TabContentsWrapper*)wrapper;
+- (void)displayDialog:(TabContents*)tabContents;
@end
namespace {
@@ -134,7 +134,7 @@ class NotificationProxy : public SSLClientAuthObserver {
namespace browser {
void ShowSSLClientCertificateSelector(
- TabContentsWrapper* wrapper,
+ TabContents* tabContents,
const net::HttpNetworkSession* network_session,
net::SSLCertRequestInfo* cert_request_info,
const base::Callback<void(net::X509Certificate*)>& callback) {
@@ -144,7 +144,7 @@ void ShowSSLClientCertificateSelector(
initWithObserver:network_session
certRequestInfo:cert_request_info
callback:callback] autorelease];
- [selector displayDialog:wrapper];
+ [selector displayDialog:tabContents];
}
} // namespace browser
@@ -191,7 +191,7 @@ void ShowSSLClientCertificateSelector(
window_->CloseConstrainedWindow();
}
-- (void)displayDialog:(TabContentsWrapper*)wrapper {
+- (void)displayDialog:(TabContents*)tabContents {
DCHECK(!window_);
// Create an array of CFIdentityRefs for the certificates:
size_t numCerts = observer_->cert_request_info()->client_certs.size();
@@ -225,7 +225,7 @@ void ShowSSLClientCertificateSelector(
}
window_ = new ConstrainedWindowMac(
- wrapper,
+ tabContents,
new ConstrainedSFChooseIdentityPanel(
panel, self,
@selector(sheetDidEnd:returnCode:context:),
« no previous file with comments | « chrome/browser/ui/cocoa/login_prompt_cocoa.mm ('k') | chrome/browser/ui/cocoa/tab_modal_confirm_dialog_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698