Misc. small changes in preparation for moving popup mode edge 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 9b58aaa65ee84fb62cfd4d42f9c26e8432651aa9..fd93b02953f9593439941f093a7be170acc49345 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -688,13 +688,8 @@ 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() ?
-          0 : kAdditionalPopupTopSpacingNonGlass);
+  return (browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH) ?
+       0 : views::NonClientFrameView::kClientEdgeThickness;
 }
 
 gfx::Size ToolbarView::GetSizeInternal(