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

Unified Diff: chrome/browser/ui/toolbar/toolbar_model.cc

Issue 7552026: Convert ToolbarModel::GetEVCertName() from wstring to string16. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/toolbar/toolbar_model.cc
diff --git a/chrome/browser/ui/toolbar/toolbar_model.cc b/chrome/browser/ui/toolbar/toolbar_model.cc
index f2c2dc45835724a3892bac1f6454d3407f988555..55622bad9515f757eee33a16e1e764f9ace2e165 100644
--- a/chrome/browser/ui/toolbar/toolbar_model.cc
+++ b/chrome/browser/ui/toolbar/toolbar_model.cc
@@ -115,14 +115,14 @@ int ToolbarModel::GetIcon() const {
return icon_ids[GetSecurityLevel()];
}
-std::wstring ToolbarModel::GetEVCertName() const {
+string16 ToolbarModel::GetEVCertName() const {
DCHECK_EQ(GetSecurityLevel(), EV_SECURE);
scoped_refptr<net::X509Certificate> cert;
// Note: Navigation controller and active entry are guaranteed non-NULL or
// the security level would be NONE.
CertStore::GetInstance()->RetrieveCert(
GetNavigationController()->GetActiveEntry()->ssl().cert_id(), &cert);
- return UTF16ToWideHack(GetEVCertName(*cert));
+ return GetEVCertName(*cert);
}
// static
« no previous file with comments | « chrome/browser/ui/toolbar/toolbar_model.h ('k') | chrome/browser/ui/views/location_bar/location_bar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698