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

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

Issue 7670041: Add --use-more-webui runtime flag to toggle WebUI replacements for native dialogs. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 9 years, 4 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" 5 #include "chrome/browser/ui/gtk/certificate_viewer.h"
6 6
7 #include <gtk/gtk.h> 7 #include <gtk/gtk.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/i18n/time_formatting.h" 12 #include "base/i18n/time_formatting.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "base/string_number_conversions.h" 14 #include "base/string_number_conversions.h"
15 #include "base/time.h" 15 #include "base/time.h"
16 #include "base/utf_string_conversions.h" 16 #include "base/utf_string_conversions.h"
17 #include "chrome/browser/certificate_viewer.h"
17 #include "chrome/browser/ui/gtk/certificate_dialogs.h" 18 #include "chrome/browser/ui/gtk/certificate_dialogs.h"
18 #include "chrome/browser/ui/gtk/gtk_util.h" 19 #include "chrome/browser/ui/gtk/gtk_util.h"
19 #include "chrome/common/net/x509_certificate_model.h" 20 #include "chrome/common/net/x509_certificate_model.h"
20 #include "grit/generated_resources.h" 21 #include "grit/generated_resources.h"
21 #include "net/base/x509_certificate.h" 22 #include "net/base/x509_certificate.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 25
25 namespace { 26 namespace {
26 27
(...skipping 673 matching lines...) Expand 10 before | Expand all | Expand 10 after
700 ShowCertExportDialog(NULL, GTK_WINDOW(viewer->dialog_), 701 ShowCertExportDialog(NULL, GTK_WINDOW(viewer->dialog_),
701 viewer->cert_chain_list_[cert_index]); 702 viewer->cert_chain_list_[cert_index]);
702 } 703 }
703 704
704 void CertificateViewer::Show() { 705 void CertificateViewer::Show() {
705 gtk_util::ShowDialog(dialog_); 706 gtk_util::ShowDialog(dialog_);
706 } 707 }
707 708
708 } // namespace 709 } // namespace
709 710
710 void ShowCertificateViewer(gfx::NativeWindow parent, 711 void ShowNativeCertificateViewer(gfx::NativeWindow parent,
711 net::X509Certificate::OSCertHandle cert) { 712 net::X509Certificate::OSCertHandle cert) {
712 net::X509Certificate::OSCertHandles cert_chain; 713 net::X509Certificate::OSCertHandles cert_chain;
713 x509_certificate_model::GetCertChainFromCert(cert, &cert_chain); 714 x509_certificate_model::GetCertChainFromCert(cert, &cert_chain);
714 (new CertificateViewer(parent, cert_chain))->Show(); 715 (new CertificateViewer(parent, cert_chain))->Show();
715 } 716 }
716 717
717 void ShowCertificateViewer(gfx::NativeWindow parent, 718 void ShowNativeCertificateViewer(gfx::NativeWindow parent,
718 net::X509Certificate* cert) { 719 net::X509Certificate* cert) {
719 ShowCertificateViewer(parent, cert->os_cert_handle()); 720 ShowNativeCertificateViewer(parent, cert->os_cert_handle());
720 } 721 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698