Fix bugs wrt to the content edge for v1 apps and panels

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

Index: chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
index 8e72e0bd215a3440f0b5e4781f2032ae56ab4f2a..22ef7d3c058ac68bf2f612f7195339dc46a92fa7 100644
--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
@@ -372,9 +372,10 @@ int BrowserNonClientFrameViewAsh::NonClientTopBorderHeight() const {
   if (!ShouldPaint() || browser_view()->IsTabStripVisible())
     return 0;
 
-  // For windows without a tab strip (popups, etc.) ensure we have enough space
-  // to see the window caption buttons.
-  return caption_button_container_->bounds().bottom() - kContentShadowHeight;
+  int caption_buttons_bottom = caption_button_container_->bounds().bottom();
+  if (browser_view()->IsToolbarVisible())
+    return caption_buttons_bottom - kContentShadowHeight;
+  return caption_buttons_bottom + kClientEdgeThickness;
 }
 
 bool BrowserNonClientFrameViewAsh::UseShortHeader() const {