MacViews: Audit TOOLKIT_VIEWS in chrome/browser/ui

chrome/browser/ui/infobar_container_delegate.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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.
+#if defined(OS_MACOSX)
+const int InfoBarContainerDelegate::kSeparatorLineHeight = 1;
+const int InfoBarContainerDelegate::kDefaultArrowTargetHeight = 11;
+#elif defined(TOOLKIT_VIEWS)
+// Views comes second until the Mac browser is 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 =
     kDefaultArrowTargetHeight;
 const int InfoBarContainerDelegate::kMaximumArrowTargetHalfWidth = 14;
 
 InfoBarContainerDelegate::InfoBarContainerDelegate()
     : top_arrow_target_height_(kDefaultArrowTargetHeight) {
@@ skipping 60 matching lines @@
   // this, changing the arrow height from 0 to kSeparatorLineHeight would
   // produce no visible effect, because the stroke would paint atop the divider
   // line above the infobar.
   if (*arrow_height)
     *arrow_height += kSeparatorLineHeight;
 
   *bar_height = animation.CurrentValueBetween(
       0,
       (bar_target_height == -1) ? kDefaultBarTargetHeight : bar_target_height);
 }