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/ssl_client_certificate_selector.h" | 5 #include "chrome/browser/ssl_client_certificate_selector.h" |
6 | 6 |
7 #include <gtk/gtk.h> | 7 #include <gtk/gtk.h> |
8 | 8 |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
339 int selected = gtk_combo_box_get_active( | 339 int selected = gtk_combo_box_get_active( |
340 GTK_COMBO_BOX(cert_combo_box_)); | 340 GTK_COMBO_BOX(cert_combo_box_)); |
341 if (selected < 0) | 341 if (selected < 0) |
342 return; | 342 return; |
343 gtk_text_buffer_set_text(cert_details_buffer_, | 343 gtk_text_buffer_set_text(cert_details_buffer_, |
344 details_strings_[selected].c_str(), | 344 details_strings_[selected].c_str(), |
345 details_strings_[selected].size()); | 345 details_strings_[selected].size()); |
346 } | 346 } |
347 | 347 |
348 void SSLClientCertificateSelector::OnViewClicked(GtkWidget* button) { | 348 void SSLClientCertificateSelector::OnViewClicked(GtkWidget* button) { |
349 #if !defined(USE_AURA) | |
350 // TODO(saintlou): need to port to Views. | |
oshima
2011/09/19 15:52:39
q: The plan is to switch to webui, corrrect?
Emmanuel Saint-loubert-Bié
2011/09/19 20:15:36
Yes it is on rbyers list.
| |
349 net::X509Certificate* cert = GetSelectedCert(); | 351 net::X509Certificate* cert = GetSelectedCert(); |
350 if (cert) { | 352 if (cert) { |
351 GtkWidget* toplevel = gtk_widget_get_toplevel(root_widget_.get()); | 353 GtkWidget* toplevel = gtk_widget_get_toplevel(root_widget_.get()); |
352 ShowCertificateViewer(GTK_WINDOW(toplevel), cert); | 354 ShowCertificateViewer(GTK_WINDOW(toplevel), cert); |
353 } | 355 } |
356 #endif | |
354 } | 357 } |
355 | 358 |
356 void SSLClientCertificateSelector::OnCancelClicked(GtkWidget* button) { | 359 void SSLClientCertificateSelector::OnCancelClicked(GtkWidget* button) { |
357 StopObserving(); | 360 StopObserving(); |
358 delegate_->CertificateSelected(NULL); | 361 delegate_->CertificateSelected(NULL); |
359 delegate_ = NULL; | 362 delegate_ = NULL; |
360 DCHECK(window_); | 363 DCHECK(window_); |
361 window_->CloseConstrainedWindow(); | 364 window_->CloseConstrainedWindow(); |
362 } | 365 } |
363 | 366 |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
396 TabContentsWrapper* wrapper, | 399 TabContentsWrapper* wrapper, |
397 net::SSLCertRequestInfo* cert_request_info, | 400 net::SSLCertRequestInfo* cert_request_info, |
398 SSLClientAuthHandler* delegate) { | 401 SSLClientAuthHandler* delegate) { |
399 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 402 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
400 (new SSLClientCertificateSelector(wrapper, | 403 (new SSLClientCertificateSelector(wrapper, |
401 cert_request_info, | 404 cert_request_info, |
402 delegate))->Show(); | 405 delegate))->Show(); |
403 } | 406 } |
404 | 407 |
405 } // namespace browser | 408 } // namespace browser |
OLD | NEW |