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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/website_settings.cc

Issue 10169004: Replace UTF16 string with UTF8 string in the |WebsiteSettings| class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: " Created 8 years, 8 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
« no previous file with comments | « chrome/browser/website_settings.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/website_settings.cc
diff --git a/chrome/browser/website_settings.cc b/chrome/browser/website_settings.cc
index 4d1e42e176e9834079af18202d194c81aa3ad095..6822b91d3e9543fbc618f69ed0ffc48755225a21 100644
--- a/chrome/browser/website_settings.cc
+++ b/chrome/browser/website_settings.cc
@@ -75,7 +75,7 @@ WebsiteSettings::WebsiteSettings(
site_info = "Identity verified";
break;
case WebsiteSettings::SITE_IDENTITY_STATUS_EV_CERT:
- site_info = UTF16ToUTF8(organization_name());
+ site_info = organization_name();
site_info += " - Identity verified";
break;
default:
@@ -127,7 +127,7 @@ void WebsiteSettings::Init(Profile* profile,
if (url.SchemeIs(chrome::kChromeUIScheme)) {
site_identity_status_ = SITE_IDENTITY_STATUS_INTERNAL_PAGE;
site_identity_details_ =
- l10n_util::GetStringUTF16(IDS_PAGE_INFO_INTERNAL_PAGE);
+ l10n_util::GetStringUTF8(IDS_PAGE_INFO_INTERNAL_PAGE);
site_connection_status_ = SITE_CONNECTION_STATUS_INTERNAL_PAGE;
return;
}
@@ -135,10 +135,10 @@ void WebsiteSettings::Init(Profile* profile,
scoped_refptr<net::X509Certificate> cert;
// Identity section.
- string16 subject_name(UTF8ToUTF16(url.host()));
+ std::string subject_name(url.host());
if (subject_name.empty()) {
subject_name.assign(
- l10n_util::GetStringUTF16(IDS_PAGE_INFO_SECURITY_TAB_UNKNOWN_PARTY));
+ l10n_util::GetStringUTF8(IDS_PAGE_INFO_SECURITY_TAB_UNKNOWN_PARTY));
}
if (ssl.cert_id &&
@@ -148,20 +148,21 @@ void WebsiteSettings::Init(Profile* profile,
// There are no major errors. Check for minor errors.
if (net::IsCertStatusMinorError(ssl.cert_status)) {
site_identity_status_ = SITE_IDENTITY_STATUS_CERT_REVOCATION_UNKNOWN;
- string16 issuer_name(UTF8ToUTF16(cert->issuer().GetDisplayName()));
+ std::string issuer_name(cert->issuer().GetDisplayName());
if (issuer_name.empty()) {
- issuer_name.assign(l10n_util::GetStringUTF16(
+ issuer_name.assign(l10n_util::GetStringUTF8(
IDS_PAGE_INFO_SECURITY_TAB_UNKNOWN_PARTY));
}
- site_identity_details_.assign(l10n_util::GetStringFUTF16(
- IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY, issuer_name));
+ site_identity_details_.assign(l10n_util::GetStringFUTF8(
+ IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY,
+ UTF8ToUTF16(issuer_name)));
- site_identity_details_ += ASCIIToUTF16("\n\n");
+ site_identity_details_ += "\n\n";
if (ssl.cert_status & net::CERT_STATUS_UNABLE_TO_CHECK_REVOCATION) {
- site_identity_details_ += l10n_util::GetStringUTF16(
+ site_identity_details_ += l10n_util::GetStringUTF8(
IDS_PAGE_INFO_SECURITY_TAB_UNABLE_TO_CHECK_REVOCATION);
} else if (ssl.cert_status & net::CERT_STATUS_NO_REVOCATION_MECHANISM) {
- site_identity_details_ += l10n_util::GetStringUTF16(
+ site_identity_details_ += l10n_util::GetStringUTF8(
IDS_PAGE_INFO_SECURITY_TAB_NO_REVOCATION_MECHANISM);
} else {
NOTREACHED() << "Need to specify string for this warning";
@@ -170,67 +171,68 @@ void WebsiteSettings::Init(Profile* profile,
// EV HTTPS page.
site_identity_status_ = SITE_IDENTITY_STATUS_EV_CERT;
DCHECK(!cert->subject().organization_names.empty());
- organization_name_ = UTF8ToUTF16(cert->subject().organization_names[0]);
+ organization_name_ = cert->subject().organization_names[0];
// An EV Cert is required to have a city (localityName) and country but
// state is "if any".
DCHECK(!cert->subject().locality_name.empty());
DCHECK(!cert->subject().country_name.empty());
- string16 locality;
+ std::string locality;
if (!cert->subject().state_or_province_name.empty()) {
- locality = l10n_util::GetStringFUTF16(
+ locality = l10n_util::GetStringFUTF8(
IDS_PAGEINFO_ADDRESS,
UTF8ToUTF16(cert->subject().locality_name),
UTF8ToUTF16(cert->subject().state_or_province_name),
UTF8ToUTF16(cert->subject().country_name));
} else {
- locality = l10n_util::GetStringFUTF16(
+ locality = l10n_util::GetStringFUTF8(
IDS_PAGEINFO_PARTIAL_ADDRESS,
UTF8ToUTF16(cert->subject().locality_name),
UTF8ToUTF16(cert->subject().country_name));
}
DCHECK(!cert->subject().organization_names.empty());
- site_identity_details_.assign(l10n_util::GetStringFUTF16(
+ site_identity_details_.assign(l10n_util::GetStringFUTF8(
IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_EV,
UTF8ToUTF16(cert->subject().organization_names[0]),
- locality,
+ UTF8ToUTF16(locality),
UTF8ToUTF16(cert->issuer().GetDisplayName())));
} else if (ssl.cert_status & net::CERT_STATUS_IS_DNSSEC) {
// DNSSEC authenticated page.
site_identity_status_ = SITE_IDENTITY_STATUS_DNSSEC_CERT;
- site_identity_details_.assign(l10n_util::GetStringFUTF16(
+ site_identity_details_.assign(l10n_util::GetStringFUTF8(
IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY, UTF8ToUTF16("DNSSEC")));
} else {
// Non-EV OK HTTPS page.
site_identity_status_ = SITE_IDENTITY_STATUS_CERT;
- string16 issuer_name(UTF8ToUTF16(cert->issuer().GetDisplayName()));
+ std::string issuer_name(cert->issuer().GetDisplayName());
if (issuer_name.empty()) {
- issuer_name.assign(l10n_util::GetStringUTF16(
+ issuer_name.assign(l10n_util::GetStringUTF8(
IDS_PAGE_INFO_SECURITY_TAB_UNKNOWN_PARTY));
}
- site_identity_details_.assign(l10n_util::GetStringFUTF16(
- IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY, issuer_name));
+ site_identity_details_.assign(l10n_util::GetStringFUTF8(
+ IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY,
+ UTF8ToUTF16(issuer_name)));
}
} else {
// HTTP or HTTPS with errors (not warnings).
- site_identity_details_.assign(l10n_util::GetStringUTF16(
+ site_identity_details_.assign(l10n_util::GetStringUTF8(
IDS_PAGE_INFO_SECURITY_TAB_INSECURE_IDENTITY));
if (ssl.security_style == content::SECURITY_STYLE_UNAUTHENTICATED)
site_identity_status_ = SITE_IDENTITY_STATUS_NO_CERT;
else
site_identity_status_ = SITE_IDENTITY_STATUS_ERROR;
- const string16 bullet = UTF8ToUTF16("\n • ");
+ const std::string bullet = "\n • ";
std::vector<SSLErrorInfo> errors;
SSLErrorInfo::GetErrorsForCertStatus(ssl.cert_id, ssl.cert_status,
url, &errors);
for (size_t i = 0; i < errors.size(); ++i) {
site_identity_details_ += bullet;
- site_identity_details_ += errors[i].short_description();
+ site_identity_details_ += UTF16ToUTF8(errors[i].short_description());
}
if (ssl.cert_status & net::CERT_STATUS_NON_UNIQUE_NAME) {
- site_identity_details_ += ASCIIToUTF16("\n\n");
- site_identity_details_ += l10n_util::GetStringUTF16(
+ site_identity_details_ += "\n\n";
+ site_identity_details_ += l10n_util::GetStringUTF8(
IDS_PAGE_INFO_SECURITY_TAB_NON_UNIQUE_NAME);
}
}
@@ -249,28 +251,28 @@ void WebsiteSettings::Init(Profile* profile,
else
site_connection_status_ = SITE_CONNECTION_STATUS_ENCRYPTED_ERROR;
- site_connection_details_.assign(l10n_util::GetStringFUTF16(
+ site_connection_details_.assign(l10n_util::GetStringFUTF8(
IDS_PAGE_INFO_SECURITY_TAB_NOT_ENCRYPTED_CONNECTION_TEXT,
- subject_name));
+ UTF8ToUTF16(subject_name)));
} else if (ssl.security_bits < 0) {
// Security strength is unknown. Say nothing.
site_connection_status_ = SITE_CONNECTION_STATUS_ENCRYPTED_ERROR;
} else if (ssl.security_bits == 0) {
DCHECK_NE(ssl.security_style, content::SECURITY_STYLE_UNAUTHENTICATED);
site_connection_status_ = SITE_CONNECTION_STATUS_ENCRYPTED_ERROR;
- site_connection_details_.assign(l10n_util::GetStringFUTF16(
+ site_connection_details_.assign(l10n_util::GetStringFUTF8(
IDS_PAGE_INFO_SECURITY_TAB_NOT_ENCRYPTED_CONNECTION_TEXT,
- subject_name));
+ UTF8ToUTF16(subject_name)));
} else if (ssl.security_bits < 80) {
site_connection_status_ = SITE_CONNECTION_STATUS_ENCRYPTED_ERROR;
- site_connection_details_.assign(l10n_util::GetStringFUTF16(
+ site_connection_details_.assign(l10n_util::GetStringFUTF8(
IDS_PAGE_INFO_SECURITY_TAB_WEAK_ENCRYPTION_CONNECTION_TEXT,
- subject_name));
+ UTF8ToUTF16(subject_name)));
} else {
site_connection_status_ = SITE_CONNECTION_STATUS_ENCRYPTED;
- site_connection_details_.assign(l10n_util::GetStringFUTF16(
+ site_connection_details_.assign(l10n_util::GetStringFUTF8(
IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_CONNECTION_TEXT,
- subject_name,
+ UTF8ToUTF16(subject_name),
base::IntToString16(ssl.security_bits)));
if (ssl.content_status) {
bool ran_insecure_content =
@@ -278,9 +280,9 @@ void WebsiteSettings::Init(Profile* profile,
site_connection_status_ = ran_insecure_content ?
SITE_CONNECTION_STATUS_ENCRYPTED_ERROR
: SITE_CONNECTION_STATUS_MIXED_CONTENT;
- site_connection_details_.assign(l10n_util::GetStringFUTF16(
+ site_connection_details_.assign(l10n_util::GetStringFUTF8(
IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_SENTENCE_LINK,
- site_connection_details_,
+ UTF8ToUTF16(site_connection_details_),
l10n_util::GetStringUTF16(ran_insecure_content ?
IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_INSECURE_CONTENT_ERROR :
IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_INSECURE_CONTENT_WARNING)));
@@ -294,8 +296,8 @@ void WebsiteSettings::Init(Profile* profile,
net::SSLConnectionStatusToVersion(ssl.connection_status);
const char* ssl_version_str;
net::SSLVersionToString(&ssl_version_str, ssl_version);
- site_connection_details_ += ASCIIToUTF16("\n\n");
- site_connection_details_ += l10n_util::GetStringFUTF16(
+ site_connection_details_ += "\n\n";
+ site_connection_details_ += l10n_util::GetStringFUTF8(
IDS_PAGE_INFO_SECURITY_TAB_SSL_VERSION,
ASCIIToUTF16(ssl_version_str));
@@ -307,22 +309,22 @@ void WebsiteSettings::Init(Profile* profile,
const char *key_exchange, *cipher, *mac;
net::SSLCipherSuiteToStrings(&key_exchange, &cipher, &mac, cipher_suite);
- site_connection_details_ += ASCIIToUTF16("\n\n");
- site_connection_details_ += l10n_util::GetStringFUTF16(
+ site_connection_details_ += "\n\n";
+ site_connection_details_ += l10n_util::GetStringFUTF8(
IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTION_DETAILS,
ASCIIToUTF16(cipher), ASCIIToUTF16(mac), ASCIIToUTF16(key_exchange));
- site_connection_details_ += ASCIIToUTF16("\n\n");
+ site_connection_details_ += "\n\n";
uint8 compression_id =
net::SSLConnectionStatusToCompression(ssl.connection_status);
if (compression_id) {
const char* compression;
net::SSLCompressionToString(&compression, compression_id);
- site_connection_details_ += l10n_util::GetStringFUTF16(
+ site_connection_details_ += l10n_util::GetStringFUTF8(
IDS_PAGE_INFO_SECURITY_TAB_COMPRESSION_DETAILS,
- ASCIIToUTF16(compression));
+ UTF8ToUTF16(compression));
} else {
- site_connection_details_ += l10n_util::GetStringUTF16(
+ site_connection_details_ += l10n_util::GetStringUTF8(
IDS_PAGE_INFO_SECURITY_TAB_NO_COMPRESSION);
}
@@ -330,13 +332,13 @@ void WebsiteSettings::Init(Profile* profile,
// For now, only SSLv3 fallback will trigger a warning icon.
if (site_connection_status_ < SITE_CONNECTION_STATUS_MIXED_CONTENT)
site_connection_status_ = SITE_CONNECTION_STATUS_MIXED_CONTENT;
- site_connection_details_ += ASCIIToUTF16("\n\n");
- site_connection_details_ += l10n_util::GetStringUTF16(
+ site_connection_details_ += "\n\n";
+ site_connection_details_ += l10n_util::GetStringUTF8(
IDS_PAGE_INFO_SECURITY_TAB_FALLBACK_MESSAGE);
}
if (no_renegotiation) {
- site_connection_details_ += ASCIIToUTF16("\n\n");
- site_connection_details_ += l10n_util::GetStringUTF16(
+ site_connection_details_ += "\n\n";
+ site_connection_details_ += l10n_util::GetStringUTF8(
IDS_PAGE_INFO_SECURITY_TAB_RENEGOTIATION_MESSAGE);
}
}
@@ -414,7 +416,7 @@ void WebsiteSettings::Show(gfx::NativeWindow parent,
// The WebsiteSettingsModel will delete itself after the UI is closed.
new WebsiteSettings(new WebsiteSettingsPopupGtk(parent,
profile,
- tab_contents_wrapper),
+ tab_contents_wrapper),
profile,
url,
ssl,
« no previous file with comments | « chrome/browser/website_settings.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698