summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbattre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-11 16:19:43 +0000
committerbattre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-11 16:19:43 +0000
commit2143216d0f3858e34d8057473002df126c11c133 (patch)
treefc76b0cc0c6dc8c4841fafff4410a3edb1a37b68
parent2d78c59ddfd18d10a62d6c5356ebb51ba62a6513 (diff)
downloadchromium_src-2143216d0f3858e34d8057473002df126c11c133.zip
chromium_src-2143216d0f3858e34d8057473002df126c11c133.tar.gz
chromium_src-2143216d0f3858e34d8057473002df126c11c133.tar.bz2
Fix windows browser_test failing due to UTF16 issue.
BUG=82278,23581 TEST=no TBR=evan git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84987 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/ui/views/shell_dialogs_win.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/ui/views/shell_dialogs_win.cc b/chrome/browser/ui/views/shell_dialogs_win.cc
index ff7b794..4f1692b 100644
--- a/chrome/browser/ui/views/shell_dialogs_win.cc
+++ b/chrome/browser/ui/views/shell_dialogs_win.cc
@@ -143,9 +143,10 @@ std::wstring FormatFilterForExtensions(
// based on the unknown extension type (i.e. if the extension is .qqq,
// the we create a description "QQQ File (.qqq)").
include_all_files = true;
- desc = l10n_util::GetStringFUTF16(IDS_APP_SAVEAS_EXTENSION_FORMAT,
- base::i18n::ToUpper(ext_name),
- ext_name);
+ desc = l10n_util::GetStringFUTF16(
+ IDS_APP_SAVEAS_EXTENSION_FORMAT,
+ base::i18n::ToUpper(WideToUTF16(ext_name)),
+ ext_name);
}
if (desc.empty())
desc = L"*." + ext_name;