remove IsInHighDPIMode

ui/gfx/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/gfx/screen_win.h"
 
 #include <windows.h>
 
 #include "base/hash.h"
 #include "base/logging.h"
@@ skipping 75 matching lines @@
 
 ScreenWin::ScreenWin()
     : displays_(GetDisplays()) {
   SingletonHwnd::GetInstance()->AddObserver(this);
 }
 
 ScreenWin::~ScreenWin() {
   SingletonHwnd::GetInstance()->RemoveObserver(this);
 }
 
 bool ScreenWin::IsDIPEnabled() {

[scottmg, 2014/10/23 02:42:06]

I think IsDIPEnabled could be deleted, it seems to be either NOTIMPLEMENTED or
return true everywhere. I'll do that subsequently.

-  return IsInHighDPIMode();
+  return GetDPIScale() > 1.0;
 }
 
 gfx::Point ScreenWin::GetCursorScreenPoint() {
   POINT pt;
   GetCursorPos(&pt);
   gfx::Point cursor_pos_pixels(pt);
   return gfx::win::ScreenToDIPPoint(cursor_pos_pixels);
 }
 
 gfx::NativeWindow ScreenWin::GetWindowUnderCursor() {
@@ skipping 49 matching lines @@
       &other_bounds_rect, MONITOR_DEFAULTTONEAREST));
   return GetDisplay(monitor_info);
 }
 
 gfx::Display ScreenWin::GetPrimaryDisplay() const {
   MONITORINFOEX mi = GetMonitorInfoForMonitor(
       MonitorFromWindow(NULL, MONITOR_DEFAULTTOPRIMARY));
   gfx::Display display = GetDisplay(mi);
   // TODO(kevers|girard): Test if these checks can be reintroduced for high-DIP
   // once more of the app is DIP-aware.
-  if (!(IsInHighDPIMode() || IsHighDPIEnabled())) {
+  if (!(GetDPIScale() > 1.0 || IsHighDPIEnabled())) {
     DCHECK_EQ(GetSystemMetrics(SM_CXSCREEN), display.size().width());
     DCHECK_EQ(GetSystemMetrics(SM_CYSCREEN), display.size().height());
   }
   return display;
 }
 
 void ScreenWin::AddObserver(DisplayObserver* observer) {
   change_notifier_.AddObserver(observer);
 }
 
@@ skipping 18 matching lines @@
   NOTREACHED();
   return NULL;
 }
 
 NativeWindow ScreenWin::GetNativeWindowFromHWND(HWND hwnd) const {
   NOTREACHED();
   return NULL;
 }
 
 }  // namespace gfx