Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/ui/views/infobars/translate_infobar_base.cc

 // 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.
 
 #include "chrome/browser/ui/views/infobars/translate_infobar_base.h"
 
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/translate/translate_infobar_delegate.h"
 #include "chrome/browser/ui/views/infobars/after_translate_infobar.h"
 #include "chrome/browser/ui/views/infobars/before_translate_infobar.h"
 #include "chrome/browser/ui/views/infobars/translate_message_infobar.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/animation/slide_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/label.h"
 
 
 // TranslateInfoBarDelegate ---------------------------------------------------
 
-// static
-scoped_ptr<InfoBar> TranslateInfoBarDelegate::CreateInfoBar(
-    scoped_ptr<TranslateInfoBarDelegate> delegate) {
-  if (delegate->infobar_type() == BEFORE_TRANSLATE)
-    return scoped_ptr<InfoBar>(new BeforeTranslateInfoBar(delegate.Pass()));
-  if (delegate->infobar_type() == AFTER_TRANSLATE)
-    return scoped_ptr<InfoBar>(new AfterTranslateInfoBar(delegate.Pass()));
-  return scoped_ptr<InfoBar>(new TranslateMessageInfoBar(delegate.Pass()));
+InfoBar* TranslateInfoBarDelegate::CreateInfoBar(InfoBarService* owner) {
+  if (infobar_type_ == BEFORE_TRANSLATE)
+    return new BeforeTranslateInfoBar(owner, this);
+  if (infobar_type_ == AFTER_TRANSLATE)
+    return new AfterTranslateInfoBar(owner, this);
+  return new TranslateMessageInfoBar(owner, this);
 }
 
 
 // TranslateInfoBarBase -------------------------------------------------------
 
 // static
 const int TranslateInfoBarBase::kButtonInLabelSpacing = 5;
 
 void TranslateInfoBarBase::UpdateLanguageButtonText(views::MenuButton* button,
                                                     const string16& text) {
   DCHECK(button);
   button->SetText(text);
   // The button may have to grow to show the new text.
   Layout();
   SchedulePaint();
 }
 
-TranslateInfoBarBase::TranslateInfoBarBase(
-    scoped_ptr<TranslateInfoBarDelegate> delegate)
-    : InfoBarView(delegate.PassAs<InfoBarDelegate>()),
+TranslateInfoBarBase::TranslateInfoBarBase(InfoBarService* owner,
+                                           TranslateInfoBarDelegate* delegate)
+    : InfoBarView(owner, delegate),
       error_background_(InfoBarDelegate::WARNING_TYPE) {
 }
 
 TranslateInfoBarBase::~TranslateInfoBarBase() {
 }
 
 void TranslateInfoBarBase::ViewHierarchyChanged(
     const ViewHierarchyChangedDetails& details) {
   if (details.is_add && (details.child == this) &&
       (background_color_animation_ == NULL)) {
@@ skipping 53 matching lines @@
 
 void TranslateInfoBarBase::FadeBackground(gfx::Canvas* canvas,
                                           double animation_value,
                                           const views::Background& background) {
   // Draw the background into an offscreen buffer with alpha value per animation
   // value, then blend it back into the current canvas.
   canvas->SaveLayerAlpha(static_cast<int>(animation_value * 255));
   background.Paint(canvas, this);
   canvas->Restore();
 }