Attempt 2 at: Adds a trivial views based table implementation (only supports single

chrome/browser/ui/views/ssl_client_certificate_selector.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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"
@@ skipping 95 matching lines @@
   views::GridLayout* layout = views::GridLayout::CreatePanel(this);
   SetLayoutManager(layout);
 
   const int column_set_id = 0;
   views::ColumnSet* column_set = layout->AddColumnSet(column_set_id);
   column_set->AddColumn(
       views::GridLayout::FILL, views::GridLayout::FILL,
       1, views::GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, column_set_id);
-  std::wstring text = UTF16ToWide(l10n_util::GetStringFUTF16(
+  string16 text = l10n_util::GetStringFUTF16(
       IDS_CLIENT_CERT_DIALOG_TEXT,
-      ASCIIToUTF16(cert_request_info_->host_and_port)));
+      ASCIIToUTF16(cert_request_info_->host_and_port));
   views::Label* label = new views::Label(text);
   label->SetMultiLine(true);
   label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   label->SetAllowCharacterBreak(true);
   layout->AddView(label);
 
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   CreateCertTable();
   layout->StartRow(1, column_set_id);
-  layout->AddView(table_);
+  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);
 
   // Select the first row automatically.  This must be done after the dialog has
@@ skipping 110 matching lines @@
 
 void SSLClientCertificateSelector::CreateCertTable() {
   std::vector<ui::TableColumn> columns;
   columns.push_back(ui::TableColumn());
   table_ = new views::TableView(model_.get(),
                                 columns,
                                 views::TEXT_ONLY,
                                 true,  // single_selection
                                 true,  // resizable_columns
                                 true);  // autosize_columns
-  table_->SetPreferredSize(gfx::Size(kTableViewWidth, kTableViewHeight));
   table_->SetObserver(this);
 }
 
 void SSLClientCertificateSelector::CreateViewCertButton() {
-  view_cert_button_ = new views::NativeTextButton(this, UTF16ToWide(
-      l10n_util::GetStringUTF16(IDS_PAGEINFO_CERT_INFO_BUTTON)));
+  view_cert_button_ = new views::NativeTextButton(this,
+      l10n_util::GetStringUTF16(IDS_PAGEINFO_CERT_INFO_BUTTON));
 
   // Wrap the view cert button in a grid layout in order to left-align it.
   view_cert_button_container_ = new views::View();
   views::GridLayout* layout = new views::GridLayout(
       view_cert_button_container_);
   view_cert_button_container_->SetLayoutManager(layout);
 
   int column_set_id = 0;
   views::ColumnSet* column_set = layout->AddColumnSet(column_set_id);
   column_set->AddColumn(views::GridLayout::LEADING, views::GridLayout::LEADING,
@@ skipping 12 matching lines @@
     net::SSLCertRequestInfo* cert_request_info,
     SSLClientAuthHandler* delegate) {
   DVLOG(1) << __FUNCTION__ << " " << wrapper;
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   (new SSLClientCertificateSelector(wrapper,
                                    cert_request_info,
                                    delegate))->Init();
 }
 
 }  // namespace browser