Make the TranslateInfoBarDelegate once again use the TranslateUIDelegate.

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/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/infobars/infobar_delegate.h"
 #include "chrome/browser/translate/translate_prefs.h"
+#include "chrome/browser/translate/translate_ui_delegate.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 {
   int always_translate_min_count;
   int never_translate_min_count;
 };
 
-// NOTE: TranslateUIDelegate should be updated if this implementation is
-// updated.
 class TranslateInfoBarDelegate : public InfoBarDelegate {
  public:
   // The different types of infobars that can be shown for translation.
   enum Type {
     BEFORE_TRANSLATE,
     TRANSLATING,
     AFTER_TRANSLATE,
     TRANSLATION_ERROR
   };
 
@@ skipping 24 matching lines @@
   static void Create(bool replace_existing_infobar,
                      content::WebContents* web_contents,
                      Type infobar_type,
                      const std::string& original_language,
                      const std::string& target_language,
                      TranslateErrors::Type error_type,
                      PrefService* prefs,
                      const ShortcutConfiguration& shortcut_config);
 
   // Returns the number of languages supported.
-  size_t num_languages() const {
-
-    return languages_.size();
-  }
+  size_t num_languages() const { return ui_delegate_.GetNumberOfLanguages(); }
 
   // Returns the ISO code for the language at |index|.
   std::string language_code_at(size_t index) const {
-    DCHECK_LT(index, num_languages());
-    return languages_[index].first;
+    return ui_delegate_.GetLanguageCodeAt(index);
   }
 
   // Returns the displayable name for the language at |index|.
   string16 language_name_at(size_t index) const {
-    if (index == static_cast<size_t>(kNoIndex))
-      return string16();
-    DCHECK_LT(index, num_languages());
-    return languages_[index].second;
+    return ui_delegate_.GetLanguageNameAt(index);
   }
 
   Type infobar_type() const { return infobar_type_; }
 
   TranslateErrors::Type error_type() const { return error_type_; }
 
-  size_t original_language_index() const { return original_language_index_; }
-
+  size_t original_language_index() const {
+    return ui_delegate_.GetOriginalLanguageIndex();
+  }
   void UpdateOriginalLanguageIndex(size_t language_index);
 
-  size_t target_language_index() const { return target_language_index_; }
-
+  size_t target_language_index() const {
+    return ui_delegate_.GetTargetLanguageIndex();
+  }
   void UpdateTargetLanguageIndex(size_t language_index);
 
   // Convenience methods.
   std::string original_language_code() const {
-    return (original_language_index() == static_cast<size_t>(kNoIndex)) ?
-        translate::kUnknownLanguageCode :
-        language_code_at(original_language_index());
+    return ui_delegate_.GetOriginalLanguageCode();
   }
   std::string target_language_code() const {
-    return language_code_at(target_language_index());
+    return ui_delegate_.GetTargetLanguageCode();
   }
 
   // Returns true if the current infobar indicates an error (in which case it
   // should get a yellow background instead of a blue one).
   bool is_error() const { return infobar_type_ == TRANSLATION_ERROR; }
 
   // Returns what kind of background fading effect the infobar should use when
   // its is shown.
   BackgroundAnimationType background_animation_type() const {
     return background_animation_;
@@ skipping 50 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(content::WebContents* web_contents,
+                           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 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
   // infobar.
   BackgroundAnimationType background_animation_;
 
-  // The list of the languages supported for translation.
-  std::vector<LanguageNamePair> languages_;
-
-  // The index of the webpage's original language.
-  size_t original_language_index_;
-
-  // The index of the language the webpage will be translated into.
-  size_t target_language_index_;
+  TranslateUIDelegate ui_delegate_;
 
   // The error that occurred when trying to translate (NONE if no error).
   TranslateErrors::Type error_type_;
 
   // 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_