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

Unified Diff: chrome/browser/extensions/external_registry_loader_win.cc

Issue 176843022: Move UTF16ToASCII, remove WideToASCII. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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/extensions/external_pref_loader.cc ('k') | chrome/browser/file_select_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/external_registry_loader_win.cc
diff --git a/chrome/browser/extensions/external_registry_loader_win.cc b/chrome/browser/extensions/external_registry_loader_win.cc
index ed8e2c08c74804c08c2d834acb0f7edf00610c63..d988f49bc90e0c10e91d3e9982350eefb3f15c52 100644
--- a/chrome/browser/extensions/external_registry_loader_win.cc
+++ b/chrome/browser/extensions/external_registry_loader_win.cc
@@ -86,7 +86,7 @@ void ExternalRegistryLoader::LoadOnFileThread() {
}
}
- std::string id = WideToASCII(*it);
+ std::string id = base::UTF16ToASCII(*it);
StringToLowerASCII(&id);
if (!Extension::IdIsValid(id)) {
LOG(ERROR) << "Invalid id value " << id
@@ -101,7 +101,7 @@ void ExternalRegistryLoader::LoadOnFileThread() {
== ERROR_SUCCESS) {
prefs->SetString(
id + "." + ExternalProviderImpl::kExternalUpdateUrl,
- WideToASCII(extension_update_url));
+ base::UTF16ToASCII(extension_update_url));
continue;
}
@@ -146,7 +146,7 @@ void ExternalRegistryLoader::LoadOnFileThread() {
continue;
}
- Version version(WideToASCII(extension_version));
+ Version version(base::UTF16ToASCII(extension_version));
if (!version.IsValid()) {
LOG(ERROR) << "Invalid version value " << extension_version
<< " for key " << key_path << ".";
@@ -155,7 +155,7 @@ void ExternalRegistryLoader::LoadOnFileThread() {
prefs->SetString(
id + "." + ExternalProviderImpl::kExternalVersion,
- WideToASCII(extension_version));
+ base::UTF16ToASCII(extension_version));
prefs->SetString(
id + "." + ExternalProviderImpl::kExternalCrx,
extension_path_str);
« no previous file with comments | « chrome/browser/extensions/external_pref_loader.cc ('k') | chrome/browser/file_select_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698