Index: chrome/browser/website_settings.h |
diff --git a/chrome/browser/website_settings.h b/chrome/browser/website_settings.h |
index 605c016414a1b1fd7d695a6d14c910bc92929444..9335e3f05c84f4175016490eddaae034be42ff44 100644 |
--- a/chrome/browser/website_settings.h |
+++ b/chrome/browser/website_settings.h |
@@ -5,7 +5,6 @@ |
#ifndef CHROME_BROWSER_WEBSITE_SETTINGS_H_ |
#define CHROME_BROWSER_WEBSITE_SETTINGS_H_ |
-#include "base/string16.h" |
#include "base/memory/scoped_ptr.h" |
#include "chrome/common/content_settings.h" |
#include "chrome/common/content_settings_types.h" |
@@ -100,15 +99,15 @@ class WebsiteSettings { |
return site_identity_status_; |
} |
- string16 site_connection_details() const { |
+ std::string site_connection_details() const { |
return site_connection_details_; |
} |
- string16 site_identity_details() const { |
+ std::string site_identity_details() const { |
return site_identity_details_; |
} |
- string16 organization_name() const { |
+ std::string organization_name() const { |
return organization_name_; |
} |
@@ -141,17 +140,17 @@ class WebsiteSettings { |
// Details about the website's identity. If the website's identity has been |
// verified then |site_identity_details_| contains who verified the identity. |
- string16 site_identity_details_; |
+ std::string site_identity_details_; |
// Details about the connection to the website. In case of an encrypted |
// connection |site_connection_details_| contains encryption details, like |
// encryption strength and ssl protocol version. |
- string16 site_connection_details_; |
+ std::string site_connection_details_; |
// For websites that provided an EV certificate |orgainization_name_| contains |
// the organization name of the certificate. In all other cases |
// |organization_name| is an empty string. |
- string16 organization_name_; |
+ std::string organization_name_; |
// The |CertStore| provides all X509Certificates. |
content::CertStore* cert_store_; |