chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.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/omnibox/omnibox_popup_view_mac.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/omnibox/omnibox_popup_view_mac.mm

diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm

index 5335a34cf96799824f1a24d6f5c957d170e41df6..a6da3198960b71a36fdf9f32e001e414adcb68e2 100644

--- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm

+++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm

@@ -453,7 +453,7 @@ void OmniboxPopupViewMac::UpdatePopupAppearance() {

// The popup's font is a slightly smaller version of the field's.

NSFont* fieldFont = OmniboxViewMac::GetFieldFont();

const CGFloat resultFontSize = [fieldFont pointSize] + kEditFontAdjust;

- gfx::Font resultFont(base::SysNSStringToUTF16([fieldFont fontName]),

+ gfx::Font resultFont(base::SysNSStringToUTF8([fieldFont fontName]),

static_cast<int>(resultFontSize));

AutocompleteMatrix* matrix = GetAutocompleteMatrix();