Fix various issues with popup/app window layout/drawing.

chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h

 // Copyright 2013 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_LAYOUT_H_
 #define CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_LAYOUT_H_
 
 #include "base/macros.h"
 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h"
 #include "ui/views/layout/layout_manager.h"
@@ skipping 17 matching lines @@
   // Constants used by OpaqueBrowserFrameView as well.
   static const int kContentEdgeShadowThickness;
 
   // Constants public for testing only.
   static const int kNonClientRestoredExtraThickness;
   static const int kFrameBorderThickness;
   static const int kTitlebarTopEdgeThickness;
   static const int kIconLeftSpacing;
   static const int kIconTitleSpacing;
   static const int kCaptionSpacing;
+  static const int kCaptionButtonBottomPadding;
   static const int kNewTabCaptionCondensedSpacing;
 
   explicit OpaqueBrowserFrameViewLayout(
       OpaqueBrowserFrameViewLayoutDelegate* delegate);
   ~OpaqueBrowserFrameViewLayout() override;
 
   // Whether we should add the (minimize,maximize,close) buttons. This should be
   // true if the buttons could be shown at any time in this session (see
   // OpaqueBrowserFrameViewLayoutDelegate::ShouldShowCaptionButtons for whether
   // they are currently visible).
@@ skipping 28 matching lines @@
   // frame, any title area, and any connected client edge.  If |restored| is
   // true, acts as if the window is restored regardless of the real mode.
   int NonClientTopBorderHeight(bool restored) const;
 
   int GetTabStripInsetsTop(bool restored) const;
 
   // Returns the y-coordinate of the caption buttons.  If |restored| is true,
   // acts as if the window is restored regardless of the real mode.
   int CaptionButtonY(bool restored) const;
 
-  // Returns the thickness of the 3D edge along the bottom of the titlebar.  If
+  // Returns the thickness of the 3D edge along the top of the titlebar.  If
   // |restored| is true, acts as if the window is restored regardless of the
   // real mode.
-  int TitlebarBottomThickness(bool restored) const;
+  int TitlebarTopThickness(bool restored) const;
 
   // Returns the bounds of the titlebar icon (or where the icon would be if
   // there was one).
   gfx::Rect IconBounds() const;
 
   // Returns the bounds of the client area for the specified view size.
   gfx::Rect CalculateClientAreaBounds(int width, int height) const;
 
   void set_extra_caption_y(int extra_caption_y) {
     extra_caption_y_ = extra_caption_y;
@@ skipping 97 matching lines @@
   AvatarMenuButton* avatar_button_;
   views::View* new_avatar_button_;
 
   std::vector<views::FrameButton> leading_buttons_;
   std::vector<views::FrameButton> trailing_buttons_;
 
   DISALLOW_COPY_AND_ASSIGN(OpaqueBrowserFrameViewLayout);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_LAYOUT_H_