Draw the same portion of the frame background behind the tabstrip in maximized

chrome/browser/ui/views/frame/browser_view_layout.cc

 // Copyright 2012 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/ui/views/frame/browser_view_layout.h"
 
 #include "base/observer_list.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
@@ skipping 168 matching lines @@
       bookmark_bar_->visible() &&
       browser()->SupportsWindowFeature(Browser::FEATURE_BOOKMARKBAR)) {
     bookmark_bar_size = bookmark_bar_->GetMinimumSize();
     bookmark_bar_size.Enlarge(0, -bookmark_bar_->GetToolbarOverlap());
   }
   gfx::Size infobar_container_size(infobar_container_->GetMinimumSize());
   // TODO: Adjust the minimum height for the find bar.
 
   gfx::Size contents_size(contents_container_->GetMinimumSize());
 
-  int min_height = delegate_->GetTopInsetInBrowserView() +
+  int min_height = delegate_->GetTopInsetInBrowserView(false) +
       tabstrip_size.height() + toolbar_size.height() +
       bookmark_bar_size.height() + infobar_container_size.height() +
       contents_size.height();
   int widths[] = {
         tabstrip_size.width(),
         toolbar_size.width(),
         bookmark_bar_size.width(),
         infobar_container_size.width(),
         contents_size.width() };
   int min_width = *std::max_element(&widths[0], &widths[arraysize(widths)]);
@@ skipping 111 matching lines @@
 
   // If the point is somewhere else, delegate to the default implementation.
   return browser_view_->views::ClientView::NonClientHitTest(point);
 }
 
 //////////////////////////////////////////////////////////////////////////////
 // BrowserViewLayout, views::LayoutManager implementation:
 
 void BrowserViewLayout::Layout(views::View* browser_view) {
   vertical_layout_rect_ = browser_view->GetLocalBounds();
-  int top = delegate_->GetTopInsetInBrowserView();
+  int top = delegate_->GetTopInsetInBrowserView(false);
   top = LayoutTabStripRegion(top);
   if (delegate_->IsTabStripVisible()) {
+    // Set the position of the background image in tabs and the new tab button.
     int x = tab_strip_->GetMirroredX() +
         browser_view_->GetMirroredX() +
         delegate_->GetThemeBackgroundXInset();
-    int y = browser_view_->y() + delegate_->GetTopInsetInBrowserView();
+    // By passing true here, we position the tab background to vertically align
+    // with the frame background image of a restored-mode frame, even in a
+    // maximized window.  Then in the frame code, we position the frame so the
+    // portion of the image that's behind the restored-mode tabstrip is always
+    // behind the tabstrip.  Together these ensure that the tab and frame images
+    // are always aligned, and that their relative alignment with the toolbar
+    // image is always the same, so themes which try to align all three will
+    // look correct in both restored and maximized windows.
+    int y = browser_view_->y() + delegate_->GetTopInsetInBrowserView(true);
     tab_strip_->SetBackgroundOffset(gfx::Point(x, y));
   }
   top = LayoutToolbar(top);
 
   top = LayoutBookmarkAndInfoBars(top, browser_view->y());
 
   // Top container requires updated toolbar and bookmark bar to compute bounds.
   UpdateTopContainerBounds();
 
   int bottom = LayoutDownloadShelf(browser_view->height());
@@ skipping 154 matching lines @@
     if (!child->visible())
       continue;
     int child_bottom = child->bounds().bottom();
     if (child_bottom > height)
       height = child_bottom;
   }
 
   // Ensure that the top container view reaches the topmost view in the
   // ClientView because the bounds of the top container view are used in
   // layout and we assume that this is the case.
-  height = std::max(height, delegate_->GetTopInsetInBrowserView());
+  height = std::max(height, delegate_->GetTopInsetInBrowserView(false));
 
   gfx::Rect top_container_bounds(vertical_layout_rect_.width(), height);
 
   // If the immersive mode controller is animating the top container, it may be
   // partly offscreen.
   top_container_bounds.set_y(
       immersive_mode_controller_->GetTopContainerVerticalOffset(
           top_container_bounds.size()));
   top_container_->SetBoundsRect(top_container_bounds);
 }
@@ skipping 27 matching lines @@
   return bottom;
 }
 
 bool BrowserViewLayout::InfobarVisible() const {
   // Cast to a views::View to access GetPreferredSize().
   views::View* infobar_container = infobar_container_;
   // NOTE: Can't check if the size IsEmpty() since it's always 0-width.
   return browser_->SupportsWindowFeature(Browser::FEATURE_INFOBAR) &&
       (infobar_container->GetPreferredSize().height() != 0);
 }