summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ssl/ssl_manager.h
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-29 22:37:45 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-29 22:37:45 +0000
commitd1318574ee4f31f1a8fbea9d8584c89c069af987 (patch)
tree44914e9ea575a25c544b0ec9bc0925e7c2f3f0ea /chrome/browser/ssl/ssl_manager.h
parent1308ac961fdd5148ce95e228fe192175584a5464 (diff)
downloadchromium_src-d1318574ee4f31f1a8fbea9d8584c89c069af987.zip
chromium_src-d1318574ee4f31f1a8fbea9d8584c89c069af987.tar.gz
chromium_src-d1318574ee4f31f1a8fbea9d8584c89c069af987.tar.bz2
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
Diffstat (limited to 'chrome/browser/ssl/ssl_manager.h')
-rw-r--r--chrome/browser/ssl/ssl_manager.h3
1 files changed, 2 insertions, 1 deletions
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 "<organization_name> [<country>]".
- 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.