Remove GetMonitorInfoWrapper, which is no longer needed.

We always use ASH on Windows, so the code in the wrapper does not have any effect. This removes the wrapper and updates the callers to use the unwrapped Windows API verison.

R=shrikant@chromium.org
BUG=247430

Review URL: https://codereview.chromium.org/137353002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247204 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 12 insertions, 12 deletions

diff --git a/ui/gfx/screen_win.cc b/ui/gfx/screen_win.cc
index 2a03d65..d207db0 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();
diff --git a/ui/gfx/win/hwnd_util.cc b/ui/gfx/win/hwnd_util.cc
index 4f06066..a986e66 100644
--- a/ui/gfx/win/hwnd_util.cc
+++ b/ui/gfx/win/hwnd_util.cc
@@ -24,7 +24,7 @@ void AdjustWindowToFit(HWND hwnd, const RECT& bounds, bool fit_to_monitor) {
     if (hmon) {
       MONITORINFO mi;
       mi.cbSize = sizeof(mi);
-      base::win::GetMonitorInfoWrapper(hmon, &mi);
+      GetMonitorInfo(hmon, &mi);
       Rect window_rect(bounds);
       Rect monitor_rect(mi.rcWork);
       Rect new_window_rect = window_rect;
@@ -150,7 +150,7 @@ void CenterAndSizeWindow(HWND parent,
     if (monitor) {
       MONITORINFO mi = {0};
       mi.cbSize = sizeof(mi);
-      base::win::GetMonitorInfoWrapper(monitor, &mi);
+      GetMonitorInfo(monitor, &mi);
       center_bounds = mi.rcWork;
     } else {
       NOTREACHED() << "Unable to get default monitor";
diff --git a/ui/views/widget/monitor_win.cc b/ui/views/widget/monitor_win.cc
index 1292692..2c6d830 100644
--- a/ui/views/widget/monitor_win.cc
+++ b/ui/views/widget/monitor_win.cc
@@ -18,7 +18,7 @@ gfx::Rect GetMonitorBoundsForRect(const gfx::Rect& rect) {
   if (monitor) {
     MONITORINFO mi = {0};
     mi.cbSize = sizeof(mi);
-    base::win::GetMonitorInfoWrapper(monitor, &mi);
+    GetMonitorInfo(monitor, &mi);
     return gfx::Rect(mi.rcWork);
   }
   NOTREACHED();
diff --git a/ui/views/win/fullscreen_handler.cc b/ui/views/win/fullscreen_handler.cc
index 2fe8cea..a6f5156 100644
--- a/ui/views/win/fullscreen_handler.cc
+++ b/ui/views/win/fullscreen_handler.cc
@@ -76,8 +76,8 @@ void FullscreenHandler::SetFullscreenImpl(bool fullscreen, bool for_metro) {
     if (!for_metro) {
       MONITORINFO monitor_info;
       monitor_info.cbSize = sizeof(monitor_info);
-      base::win::GetMonitorInfoWrapper(
-          MonitorFromWindow(hwnd_, MONITOR_DEFAULTTONEAREST), &monitor_info);
+      GetMonitorInfo(MonitorFromWindow(hwnd_, MONITOR_DEFAULTTONEAREST),
+                     &monitor_info);
       gfx::Rect window_rect(monitor_info.rcMonitor);
       SetWindowPos(hwnd_, NULL, window_rect.x(), window_rect.y(),
                    window_rect.width(), window_rect.height(),
diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
index 5a4e0a8..db8d0cb 100644
--- a/ui/views/win/hwnd_message_handler.cc
+++ b/ui/views/win/hwnd_message_handler.cc
@@ -186,7 +186,7 @@ bool GetMonitorAndRects(const RECT& rect,
     return false;
   MONITORINFO monitor_info = { 0 };
   monitor_info.cbSize = sizeof(monitor_info);
-  base::win::GetMonitorInfoWrapper(*monitor, &monitor_info);
+  GetMonitorInfo(*monitor, &monitor_info);
   *monitor_rect = gfx::Rect(monitor_info.rcMonitor);
   *work_area = gfx::Rect(monitor_info.rcWork);
   return true;
@@ -550,7 +550,7 @@ void HWNDMessageHandler::GetWindowPlacement(
     } else {
       MONITORINFO mi;
       mi.cbSize = sizeof(mi);
-      const bool succeeded = base::win::GetMonitorInfoWrapper(
+      const bool succeeded = GetMonitorInfo(
           MonitorFromWindow(hwnd(), MONITOR_DEFAULTTONEAREST), &mi) != 0;
       DCHECK(succeeded);
 
@@ -1168,7 +1168,7 @@ void HWNDMessageHandler::ResetWindowRegion(bool force, bool redraw) {
     HMONITOR monitor = MonitorFromWindow(hwnd(), MONITOR_DEFAULTTONEAREST);
     MONITORINFO mi;
     mi.cbSize = sizeof mi;
-    base::win::GetMonitorInfoWrapper(monitor, &mi);
+    GetMonitorInfo(monitor, &mi);
     CRect work_rect = mi.rcWork;
     work_rect.OffsetRect(-window_rect.left, -window_rect.top);
     new_region = CreateRectRgnIndirect(&work_rect);