diff options
Diffstat (limited to 'chromium/ui/views/widget/monitor_win.cc')
| -rw-r--r-- | chromium/ui/views/widget/monitor_win.cc | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/chromium/ui/views/widget/monitor_win.cc b/chromium/ui/views/widget/monitor_win.cc index 1292692d9f3..1220671beb8 100644 --- a/chromium/ui/views/widget/monitor_win.cc +++ b/chromium/ui/views/widget/monitor_win.cc @@ -4,10 +4,9 @@ #include "ui/views/widget/monitor_win.h" -#include <shellapi.h> +#include <windows.h> #include "base/logging.h" -#include "base/win/win_util.h" #include "ui/gfx/rect.h" namespace views { @@ -16,24 +15,12 @@ gfx::Rect GetMonitorBoundsForRect(const gfx::Rect& rect) { RECT p_rect = rect.ToRECT(); HMONITOR monitor = MonitorFromRect(&p_rect, MONITOR_DEFAULTTONEAREST); if (monitor) { - MONITORINFO mi = {0}; - mi.cbSize = sizeof(mi); - base::win::GetMonitorInfoWrapper(monitor, &mi); + MONITORINFO mi = { sizeof(MONITORINFO) }; + GetMonitorInfo(monitor, &mi); return gfx::Rect(mi.rcWork); } NOTREACHED(); return gfx::Rect(); } -HWND GetTopmostAutoHideTaskbarForEdge(UINT edge, HMONITOR monitor) { - // NOTE: this may be invoked on a background thread. - APPBARDATA taskbar_data = { sizeof(APPBARDATA), NULL, 0, edge }; - HWND taskbar = reinterpret_cast<HWND>(SHAppBarMessage(ABM_GETAUTOHIDEBAR, - &taskbar_data)); - return (::IsWindow(taskbar) && (monitor != NULL) && - (MonitorFromWindow(taskbar, MONITOR_DEFAULTTONULL) == monitor) && - (GetWindowLong(taskbar, GWL_EXSTYLE) & WS_EX_TOPMOST)) ? - taskbar : NULL; -} - } // namespace views |