TabContentsWrapper -> TabContents, part 37.

chrome/browser/ui/cocoa/ssl_client_certificate_selector.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ssl_client_certificate_selector.h"
 
 #import <SecurityInterface/SFChooseIdentityPanel.h>
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #import "base/memory/scoped_nsobject.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #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"
 #include "net/base/x509_certificate.h"
 #include "net/base/x509_util_mac.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
 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;
 @end
 
 namespace {
 class NotificationProxy;
 }  // namespace
 
 @interface SSLClientCertificateSelectorCocoa : NSObject {
  @private
   // The list of identities offered to the user.
   scoped_nsobject<NSMutableArray> identities_;
   // The corresponding list of certificates.
   std::vector<scoped_refptr<net::X509Certificate> > certificates_;
   // The currently open dialog.
   ConstrainedWindow* window_;
   // A C++ object to proxy SSLClientAuthObserver notifications to us.
   scoped_ptr<NotificationProxy> observer_;
 }
 
 - (id)initWithObserver:(const net::HttpNetworkSession*)networkSession
        certRequestInfo:(net::SSLCertRequestInfo*)certRequestInfo
          callback:(const base::Callback<void(net::X509Certificate*)>&)callback;
 - (void)onNotification;
-- (void)displayDialog:(TabContentsWrapper*)wrapper;
+- (void)displayDialog:(TabContents*)tabContents;
 @end
 
 namespace {
 
 class ConstrainedSFChooseIdentityPanel
     : public ConstrainedWindowMacDelegateSystemSheet {
  public:
   ConstrainedSFChooseIdentityPanel(SFChooseIdentityPanel* panel,
                                    id delegate, SEL didEndSelector,
                                    NSArray* identities, NSString* message)
@@ skipping 59 matching lines @@
 
  private:
   SSLClientCertificateSelectorCocoa* controller_;
 };
 
 }  // namespace
 
 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) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   SSLClientCertificateSelectorCocoa* selector =
       [[[SSLClientCertificateSelectorCocoa alloc]
           initWithObserver:network_session
            certRequestInfo:cert_request_info
                   callback:callback] autorelease];
-  [selector displayDialog:wrapper];
+  [selector displayDialog:tabContents];
 }
 
 }  // namespace browser
 
 @implementation SSLClientCertificateSelectorCocoa
 
 - (id)initWithObserver:(const net::HttpNetworkSession*)networkSession
        certRequestInfo:(net::SSLCertRequestInfo*)certRequestInfo
         callback:(const base::Callback<void(net::X509Certificate*)>&)callback {
   DCHECK(networkSession);
@@ skipping 26 matching lines @@
   observer_->CertificateSelected(cert);
   // Close the constrained window.
   DCHECK(window_);
   window_->CloseConstrainedWindow();
 }
 
 - (void)onNotification {
   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();
   identities_.reset([[NSMutableArray alloc] initWithCapacity:numCerts]);
   for (size_t i = 0; i < numCerts; ++i) {
     SecCertificateRef cert;
     cert = observer_->cert_request_info()->client_certs[i]->os_cert_handle();
     SecIdentityRef identity;
     if (SecIdentityCreateWithCertificate(NULL, cert, &identity) == noErr) {
       [identities_ addObject:(id)identity];
@@ skipping 13 matching lines @@
   [panel setInformativeText:message];
   [panel setDefaultButtonTitle:l10n_util::GetNSString(IDS_OK)];
   [panel setAlternateButtonTitle:l10n_util::GetNSString(IDS_CANCEL)];
   SecPolicyRef sslPolicy;
   if (net::x509_util::CreateSSLClientPolicy(&sslPolicy) == noErr) {
     [panel setPolicies:(id)sslPolicy];
     CFRelease(sslPolicy);
   }
 
   window_ = new ConstrainedWindowMac(
-      wrapper,
+      tabContents,
       new ConstrainedSFChooseIdentityPanel(
           panel, self,
           @selector(sheetDidEnd:returnCode:context:),
           identities_, title));
   observer_->StartObserving();
   // Note: SFChooseIdentityPanel does not take a reference to itself while the
   // sheet is open. ConstrainedSFChooseIdentityPanel will release ownership
   // on destruction.
 }
 
 @end