Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(655)

Side by Side Diff: chrome/browser/ui/gtk/ssl_client_certificate_selector.cc

Issue 8511048: Addressed or cleaned-up a number of TODOs. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 int selected = gtk_combo_box_get_active( 342 int selected = gtk_combo_box_get_active(
343 GTK_COMBO_BOX(cert_combo_box_)); 343 GTK_COMBO_BOX(cert_combo_box_));
344 if (selected < 0) 344 if (selected < 0)
345 return; 345 return;
346 gtk_text_buffer_set_text(cert_details_buffer_, 346 gtk_text_buffer_set_text(cert_details_buffer_,
347 details_strings_[selected].c_str(), 347 details_strings_[selected].c_str(),
348 details_strings_[selected].size()); 348 details_strings_[selected].size());
349 } 349 }
350 350
351 void SSLClientCertificateSelector::OnViewClicked(GtkWidget* button) { 351 void SSLClientCertificateSelector::OnViewClicked(GtkWidget* button) {
352 #if !defined(USE_AURA)
353 // TODO(saintlou): need to port to Views.
354 net::X509Certificate* cert = GetSelectedCert(); 352 net::X509Certificate* cert = GetSelectedCert();
355 if (cert) { 353 if (cert) {
356 GtkWidget* toplevel = gtk_widget_get_toplevel(root_widget_.get()); 354 GtkWidget* toplevel = gtk_widget_get_toplevel(root_widget_.get());
357 ShowCertificateViewer(GTK_WINDOW(toplevel), cert); 355 ShowCertificateViewer(GTK_WINDOW(toplevel), cert);
358 } 356 }
359 #endif
360 } 357 }
361 358
362 void SSLClientCertificateSelector::OnCancelClicked(GtkWidget* button) { 359 void SSLClientCertificateSelector::OnCancelClicked(GtkWidget* button) {
363 StopObserving(); 360 StopObserving();
364 delegate_->CertificateSelected(NULL); 361 delegate_->CertificateSelected(NULL);
365 delegate_ = NULL; 362 delegate_ = NULL;
366 DCHECK(window_); 363 DCHECK(window_);
367 window_->CloseConstrainedWindow(); 364 window_->CloseConstrainedWindow();
368 } 365 }
369 366
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 TabContentsWrapper* wrapper, 400 TabContentsWrapper* wrapper,
404 net::SSLCertRequestInfo* cert_request_info, 401 net::SSLCertRequestInfo* cert_request_info,
405 SSLClientAuthHandler* delegate) { 402 SSLClientAuthHandler* delegate) {
406 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 403 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
407 (new SSLClientCertificateSelector(wrapper, 404 (new SSLClientCertificateSelector(wrapper,
408 cert_request_info, 405 cert_request_info,
409 delegate))->Show(); 406 delegate))->Show();
410 } 407 }
411 408
412 } // namespace browser 409 } // namespace browser
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698