summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/download_item_view.cc
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-18 16:23:18 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-18 16:23:18 +0000
commit70edb8606702fd26565cc46fd3075bfe75f68d97 (patch)
treec2647cc5cd843c5abbc9c90bd6855bd8b0b7c674 /chrome/browser/views/download_item_view.cc
parent05672cafff847dc3beb0e29e1506bee6a5a7447e (diff)
downloadchromium_src-70edb8606702fd26565cc46fd3075bfe75f68d97.zip
chromium_src-70edb8606702fd26565cc46fd3075bfe75f68d97.tar.gz
chromium_src-70edb8606702fd26565cc46fd3075bfe75f68d97.tar.bz2
Convert GetDisplayStringInLTRDirectionality from wstring to string16.
BUG=23581 Review URL: http://codereview.chromium.org/3108027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56535 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/download_item_view.cc')
-rw-r--r--chrome/browser/views/download_item_view.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/views/download_item_view.cc b/chrome/browser/views/download_item_view.cc
index 7ceb549..7dc9d5a 100644
--- a/chrome/browser/views/download_item_view.cc
+++ b/chrome/browser/views/download_item_view.cc
@@ -15,6 +15,7 @@
#include "base/i18n/rtl.h"
#include "base/string_util.h"
#include "base/sys_string_conversions.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_theme_provider.h"
#include "chrome/browser/download/download_item_model.h"
@@ -285,7 +286,8 @@ DownloadItemView::DownloadItemView(DownloadItem* download,
} else {
ElideString(rootname, kFileNameMaxLength - extension.length(), &rootname);
std::wstring filename = rootname + L"." + extension;
- base::i18n::GetDisplayStringInLTRDirectionality(&filename);
+ filename = UTF16ToWide(base::i18n::GetDisplayStringInLTRDirectionality(
+ WideToUTF16(filename)));
dangerous_download_label_ = new views::Label(
l10n_util::GetStringF(IDS_PROMPT_DANGEROUS_DOWNLOAD, filename));
}