Fix opaque frame popup titlebar not being painted.

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 a9692e2119cfb976d2cea5a1a40d3a214d806fc1..52ac32e857887fcffa686367791d89bfb0a30b3e 100644
--- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
+++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
@@ -510,7 +510,9 @@ bool OpaqueBrowserFrameView::ShouldShowWindowTitleBar() const {
 
 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,