Fix system menu positioning a bit. In Aero glass, the maximized mode menu wa...

chrome/browser/views/frame/aero_glass_non_client_view.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 "chrome/browser/views/frame/aero_glass_non_client_view.h"
 
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/views/tabs/tab_strip.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/views/client_view.h"
@@ skipping 133 matching lines @@
     int width,
     int height) const {
   int border_thickness = NonClientBorderThickness();
   return gfx::Size(width + (2 * border_thickness),
                    height + NonClientTopBorderHeight() + border_thickness);
 }
 
 gfx::Point AeroGlassNonClientView::GetSystemMenuPoint() const {
   gfx::Point system_menu_point;
   if (browser_view_->IsTabStripVisible()) {
-    system_menu_point.SetPoint(
-        NonClientBorderThickness() - kClientEdgeThickness,
-        NonClientTopBorderHeight() + browser_view_->GetTabStripHeight());
+    // The maximized mode bit here 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),
+        NonClientTopBorderHeight() + browser_view_->GetTabStripHeight() -
+        kClientEdgeThickness);
   } else {
     system_menu_point.SetPoint(0, -kFrameShadowThickness);
   }
   ConvertPointToScreen(this, &system_menu_point);
   return system_menu_point;
 }
 
 int AeroGlassNonClientView::NonClientHitTest(const gfx::Point& point) {
   // If we don't have a tabstrip, we haven't customized the frame, so Windows
   // can figure this out.  If the point isn't within our bounds, then it's in
@@ skipping 181 matching lines @@
 
 #if defined(GOOGLE_CHROME_BUILD)
     distributor_logo_ = ResourceBundle::GetSharedInstance().
         GetBitmapNamed(IDR_DISTRIBUTOR_LOGO);
 #endif
 
     initialized = true;
   }
 }