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

Unified Diff: views/drag_utils.cc

Issue 8373016: views: Change the remaining std::wstring entries to string16. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 2 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: views/drag_utils.cc
diff --git a/views/drag_utils.cc b/views/drag_utils.cc
index 7d417c2948ee0423b9081f8fea699acc64f60239..fa6c9a06a20e07b59f88c9fc05041c9334e6cf9a 100644
--- a/views/drag_utils.cc
+++ b/views/drag_utils.cc
@@ -74,7 +74,7 @@ void CreateDragImageForFile(const FilePath& file_name,
// Paint the icon.
canvas.DrawBitmapInt(*icon, (width - icon->width()) / 2, 0);
- std::wstring name = UTF16ToWide(file_name.BaseName().LossyDisplayName());
+ string16 name = file_name.BaseName().LossyDisplayName();
#if defined(OS_WIN)
// Paint the file name. We inset it one pixel to allow room for the halo.
canvas.DrawStringWithHalo(name, font, kFileDragImageTextColor, SK_ColorWHITE,
@@ -82,7 +82,7 @@ void CreateDragImageForFile(const FilePath& file_name,
width - 2, font.GetHeight(),
gfx::Canvas::TEXT_ALIGN_CENTER);
#else
- canvas.DrawStringInt(WideToUTF16Hack(name), font, kFileDragImageTextColor,
+ canvas.DrawStringInt(name, font, kFileDragImageTextColor,
0, icon->height() + kLinkDragImageVPadding,
width, font.GetHeight(), gfx::Canvas::TEXT_ALIGN_CENTER);
#endif

Powered by Google App Engine
This is Rietveld 408576698