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

Unified Diff: base/win/win_util.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 | « base/win/win_util.h ('k') | chrome/browser/extensions/api/system_display/display_info_provider_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/win/win_util.cc
diff --git a/base/win/win_util.cc b/base/win/win_util.cc
index 7b85418a1ea79917215a33ec5e0fc125c99fe15b..782df621882b7256b2b98ddd1d7e4f7366a25bb5 100644
--- a/base/win/win_util.cc
+++ b/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;
« no previous file with comments | « base/win/win_util.h ('k') | chrome/browser/extensions/api/system_display/display_info_provider_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698