Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(855)

Unified Diff: ui/gfx/screen_win.cc

Issue 137353002: Remove GetMonitorInfoWrapper, which is no longer needed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_win.cc ('k') | ui/gfx/win/hwnd_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/screen_win.cc
diff --git a/ui/gfx/screen_win.cc b/ui/gfx/screen_win.cc
index 2a03d65ac7fdfe8f791463f962a61cefa03cf115..d207db0fecb21cda92adfa73251049733848ba3f 100644
--- a/ui/gfx/screen_win.cc
+++ b/ui/gfx/screen_win.cc
@@ -19,7 +19,7 @@ MONITORINFOEX GetMonitorInfoForMonitor(HMONITOR monitor) {
MONITORINFOEX monitor_info;
ZeroMemory(&monitor_info, sizeof(MONITORINFOEX));
monitor_info.cbSize = sizeof(monitor_info);
- base::win::GetMonitorInfoWrapper(monitor, &monitor_info);
+ GetMonitorInfo(monitor, &monitor_info);
return monitor_info;
}
@@ -100,8 +100,8 @@ gfx::Display ScreenWin::GetDisplayNearestWindow(gfx::NativeView window) const {
MONITORINFOEX monitor_info;
monitor_info.cbSize = sizeof(monitor_info);
- base::win::GetMonitorInfoWrapper(
- MonitorFromWindow(window_hwnd, MONITOR_DEFAULTTONEAREST), &monitor_info);
+ GetMonitorInfo(MonitorFromWindow(window_hwnd, MONITOR_DEFAULTTONEAREST),
+ &monitor_info);
return GetDisplay(monitor_info);
}
@@ -111,7 +111,7 @@ gfx::Display ScreenWin::GetDisplayNearestPoint(const gfx::Point& point) const {
MONITORINFOEX mi;
ZeroMemory(&mi, sizeof(MONITORINFOEX));
mi.cbSize = sizeof(mi);
- if (monitor && base::win::GetMonitorInfoWrapper(monitor, &mi)) {
+ if (monitor && GetMonitorInfo(monitor, &mi)) {
return GetDisplay(mi);
}
return gfx::Display();
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_win.cc ('k') | ui/gfx/win/hwnd_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698