chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm - Issue 6134010: Revert 71167 - Remove wstring from gfx....

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/bookmarks/bookmark_menu_cocoa_controller.mm

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:

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm

===================================================================

--- chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm (revision 71168)

+++ chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm (working copy)

@@ -27,7 +27,7 @@

+ (NSString*)menuTitleForNode:(const BookmarkNode*)node {

NSFont* nsfont = [NSFont menuBarFontOfSize:0]; // 0 means "default"

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

+ gfx::Font font(base::SysNSStringToWide([nsfont fontName]),

static_cast<int>([nsfont pointSize]));

string16 title = gfx::ElideText(node->GetTitle(),

font,