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

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

Issue 7919028: Revert 101581 - Add --use-more-webui runtime flag to toggle WebUI replacements for native dialogs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 3 months 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 | Annotate | Revision Log
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/ui/gtk/certificate_viewer.h"
6
5 #include <gtk/gtk.h> 7 #include <gtk/gtk.h>
6 8
7 #include <algorithm> 9 #include <algorithm>
8 #include <vector> 10 #include <vector>
9 11
10 #include "base/i18n/time_formatting.h" 12 #include "base/i18n/time_formatting.h"
11 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
12 #include "base/string_number_conversions.h" 14 #include "base/string_number_conversions.h"
13 #include "base/time.h" 15 #include "base/time.h"
14 #include "base/utf_string_conversions.h" 16 #include "base/utf_string_conversions.h"
15 #include "chrome/browser/certificate_viewer.h"
16 #include "chrome/browser/ui/gtk/certificate_dialogs.h" 17 #include "chrome/browser/ui/gtk/certificate_dialogs.h"
17 #include "chrome/browser/ui/gtk/gtk_util.h" 18 #include "chrome/browser/ui/gtk/gtk_util.h"
18 #include "chrome/common/net/x509_certificate_model.h" 19 #include "chrome/common/net/x509_certificate_model.h"
19 #include "grit/generated_resources.h" 20 #include "grit/generated_resources.h"
20 #include "net/base/x509_certificate.h" 21 #include "net/base/x509_certificate.h"
21 #include "ui/base/gtk/gtk_hig_constants.h" 22 #include "ui/base/gtk/gtk_hig_constants.h"
22 #include "ui/base/l10n/l10n_util.h" 23 #include "ui/base/l10n/l10n_util.h"
23 #include "ui/gfx/gtk_util.h" 24 #include "ui/gfx/gtk_util.h"
24 #include "ui/gfx/native_widget_types.h"
25 25
26 namespace { 26 namespace {
27 27
28 const char kDetailsFontFamily[] = "monospace"; 28 const char kDetailsFontFamily[] = "monospace";
29 29
30 //////////////////////////////////////////////////////////////////////////////// 30 ////////////////////////////////////////////////////////////////////////////////
31 // Gtk utility functions. 31 // Gtk utility functions.
32 32
33 void AddTitle(GtkTable* table, int row, const std::string& text) { 33 void AddTitle(GtkTable* table, int row, const std::string& text) {
34 gtk_table_attach_defaults(table, 34 gtk_table_attach_defaults(table,
(...skipping 666 matching lines...) Expand 10 before | Expand all | Expand 10 after
701 ShowCertExportDialog(NULL, GTK_WINDOW(viewer->dialog_), 701 ShowCertExportDialog(NULL, GTK_WINDOW(viewer->dialog_),
702 viewer->cert_chain_list_[cert_index]); 702 viewer->cert_chain_list_[cert_index]);
703 } 703 }
704 704
705 void CertificateViewer::Show() { 705 void CertificateViewer::Show() {
706 gtk_util::ShowDialog(dialog_); 706 gtk_util::ShowDialog(dialog_);
707 } 707 }
708 708
709 } // namespace 709 } // namespace
710 710
711 void ShowNativeCertificateViewer(gfx::NativeWindow parent, 711 void ShowCertificateViewer(gfx::NativeWindow parent,
712 net::X509Certificate::OSCertHandle cert) { 712 net::X509Certificate::OSCertHandle cert) {
713 net::X509Certificate::OSCertHandles cert_chain; 713 net::X509Certificate::OSCertHandles cert_chain;
714 x509_certificate_model::GetCertChainFromCert(cert, &cert_chain); 714 x509_certificate_model::GetCertChainFromCert(cert, &cert_chain);
715 (new CertificateViewer(parent, cert_chain))->Show(); 715 (new CertificateViewer(parent, cert_chain))->Show();
716 } 716 }
717 717
718 void ShowNativeCertificateViewer(gfx::NativeWindow parent, 718 void ShowCertificateViewer(gfx::NativeWindow parent,
719 net::X509Certificate* cert) { 719 net::X509Certificate* cert) {
720 ShowNativeCertificateViewer(parent, cert->os_cert_handle()); 720 ShowCertificateViewer(parent, cert->os_cert_handle());
721 } 721 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/certificate_viewer.h ('k') | chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698