chrome/browser/ui/cocoa/location_bar/ev_bubble_decoration.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/location_bar/ev_bubble_decoration.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/location_bar/ev_bubble_decoration.mm

diff --git a/chrome/browser/ui/cocoa/location_bar/ev_bubble_decoration.mm b/chrome/browser/ui/cocoa/location_bar/ev_bubble_decoration.mm

index 661dd491647c91cb7ffd5071286a5d184a56d485..fc1a971fce74e89f5dd9ae09db74fc0baa8e8663 100644

--- a/chrome/browser/ui/cocoa/location_bar/ev_bubble_decoration.mm

+++ b/chrome/browser/ui/cocoa/location_bar/ev_bubble_decoration.mm

@@ -91,7 +91,7 @@ CGFloat EVBubbleDecoration::GetWidthForSpace(CGFloat width) {

// Middle-elide the label to fit |width_left|. This leaves the

// prefix and the trailing country code in place.

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

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

[font_ pointSize]);

NSString* elided_label = base::SysUTF16ToNSString(

ui::ElideText(base::SysNSStringToUTF16(full_label_), font, width_left,