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

Unified Diff: chrome/browser/ui/views/chrome_views_delegate.cc

Issue 1462373003: Fix for a long standing bug in Chrome windows with the auto hide taskbar. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/chrome_views_delegate.cc
diff --git a/chrome/browser/ui/views/chrome_views_delegate.cc b/chrome/browser/ui/views/chrome_views_delegate.cc
index f7efbac74c2e794339c6c16fdd2d4b342eb54fb0..72c1ad7d33d019e3d651aada20331c13df1bc009 100644
--- a/chrome/browser/ui/views/chrome_views_delegate.cc
+++ b/chrome/browser/ui/views/chrome_views_delegate.cc
@@ -90,6 +90,7 @@ PrefService* GetPrefsForWindow(const views::Widget* window) {
#if defined(OS_WIN)
bool MonitorHasTopmostAutohideTaskbarForEdge(UINT edge, HMONITOR monitor) {
APPBARDATA taskbar_data = { sizeof(APPBARDATA), NULL, 0, edge };
+ taskbar_data.hWnd = ::GetForegroundWindow();
// TODO(robliao): Remove ScopedTracker below once crbug.com/462368 is fixed.
tracked_objects::ScopedTracker tracking_profile(
@@ -101,12 +102,31 @@ bool MonitorHasTopmostAutohideTaskbarForEdge(UINT edge, HMONITOR monitor) {
// idea for multi-monitor systems. Unfortunately, it appears to not work at
// least some of the time (erroneously returning NULL) and there's almost no
// online documentation or other sample code using it that suggests ways to
- // address this problem. So we just use ABM_GETAUTOHIDEBAR and hope the user
- // only cares about autohide bars on the monitor with the primary taskbar.
- //
+ // address this problem. We do the following:-
+ // 1. Use the ABM_GETAUTOHIDEBAR message. If it works, i.e. returns a valid
+ // window we are done.
+ // 2. If the ABM_GETAUTOHIDEBAR message does not work we query the auto hide
+ // state of the taskbar and then retrieve its position. That call returns
+ // the edge on which the taskbar is present. If it matches the edge we
+ // are looking for, we are done.
// NOTE: This call spins a nested message loop.
HWND taskbar = reinterpret_cast<HWND>(SHAppBarMessage(ABM_GETAUTOHIDEBAR,
&taskbar_data));
+ if (!::IsWindow(taskbar)) {
+ APPBARDATA taskbar_data = { sizeof(APPBARDATA), 0, 0, 0};
+ unsigned int taskbar_state = SHAppBarMessage(ABM_GETSTATE,
sky 2015/11/22 15:57:19 All these ole function calls make me nervous that
ananta 2015/11/23 19:10:44 Please see below. The function GetAppbarAutohideEd
+ &taskbar_data);
+ if (!(taskbar_state & ABS_AUTOHIDE))
+ return false;
+
+ taskbar_data.hWnd = ::FindWindow(L"Shell_TrayWnd", NULL);
+ if (!::IsWindow(taskbar_data.hWnd))
+ return false;
+
+ SHAppBarMessage(ABM_GETTASKBARPOS, &taskbar_data);
+ if (taskbar_data.uEdge == edge)
+ taskbar = taskbar_data.hWnd;
+ }
return ::IsWindow(taskbar) &&
(MonitorFromWindow(taskbar, MONITOR_DEFAULTTONULL) == monitor) &&
(GetWindowLong(taskbar, GWL_EXSTYLE) & WS_EX_TOPMOST);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698