TabContentsWrapper -> TabContents, part 48.

chrome/browser/ui/views/ssl_client_certificate_selector.cc

 // 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/ui/views/ssl_client_certificate_selector.h"
 
 #include "base/compiler_specific.h"
 #include "base/i18n/time_formatting.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/certificate_viewer.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/views/constrained_window_views.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "grit/generated_resources.h"
 #include "net/base/ssl_cert_request_info.h"
 #include "net/base/x509_certificate.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/table_model.h"
 #include "ui/base/models/table_model_observer.h"
@@ skipping 58 matching lines @@
 }
 
 void CertificateSelectorTableModel::SetObserver(
     ui::TableModelObserver* observer) {
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // SSLClientCertificateSelector:
 
 SSLClientCertificateSelector::SSLClientCertificateSelector(
-    TabContentsWrapper* wrapper,
+    TabContents* tab_contents,
     const net::HttpNetworkSession* network_session,
     net::SSLCertRequestInfo* cert_request_info,
     const base::Callback<void(net::X509Certificate*)>& callback)
     : SSLClientAuthObserver(network_session, cert_request_info, callback),
       model_(new CertificateSelectorTableModel(cert_request_info)),
-      wrapper_(wrapper),
+      tab_contents_(tab_contents),
       window_(NULL),
       table_(NULL),
       view_cert_button_(NULL),
       view_cert_button_container_(NULL) {
   DVLOG(1) << __FUNCTION__;
 }
 
 SSLClientCertificateSelector::~SSLClientCertificateSelector() {
   table_->SetModel(NULL);
 }
@@ skipping 25 matching lines @@
   layout->AddView(table_->CreateParentIfNecessary(), 1, 1,
                   views::GridLayout::FILL,
                   views::GridLayout::FILL, kTableViewWidth, kTableViewHeight);
 
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   CreateViewCertButton();
 
   StartObserving();
 
-  window_ = new ConstrainedWindowViews(wrapper_, this);
+  window_ = new ConstrainedWindowViews(tab_contents_, this);
 
   // Select the first row automatically.  This must be done after the dialog has
   // been created.
   table_->Select(0);
 }
 
 net::X509Certificate* SSLClientCertificateSelector::GetSelectedCert() const {
   int selected = table_->FirstSelectedRow();
   if (selected >= 0 &&
       selected < static_cast<int>(
@@ skipping 68 matching lines @@
 
 ///////////////////////////////////////////////////////////////////////////////
 // views::ButtonListener implementation:
 
 void SSLClientCertificateSelector::ButtonPressed(
     views::Button* sender, const views::Event& event) {
   if (sender == view_cert_button_) {
     net::X509Certificate* cert = GetSelectedCert();
     if (cert)
       ShowCertificateViewer(
-          wrapper_->web_contents()->GetView()->GetTopLevelNativeWindow(),
+          tab_contents_->web_contents()->GetView()->GetTopLevelNativeWindow(),
           cert);
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // views::TableViewObserver implementation:
 void SSLClientCertificateSelector::OnSelectionChanged() {
   GetDialogClientView()->ok_button()->SetEnabled(!!GetSelectedCert());
 }
 
@@ skipping 34 matching lines @@
   layout->StartRow(0, column_set_id);
   layout->AddView(view_cert_button_);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // SSLClientCertificateSelector public interface:
 
 namespace browser {
 
 void ShowSSLClientCertificateSelector(
-    TabContentsWrapper* wrapper,
+    TabContents* tab_contents,
     const net::HttpNetworkSession* network_session,
     net::SSLCertRequestInfo* cert_request_info,
     const base::Callback<void(net::X509Certificate*)>& callback) {
-  DVLOG(1) << __FUNCTION__ << " " << wrapper;
+  DVLOG(1) << __FUNCTION__ << " " << tab_contents;
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   (new SSLClientCertificateSelector(
-       wrapper, network_session, cert_request_info, callback))->Init();
+       tab_contents, network_session, cert_request_info, callback))->Init();
 }
 
 }  // namespace browser