Index: content/browser/renderer_host/render_view_host_impl.cc |
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc |
index d782ebeb9721680ac016e8f8c2c814b05dc723be..1b82493bce41740595f7dba6e7b44eaca830449f 100644 |
--- a/content/browser/renderer_host/render_view_host_impl.cc |
+++ b/content/browser/renderer_host/render_view_host_impl.cc |
@@ -113,8 +113,8 @@ using blink::WebPluginAction; |
namespace content { |
namespace { |
+void GetPlatformSpecificPrefs(RendererPreferences* prefs) { |
#if defined(OS_WIN) |
-void GetWindowsSpecificPrefs(RendererPreferences* prefs) { |
NONCLIENTMETRICS_XP metrics = {0}; |
base::win::GetNonClientMetrics(&metrics); |
@@ -146,8 +146,10 @@ void GetWindowsSpecificPrefs(RendererPreferences* prefs) { |
display::win::ScreenWin::GetSystemMetricsInDIP(SM_CYVSCROLL); |
prefs->arrow_bitmap_width_horizontal_scroll_bar_in_dips = |
display::win::ScreenWin::GetSystemMetricsInDIP(SM_CXHSCROLL); |
-} |
+#elif defined(OS_LINUX) |
+ prefs->system_font_family_name = gfx::Font().GetFontName(); |
#endif |
+} |
std::vector<DropData::Metadata> DropDataToMetaData(const DropData& drop_data) { |
std::vector<DropData::Metadata> metadata; |
@@ -335,9 +337,7 @@ bool RenderViewHostImpl::CreateRenderView( |
mojom::CreateViewParamsPtr params = mojom::CreateViewParams::New(); |
params->renderer_preferences = |
delegate_->GetRendererPrefs(GetProcess()->GetBrowserContext()); |
-#if defined(OS_WIN) |
- GetWindowsSpecificPrefs(¶ms->renderer_preferences); |
-#endif |
+ GetPlatformSpecificPrefs(¶ms->renderer_preferences); |
params->web_preferences = GetWebkitPreferences(); |
params->view_id = GetRoutingID(); |
params->main_frame_routing_id = main_frame_routing_id_; |
@@ -403,9 +403,7 @@ bool RenderViewHostImpl::IsRenderViewLive() const { |
void RenderViewHostImpl::SyncRendererPrefs() { |
RendererPreferences renderer_preferences = |
delegate_->GetRendererPrefs(GetProcess()->GetBrowserContext()); |
-#if defined(OS_WIN) |
- GetWindowsSpecificPrefs(&renderer_preferences); |
-#endif |
+ GetPlatformSpecificPrefs(&renderer_preferences); |
Send(new ViewMsg_SetRendererPrefs(GetRoutingID(), renderer_preferences)); |
} |