Attempt to fix more standard non-client painting by extending the client area...

chrome/browser/views/frame/opaque_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/opaque_non_client_view.h"
 
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/browser/views/frame/browser_view2.h"
 #include "chrome/browser/views/tabs/tab_strip.h"
 #include "chrome/browser/views/window_resources.h"
@@ skipping 440 matching lines @@
   int top_height = CalculateNonClientTopHeight();
   int window_x = std::max(0, client_bounds.x() - kWindowHorizontalBorderSize);
   int window_y = std::max(0, client_bounds.y() - top_height);
   int window_w = client_bounds.width() + (2 * kWindowHorizontalBorderSize);
   int window_h =
       client_bounds.height() + top_height + kWindowVerticalBorderBottomSize;
   return gfx::Rect(window_x, window_y, window_w, window_h);
 }
 
 gfx::Rect OpaqueNonClientView::GetBoundsForTabStrip(TabStrip* tabstrip) {
-  int tabstrip_height = tabstrip->GetPreferredHeight();
   int tabstrip_x = otr_avatar_bounds_.right();
+  int tabstrip_y = CalculateNonClientTopHeight();
+  int tabstrip_height =
+      browser_view_->IsTabStripVisible() ? tabstrip->GetPreferredHeight() : 0;
   int tabstrip_width = minimize_button_->x() - tabstrip_x;
   if (frame_->IsMaximized())
     tabstrip_width -= kNewTabIconWindowControlsSpacing;
-  return gfx::Rect(tabstrip_x, 0, tabstrip_width, tabstrip_height);
+  return gfx::Rect(tabstrip_x, tabstrip_y, tabstrip_width, tabstrip_height);
 }
 
 void OpaqueNonClientView::UpdateWindowIcon() {
   if (window_icon_)
     window_icon_->Update();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // OpaqueNonClientView, TabIconView::TabContentsProvider implementation:
 
@@ skipping 18 matching lines @@
   } else if (sender == close_button_) {
     frame_->ExecuteSystemMenuCommand(SC_CLOSE);
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // OpaqueNonClientView, ChromeViews::NonClientView implementation:
 
 gfx::Rect OpaqueNonClientView::CalculateClientAreaBounds(int width,
                                                          int height) const {
-  int top_margin = CalculateNonClientTopHeight();
-  return gfx::Rect(kWindowHorizontalBorderSize, top_margin,
+  return gfx::Rect(kWindowHorizontalBorderSize, 0,
       std::max(0, width - (2 * kWindowHorizontalBorderSize)),
-      std::max(0, height - top_margin - kWindowVerticalBorderBottomSize));
+      std::max(0, height - kWindowVerticalBorderBottomSize));
 }
 
 gfx::Size OpaqueNonClientView::CalculateWindowSizeForClientSize(
     int width,
     int height) const {
   int top_margin = CalculateNonClientTopHeight();
   return gfx::Size(width + (2 * kWindowHorizontalBorderSize),
                    height + top_margin + kWindowVerticalBorderBottomSize);
 }
 
@@ skipping 515 matching lines @@
 
 // static
 void OpaqueNonClientView::InitAppWindowResources() {
   static bool initialized = false;
   if (!initialized) {
     title_font_ = ResourceBundle::GetSharedInstance().GetFont(
         ResourceBundle::BaseFont).DeriveFont(1, ChromeFont::BOLD);
     initialized = true;
   }
 }