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

chrome/browser/ui/views/toolbar/toolbar_view.h

Index: chrome/browser/ui/views/toolbar/toolbar_view.h
diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.h b/chrome/browser/ui/views/toolbar/toolbar_view.h
index d41a4465d6eece28fd0a12c0af5d22dd3781deed..09c7041f753e017e76d0ddbd8d4b7c1f360472d8 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_view.h
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.h
@@ -169,9 +169,6 @@ class ToolbarView : public views::AccessiblePaneView,
                            AppMenuIconPainter::Severity severity,
                            bool animate) override;
 
-  // Returns the number of pixels above the location bar in non-normal display.
-  int PopupTopSpacing() const;
-
   // Used to avoid duplicating the near-identical logic of
   // ToolbarView::GetPreferredSize() and ToolbarView::GetMinimumSize(). These
   // two functions call through to GetSizeInternal(), passing themselves as the