Fix opaque frame popup titlebar not being painted.

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 492 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 {
   const gfx::ImageSkia frame_image = GetFrameImage();
-  int top_area_height = frame_image.height();  // Returns 0 if isNull().
+  int top_area_height = frame_image.isNull()
+                            ? layout_->NonClientTopHeight(false)

[Bret, 2017/03/09 01:18:26]

this "false" is "calculate for restored"... it looks like the titlebar is always
laid out as restored (see OpaqueBrowserFrameViewLayout::LayoutTitleBar), which
is strange but I'm not going to interrogate it for this patch.

[Peter Kasting, 2017/03/09 05:27:06]

I think maybe this should be std::max(frame_image.height(),
layout_->NonClientTopHeight(...)).

My worry here is that if a broken theme provides an image that is too short for
the tab area, we should probably draw the normal background behind it, so we
don't have black/unpainted gaps.  I think that's what using max() here would
accomplish.  I'm not 100% sure.

[Bret, 2017/03/09 21:47:49]

You're right, that's probably safer. Done.

+                            : frame_image.height();
   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 {
@@ skipping 140 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);
 }