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 a94a409cdd249c94800faa69864940787929f163..6da4ee96495ca69a1b6bd71790b569f2ebc9df73 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -83,6 +83,7 @@
 #if !defined(OS_CHROMEOS)
 #include "chrome/browser/signin/signin_global_error_factory.h"
 #include "chrome/browser/sync/sync_global_error_factory.h"
+#include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h"
 #endif
 
 #if defined(USE_ASH)
@@ -699,10 +700,13 @@ void ToolbarView::UpdateBadgeSeverity(AppMenuBadgeController::BadgeType type,
 }
 
 int ToolbarView::PopupTopSpacing() const {
-  const int kAdditionalPopupTopSpacingNonGlass = 2;
+#if defined(OS_CHROMEOS)
+  return views::NonClientFrameView::kClientEdgeThickness;
+#else
   return views::NonClientFrameView::kClientEdgeThickness +
       (GetWidget()->ShouldWindowContentsBeTransparent() ?
-          0 : kAdditionalPopupTopSpacingNonGlass);
+          0 : OpaqueBrowserFrameView::kContentEdgeShadowThickness);
+#endif
 }
 
 gfx::Size ToolbarView::GetSizeInternal(