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 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
217 } | 217 } |
218 | 218 |
219 views::View* SSLClientCertificateSelector::GetExtraView() { | 219 views::View* SSLClientCertificateSelector::GetExtraView() { |
220 return view_cert_button_container_; | 220 return view_cert_button_container_; |
221 } | 221 } |
222 | 222 |
223 /////////////////////////////////////////////////////////////////////////////// | 223 /////////////////////////////////////////////////////////////////////////////// |
224 // views::ButtonListener implementation: | 224 // views::ButtonListener implementation: |
225 | 225 |
226 void SSLClientCertificateSelector::ButtonPressed( | 226 void SSLClientCertificateSelector::ButtonPressed( |
227 views::Button* sender, const views::Event& event) { | 227 views::Button* sender, const ui::Event& event) { |
228 if (sender == view_cert_button_) { | 228 if (sender == view_cert_button_) { |
229 net::X509Certificate* cert = GetSelectedCert(); | 229 net::X509Certificate* cert = GetSelectedCert(); |
230 if (cert) | 230 if (cert) |
231 ShowCertificateViewer( | 231 ShowCertificateViewer( |
232 tab_contents_->web_contents(), | 232 tab_contents_->web_contents(), |
233 tab_contents_->web_contents()->GetView()->GetTopLevelNativeWindow(), | 233 tab_contents_->web_contents()->GetView()->GetTopLevelNativeWindow(), |
234 cert); | 234 cert); |
235 } | 235 } |
236 } | 236 } |
237 | 237 |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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__ << " " << tab_contents; |
290 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 290 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
291 (new SSLClientCertificateSelector( | 291 (new SSLClientCertificateSelector( |
292 tab_contents, network_session, cert_request_info, callback))->Init(); | 292 tab_contents, network_session, cert_request_info, callback))->Init(); |
293 } | 293 } |
294 | 294 |
295 } // namespace chrome | 295 } // namespace chrome |
OLD | NEW |