chrome/browser/chrome_content_browser_client.cc - Issue 10540022: mac: Plumbing for the emoji font.

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/chrome_content_browser_client.cc

Issue 10540022: mac: Plumbing for the emoji font. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: comments falken Created 8 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/chrome_content_browser_client.cc

diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc

index d2558b73f9b4631ed05f3a870b957c6bc147b32a..b135992bbc388ded00683d22e57baa07769ef994 100644

--- a/chrome/browser/chrome_content_browser_client.cc

+++ b/chrome/browser/chrome_content_browser_client.cc

@@ -1492,6 +1492,8 @@ void ChromeContentBrowserClient::OverrideWebkitPrefs(

&web_prefs->cursive_font_family_map);

FillFontFamilyMap(prefs, prefs::kWebKitFantasyFontFamilyMap,

&web_prefs->fantasy_font_family_map);

+ FillFontFamilyMap(prefs, prefs::kWebKitPictographFontFamilyMap,

+ &web_prefs->pictograph_font_family_map);

web_prefs->default_font_size =

prefs->GetInteger(prefs::kWebKitDefaultFontSize);