Implement MD specs for non-tabbed windows in Ash

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 de07fa29263c1a9b3d4f64a32d0cd7fb551d8190..9b58aaa65ee84fb62cfd4d42f9c26e8432651aa9 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -688,6 +688,9 @@ void ToolbarView::UpdateBadgeSeverity(AppMenuBadgeController::BadgeType type,
 }
 
 int ToolbarView::PopupTopSpacing() const {
+  if (browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH)
+    return 0;
+
   const int kAdditionalPopupTopSpacingNonGlass = 2;
   return views::NonClientFrameView::kClientEdgeThickness +
       (GetWidget()->ShouldWindowContentsBeTransparent() ?
@@ -735,14 +738,7 @@ gfx::Size ToolbarView::SizeForContentSize(gfx::Size size) const {
       size.SetToMax(
           gfx::Size(0, normal_background->height() - content_shadow_height()));
     }
-  } else if (size.height() == 0) {
-    // Location mode with a 0 height location bar. If on ash, expand by one
-    // pixel to show a border in the title bar, otherwise leave the size as zero
-    // height.
-    const int kAshBorderSpacing = 1;
-    if (browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH)
-      size.Enlarge(0, kAshBorderSpacing);
-  } else {
+  } else if (size.height() > 0) {
     size.Enlarge(
         0, PopupTopSpacing() + views::NonClientFrameView::kClientEdgeThickness);
   }