Update avatar button to MD

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 16 matching lines @@
 
 namespace display {
 namespace win {
 namespace {
 
 // TODO(robliao): http://crbug.com/615514 Remove when ScreenWin usage is
 // resolved with Desktop Aura and WindowTreeHost.
 ScreenWin* g_screen_win_instance = nullptr;
 
 float GetMonitorScaleFactor(HMONITOR monitor) {
-  DCHECK(monitor);
   if (Display::HasForceDeviceScaleFactor())
     return Display::GetForcedDeviceScaleFactor();
-
-  if (base::win::IsProcessPerMonitorDpiAware()) {
-    static auto get_dpi_for_monitor_func = [](){
-      using GetDpiForMonitorPtr = decltype(::GetDpiForMonitor)*;
-      HMODULE shcore_dll = ::LoadLibrary(L"shcore.dll");
-      if (shcore_dll) {
-        return reinterpret_cast<GetDpiForMonitorPtr>(
-                   ::GetProcAddress(shcore_dll, "GetDpiForMonitor"));
-      }
-      return static_cast<GetDpiForMonitorPtr>(nullptr);
-    }();
-
-    UINT dpi_x;
-    UINT dpi_y;
-    if (get_dpi_for_monitor_func &&
-        SUCCEEDED(get_dpi_for_monitor_func(monitor, MDT_EFFECTIVE_DPI,
-                                           &dpi_x, &dpi_y))) {
-      DCHECK_EQ(dpi_x, dpi_y);
-      return GetScalingFactorFromDPI(dpi_x);
-    }
-  }
-  return GetDPIScale();
+  return ScreenWin::GetUnforcedMonitorScaleFactor(monitor);
 }
 
 std::vector<DisplayInfo> FindAndRemoveTouchingDisplayInfos(
     const DisplayInfo& ref_display_info,
     std::vector<DisplayInfo>* display_infos) {
   std::vector<DisplayInfo> touching_display_infos;
   display_infos->erase(
       std::remove_if(display_infos->begin(), display_infos->end(),
           [&touching_display_infos, ref_display_info](
               const DisplayInfo& display_info) {
@@ skipping 273 matching lines @@
     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();
 }
 
 // static
+float ScreenWin::GetUnforcedMonitorScaleFactor(HMONITOR monitor) {
+  DCHECK(monitor);
+  if (base::win::IsProcessPerMonitorDpiAware()) {
+    static auto get_dpi_for_monitor_func = []() {
+      using GetDpiForMonitorPtr = decltype(::GetDpiForMonitor)*;
+      HMODULE shcore_dll = ::LoadLibrary(L"shcore.dll");
+      if (shcore_dll) {
+        return reinterpret_cast<GetDpiForMonitorPtr>(
+            ::GetProcAddress(shcore_dll, "GetDpiForMonitor"));
+      }
+      return static_cast<GetDpiForMonitorPtr>(nullptr);
+    }();
+
+    UINT dpi_x;
+    UINT dpi_y;
+    if (get_dpi_for_monitor_func &&
+        SUCCEEDED(get_dpi_for_monitor_func(monitor, MDT_EFFECTIVE_DPI, &dpi_x,
+                                           &dpi_y))) {
+      DCHECK_EQ(dpi_x, dpi_y);
+      return GetScalingFactorFromDPI(dpi_x);
+    }
+  }
+  return GetUnforcedDeviceScaleFactor();
+}
+
+// static
 float ScreenWin::GetSystemScaleFactor() {
   return GetUnforcedDeviceScaleFactor();
 }
 
 HWND ScreenWin::GetHWNDFromNativeView(gfx::NativeView window) const {
   NOTREACHED();
   return nullptr;
 }
 
 gfx::NativeWindow ScreenWin::GetNativeWindowFromHWND(HWND hwnd) const {
@@ skipping 227 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