Avoid calling the GetSystemMetrics API in the renderer process on Windows to get the scrollbar metr…

chrome/browser/renderer_preferences_util.cc

Index: chrome/browser/renderer_preferences_util.cc
diff --git a/chrome/browser/renderer_preferences_util.cc b/chrome/browser/renderer_preferences_util.cc
index ce174ef34c6375bea36ef73df2423d1df201c96f..f67955e592ecf74941508ffd09b1a5e79e16c4af 100644
--- a/chrome/browser/renderer_preferences_util.cc
+++ b/chrome/browser/renderer_preferences_util.cc
@@ -34,6 +34,7 @@
 #if defined(OS_WIN)
 #include "base/win/win_util.h"
 #include "ui/gfx/platform_font_win.h"
+#include "ui/gfx/win/dpi.h"

[brucedawson, 2015/04/03 19:42:17]

Why is the only addition to this file to add a #include?

[ananta, 2015/04/03 20:16:33]

Left over from the previous patch set. Removed. I also removed the other
includes under OS_WIN as the code has moved to render_view_host_impl.cc now.

Thanks

 #endif
 
 namespace renderer_preferences_util {
@@ -121,31 +122,6 @@ void UpdateFromSystemSettings(content::RendererPreferences* prefs,
   prefs->plugin_fullscreen_allowed =
       pref_service->GetBoolean(prefs::kFullscreenAllowed);
 #endif
-
-#if defined(OS_WIN)
-  NONCLIENTMETRICS_XP metrics = {0};
-  base::win::GetNonClientMetrics(&metrics);
-
-  prefs->caption_font_family_name = metrics.lfCaptionFont.lfFaceName;
-  prefs->caption_font_height = gfx::PlatformFontWin::GetFontSize(
-      metrics.lfCaptionFont);
-
-  prefs->small_caption_font_family_name = metrics.lfSmCaptionFont.lfFaceName;
-  prefs->small_caption_font_height = gfx::PlatformFontWin::GetFontSize(
-      metrics.lfSmCaptionFont);
-
-  prefs->menu_font_family_name = metrics.lfMenuFont.lfFaceName;
-  prefs->menu_font_height = gfx::PlatformFontWin::GetFontSize(
-      metrics.lfMenuFont);
-
-  prefs->status_font_family_name = metrics.lfStatusFont.lfFaceName;
-  prefs->status_font_height = gfx::PlatformFontWin::GetFontSize(
-      metrics.lfStatusFont);
-
-  prefs->message_font_family_name = metrics.lfMessageFont.lfFaceName;
-  prefs->message_font_height = gfx::PlatformFontWin::GetFontSize(
-      metrics.lfMessageFont);
-#endif
 }
 
 }  // namespace renderer_preferences_util