diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-04 20:41:33 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-04 20:41:33 +0000 |
| commit | 8a205c0f534bf8e5f17a531182dee38aaacd46e6 (patch) | |
| tree | 1b1bab965f71658393dccdda1590d59711689962 /views/drag_utils.cc | |
| parent | 58023bea8fa444c4ac08c12c825dcc79b5954abe (diff) | |
| download | chromium_src-8a205c0f534bf8e5f17a531182dee38aaacd46e6.zip chromium_src-8a205c0f534bf8e5f17a531182dee38aaacd46e6.tar.gz chromium_src-8a205c0f534bf8e5f17a531182dee38aaacd46e6.tar.bz2 | |
FilePath: Remove much of ToWStringHack, adding a LossyDisplayName()
The reason we don't want a free conversion between FilePaths and Unicode
is that it can be lossy. But when displaying a string to the user,
we're ok if it's lossy when we have no other option.
This change introduces a LossyDisplayName() method that returns a
string16, and converts many of the users of ToWStringHack to use it.
BUG=69467
Review URL: http://codereview.chromium.org/6246036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73840 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/drag_utils.cc')
| -rw-r--r-- | views/drag_utils.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/views/drag_utils.cc b/views/drag_utils.cc index 23622ae..43fc3d4 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 = file_name.BaseName().ToWStringHack(); + std::wstring name = UTF16ToWide(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, |