Reland r10674, which got lost during Ben's reorg of the frame code.

I guess CalculateWindowSizeForClientSize() disappeared in that reorg?  That's the one part of the old change I can't find where to put.

BUG=8151
Review URL: http://codereview.chromium.org/39074

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10896 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 7 insertions, 7 deletions

diff --git a/chrome/browser/views/frame/glass_browser_frame_view.cc b/chrome/browser/views/frame/glass_browser_frame_view.cc
index 8ca20b0..274f561 100644
--- a/chrome/browser/views/frame/glass_browser_frame_view.cc
+++ b/chrome/browser/views/frame/glass_browser_frame_view.cc
@@ -178,14 +178,14 @@ gfx::Rect GlassBrowserFrameView::GetWindowBoundsForClientBounds(
 gfx::Point GlassBrowserFrameView::GetSystemMenuPoint() const {
   gfx::Point system_menu_point;
   if (browser_view_->IsBrowserTypeNormal()) {
-    // The maximized mode bit here is because in maximized mode there is no
-    // client edge, but in restored mode there is one, and unlike in the opaque
-    // frame we don't have a convenient function to get its coordinate (since
-    // FrameBorderThickness() won't do what we want).
+    // The X coordinate conditional is because in maximized mode the frame edge
+    // and the client edge are both offscreen, whereas in the opaque frame
+    // (where we don't do this trick) maximized windows have no client edge and
+    // only the frame edge is offscreen.
     system_menu_point.SetPoint(NonClientBorderThickness() -
-        (frame_->IsMaximized() ? 0 : kClientEdgeThickness),
+        (browser_view_->CanCurrentlyResize() ? kClientEdgeThickness : 0),
         NonClientTopBorderHeight() + browser_view_->GetTabStripHeight() -
-        kClientEdgeThickness);
+        (browser_view_->IsFullscreen() ? 0 : kClientEdgeThickness));
   } else {
     system_menu_point.SetPoint(0, -kFrameShadowThickness);
   }
diff --git a/chrome/browser/views/frame/opaque_browser_frame_view.cc b/chrome/browser/views/frame/opaque_browser_frame_view.cc
index 4e45151..03d755b 100644
--- a/chrome/browser/views/frame/opaque_browser_frame_view.cc
+++ b/chrome/browser/views/frame/opaque_browser_frame_view.cc
@@ -465,7 +465,7 @@ gfx::Rect OpaqueBrowserFrameView::GetWindowBoundsForClientBounds(
 gfx::Point OpaqueBrowserFrameView::GetSystemMenuPoint() const {
   gfx::Point system_menu_point(FrameBorderThickness(),
       NonClientTopBorderHeight() + browser_view_->GetTabStripHeight() -
-      kClientEdgeThickness);
+      (browser_view_->IsFullscreen() ? 0 : kClientEdgeThickness));
   ConvertPointToScreen(this, &system_menu_point);
   return system_menu_point;
 }