Refactor the translate infobars on mac to match the new windows code.

chrome/browser/cocoa/translate/translate_message_infobar_controller.mm

+// Copyright (c) 2010 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/cocoa/translate/translate_message_infobar_controller.h"
+
+#include "base/sys_string_conversions.h"
+
+using TranslateInfoBarUtilities::MoveControl;
+
+@implementation TranslateMessageInfobarController
+
+- (id)initWithDelegate:(InfoBarDelegate*)delegate {
+  if ((self = [super initWithDelegate:delegate])) {
+    TranslateInfoBarDelegate2* delegate = [self delegate];
+    if (delegate->IsError())
+      state_ = TranslateInfoBarDelegate2::TRANSLATION_ERROR;
+    else
+      state_ = TranslateInfoBarDelegate2::TRANSLATING;
+  }
+  return self;
+}
+
+- (void)layout {
+  [optionsPopUp_ setHidden:YES];
+  [self removeOkCancelButtons];
+  MoveControl(label1_, tryAgainButton_, spaceBetweenControls_ * 2, true);
+  TranslateInfoBarDelegate2* delegate = [self delegate];
+  if (delegate->IsError())
+    MoveControl(label1_, tryAgainButton_, spaceBetweenControls_ * 2, true);
+}
+
+- (NSArray*)visibleControls {
+  NSMutableArray* visibleControls =
+      [NSMutableArray arrayWithObjects:label1_.get(), nil];
+  if (state_ == TranslateInfoBarDelegate2::TRANSLATION_ERROR)
+    [visibleControls addObject:tryAgainButton_];
+  return visibleControls;
+}
+
+- (void)loadLabelText {
+  TranslateInfoBarDelegate2* delegate = [self delegate];
+  string16 messageText = delegate->GetMessageInfoBarText();
+  NSString* string1 = base::SysUTF16ToNSString(messageText);
+  [label1_ setStringValue:string1];
+}
+
+- (bool)verifyLayout {
+  if (![optionsPopUp_ isHidden])
+    return false;
+  return [super verifyLayout];
+}
+
+@end