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

base/win/win_util.cc

@@ -329,33 +329,6 @@ bool DismissVirtualKeyboard() {
 
 typedef HWND (*MetroRootWindow) ();
 
-// As of this writing, GetMonitorInfo function seem to return wrong values
-// for rcWork.left and rcWork.top in case of split screen situation inside
-// metro mode. In order to get required values we query for core window screen
-// coordinates.
-// TODO(shrikant): Remove detour code once GetMonitorInfo is fixed for 8.1.
-BOOL GetMonitorInfoWrapper(HMONITOR monitor, MONITORINFO* mi) {
-  BOOL ret = ::GetMonitorInfo(monitor, mi);
-#if !defined(USE_ASH)
-  if (base::win::IsMetroProcess() &&
-      base::win::GetVersion() >= base::win::VERSION_WIN8_1) {
-    static MetroRootWindow root_window = NULL;
-    if (!root_window) {
-      HMODULE metro = base::win::GetMetroModule();
-      // There are apparently instances when current process is inside metro
-      // environment but metro driver dll is not loaded.
-      if (!metro) {
-        return ret;
-      }
-      root_window = reinterpret_cast<MetroRootWindow>(
-          ::GetProcAddress(metro, "GetRootWindow"));
-    }
-    ret = ::GetWindowRect(root_window(), &(mi->rcWork));
-  }
-#endif
-  return ret;
-}
-
 bool IsEnrolledToDomain() {
   LPWSTR domain;
   NETSETUP_JOIN_STATUS join_status;

base/win/win_util.h

@@ -126,10 +126,6 @@ BASE_EXPORT bool DisplayVirtualKeyboard();
 // above. Returns true on success.
 BASE_EXPORT bool DismissVirtualKeyboard();
 
-// Returns monitor info after correcting rcWorkArea based on metro version.
-// see bug #247430 for more details.
-BASE_EXPORT BOOL GetMonitorInfoWrapper(HMONITOR monitor, MONITORINFO* mi);
-
 // Returns true if the machine is enrolled to a domain.
 BASE_EXPORT bool IsEnrolledToDomain();
 

chrome/browser/extensions/api/system_display/display_info_provider_win.cc

@@ -31,7 +31,7 @@ BOOL CALLBACK EnumMonitorCallback(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);
 
   DISPLAY_DEVICE device;
   device.cb = sizeof(device);

chrome/browser/fullscreen_win.cc

@@ -62,7 +62,7 @@ static bool IsFullScreenWindowMode() {
   if (!monitor)
     return false;
   MONITORINFO monitor_info = { sizeof(monitor_info) };
-  if (!base::win::GetMonitorInfoWrapper(monitor, &monitor_info))
+  if (!::GetMonitorInfo(monitor, &monitor_info))
     return false;
 
   // It should be the main monitor.