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

Unified 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: Fix spelling error in comment. 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/gtk/certificate_viewer.cc
diff --git a/chrome/browser/ui/gtk/certificate_viewer.cc b/chrome/browser/ui/gtk/certificate_viewer.cc
index e062fec3335c085c38f05c66bd9d1cb496646473..2f25189a34a6206076300abffe6e2f5b57e84a49 100644
--- a/chrome/browser/ui/gtk/certificate_viewer.cc
+++ b/chrome/browser/ui/gtk/certificate_viewer.cc
@@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/ui/gtk/certificate_viewer.h"
-
#include <gtk/gtk.h>
#include <algorithm>
@@ -14,6 +12,7 @@
#include "base/string_number_conversions.h"
#include "base/time.h"
#include "base/utf_string_conversions.h"
+#include "chrome/browser/certificate_viewer.h"
#include "chrome/browser/ui/gtk/certificate_dialogs.h"
#include "chrome/browser/ui/gtk/gtk_util.h"
#include "chrome/common/net/x509_certificate_model.h"
@@ -21,6 +20,7 @@
#include "net/base/x509_certificate.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/gfx/gtk_util.h"
+#include "ui/gfx/native_widget_types.h"
namespace {
@@ -707,14 +707,14 @@ void CertificateViewer::Show() {
} // namespace
-void ShowCertificateViewer(gfx::NativeWindow parent,
- net::X509Certificate::OSCertHandle cert) {
+void ShowNativeCertificateViewer(gfx::NativeWindow parent,
+ net::X509Certificate::OSCertHandle cert) {
net::X509Certificate::OSCertHandles cert_chain;
x509_certificate_model::GetCertChainFromCert(cert, &cert_chain);
(new CertificateViewer(parent, cert_chain))->Show();
}
-void ShowCertificateViewer(gfx::NativeWindow parent,
- net::X509Certificate* cert) {
- ShowCertificateViewer(parent, cert->os_cert_handle());
+void ShowNativeCertificateViewer(gfx::NativeWindow parent,
+ net::X509Certificate* cert) {
+ ShowNativeCertificateViewer(parent, cert->os_cert_handle());
}

Powered by Google App Engine
This is Rietveld 408576698