From d1318574ee4f31f1a8fbea9d8584c89c069af987 Mon Sep 17 00:00:00 2001 From: "avi@chromium.org" Date: Wed, 29 Dec 2010 22:37:45 +0000 Subject: Revert 70281 - Revert 70271 - Remove wstring from l10n_util. Part 3. BUG=9911 TEST=no visible changes; all tests pass Review URL: http://codereview.chromium.org/6044006 TBR=avi@chromium.org Review URL: http://codereview.chromium.org/6051012 TBR=avi@chromium.org Review URL: http://codereview.chromium.org/5989012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70283 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/ssl/ssl_manager.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'chrome/browser/ssl/ssl_manager.h') diff --git a/chrome/browser/ssl/ssl_manager.h b/chrome/browser/ssl/ssl_manager.h index 0c61596..c488c35 100644 --- a/chrome/browser/ssl/ssl_manager.h +++ b/chrome/browser/ssl/ssl_manager.h @@ -10,6 +10,7 @@ #include "base/basictypes.h" #include "base/scoped_ptr.h" +#include "base/string16.h" #include "chrome/browser/ssl/ssl_policy_backend.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" @@ -66,7 +67,7 @@ class SSLManager : public NotificationObserver { int* connection_status); // Returns " []". - static std::wstring GetEVCertName(const net::X509Certificate& cert); + static string16 GetEVCertName(const net::X509Certificate& cert); // Construct an SSLManager for the specified tab. // If |delegate| is NULL, SSLPolicy::GetDefaultPolicy() is used. -- cgit v1.1