Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / ui / views / widget / monitor_win.cc

diff --git a/src/ui/views/widget/monitor_win.cc b/src/ui/views/widget/monitor_win.cc
index 2c6d830..1220671 100644 (file)
--- a/src/ui/views/widget/monitor_win.cc
+++ b/src/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,8 +15,7 @@ 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);
+    MONITORINFO mi = { sizeof(MONITORINFO) };
     GetMonitorInfo(monitor, &mi);
     return gfx::Rect(mi.rcWork);
   }
@@ -25,15 +23,4 @@ gfx::Rect GetMonitorBoundsForRect(const gfx::Rect& rect) {
   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