chrome/browser/tab_contents/render_view_host_delegate_helper.cc - Issue 6602021: web-ui settings: Standard font setting now correlates to WebKit's standard fo...

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/tab_contents/render_view_host_delegate_helper.cc

Issue 6602021: web-ui settings: Standard font setting now correlates to WebKit's standard fo... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: rebase Created 9 years, 10 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

Index: chrome/browser/tab_contents/render_view_host_delegate_helper.cc

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

--- chrome/browser/tab_contents/render_view_host_delegate_helper.cc (revision 76410)

+++ chrome/browser/tab_contents/render_view_host_delegate_helper.cc (working copy)

@@ -197,16 +197,14 @@

PrefService* prefs = profile->GetPrefs();

WebPreferences web_prefs;

+ web_prefs.standard_font_family =

+ UTF8ToUTF16(prefs->GetString(prefs::kWebKitStandardFontFamily));

web_prefs.fixed_font_family =

UTF8ToUTF16(prefs->GetString(prefs::kWebKitFixedFontFamily));

web_prefs.serif_font_family =

UTF8ToUTF16(prefs->GetString(prefs::kWebKitSerifFontFamily));

web_prefs.sans_serif_font_family =

UTF8ToUTF16(prefs->GetString(prefs::kWebKitSansSerifFontFamily));

- if (prefs->GetBoolean(prefs::kWebKitStandardFontIsSerif))

- web_prefs.standard_font_family = web_prefs.serif_font_family;

- else

- web_prefs.standard_font_family = web_prefs.sans_serif_font_family;

web_prefs.cursive_font_family =

UTF8ToUTF16(prefs->GetString(prefs::kWebKitCursiveFontFamily));

web_prefs.fantasy_font_family =

« no previous file with comments | « chrome/browser/resources/options/font_settings.js ('k') | chrome/browser/tab_contents/web_contents_unittest.cc » ('j') | no next file with comments »