diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-12 15:16:04 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-12 15:16:04 +0000 |
| commit | b22558a183cefa554a1730188a51994504100351 (patch) | |
| tree | 1761e4f23e2e9060ff7bfa5a9026a4937d73e312 /chrome/browser/ui/cocoa/download | |
| parent | 3f891cf79f72f4768a15bfae051e08b9211ed8c3 (diff) | |
| download | chromium_src-b22558a183cefa554a1730188a51994504100351.zip chromium_src-b22558a183cefa554a1730188a51994504100351.tar.gz chromium_src-b22558a183cefa554a1730188a51994504100351.tar.bz2 | |
Revert 71167 - Remove wstring from gfx.
BUG=68882
TEST=no visible changes; all tests pass
Review URL: http://codereview.chromium.org/6121004
TBR=avi@chromium.org
Review URL: http://codereview.chromium.org/6134010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71169 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/cocoa/download')
| -rw-r--r-- | chrome/browser/ui/cocoa/download/download_item_cell.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/ui/cocoa/download/download_item_cell.mm b/chrome/browser/ui/cocoa/download/download_item_cell.mm index 586252d..db5d5fa 100644 --- a/chrome/browser/ui/cocoa/download/download_item_cell.mm +++ b/chrome/browser/ui/cocoa/download/download_item_cell.mm @@ -394,7 +394,7 @@ NSGradient* BackgroundTheme::GetNSGradient(int id) const { - (NSString*)elideTitle:(int)availableWidth { NSFont* font = [self font]; - gfx::Font font_chr(base::SysNSStringToUTF16([font fontName]), + gfx::Font font_chr(base::SysNSStringToWide([font fontName]), [font pointSize]); return base::SysUTF16ToNSString( @@ -403,7 +403,7 @@ NSGradient* BackgroundTheme::GetNSGradient(int id) const { - (NSString*)elideStatus:(int)availableWidth { NSFont* font = [self secondaryFont]; - gfx::Font font_chr(base::SysNSStringToUTF16([font fontName]), + gfx::Font font_chr(base::SysNSStringToWide([font fontName]), [font pointSize]); return base::SysUTF16ToNSString(ElideText( |