Fix some of the most egregious problems with Aero glass frames. These change...

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/app/theme/theme_resources.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/views/tabs/tab_strip.h"
 #include "chrome/common/gfx/chrome_canvas.h"
@@ skipping 75 matching lines @@
 SkBitmap AeroGlassWindowResources::app_top_center_;
 SkBitmap AeroGlassWindowResources::app_top_right_;
 
 AeroGlassWindowResources* AeroGlassNonClientView::resources_ = NULL;
 SkBitmap AeroGlassNonClientView::distributor_logo_;
 
 // The distance between the top of the TabStrip and the top of the non-client
 // area of the window.
 static const int kNoTitleTopSpacing = 8;
 // The width of the client edge to the left and right of the window.
-static const int kWindowHorizontalClientEdgeWidth = 2;
+static const int kWindowHorizontalClientEdgeWidth = 3;
 // The height of the client edge to the bottom of the window.
 static const int kWindowBottomClientEdgeHeight = 2;
 // The horizontal distance between the left of the minimize button and the
 // right edge of the distributor logo.
 static const int kDistributorLogoHorizontalOffset = 7;
 // The distance from the top of the non-client view and the top edge of the
 // distributor logo.
 static const int kDistributorLogoVerticalOffset = 3;
 // The distance of the TabStrip from the top of the window's client area.
-static const int kTabStripY = 14;
+static const int kTabStripY = 19;
+// How much space on the right is not used for the tab strip (to provide
+// separation between the tabs and the window controls).
+static const int kTabStripRightHorizOffset = 30;
 // A single pixel.
 static const int kPixel = 1;
 // The height of the sizing border.
 static const int kWindowSizingBorderSize = 8;
 // The size (width/height) of the window icon.
 static const int kWindowIconSize = 16;
 // The distance from the left of the window of the OTR avatar icon.
 static const int kOTRAvatarIconMargin = 9;
 // The distance from the right edge of the OTR avatar icon to the left edge of
 // the TabStrip.
@@ skipping 12 matching lines @@
                                                BrowserView* browser_view)
     : frame_(frame),
       browser_view_(browser_view) {
   InitClass();
 }
 
 AeroGlassNonClientView::~AeroGlassNonClientView() {
 }
 
 gfx::Rect AeroGlassNonClientView::GetBoundsForTabStrip(TabStrip* tabstrip) {
-  // If we are maximized, the tab strip will be in line with the window
-  // controls, so we need to make sure they don't overlap.
-  int tabstrip_width = browser_view_->width() - otr_avatar_bounds_.width() -
-      kOTRAvatarIconTabStripSpacing;
-  if(frame_->IsMaximized()) {
-    TITLEBARINFOEX titlebar_info;
-    titlebar_info.cbSize = sizeof(TITLEBARINFOEX);
-    SendMessage(frame_->GetHWND(), WM_GETTITLEBARINFOEX, 0,
-      reinterpret_cast<WPARAM>(&titlebar_info));
-    tabstrip_width = titlebar_info.rgrect[2].left;  // Edge of minimize button
-  }
-  int tabstrip_height = tabstrip->GetPreferredHeight();
-  int tabstrip_x = otr_avatar_bounds_.width() + kOTRAvatarIconTabStripSpacing;
-  int tabstrip_y = frame_->IsMaximized() ? 0 : kTabStripY;
-  return gfx::Rect(tabstrip_x, tabstrip_y, tabstrip_width, tabstrip_height);
+  int tabstrip_x = browser_view_->ShouldShowOffTheRecordAvatar() ?
+      (otr_avatar_bounds_.right() + kOTRAvatarIconTabStripSpacing) :
+      kWindowHorizontalClientEdgeWidth;
+  int tabstrip_width = width() - tabstrip_x - kTabStripRightHorizOffset -
+    (frame_->IsMaximized() ? frame_->GetMinimizeButtonOffset() : 0);
+  int tabstrip_y =
+    frame_->IsMaximized() ? (CalculateNonClientTopHeight() - 2) : kTabStripY;

[Glen Murphy, 2009/02/03 01:30:01]

Could you describe what the '2' is?

+  return gfx::Rect(tabstrip_x, tabstrip_y, std::max(0, tabstrip_width),
+                   tabstrip->GetPreferredHeight());
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // AeroGlassNonClientView, views::NonClientView implementation:
 
 gfx::Rect AeroGlassNonClientView::CalculateClientAreaBounds(int win_width,
                                                             int win_height) const {
   if (!browser_view_->IsToolbarVisible()) {
     // App windows don't have a toolbar.
     return gfx::Rect(0, 0, width(), height());
@@ skipping 259 matching lines @@
     resources_ = new AeroGlassWindowResources;
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
 #if defined(GOOGLE_CHROME_BUILD)
     distributor_logo_ = *rb.GetBitmapNamed(IDR_DISTRIBUTOR_LOGO);
 #endif
 
     initialized = true;
   }
 }