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

chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.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_non_client_frame_view_ash.h"
 
 #include <algorithm>
 
 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
 #include "ash/frame/default_header_painter.h"
@@ skipping 148 matching lines @@
     return gfx::Rect();
 
   // When the tab strip is painted in the immersive fullscreen light bar style,
   // the caption buttons and the avatar button are not visible. However, their
   // bounds are still used to compute the tab strip bounds so that the tabs have
   // the same horizontal position when the tab strip is painted in the immersive
   // light bar style as when the top-of-window views are revealed.
   int left_inset = GetTabStripLeftInset();
   int right_inset = GetTabStripRightInset();
   return gfx::Rect(left_inset,
-                   GetTopInset(),
+                   GetTopInset(false),
                    std::max(0, width() - left_inset - right_inset),
                    tabstrip->GetPreferredSize().height());
 }
 
-int BrowserNonClientFrameViewAsh::GetTopInset() const {
+int BrowserNonClientFrameViewAsh::GetTopInset(bool restored) const {
   if (!ShouldPaint() || UseImmersiveLightbarHeaderStyle())
     return 0;
 
   if (browser_view()->IsTabStripVisible()) {
-    return (frame()->IsMaximized() || frame()->IsFullscreen()) ?
+    return ((frame()->IsMaximized() || frame()->IsFullscreen()) && !restored) ?
         kTabstripTopSpacingShort : kTabstripTopSpacingTall;
   }
 
   if (UsePackagedAppHeaderStyle() || UseWebAppHeaderStyle())
     return header_painter_->GetHeaderHeight();
 
   int caption_buttons_bottom = caption_button_container_->bounds().bottom();
 
   // The toolbar partially overlaps the caption buttons.
   if (browser_view()->IsToolbarVisible())
@@ skipping 135 matching lines @@
 }
 
 void BrowserNonClientFrameViewAsh::Layout() {
   // The header must be laid out before computing |painted_height| because the
   // computation of |painted_height| for app and popup windows depends on the
   // position of the window controls.
   header_painter_->LayoutHeader();
 
   int painted_height = 0;
   if (browser_view()->IsTabStripVisible()) {
-    painted_height = GetTopInset() +
+    painted_height = GetTopInset(false) +
         browser_view()->tabstrip()->GetPreferredSize().height();
   } else if (browser_view()->IsToolbarVisible()) {
     // Paint the header so that it overlaps with the top few pixels of the
     // toolbar because the top few pixels of the toolbar are not opaque.
-    painted_height = GetTopInset() + kFrameShadowThickness * 2;
+    painted_height = GetTopInset(false) + kFrameShadowThickness * 2;
   } else {
-    painted_height = GetTopInset();
+    painted_height = GetTopInset(false);
   }
   header_painter_->SetHeaderHeightForPainting(painted_height);
 
   if (avatar_button()) {
     LayoutAvatar();
     header_painter_->UpdateLeftViewXInset(avatar_button()->bounds().right());
   }
 #if defined(FRAME_AVATAR_BUTTON)
   if (new_avatar_button())
     LayoutNewStyleAvatar();
@@ skipping 131 matching lines @@
         rect_in_tabstrip_coords_f);
 
      if (rect_in_tabstrip_coords.y() > tabstrip->height())
        return false;
 
     return !tabstrip->HitTestRect(rect_in_tabstrip_coords) ||
         tabstrip->IsRectInWindowCaption(rect_in_tabstrip_coords);
   }
 
   // Claim |rect| if it is above the top of the topmost view in the client area.
-  return rect.y() < GetTopInset();
+  return rect.y() < GetTopInset(false);
 }
 
 int BrowserNonClientFrameViewAsh::GetTabStripLeftInset() const {
   const gfx::Insets insets(GetLayoutInsets(AVATAR_ICON));
   const int avatar_right = avatar_button() ?
       (insets.left() + browser_view()->GetOTRAvatarIcon().width()) : 0;
   return avatar_right + insets.right();
 }
 
 int BrowserNonClientFrameViewAsh::GetTabStripRightInset() const {
@@ skipping 35 matching lines @@
 }
 
 void BrowserNonClientFrameViewAsh::LayoutAvatar() {
   DCHECK(avatar_button());
 #if !defined(OS_CHROMEOS)
   // ChromeOS shows avatar on V1 app.
   DCHECK(browser_view()->IsTabStripVisible());
 #endif
   gfx::ImageSkia incognito_icon = browser_view()->GetOTRAvatarIcon();
   gfx::Insets avatar_insets = GetLayoutInsets(AVATAR_ICON);
-  int avatar_bottom = GetTopInset() + browser_view()->GetTabStripHeight() -
+  int avatar_bottom = GetTopInset(false) + browser_view()->GetTabStripHeight() -
                       avatar_insets.bottom();
   int avatar_y = avatar_bottom - incognito_icon.height();
   if (!ui::MaterialDesignController::IsModeMaterial() &&
       browser_view()->IsTabStripVisible() &&
       (frame()->IsMaximized() || frame()->IsFullscreen())) {
-    avatar_y = GetTopInset() + kContentShadowHeight;
+    avatar_y = GetTopInset(false) + kContentShadowHeight;
   }
 
   // Hide the incognito icon in immersive fullscreen when the tab light bar is
   // visible because the header is too short for the icognito icon to be
   // recognizable.
   bool avatar_visible = !UseImmersiveLightbarHeaderStyle();
   int avatar_height = avatar_visible ? avatar_bottom - avatar_y : 0;
 
   gfx::Rect avatar_bounds(avatar_insets.left(), avatar_y,
                           incognito_icon.width(), avatar_height);
@@ skipping 57 matching lines @@
   if (ui::MaterialDesignController::IsModeMaterial()) {
     // Paint the main toolbar image.  Since this image is also used to draw the
     // tab background, we must use the tab strip offset to compute the image
     // source y position.  If you have to debug this code use an image editor
     // to paint a diagonal line through the toolbar image and ensure it lines up
     // across the tab and toolbar.
     gfx::ImageSkia* theme_toolbar = tp->GetImageSkiaNamed(IDR_THEME_TOOLBAR);
     canvas->TileImageInt(
         *theme_toolbar,
         x + GetThemeBackgroundXInset(),
-        y - GetTopInset(),
+        y - GetTopInset(false),
         x, y,
         w, theme_toolbar->height());
 
     // Draw the content/toolbar separator.
     toolbar_bounds.Inset(kClientEdgeThickness, 0);
     BrowserView::Paint1pxHorizontalLine(
         canvas,
         ThemeProperties::GetDefaultColor(
             ThemeProperties::COLOR_TOOLBAR_SEPARATOR),
         toolbar_bounds);
@@ skipping 13 matching lines @@
 
     // Paint the main toolbar image.  Since this image is also used to draw the
     // tab background, we must use the tab strip offset to compute the image
     // source y position.  If you have to debug this code use an image editor
     // to paint a diagonal line through the toolbar image and ensure it lines up
     // across the tab and toolbar.
     gfx::ImageSkia* theme_toolbar = tp->GetImageSkiaNamed(IDR_THEME_TOOLBAR);
     canvas->TileImageInt(
         *theme_toolbar,
         x + GetThemeBackgroundXInset(),
-        bottom_y - GetTopInset(),
+        bottom_y - GetTopInset(false),
         x, bottom_y,
         w, theme_toolbar->height());
 
     // The pre-material design content area line has a shadow that extends a
     // couple of pixels above the toolbar bounds.
     const int kContentShadowHeight = 2;
     gfx::ImageSkia* toolbar_top = tp->GetImageSkiaNamed(IDR_TOOLBAR_SHADE_TOP);
     canvas->TileImageInt(*toolbar_top,
                          0, 0,
                          x, y - kContentShadowHeight,
@@ skipping 26 matching lines @@
   }
 }
 
 void BrowserNonClientFrameViewAsh::PaintContentEdge(gfx::Canvas* canvas) {
   DCHECK(!UsePackagedAppHeaderStyle() && !UseWebAppHeaderStyle());
   canvas->FillRect(gfx::Rect(0, caption_button_container_->bounds().bottom(),
                              width(), kClientEdgeThickness),
                    ThemeProperties::GetDefaultColor(
                        ThemeProperties::COLOR_TOOLBAR_SEPARATOR));
 }