| Index: ui/base/win/dpi.cc
|
| ===================================================================
|
| --- ui/base/win/dpi.cc (revision 185501)
|
| +++ ui/base/win/dpi.cc (working copy)
|
| @@ -7,7 +7,6 @@
|
| #include <windows.h>
|
|
|
| #include "base/win/scoped_hdc.h"
|
| -#include "base/win/registry.h"
|
| #include "ui/gfx/display.h"
|
| #include "ui/gfx/point_conversions.h"
|
| #include "ui/gfx/rect_conversions.h"
|
| @@ -28,16 +27,6 @@
|
| #endif
|
| }
|
|
|
| -BOOL IsProcessDPIAwareWrapper() {
|
| - typedef BOOL(WINAPI *IsProcessDPIAwarePtr)(VOID);
|
| - IsProcessDPIAwarePtr is_process_dpi_aware_func =
|
| - reinterpret_cast<IsProcessDPIAwarePtr>(
|
| - GetProcAddress(GetModuleHandleA("user32.dll"), "IsProcessDPIAware"));
|
| - if (is_process_dpi_aware_func)
|
| - return is_process_dpi_aware_func();
|
| - return FALSE;
|
| -}
|
| -
|
| } // namespace
|
|
|
| namespace ui {
|
| @@ -111,28 +100,6 @@
|
| return gfx::ToFlooredSize(gfx::ScaleSize(dip_size, GetDeviceScaleFactor()));
|
| }
|
|
|
| -double GetDPIScaleFromRegistry() {
|
| - static double scale = -1.0;
|
| - if (scale == -1.0) {
|
| - double result = 1.0;
|
| - if (!IsProcessDPIAwareWrapper()) {
|
| - //HKEY_CURRENT_USER\Control Panel\Desktop\WindowMetrics\AppliedDPI
|
| - base::win::RegKey key(HKEY_CURRENT_USER,
|
| - L"Control Panel\\Desktop\\WindowMetrics",
|
| - KEY_QUERY_VALUE);
|
| -
|
| - if (key.Valid()) {
|
| - DWORD value = 0;
|
| - if (key.ReadValueDW(L"AppliedDPI", &value) == ERROR_SUCCESS) {
|
| - result = ((double)value) / kDefaultDPIX;
|
| - }
|
| - }
|
| - }
|
| - scale = result;
|
| - }
|
| - return scale;
|
| -}
|
| -
|
| } // namespace win
|
|
|
| } // namespace ui
|
|
|