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

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

 // Copyright (c) 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/opaque_browser_frame_view.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/compiler_specific.h"
@@ skipping 64 matching lines @@
 const int kResizeAreaCornerSize = 16;
 
 // The content left/right images have a shadow built into them.
 const int kContentEdgeShadowThickness = 2;
 
 #if !defined(OS_WIN)
 // The icon never shrinks below 16 px on a side.
 const int kIconMinimumSize = 16;
 #endif
 
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-// The number of pixels to move the frame background image upwards when using
-// the GTK+ theme and the titlebar is condensed.
-const int kGTKThemeCondensedFrameTopInset = 15;
-#endif
-
 }  // namespace
 
 ///////////////////////////////////////////////////////////////////////////////
 // OpaqueBrowserFrameView, public:
 
 OpaqueBrowserFrameView::OpaqueBrowserFrameView(BrowserFrame* frame,
                                                BrowserView* browser_view)
     : BrowserNonClientFrameView(frame, browser_view),
       layout_(new OpaqueBrowserFrameViewLayout(this)),
       minimize_button_(nullptr),
@@ skipping 62 matching lines @@
 // OpaqueBrowserFrameView, BrowserNonClientFrameView implementation:
 
 gfx::Rect OpaqueBrowserFrameView::GetBoundsForTabStrip(
     views::View* tabstrip) const {
   if (!tabstrip)
     return gfx::Rect();
 
   return layout_->GetBoundsForTabStrip(tabstrip->GetPreferredSize(), width());
 }
 
-int OpaqueBrowserFrameView::GetTopInset() const {
+int OpaqueBrowserFrameView::GetTopInset(bool restored) const {
   return browser_view()->IsTabStripVisible() ?
-      layout_->GetTabStripInsetsTop(false) :
-      layout_->NonClientTopBorderHeight(false);
+      layout_->GetTabStripInsetsTop(restored) :
+      layout_->NonClientTopBorderHeight(restored);
 }
 
 int OpaqueBrowserFrameView::GetThemeBackgroundXInset() const {
   return 0;
 }
 
 void OpaqueBrowserFrameView::UpdateThrobber(bool running) {
   if (window_icon_)
     window_icon_->Update();
 }
@@ skipping 432 matching lines @@
   // attached client edge and their sizing algorithm is a little involved, we do
   // all this in PaintRestoredClientEdge().
 }
 
 void OpaqueBrowserFrameView::PaintMaximizedFrameBorder(gfx::Canvas* canvas) {
   ui::ThemeProvider* tp = GetThemeProvider();
   frame_background_->set_frame_color(GetFrameColor());
   frame_background_->set_theme_image(GetFrameImage());
   frame_background_->set_theme_overlay_image(GetFrameOverlayImage());
   frame_background_->set_top_area_height(GetTopAreaHeight());
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-  // The window manager typically shows a gradient in the native title bar (when
-  // the system title bar pref is set, or when maximized on Ubuntu). Hide the
-  // gradient in the tab strip (by shifting it up vertically) to avoid a
-  // double-gradient effect.
-  if (tp->UsingSystemTheme())
-    frame_background_->set_maximized_top_inset(kGTKThemeCondensedFrameTopInset);

[Peter Kasting, 2015/11/05 21:15:27]

Note that this is no longer necessary since the new code shifts up by 16 px, and
thus already does what this does and more.

-#endif
+  frame_background_->set_maximized_top_inset(
+      GetTopInset(true) - GetTopInset(false));
 
   frame_background_->PaintMaximized(canvas, this);
 
   // TODO(jamescook): Migrate this into FrameBackground.
   if (!browser_view()->IsToolbarVisible()) {
     // There's no toolbar to edge the frame border, so we need to draw a bottom
     // edge.  The graphic we use for this has a built in client edge, so we clip
     // it off the bottom.
     gfx::ImageSkia* top_center = tp->GetImageSkiaNamed(IDR_APP_TOP_CENTER);
     int edge_height = top_center->height() - kClientEdgeThickness;
@@ skipping 34 matching lines @@
 
   // Paint the bottom rect.
   canvas->FillRect(gfx::Rect(x, bottom_y, w, bottom_edge_height),
                    tp->GetColor(ThemeProperties::COLOR_TOOLBAR));
 
   // Tile the toolbar image starting at the frame edge on the left and where the
   // horizontal tabstrip is (or would be) on the top.
   gfx::ImageSkia* theme_toolbar = tp->GetImageSkiaNamed(IDR_THEME_TOOLBAR);
   canvas->TileImageInt(
       *theme_toolbar, x + GetThemeBackgroundXInset(),
-      bottom_y - GetTopInset() + Tab::GetYOffsetForActiveTabBackground(),
+      bottom_y - GetTopInset(false) + Tab::GetYOffsetForActiveTabBackground(),
       x, bottom_y, w, theme_toolbar->height());
 
   // Draw rounded corners for the tab.
   gfx::ImageSkia* toolbar_left_mask =
       tp->GetImageSkiaNamed(IDR_CONTENT_TOP_LEFT_CORNER_MASK);
   gfx::ImageSkia* toolbar_right_mask =
       tp->GetImageSkiaNamed(IDR_CONTENT_TOP_RIGHT_CORNER_MASK);
 
   // We mask out the corners by using the DestinationIn transfer mode,
   // which keeps the RGB pixels from the destination and the alpha from
@@ skipping 145 matching lines @@
       client_area_bottom + kClientEdgeThickness - client_area_top),
        toolbar_color);
   canvas->FillRect(gfx::Rect(client_area_bounds.x(), client_area_bottom,
                              client_area_bounds.width(), kClientEdgeThickness),
                    toolbar_color);
   canvas->FillRect(gfx::Rect(client_area_bounds.right(), client_area_top,
       kClientEdgeThickness,
       client_area_bottom + kClientEdgeThickness - client_area_top),
       toolbar_color);
 }