diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-29 20:08:33 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-29 20:08:33 +0000 |
| commit | 7c8c869c9cd34e78dc40d7c9840aa7b4b778ba0a (patch) | |
| tree | 3b997b69adc872122ada0872405017c9a4f18cc8 /chrome/browser/ssl/ssl_manager.cc | |
| parent | 8d4db9d979a78a413fb28e02ae286643c86972ee (diff) | |
| download | chromium_src-7c8c869c9cd34e78dc40d7c9840aa7b4b778ba0a.zip chromium_src-7c8c869c9cd34e78dc40d7c9840aa7b4b778ba0a.tar.gz chromium_src-7c8c869c9cd34e78dc40d7c9840aa7b4b778ba0a.tar.bz2 | |
Remove wstring from l10n_util. Part 3.
BUG=9911
TEST=no visible changes; all tests pass
Review URL: http://codereview.chromium.org/6044006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70271 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ssl/ssl_manager.cc')
| -rw-r--r-- | chrome/browser/ssl/ssl_manager.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/ssl/ssl_manager.cc b/chrome/browser/ssl/ssl_manager.cc index f874cc0..597d3ca 100644 --- a/chrome/browser/ssl/ssl_manager.cc +++ b/chrome/browser/ssl/ssl_manager.cc @@ -95,17 +95,18 @@ bool SSLManager::DeserializeSecurityInfo(const std::string& state, } // static -std::wstring SSLManager::GetEVCertName(const net::X509Certificate& cert) { +string16 SSLManager::GetEVCertName(const net::X509Certificate& cert) { // EV are required to have an organization name and country. if (cert.subject().organization_names.empty() || cert.subject().country_name.empty()) { NOTREACHED(); - return std::wstring(); + return string16(); } - return l10n_util::GetStringF(IDS_SECURE_CONNECTION_EV, - UTF8ToWide(cert.subject().organization_names[0]), - UTF8ToWide(cert.subject().country_name)); + return l10n_util::GetStringFUTF16( + IDS_SECURE_CONNECTION_EV, + UTF8ToUTF16(cert.subject().organization_names[0]), + UTF8ToUTF16(cert.subject().country_name)); } SSLManager::SSLManager(NavigationController* controller) |