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

Unified Diff: chrome_frame/utils.cc

Issue 112433004: Update uses of UTF conversions in chrome_frame/, chromeos/, components/ to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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_frame/urlmon_url_request.cc ('k') | chromeos/network/network_event_log.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/utils.cc
diff --git a/chrome_frame/utils.cc b/chrome_frame/utils.cc
index 46f3f7e55cede0b1ce2e6b96f3efc6f4e06d42a4..d4d43bc0a6ad3fadd44556281e5cae9c32d37be2 100644
--- a/chrome_frame/utils.cc
+++ b/chrome_frame/utils.cc
@@ -304,7 +304,7 @@ void DisplayVersionMismatchWarning(HWND parent,
if (server_version.empty()) {
wide_server_version = SimpleResourceLoader::Get(IDS_VERSIONUNKNOWN);
} else {
- wide_server_version = ASCIIToWide(server_version);
+ wide_server_version = base::ASCIIToWide(server_version);
}
std::wstring title = SimpleResourceLoader::Get(IDS_VERSIONMISMATCH_HEADER);
std::wstring message;
@@ -900,7 +900,8 @@ HRESULT NavigateBrowserToMoniker(IUnknown* browser, IMoniker* moniker,
fragment = NULL;
}
- base::win::ScopedVariant var_url(UTF8ToWide(target_url.spec()).c_str());
+ base::win::ScopedVariant var_url(
+ base::UTF8ToWide(target_url.spec()).c_str());
hr = browser_priv->NavigateWithBindCtx(var_url.AsInput(), flags, NULL,
post_data_variant.AsInput(),
headers_var.AsInput(), bind_ctx,
@@ -1041,7 +1042,7 @@ std::wstring GetActualUrlFromMoniker(IMoniker* moniker,
moniker->GetDisplayName(bind_context, NULL, &display_name);
std::wstring moniker_url = display_name;
- GURL parsed_url(WideToUTF8(bho_url));
+ GURL parsed_url(base::WideToUTF8(bho_url));
if (!parsed_url.has_ref())
return moniker_url;
@@ -1131,7 +1132,7 @@ std::string FindReferrerFromHeaders(const wchar_t* headers,
for (int i = 0; referrer.empty() && i < arraysize(both_headers); ++i) {
if (!both_headers[i])
continue;
- std::string raw_headers_utf8 = WideToUTF8(both_headers[i]);
+ std::string raw_headers_utf8 = base::WideToUTF8(both_headers[i]);
net::HttpUtil::HeadersIterator it(raw_headers_utf8.begin(),
raw_headers_utf8.end(), "\r\n");
while (it.GetNext()) {
« no previous file with comments | « chrome_frame/urlmon_url_request.cc ('k') | chromeos/network/network_event_log.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698