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

Unified Diff: chrome/browser/extensions/api/proxy/proxy_api_helpers.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/enumerate_modules_model_win.cc ('k') | chrome/browser/extensions/external_pref_loader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/proxy/proxy_api_helpers.cc
diff --git a/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc b/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc
index 2961a2c23db8cc31374d021d41fbf86f61a2042e..e7c11742a602fd7af139cc0317a0fd6a7b54abad 100644
--- a/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc
+++ b/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc
@@ -117,7 +117,7 @@ bool GetPacUrlFromExtensionPref(const base::DictionaryValue* proxy_config,
"(encode URLs in Punycode format).";
return false;
}
- *out = UTF16ToASCII(pac_url16);
+ *out = base::UTF16ToASCII(pac_url16);
return true;
}
@@ -142,7 +142,7 @@ bool GetPacDataFromExtensionPref(const base::DictionaryValue* proxy_config,
"(encode URLs in Punycode format).";
return false;
}
- *out = UTF16ToASCII(pac_data16);
+ *out = base::UTF16ToASCII(pac_data16);
return true;
}
@@ -176,7 +176,7 @@ bool GetProxyServer(const base::DictionaryValue* proxy_server,
base::UTF16ToUTF8(host16));
return false;
}
- std::string host = UTF16ToASCII(host16);
+ std::string host = base::UTF16ToASCII(host16);
int port; // optional.
if (!proxy_server->GetInteger(keys::kProxyConfigRulePort, &port))
@@ -277,7 +277,7 @@ bool JoinUrlList(const base::ListValue* list,
"(encode URLs in Punycode format).";
return false;
}
- result.append(UTF16ToASCII(entry));
+ result.append(base::UTF16ToASCII(entry));
}
*out = result;
return true;
« no previous file with comments | « chrome/browser/enumerate_modules_model_win.cc ('k') | chrome/browser/extensions/external_pref_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698