infobars: Fix static initializer created in r308046.

BUG=382924
TBR=pkasting@chromium.org

Review URL: https://codereview.chromium.org/801753002

Cr-Commit-Position: refs/heads/master@{#308076}

chrome/browser/ui/cocoa/infobars/infobar_container_cocoa.mm

@@ -7,9 +7,6 @@
 #import "chrome/browser/ui/cocoa/infobars/infobar_cocoa.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"
 
-const int InfoBarContainerDelegate::kSeparatorLineHeight = 1;
-const int InfoBarContainerDelegate::kDefaultArrowTargetHeight = 11;
-
 InfoBarContainerCocoa::InfoBarContainerCocoa(
     InfoBarContainerController* controller)
     : infobars::InfoBarContainer(this),

chrome/browser/ui/infobar_container_delegate.cc

@@ -5,6 +5,21 @@
 #include "chrome/browser/ui/infobar_container_delegate.h"
 #include "ui/gfx/animation/slide_animation.h"
 
+#if defined(TOOLKIT_VIEWS)
+#include "ui/views/window/non_client_view.h"
+#endif
+
+// static
+#if defined(TOOLKIT_VIEWS)
+// Views comes first since Mac may eventually be Views-based.
+const int InfoBarContainerDelegate::kSeparatorLineHeight =
+    views::NonClientFrameView::kClientEdgeThickness;
+const int InfoBarContainerDelegate::kDefaultArrowTargetHeight = 9;
+#elif defined(OS_MACOSX)
+const int InfoBarContainerDelegate::kSeparatorLineHeight = 1;
+const int InfoBarContainerDelegate::kDefaultArrowTargetHeight = 11;
+#endif
+
 const int InfoBarContainerDelegate::kDefaultBarTargetHeight = 36;
 const int InfoBarContainerDelegate::kMaximumArrowTargetHeight = 24;
 const int InfoBarContainerDelegate::kDefaultArrowTargetHalfWidth =

chrome/browser/ui/views/frame/browser_view.cc

@@ -1905,10 +1905,6 @@ void BrowserView::OnOmniboxPopupShownOrHidden() {
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserView, InfoBarContainerDelegate overrides:
 
-const int InfoBarContainerDelegate::kSeparatorLineHeight =
-    views::NonClientFrameView::kClientEdgeThickness;
-const int InfoBarContainerDelegate::kDefaultArrowTargetHeight = 9;
-
 SkColor BrowserView::GetInfoBarSeparatorColor() const {
   // NOTE: Keep this in sync with ToolbarView::OnPaint()!
   return (IsTabStripVisible() || !frame_->ShouldUseNativeFrame()) ?