Infobar system refactor.

chrome/browser/ui/cocoa/infobars/translate_infobar_base.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/translate_infobar_base.h"
 
 #include "base/logging.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/translate/translate_infobar_delegate.h"
 #import "chrome/browser/ui/cocoa/hover_close_button.h"
 #include "chrome/browser/ui/cocoa/infobars/after_translate_infobar_controller.h"
 #import "chrome/browser/ui/cocoa/infobars/before_translate_infobar_controller.h"
 #include "chrome/browser/ui/cocoa/infobars/infobar_cocoa.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_controller.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_gradient_view.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_utilities.h"
 #include "chrome/browser/ui/cocoa/infobars/translate_message_infobar_controller.h"
 #include "grit/generated_resources.h"
 #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using InfoBarUtilities::MoveControl;
 using InfoBarUtilities::VerticallyCenterView;
 using InfoBarUtilities::VerifyControlOrderAndSpacing;
 using InfoBarUtilities::CreateLabel;
 using InfoBarUtilities::AddMenuItem;
 
-// TranslateInfoBarDelegate views specific method:
-InfoBar* TranslateInfoBarDelegate::CreateInfoBar(InfoBarService* owner) {
-  scoped_ptr<InfoBarCocoa> infobar(new InfoBarCocoa(owner, this));
+// static
+scoped_ptr<InfoBar> TranslateInfoBarDelegate::CreateInfoBar(
+    scoped_ptr<TranslateInfoBarDelegate> delegate) {
+  scoped_ptr<InfoBarCocoa> infobar(
+      new InfoBarCocoa(delegate.PassAs<InfoBarDelegate>()));
   base::scoped_nsobject<TranslateInfoBarControllerBase> infobar_controller;
-  switch (infobar_type_) {
+  switch (infobar->delegate()->AsTranslateInfoBarDelegate()->infobar_type()) {
     case BEFORE_TRANSLATE:
       infobar_controller.reset([[BeforeTranslateInfobarController alloc]
           initWithInfoBar:infobar.get()]);
       break;
     case AFTER_TRANSLATE:
       infobar_controller.reset([[AfterTranslateInfobarController alloc]
           initWithInfoBar:infobar.get()]);
       break;
     case TRANSLATING:
     case TRANSLATION_ERROR:
       infobar_controller.reset([[TranslateMessageInfobarController alloc]
           initWithInfoBar:infobar.get()]);
       break;
     default:
       NOTREACHED();
   }
   infobar->set_controller(infobar_controller);
-  return infobar.release();
+  return infobar.PassAs<InfoBar>();
 }
 
 @implementation TranslateInfoBarControllerBase (FrameChangeObserver)
 
 // Triggered when the frame changes.  This will figure out what size and
 // visibility the options popup should be.
 - (void)didChangeFrame:(NSNotification*)notification {
   [self adjustOptionsButtonSizeAndVisibilityForView:
       [[self visibleControls] lastObject]];
 }
@@ skipping 479 matching lines @@
           [[control description] UTF8String] <<[title UTF8String];
       return false;
     }
     previousControl = control;
   }
 
   return true;
 }
 
 @end // TranslateInfoBarControllerBase (TestingAPI)