Merge 246441 "Disable calls to SetProcessDPIAware under Win8.1 (..."

ui/gfx/win/dpi.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/gfx/win/dpi.h"
 
 #include <windows.h>
 #include "base/command_line.h"
 #include "base/win/scoped_hdc.h"
 #include "base/win/windows_version.h"
@@ skipping 88 matching lines @@
         switches::kHighDPISupport).compare("1") == 0;
   }
   return false;
 }
 
 bool IsInHighDPIMode() {
   return GetDPIScale() > 1.0;
 }
 
 void EnableHighDPISupport() {
-  if (IsHighDPIEnabled()) {
+  if (IsHighDPIEnabled() &&
+      (base::win::GetVersion() < base::win::VERSION_WIN8_1)) {
     typedef BOOL(WINAPI *SetProcessDPIAwarePtr)(VOID);
     SetProcessDPIAwarePtr set_process_dpi_aware_func =
         reinterpret_cast<SetProcessDPIAwarePtr>(
             GetProcAddress(GetModuleHandleA("user32.dll"),
                            "SetProcessDPIAware"));
     if (set_process_dpi_aware_func)
       set_process_dpi_aware_func();
   }
 }
 
@@ skipping 65 matching lines @@
 
 double GetUndocumentedDPITouchScale() {
   static double scale =
       (base::win::GetVersion() < base::win::VERSION_WIN8_1) ?
       GetUndocumentedDPIScale() : 1.0;
   return scale;
 }
 
 }  // namespace win
 }  // namespace gfx