Index: chrome/browser/views/download_tab_view.cc |
=================================================================== |
--- chrome/browser/views/download_tab_view.cc (revision 7599) |
+++ chrome/browser/views/download_tab_view.cc (working copy) |
@@ -285,7 +285,8 @@ |
ResourceBundle& rb = ResourceBundle::GetSharedInstance(); |
ChromeFont font = rb.GetFont(ResourceBundle::WebFont); |
file_name_->SetText( |
- gfx::ElideFilename(model_->GetFileName(), font, kFilenameSize)); |
+ gfx::ElideFilename(model_->GetFileName().ToWStringHack(), font, |
+ kFilenameSize)); |
gfx::Size file_name_size = file_name_->GetPreferredSize(); |
@@ -339,7 +340,7 @@ |
// File name and URL, truncated to show cancelled status |
ResourceBundle& rb = ResourceBundle::GetSharedInstance(); |
ChromeFont font = rb.GetFont(ResourceBundle::WebFont); |
- file_name_->SetText(gfx::ElideFilename(model_->GetFileName(), |
+ file_name_->SetText(gfx::ElideFilename(model_->GetFileName().ToWStringHack(), |
font, |
kFilenameSize)); |
gfx::Size file_name_size = file_name_->GetPreferredSize(); |
@@ -430,7 +431,7 @@ |
// File name and URL, truncated to show progress status |
ResourceBundle& rb = ResourceBundle::GetSharedInstance(); |
ChromeFont font = rb.GetFont(ResourceBundle::WebFont); |
- file_name_->SetText(gfx::ElideFilename(model_->GetFileName(), |
+ file_name_->SetText(gfx::ElideFilename(model_->GetFileName().ToWStringHack(), |
font, |
kFilenameSize)); |
gfx::Size file_name_size = file_name_->GetPreferredSize(); |
@@ -590,7 +591,7 @@ |
// Warning message and URL. |
std::wstring file_name; |
- ElideString(model_->original_name(), kFileNameMaxLength, &file_name); |
+ ElideString(model_->original_name().ToWStringHack(), kFileNameMaxLength, &file_name); |
dangerous_download_warning_->SetText( |
l10n_util::GetStringF(IDS_PROMPT_DANGEROUS_DOWNLOAD, file_name)); |
gfx::Size warning_size = dangerous_download_warning_->GetPreferredSize(); |
@@ -1074,7 +1075,8 @@ |
SkBitmap* DownloadTabView::LookupIcon(DownloadItem* download) { |
IconManager* im = g_browser_process->icon_manager(); |
// Fast look up. |
- SkBitmap* icon = im->LookupIcon(download->full_path(), IconLoader::NORMAL); |
+ SkBitmap* icon = im->LookupIcon(download->full_path().ToWStringHack(), |
+ IconLoader::NORMAL); |
// Expensive look up. |
if (!icon) |
@@ -1089,7 +1091,7 @@ |
void DownloadTabView::LoadIcon(DownloadItem* download) { |
IconManager* im = g_browser_process->icon_manager(); |
IconManager::Handle h = |
- im->LoadIcon(download->full_path(), IconLoader::NORMAL, |
+ im->LoadIcon(download->full_path().ToWStringHack(), IconLoader::NORMAL, |
&icon_consumer_, |
NewCallback(this, &DownloadTabView::OnExtractIconComplete)); |
icon_consumer_.SetClientData(im, h, download); |