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

chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.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/browser_non_client_frame_view_ash.h"
 
 #include "ash/ash_switches.h"
 #include "ash/wm/caption_buttons/frame_caption_button_container_view.h"
 #include "ash/wm/frame_painter.h"
 #include "chrome/browser/themes/theme_properties.h"
@@ skipping 354 matching lines @@
   return delegate->GetWindowIcon();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserNonClientFrameViewAsh, private:
 
 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 {
   // Restored browser -> tall header
   // Maximized browser -> short header
   // Fullscreen browser, no immersive reveal -> hidden or super short light bar
   // Fullscreen browser, immersive reveal -> short header
   // Popup&App window -> tall header
   // Panels use short header and are handled via ash::PanelFrameView.
   // Dialogs use short header and are handled via ash::CustomFrameViewAsh.
@@ skipping 167 matching lines @@
 int BrowserNonClientFrameViewAsh::GetThemeFrameOverlayImageId() const {
   ui::ThemeProvider* tp = GetThemeProvider();
   if (tp->HasCustomImage(IDR_THEME_FRAME_OVERLAY) &&
       browser_view()->IsBrowserTypeNormal() &&
       !browser_view()->IsOffTheRecord()) {
     return ShouldPaintAsActive() ?
         IDR_THEME_FRAME_OVERLAY : IDR_THEME_FRAME_OVERLAY_INACTIVE;
   }
   return 0;
 }