Gtk3: Render a GtkHeaderBar as the background of the tab strip

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 "build/build_config.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/layout_constants.h"
@@ skipping 394 matching lines @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // OpaqueBrowserFrameView, protected:
 
 // views::View:
 void OpaqueBrowserFrameView::OnPaint(gfx::Canvas* canvas) {
   if (frame()->IsFullscreen())
     return;  // Nothing is visible, so don't bother to paint.
 
+  frame_background_->set_frame_color(GetFrameColor());
+  frame_background_->set_use_custom_frame(frame()->UseCustomFrame());
+  frame_background_->set_is_active(ShouldPaintAsActive());
+  frame_background_->set_incognito(browser_view()->IsIncognito());
+  frame_background_->set_theme_image(GetFrameImage());
+  frame_background_->set_theme_overlay_image(GetFrameOverlayImage());
+  frame_background_->set_top_area_height(GetTopAreaHeight());
+
   if (layout_->IsTitleBarCondensed())
     PaintMaximizedFrameBorder(canvas);
   else
     PaintRestoredFrameBorder(canvas);
 
   // The window icon and title are painted by their respective views.
   /* TODO(pkasting):  If this window is active, we should also draw a drop
    * shadow on the title.  This is tricky, because we don't want to hardcode a
    * shadow color (since we want to work with various themes), but we can't
    * alpha-blend either (since the Windows text APIs don't really do this).
@@ skipping 69 matching lines @@
 
   // Do not show caption buttons if the window manager is forcefully providing a
   // title bar (e.g., in Ubuntu Unity, if the window is maximized).
   if (!views::ViewsDelegate::GetInstance())
     return true;
   return !views::ViewsDelegate::GetInstance()->WindowManagerProvidesTitleBar(
       IsMaximized());
 }
 
 int OpaqueBrowserFrameView::GetTopAreaHeight() const {
-  // The top area height in dp (only used when there's no frame image).
-  // TODO(pkasting): investigate removing this constant. See crbug.com/590301
-  const int kHeight = 64;
   const gfx::ImageSkia frame_image = GetFrameImage();
-  int top_area_height = frame_image.isNull() ? kHeight : frame_image.height();
+  int top_area_height = frame_image.height();  // Returns 0 if isNull()

[Peter Kasting, 2017/01/17 21:05:16]

Nit: Trailing period if you're keeping this comment.

[Tom (Use chromium acct), 2017/01/17 21:23:14]

Done.

   if (browser_view()->IsTabStripVisible()) {
     top_area_height =
         std::max(top_area_height,
                  GetBoundsForTabStrip(browser_view()->tabstrip()).bottom());
   }
   return top_area_height;
 }
 
 void OpaqueBrowserFrameView::PaintRestoredFrameBorder(
     gfx::Canvas* canvas) const {
-  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());
-
   const ui::ThemeProvider* tp = GetThemeProvider();
   frame_background_->SetSideImages(
       tp->GetImageSkiaNamed(IDR_WINDOW_LEFT_SIDE),
       tp->GetImageSkiaNamed(IDR_WINDOW_TOP_CENTER),
       tp->GetImageSkiaNamed(IDR_WINDOW_RIGHT_SIDE),
       tp->GetImageSkiaNamed(IDR_WINDOW_BOTTOM_CENTER));
   frame_background_->SetCornerImages(
       tp->GetImageSkiaNamed(IDR_WINDOW_TOP_LEFT_CORNER),
       tp->GetImageSkiaNamed(IDR_WINDOW_TOP_RIGHT_CORNER),
       tp->GetImageSkiaNamed(IDR_WINDOW_BOTTOM_LEFT_CORNER),
       tp->GetImageSkiaNamed(IDR_WINDOW_BOTTOM_RIGHT_CORNER));
   frame_background_->PaintRestored(canvas, this);
 
   // Note: When we don't have a toolbar, we need to draw some kind of bottom
   // edge here.  Because the App Window graphics we use for this have an
   // attached client edge and their sizing algorithm is a little involved, we do
   // all this in PaintRestoredClientEdge().
 }
 
 void OpaqueBrowserFrameView::PaintMaximizedFrameBorder(
     gfx::Canvas* canvas) const {
-  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());
   frame_background_->set_maximized_top_inset(
       GetTopInset(true) - GetTopInset(false));
   frame_background_->PaintMaximized(canvas, this);
 }
 
 void OpaqueBrowserFrameView::PaintToolbarBackground(gfx::Canvas* canvas) const {
   // TODO(estade): can this be shared with OpaqueBrowserFrameView?
   gfx::Rect toolbar_bounds(browser_view()->GetToolbarBounds());
   if (toolbar_bounds.IsEmpty())
     return;
@@ skipping 107 matching lines @@
   gfx::Rect side(x, y, kClientEdgeThickness, h);
   canvas->FillRect(side, color);
   if (draw_bottom) {
     canvas->FillRect(gfx::Rect(x, y + h, w + (2 * kClientEdgeThickness),
                                kClientEdgeThickness),
                      color);
   }
   side.Offset(w + kClientEdgeThickness, 0);
   canvas->FillRect(side, color);
 }