Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/translate/translate_infobar_delegate.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_TRANSLATE_TRANSLATE_INFOBAR_DELEGATE_H_
 #define CHROME_BROWSER_TRANSLATE_TRANSLATE_INFOBAR_DELEGATE_H_
 
 #include <string>
 #include <utility>
 #include <vector>
 
+#include "base/compiler_specific.h"
 #include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
 #include "chrome/browser/infobars/infobar_delegate.h"
 #include "chrome/browser/translate/translate_prefs.h"
 #include "chrome/common/translate/translate_errors.h"
 #include "components/translate/common/translate_constants.h"
 
 class PrefService;
 
 // The defaults after which extra shortcuts for options
 // can be shown.
 struct ShortcutConfiguration {
@@ skipping 149 matching lines @@
   // text is split in 2 or 3 chunks. |swap_languages| is set to true if
   // |autodetermined_source_language| is false, and <lang1> and <lang2>
   // should be inverted (some languages express the sentense as "The page has
   // been translate to <lang2> from <lang1>."). It is ignored if
   // |autodetermined_source_language| is true.
   static void GetAfterTranslateStrings(std::vector<string16>* strings,
                                        bool* swap_languages,
                                        bool autodetermined_source_language);
 
  protected:
-  TranslateInfoBarDelegate(Type infobar_type,
+  TranslateInfoBarDelegate(InfoBarService* infobar_service,
+                           Type infobar_type,
                            TranslateInfoBarDelegate* old_delegate,
                            const std::string& original_language,
                            const std::string& target_language,
                            TranslateErrors::Type error_type,
                            PrefService* prefs,
                            ShortcutConfiguration shortcut_config);
 
  private:
-  friend class TranslationInfoBarTest;
   typedef std::pair<std::string, string16> LanguageNamePair;
 
-  // Returns a translate infobar that owns |delegate|.
-  static scoped_ptr<InfoBar> CreateInfoBar(
-      scoped_ptr<TranslateInfoBarDelegate> delegate);
-
   // InfoBarDelegate:
+  virtual InfoBar* CreateInfoBar(InfoBarService* infobar_service) OVERRIDE;
   virtual void InfoBarDismissed() OVERRIDE;
   virtual int GetIconID() const OVERRIDE;
   virtual InfoBarDelegate::Type GetInfoBarType() const OVERRIDE;
   virtual bool ShouldExpire(
        const content::LoadCommittedDetails& details) const OVERRIDE;
   virtual TranslateInfoBarDelegate* AsTranslateInfoBarDelegate() OVERRIDE;
 
   Type infobar_type_;
 
   // The type of fading animation if any that should be used when showing this
@@ skipping 14 matching lines @@
 
   // The translation related preferences.
   TranslatePrefs prefs_;
 
   // Translation shortcut configuration
   ShortcutConfiguration shortcut_config_;
   DISALLOW_COPY_AND_ASSIGN(TranslateInfoBarDelegate);
 };
 
 #endif  // CHROME_BROWSER_TRANSLATE_TRANSLATE_INFOBAR_DELEGATE_H_