| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 CreateCertTable(); | 125 CreateCertTable(); |
| 126 layout->StartRow(1, column_set_id); | 126 layout->StartRow(1, column_set_id); |
| 127 layout->AddView(table_); | 127 layout->AddView(table_); |
| 128 | 128 |
| 129 layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing); | 129 layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing); |
| 130 | 130 |
| 131 CreateViewCertButton(); | 131 CreateViewCertButton(); |
| 132 | 132 |
| 133 StartObserving(); | 133 StartObserving(); |
| 134 | 134 |
| 135 window_ = new ConstrainedWindowViews(wrapper_->tab_contents(), this); | 135 window_ = new ConstrainedWindowViews(wrapper_, this); |
| 136 | 136 |
| 137 // Select the first row automatically. This must be done after the dialog has | 137 // Select the first row automatically. This must be done after the dialog has |
| 138 // been created. | 138 // been created. |
| 139 table_->Select(0); | 139 table_->Select(0); |
| 140 } | 140 } |
| 141 | 141 |
| 142 net::X509Certificate* SSLClientCertificateSelector::GetSelectedCert() const { | 142 net::X509Certificate* SSLClientCertificateSelector::GetSelectedCert() const { |
| 143 int selected = table_->FirstSelectedRow(); | 143 int selected = table_->FirstSelectedRow(); |
| 144 if (selected >= 0 && | 144 if (selected >= 0 && |
| 145 selected < static_cast<int>( | 145 selected < static_cast<int>( |
| (...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 286 net::SSLCertRequestInfo* cert_request_info, | 286 net::SSLCertRequestInfo* cert_request_info, |
| 287 SSLClientAuthHandler* delegate) { | 287 SSLClientAuthHandler* delegate) { |
| 288 DVLOG(1) << __FUNCTION__ << " " << wrapper; | 288 DVLOG(1) << __FUNCTION__ << " " << wrapper; |
| 289 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 289 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 290 (new SSLClientCertificateSelector(wrapper, | 290 (new SSLClientCertificateSelector(wrapper, |
| 291 cert_request_info, | 291 cert_request_info, |
| 292 delegate))->Init(); | 292 delegate))->Init(); |
| 293 } | 293 } |
| 294 | 294 |
| 295 } // namespace browser | 295 } // namespace browser |
| OLD | NEW |