chrome/browser/ui/cocoa/download/download_item_cell.mm - Issue 8392017: Change string16 to std::string in the gfx::Font() interface.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/cocoa/download/download_item_cell.mm

Issue 8392017: Change string16 to std::string in the gfx::Font() interface. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Add 'UTF-8' everywhere in the comments 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:

Index: chrome/browser/ui/cocoa/download/download_item_cell.mm

diff --git a/chrome/browser/ui/cocoa/download/download_item_cell.mm b/chrome/browser/ui/cocoa/download/download_item_cell.mm

index a7ffa34413f98a9250dcafeb572f3d4de183af31..793d805dfeee8349640e84100d789452c4395571 100644

--- a/chrome/browser/ui/cocoa/download/download_item_cell.mm

+++ b/chrome/browser/ui/cocoa/download/download_item_cell.mm

@@ -336,7 +336,7 @@ const int kInterruptedAnimationDuration = 2.5;

- (NSString*)elideTitle:(int)availableWidth {

NSFont* font = [self font];

- gfx::Font font_chr(base::SysNSStringToUTF16([font fontName]),

+ gfx::Font font_chr(base::SysNSStringToUTF8([font fontName]),

[font pointSize]);

return base::SysUTF16ToNSString(

@@ -345,7 +345,7 @@ const int kInterruptedAnimationDuration = 2.5;

- (NSString*)elideStatus:(int)availableWidth {

NSFont* font = [self secondaryFont];

- gfx::Font font_chr(base::SysNSStringToUTF16([font fontName]),

+ gfx::Font font_chr(base::SysNSStringToUTF8([font fontName]),

[font pointSize]);

return base::SysUTF16ToNSString(ui::ElideText(