Create ScreenWin::GetSystemMetricsInDIP and Correctly Deprecate display::win::GetSystemMetricsInDIP

ui/display/win/screen_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/display/win/screen_win.h"
 
 #include <windows.h>
 #include <shellscalingapi.h>
 
 #include <algorithm>
@@ skipping 299 matching lines @@
   int system_metrics_result = g_screen_win_instance->GetSystemMetrics(metric);
 
   float metrics_relative_scale_factor = hwnd
       ? GetScaleFactorForHWND(hwnd) / primary_display.device_scale_factor()
       : 1.0f;
   return static_cast<int>(std::round(
       system_metrics_result * metrics_relative_scale_factor));
 }
 
 // static
+int ScreenWin::GetSystemMetricsInDIP(int metric) {
+  if (!g_screen_win_instance)
+    return ::GetSystemMetrics(metric);
+
+  // GetSystemMetrics returns screen values based off of the primary monitor's
+  // DPI.
+  Display primary_display(g_screen_win_instance->GetPrimaryDisplay());
+  int system_metrics_result = g_screen_win_instance->GetSystemMetrics(metric);
+  return static_cast<int>(std::round(
+      system_metrics_result / primary_display.device_scale_factor()));
+}
+
+// static
 float ScreenWin::GetScaleFactorForHWND(HWND hwnd) {
   if (!g_screen_win_instance)
     return ScreenWinDisplay().display().device_scale_factor();
 
   DCHECK(hwnd);
   HWND rootHwnd = g_screen_win_instance->GetRootWindow(hwnd);
   ScreenWinDisplay screen_win_display =
       g_screen_win_instance->GetScreenWinDisplayNearestHWND(rootHwnd);
   return screen_win_display.display().device_scale_factor();
 }
@@ skipping 235 matching lines @@
     if (std::find(unique_scale_factors.begin(), unique_scale_factors.end(),
                   reported_scale) == unique_scale_factors.end()) {
       unique_scale_factors.push_back(reported_scale);
       UMA_HISTOGRAM_SPARSE_SLOWLY("UI.DeviceScale", reported_scale);
     }
   }
 }
 
 }  // namespace win
 }  // namespace display