For consistency, stop using the workarea coordinate in...

views/window/window_win.cc

 // Copyright (c) 2006-2008 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 "views/window/window_win.h"
 
 #include <shellapi.h>
 
 #include "app/gfx/canvas_paint.h"
 #include "app/gfx/font.h"
@@ skipping 103 matching lines @@
   WidgetWin::GetBounds(&bounds, true);
   return bounds;
 }
 
 gfx::Rect WindowWin::GetNormalBounds() const {
   // If we're in fullscreen mode, we've changed the normal bounds to the monitor
   // rect, so return the saved bounds instead.
   if (IsFullscreen())
     return gfx::Rect(saved_window_info_.window_rect);
 
-  WINDOWPLACEMENT wp;
-  wp.length = sizeof(wp);
-  const bool ret = !!GetWindowPlacement(GetNativeView(), &wp);
-  DCHECK(ret);
-  return gfx::Rect(wp.rcNormalPosition);
+  gfx::Rect bounds;
+  GetWindowBoundsAndMaximizedState(&bounds, NULL);
+  return bounds;
 }
 
 void WindowWin::SetBounds(const gfx::Rect& bounds,
                           gfx::NativeWindow other_window) {
   win_util::SetChildBounds(GetNativeView(), GetParent(), other_window, bounds,
                            kMonitorEdgePadding, 0);
 }
 
 void WindowWin::Show(int show_state) {
   ShowWindow(show_state);
@@ skipping 1143 matching lines @@
 }
 
 void WindowWin::SaveWindowPosition() {
   // The window delegate does the actual saving for us. It seems like (judging
   // by go/crash) that in some circumstances we can end up here after
   // WM_DESTROY, at which point the window delegate is likely gone. So just
   // bail.
   if (!window_delegate_)
     return;
 
-  WINDOWPLACEMENT win_placement = { 0 };
-  win_placement.length = sizeof(WINDOWPLACEMENT);
-
-  BOOL r = GetWindowPlacement(GetNativeView(), &win_placement);
-  DCHECK(r);
-
-  bool maximized = (win_placement.showCmd == SW_SHOWMAXIMIZED);
-  CRect window_bounds(win_placement.rcNormalPosition);
-  window_delegate_->SaveWindowPlacement(
-      gfx::Rect(win_placement.rcNormalPosition), maximized);
+  bool maximized;
+  gfx::Rect bounds;
+  GetWindowBoundsAndMaximizedState(&bounds, &maximized);
+  window_delegate_->SaveWindowPlacement(bounds, maximized);
 }
 
 void WindowWin::LockUpdates() {
   lock_updates_ = true;
   saved_window_style_ = GetWindowLong(GWL_STYLE);
   SetWindowLong(GWL_STYLE, saved_window_style_ & ~WS_VISIBLE);
 }
 
 void WindowWin::UnlockUpdates() {
   SetWindowLong(GWL_STYLE, saved_window_style_);
@@ skipping 45 matching lines @@
 }
 
 LRESULT WindowWin::CallDefaultNCActivateHandler(BOOL active) {
   // The DefWindowProc handling for WM_NCACTIVATE renders the classic-look
   // window title bar directly, so we need to use a redraw lock here to prevent
   // it from doing so.
   ScopedRedrawLock lock(this);
   return DefWindowProc(GetNativeView(), WM_NCACTIVATE, active, 0);
 }
 
+void WindowWin::GetWindowBoundsAndMaximizedState(gfx::Rect* bounds,
+                                                 bool* maximized) const {
+  WINDOWPLACEMENT wp;
+  wp.length = sizeof(wp);
+  const bool succeeded = !!GetWindowPlacement(GetNativeView(), &wp);
+  DCHECK(succeeded);
+
+  if (bounds != NULL) {
+    MONITORINFO mi;
+    mi.cbSize = sizeof(mi);
+    const bool succeeded = !!GetMonitorInfo(
+        MonitorFromWindow(GetNativeView(), MONITOR_DEFAULTTONEAREST), &mi);
+    DCHECK(succeeded);
+    *bounds = gfx::Rect(wp.rcNormalPosition);
+    // Convert normal position from workarea coordinates to screen coordinates.
+    bounds->Offset(mi.rcWork.left, mi.rcWork.top);
+  }
+
+  if (maximized != NULL)
+    *maximized = (wp.showCmd == SW_SHOWMAXIMIZED);
+}
+
 void WindowWin::InitClass() {
   static bool initialized = false;
   if (!initialized) {
     resize_cursors_[RC_NORMAL] = LoadCursor(NULL, IDC_ARROW);
     resize_cursors_[RC_VERTICAL] = LoadCursor(NULL, IDC_SIZENS);
     resize_cursors_[RC_HORIZONTAL] = LoadCursor(NULL, IDC_SIZEWE);
     resize_cursors_[RC_NESW] = LoadCursor(NULL, IDC_SIZENESW);
     resize_cursors_[RC_NWSE] = LoadCursor(NULL, IDC_SIZENWSE);
     initialized = true;
   }
@@ skipping 25 matching lines @@
   }
   return TRUE;
 }
 }  // namespace
 
 void Window::CloseAllSecondaryWindows() {
   EnumThreadWindows(GetCurrentThreadId(), WindowCallbackProc, 0);
 }
 
 }  // namespace views