| Index: chrome/browser/renderer_preferences_util.cc
|
| diff --git a/chrome/browser/renderer_preferences_util.cc b/chrome/browser/renderer_preferences_util.cc
|
| index aa4f1c212d2f7e9270239b3d553ad439e1af4a1d..95f7aa67d14aad1f77aa326381c6965dece9e1e9 100644
|
| --- a/chrome/browser/renderer_preferences_util.cc
|
| +++ b/chrome/browser/renderer_preferences_util.cc
|
| @@ -18,6 +18,10 @@
|
| #include "content/public/common/webrtc_ip_handling_policy.h"
|
| #include "third_party/skia/include/core/SkColor.h"
|
|
|
| +#if defined(OS_LINUX)
|
| +#include "ui/base/resource/resource_bundle.h"
|
| +#endif
|
| +
|
| #if defined(OS_LINUX) || defined(OS_ANDROID)
|
| #include "ui/gfx/font_render_params.h"
|
| #endif
|
| @@ -165,6 +169,11 @@ void UpdateFromSystemSettings(content::RendererPreferences* prefs,
|
| prefs->subpixel_rendering = params.subpixel_rendering;
|
| #endif
|
|
|
| +#if defined(OS_LINUX)
|
| + prefs->system_font_family_name = ui::ResourceBundle::GetSharedInstance()
|
| + .GetFontWithDelta(0).GetFontName();
|
| +#endif
|
| +
|
| #if !defined(OS_MACOSX)
|
| prefs->plugin_fullscreen_allowed =
|
| pref_service->GetBoolean(prefs::kFullscreenAllowed);
|
|
|