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

ash/wm/panels/panel_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 "ash/wm/panels/panel_frame_view.h"
 
 #include "ash/wm/caption_buttons/frame_caption_button_container_view.h"
 #include "ash/wm/frame_painter.h"
 #include "grit/ash_resources.h"
 #include "third_party/skia/include/core/SkPaint.h"
@@ skipping 39 matching lines @@
   AddChildView(caption_button_container_);
 
   if (frame_->widget_delegate()->ShouldShowWindowIcon()) {
     window_icon_ = new views::ImageView();
     AddChildView(window_icon_);
   }
 
   frame_painter_->Init(frame_, window_icon_, caption_button_container_);
 }
 
+int PanelFrameView::NonClientTopBorderHeight() const {
+  if (!frame_painter_)
+    return 0;
+  // Reserve enough space to see the buttons and the separator line.
+  return caption_button_container_->bounds().bottom() +
+      frame_painter_->HeaderContentSeparatorSize();
+}
+

[James Cook, 2013/10/01 16:00:47]

nit: one blank line

+
 gfx::Size PanelFrameView::GetMinimumSize() {
   if (!frame_painter_)
     return gfx::Size();
   return frame_painter_->GetMinimumSize(this);
 }
 
 void PanelFrameView::Layout() {
   if (!frame_painter_)
     return;
   frame_painter_->LayoutHeader(this, true);
@@ skipping 47 matching lines @@
       theme_frame_id,
       0);
   frame_painter_->PaintTitleBar(this, canvas, title_font_);
   frame_painter_->PaintHeaderContentSeparator(this, canvas);
 }
 
 gfx::Rect PanelFrameView::GetBoundsForClientView() const {
   if (!frame_painter_)
     return bounds();
   return frame_painter_->GetBoundsForClientView(
-      caption_button_container_->bounds().bottom(),
-      bounds());
+      NonClientTopBorderHeight(), bounds());
 }
 
 gfx::Rect PanelFrameView::GetWindowBoundsForClientBounds(
     const gfx::Rect& client_bounds) const {
   if (!frame_painter_)
     return client_bounds;
   return frame_painter_->GetWindowBoundsForClientBounds(
-      caption_button_container_->bounds().bottom(), client_bounds);
+      NonClientTopBorderHeight(), client_bounds);
 }
 
 }  // namespace ash