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

Unified Diff: chrome/browser/ui/views/external_protocol_dialog.cc

Issue 12314090: Add utf_string_conversions to base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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
Index: chrome/browser/ui/views/external_protocol_dialog.cc
diff --git a/chrome/browser/ui/views/external_protocol_dialog.cc b/chrome/browser/ui/views/external_protocol_dialog.cc
index 2112377a00d142e01ac15494dbb925acc80a1c17..af59761470074a73b7525e3544c6823f810931a4 100644
--- a/chrome/browser/ui/views/external_protocol_dialog.cc
+++ b/chrome/browser/ui/views/external_protocol_dialog.cc
@@ -134,7 +134,8 @@ ExternalProtocolDialog::ExternalProtocolDialog(WebContents* web_contents,
string16 elided_command;
ui::ElideString(ASCIIToUTF16(url.possibly_invalid_spec()),
kMaxUrlWithoutSchemeSize, &elided_url_without_scheme);
- ui::ElideString(WideToUTF16Hack(command), kMaxCommandSize, &elided_command);
+ ui::ElideString(base::WideToUTF16Hack(command), kMaxCommandSize,
+ &elided_command);
string16 message_text = l10n_util::GetStringFUTF16(
IDS_EXTERNAL_PROTOCOL_INFORMATION,
@@ -171,9 +172,9 @@ std::wstring ExternalProtocolDialog::GetApplicationForProtocol(
// to disk. http://crbug.com/61996
base::ThreadRestrictions::ScopedAllowIO allow_io;
- std::wstring url_spec = ASCIIToWide(url.possibly_invalid_spec());
+ std::wstring url_spec = base::ASCIIToWide(url.possibly_invalid_spec());
std::wstring cmd_key_path =
- ASCIIToWide(url.scheme() + "\\shell\\open\\command");
+ base::ASCIIToWide(url.scheme() + "\\shell\\open\\command");
base::win::RegKey cmd_key(HKEY_CLASSES_ROOT, cmd_key_path.c_str(), KEY_READ);
size_t split_offset = url_spec.find(L':');
if (split_offset == std::wstring::npos)
« no previous file with comments | « chrome/browser/ui/views/extensions/native_app_window_views.cc ('k') | chrome/browser/ui/views/external_tab_container_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698