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

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

Issue 6134010: Revert 71167 - Remove wstring from gfx.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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/download_item_view.cc
===================================================================
--- chrome/browser/ui/views/download_item_view.cc (revision 71168)
+++ chrome/browser/ui/views/download_item_view.cc (working copy)
@@ -515,9 +515,8 @@
SkColorGetG(file_name_color)),
static_cast<int>(kDownloadItemLuminanceMod *
SkColorGetB(file_name_color)));
- canvas->DrawStringInt(WideToUTF16Hack(status_text_), font_,
- file_name_color, mirrored_x, y, kTextWidth,
- font_.GetHeight());
+ canvas->DrawStringInt(status_text_, font_, file_name_color,
+ mirrored_x, y, kTextWidth, font_.GetHeight());
}
}
@@ -634,7 +633,7 @@
(box_height_ - font_.GetHeight()) / 2);
// Draw the file's name.
- canvas->DrawStringInt(filename, font_,
+ canvas->DrawStringInt(UTF16ToWide(filename), font_,
IsEnabled() ? file_name_color :
kFileNameDisabledColor,
mirrored_x, y, kTextWidth, font_.GetHeight());

Powered by Google App Engine
This is Rietveld 408576698