Mac InfoBar: Use cross platform infobar classes

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

 // Copyright (c) 2012 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.
 
 #import "chrome/browser/ui/cocoa/infobars/infobar_utilities.h"
 
 #include "base/mac/scoped_nsobject.h"
+#import "chrome/browser/infobars/infobar.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_gradient_view.h"
 
 namespace InfoBarUtilities {
 
 // Move the |toMove| view |spacing| pixels before/after the |anchor| view.
 // |after| signifies the side of |anchor| on which to place |toMove|.
 void MoveControl(NSView* anchor, NSView* toMove, int spacing, bool after) {
   NSRect anchorFrame = [anchor frame];
   NSRect toMoveFrame = [toMove frame];
@@ skipping 22 matching lines @@
 
 // Vertically center |toMove| in its container.
 void VerticallyCenterView(NSView* toMove) {
   NSRect superViewFrame = [[toMove superview] frame];
   NSRect viewFrame = [toMove frame];
   // If the superview is the infobar view, then subtract out the anti-spoof
   // height so that the content is centered in the content area of the infobar,
   // rather than in the total height (which includes the bulge).
   CGFloat superHeight = NSHeight(superViewFrame);
   if ([[toMove superview] isKindOfClass:[InfoBarGradientView class]])
-    superHeight = infobars::kBaseHeight;
+    superHeight = InfoBar::kDefaultBarTargetHeight;
   viewFrame.origin.y =
       floor((superHeight - NSHeight(viewFrame)) / 2.0);
   [toMove setFrame:viewFrame];
 }
 
 // Creates a label control in the style we need for the infobar's labels
 // within |bounds|.
 NSTextField* CreateLabel(NSRect bounds) {
   NSTextField* ret = [[NSTextField alloc] initWithFrame:bounds];
   [ret setEditable:NO];
@@ skipping 16 matching lines @@
     [menu addItem:item];
     [item setTarget:target];
     if (checked)
       [item setState:NSOnState];
     if (!enabled)
       [item setEnabled:NO];
   }
 }
 
 }  // namespace InfoBarUtilities