Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(27)

Unified Diff: content/browser/renderer_host/render_view_host_impl.cc

Issue 2138613002: Set the font family for the "system-ui" generic font family on Linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: jochen review nit (add braces) Created 4 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/common/view_messages.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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(&params->renderer_preferences);
-#endif
+ GetPlatformSpecificPrefs(&params->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));
}
« no previous file with comments | « no previous file | content/common/view_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698