| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/views/ssl_client_certificate_selector.h" | 5 #include "chrome/browser/ui/views/ssl_client_certificate_selector.h" |
| 6 | 6 |
| 7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
| 8 #include "base/i18n/time_formatting.h" | 8 #include "base/i18n/time_formatting.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
| (...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 272 view_cert_button_container_->SetLayoutManager(layout); | 272 view_cert_button_container_->SetLayoutManager(layout); |
| 273 | 273 |
| 274 int column_set_id = 0; | 274 int column_set_id = 0; |
| 275 views::ColumnSet* column_set = layout->AddColumnSet(column_set_id); | 275 views::ColumnSet* column_set = layout->AddColumnSet(column_set_id); |
| 276 column_set->AddColumn(views::GridLayout::LEADING, views::GridLayout::LEADING, | 276 column_set->AddColumn(views::GridLayout::LEADING, views::GridLayout::LEADING, |
| 277 0, views::GridLayout::USE_PREF, 0, 0); | 277 0, views::GridLayout::USE_PREF, 0, 0); |
| 278 layout->StartRow(0, column_set_id); | 278 layout->StartRow(0, column_set_id); |
| 279 layout->AddView(view_cert_button_); | 279 layout->AddView(view_cert_button_); |
| 280 } | 280 } |
| 281 | 281 |
| 282 /////////////////////////////////////////////////////////////////////////////// | 282 namespace chrome { |
| 283 // SSLClientCertificateSelector public interface: | |
| 284 | |
| 285 namespace browser { | |
| 286 | 283 |
| 287 void ShowSSLClientCertificateSelector( | 284 void ShowSSLClientCertificateSelector( |
| 288 TabContents* tab_contents, | 285 TabContents* tab_contents, |
| 289 const net::HttpNetworkSession* network_session, | 286 const net::HttpNetworkSession* network_session, |
| 290 net::SSLCertRequestInfo* cert_request_info, | 287 net::SSLCertRequestInfo* cert_request_info, |
| 291 const base::Callback<void(net::X509Certificate*)>& callback) { | 288 const base::Callback<void(net::X509Certificate*)>& callback) { |
| 292 DVLOG(1) << __FUNCTION__ << " " << tab_contents; | 289 DVLOG(1) << __FUNCTION__ << " " << tab_contents; |
| 293 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 290 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 294 (new SSLClientCertificateSelector( | 291 (new SSLClientCertificateSelector( |
| 295 tab_contents, network_session, cert_request_info, callback))->Init(); | 292 tab_contents, network_session, cert_request_info, callback))->Init(); |
| 296 } | 293 } |
| 297 | 294 |
| 298 } // namespace browser | 295 } // namespace chrome |
| OLD | NEW |