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

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

Index: chrome/browser/ui/views/toolbar/toolbar_view.cc
diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc
index fd93b02953f9593439941f093a7be170acc49345..0e42d417f0fbdf9e55b6295bccedd639cfca3609 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -488,7 +488,7 @@ void ToolbarView::Layout() {
     return;
 
   if (!is_display_mode_normal()) {
-    location_bar_->SetBounds(0, PopupTopSpacing(), width(),
+    location_bar_->SetBounds(0, 0, width(),
                              location_bar_->GetPreferredSize().height());
     return;
   }
@@ -687,11 +687,6 @@ void ToolbarView::UpdateBadgeSeverity(AppMenuBadgeController::BadgeType type,
   }
 }
 
-int ToolbarView::PopupTopSpacing() const {
-  return (browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH) ?
-       0 : views::NonClientFrameView::kClientEdgeThickness;
-}
-
 gfx::Size ToolbarView::GetSizeInternal(
     gfx::Size (View::*get_size)() const) const {
   gfx::Size size((location_bar_->*get_size)());
@@ -733,9 +728,6 @@ gfx::Size ToolbarView::SizeForContentSize(gfx::Size size) const {
       size.SetToMax(
           gfx::Size(0, normal_background->height() - content_shadow_height()));
     }
-  } else if (size.height() > 0) {
-    size.Enlarge(
-        0, PopupTopSpacing() + views::NonClientFrameView::kClientEdgeThickness);
   }
   return size;
 }