Index: chrome/browser/ui/views/external_protocol_dialog.cc |
=================================================================== |
--- chrome/browser/ui/views/external_protocol_dialog.cc (revision 184354) |
+++ chrome/browser/ui/views/external_protocol_dialog.cc (working copy) |
@@ -134,8 +134,7 @@ |
string16 elided_command; |
ui::ElideString(ASCIIToUTF16(url.possibly_invalid_spec()), |
kMaxUrlWithoutSchemeSize, &elided_url_without_scheme); |
- ui::ElideString(base::WideToUTF16Hack(command), kMaxCommandSize, |
- &elided_command); |
+ ui::ElideString(WideToUTF16Hack(command), kMaxCommandSize, &elided_command); |
string16 message_text = l10n_util::GetStringFUTF16( |
IDS_EXTERNAL_PROTOCOL_INFORMATION, |
@@ -172,9 +171,9 @@ |
// to disk. http://crbug.com/61996 |
base::ThreadRestrictions::ScopedAllowIO allow_io; |
- std::wstring url_spec = base::ASCIIToWide(url.possibly_invalid_spec()); |
+ std::wstring url_spec = ASCIIToWide(url.possibly_invalid_spec()); |
std::wstring cmd_key_path = |
- base::ASCIIToWide(url.scheme() + "\\shell\\open\\command"); |
+ 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) |