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

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

Index: chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
index c3623f8093da0bcaa83dee045fb13ced6a57600d..198f762d1ad1cc62023ecdc17b6fe2c79c325fa1 100644
--- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
+++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
@@ -507,9 +507,8 @@ int OpaqueBrowserFrameView::GetTopAreaHeight() const {
   const gfx::ImageSkia frame_image = GetFrameImage();
   int top_area_height = frame_image.isNull() ? kHeight : frame_image.height();
   if (browser_view()->IsTabStripVisible()) {
-    top_area_height =
-        std::max(top_area_height,
-                 GetBoundsForTabStrip(browser_view()->tabstrip()).bottom());
+    // TODO(thomasanderson): Figure out what this should be.  Do no land as is.
+    top_area_height = GetBoundsForTabStrip(browser_view()->tabstrip()).bottom();
   }
   return top_area_height;
 }
@@ -517,6 +516,7 @@ int OpaqueBrowserFrameView::GetTopAreaHeight() const {
 void OpaqueBrowserFrameView::PaintRestoredFrameBorder(
     gfx::Canvas* canvas) const {
   frame_background_->set_frame_color(GetFrameColor());
+  frame_background_->set_is_active(ShouldPaintAsActive());
   frame_background_->set_theme_image(GetFrameImage());
   frame_background_->set_theme_overlay_image(GetFrameOverlayImage());
   frame_background_->set_top_area_height(GetTopAreaHeight());
@@ -543,6 +543,7 @@ void OpaqueBrowserFrameView::PaintRestoredFrameBorder(
 void OpaqueBrowserFrameView::PaintMaximizedFrameBorder(
     gfx::Canvas* canvas) const {
   frame_background_->set_frame_color(GetFrameColor());
+  frame_background_->set_is_active(ShouldPaintAsActive());
   frame_background_->set_theme_image(GetFrameImage());
   frame_background_->set_theme_overlay_image(GetFrameOverlayImage());
   frame_background_->set_top_area_height(GetTopAreaHeight());