chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.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/bookmarks/bookmark_menu_cocoa_controller.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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc ('k') | chrome/browser/ui/cocoa/download/download_item_cell.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm

index dcfd18c15c484fdc832e0ec20fdda376b089ae60..a85468926bae3b3e81cebb31758778b85167999e 100644

--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm

+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm

@@ -28,7 +28,7 @@ const NSUInteger kMaximumMenuPixelsWide = 300;

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

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

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

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

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

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

font,