Index: ui/gfx/screen_win.cc |
diff --git a/ui/gfx/screen_win.cc b/ui/gfx/screen_win.cc |
index a115a104752411eb7d0858c9b181717b75789d8e..ae07bbe50c273ffd285da9f8c390d1b2b83cfec7 100644 |
--- a/ui/gfx/screen_win.cc |
+++ b/ui/gfx/screen_win.cc |
@@ -94,7 +94,7 @@ ScreenWin::~ScreenWin() { |
} |
bool ScreenWin::IsDIPEnabled() { |
scottmg
2014/10/23 02:42:06
I think IsDIPEnabled could be deleted, it seems to
|
- return IsInHighDPIMode(); |
+ return GetDPIScale() > 1.0; |
} |
gfx::Point ScreenWin::GetCursorScreenPoint() { |
@@ -164,7 +164,7 @@ gfx::Display ScreenWin::GetPrimaryDisplay() const { |
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()); |
} |