Fix the positioning of the TryChromeDialog when the taskbar is hidden.

chrome/browser/first_run/try_chrome_dialog_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/first_run/try_chrome_dialog_view.h"
 
 #include <shellapi.h>
 
 #include "base/logging.h"
 #include "base/macros.h"
@@ skipping 261 matching lines @@
 
   // We resize the window according to the layout manager. This takes into
   // account the differences between XP and Vista fonts and buttons.
   layout->Layout(root_view);
   gfx::Size preferred = layout->GetPreferredSize(root_view);
   if (separator) {
     int separator_height = separator->GetPreferredSize().height();
     separator->SetSize(gfx::Size(preferred.width(), separator_height));
   }
 
-  gfx::Rect pos = ComputeWindowPosition(preferred.width(), preferred.height(),
-                                        base::i18n::IsRTL());
+  gfx::Rect pos = ComputeWindowPosition(preferred, base::i18n::IsRTL());
   popup_->SetBounds(pos);
 
   // Carve the toast shape into the window.
   HWND toast_window;
   toast_window = popup_->GetNativeView()->GetHost()->GetAcceleratedWidget();
   SetToastRegion(toast_window, preferred.width(), preferred.height());
 
   // Time to show the window in a modal loop.
   popup_->Show();
   if (!listener.is_null())
     listener.Run(popup_->GetNativeView());
   base::RunLoop().Run();
   if (!listener.is_null())
     listener.Run(NULL);
   return result_;
 }
 
-gfx::Rect TryChromeDialogView::ComputeWindowPosition(int width,
-                                                     int height,
+gfx::Rect TryChromeDialogView::ComputeWindowPosition(gfx::Size size,
                                                      bool is_RTL) {
-  // The 'Shell_TrayWnd' is the taskbar. We like to show our window in that
-  // monitor if we can. This code works even if such window is not found.
-  HWND taskbar = ::FindWindowW(L"Shell_TrayWnd", NULL);
-  HMONITOR monitor = ::MonitorFromWindow(taskbar, MONITOR_DEFAULTTOPRIMARY);
+  // A best guess at a visible location in case all else fails.
+  gfx::Point origin(20, 20);
+
+  // The taskbar (the 'Shell_TrayWnd' window) is always on the primary monitor.
+  constexpr POINT kOrigin = {};
   MONITORINFO info = {sizeof(info)};
-  if (!GetMonitorInfoW(monitor, &info)) {
-    // Quite unexpected. Do a best guess at a visible rectangle.
-    return gfx::Rect(20, 20, width + 20, height + 20);
+  if (::GetMonitorInfo(::MonitorFromPoint(kOrigin, MONITOR_DEFAULTTOPRIMARY),
+                       &info)) {
+    // |rcWork| is the work area, accounting for the visible taskbars.
+    origin.set_x(is_RTL ? info.rcWork.left : info.rcWork.right - size.width());
+    origin.set_y(info.rcWork.bottom - size.height());
   }
-  // The |rcWork| is the work area. It should account for the taskbars that
-  // are in the screen when we called the function.
-  int left = is_RTL ? info.rcWork.left : info.rcWork.right - width;
-  int top = info.rcWork.bottom - height;
-  return gfx::Rect(left, top, width, height);
+
+  return gfx::Rect(origin, size);
 }
 
 void TryChromeDialogView::SetToastRegion(HWND window, int w, int h) {
   static const POINT polygon[] = {
     {0,   4}, {1,   2}, {2,   1}, {4, 0},   // Left side.
     {w-4, 0}, {w-2, 1}, {w-1, 2}, {w, 4},   // Right side.
     {w, h}, {0, h}
   };
   HRGN region = ::CreatePolygonRgn(polygon, arraysize(polygon), WINDING);
   ::SetWindowRgn(window, region, FALSE);
@@ skipping 36 matching lines @@
         result_ = TRY_CHROME_AS_DEFAULT;
   }
 
   popup_->Close();
   base::MessageLoop::current()->QuitWhenIdle();
 }
 
 void TryChromeDialogView::LinkClicked(views::Link* source, int event_flags) {
   ::ShellExecuteW(NULL, L"open", kHelpCenterUrl, NULL, NULL, SW_SHOW);
 }