| 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 264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 namespace chrome { | 282 namespace chrome { |
| 283 | 283 |
| 284 void ShowSSLClientCertificateSelector( | 284 void ShowSSLClientCertificateSelector( |
| 285 TabContents* tab_contents, | 285 content::WebContents* contents, |
| 286 const net::HttpNetworkSession* network_session, | 286 const net::HttpNetworkSession* network_session, |
| 287 net::SSLCertRequestInfo* cert_request_info, | 287 net::SSLCertRequestInfo* cert_request_info, |
| 288 const base::Callback<void(net::X509Certificate*)>& callback) { | 288 const base::Callback<void(net::X509Certificate*)>& callback) { |
| 289 DVLOG(1) << __FUNCTION__ << " " << tab_contents; | 289 DVLOG(1) << __FUNCTION__ << " " << contents; |
| 290 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 290 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 291 TabContents* tab_contents = TabContents::FromWebContents(contents); |
| 291 (new SSLClientCertificateSelector( | 292 (new SSLClientCertificateSelector( |
| 292 tab_contents, network_session, cert_request_info, callback))->Init(); | 293 tab_contents, network_session, cert_request_info, callback))->Init(); |
| 293 } | 294 } |
| 294 | 295 |
| 295 } // namespace chrome | 296 } // namespace chrome |
| OLD | NEW |