Copy the implementations of TranslateUIDelegate to TransalteInfobarDelegate

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 "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;
@@ skipping 36 matching lines @@
   static void Create(bool replace_existing_infobar,
                      InfoBarService* infobar_service,
                      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 ui_delegate_.GetNumberOfLanguages(); }
+  size_t num_languages() const {
+    // Note: TranslateUIDelegate should be updated if this implementation is
+    // updated.

[Peter Kasting, 2013/11/08 23:47:47]

Let's not put these comments into every function in both files.  A big "NOTE:"
sort of comment in the file comments for each file seems sufficient.

[hajimehoshi, 2013/11/11 04:01:02]

Done.

+    return languages_.size();
+  }
 
   // Returns the ISO code for the language at |index|.
   std::string language_code_at(size_t index) const {
-    return ui_delegate_.GetLanguageCodeAt(index);
+    // Note: TranslateUIDelegate should be updated if this implementation is
+    // updated.
+    DCHECK_LT(index, num_languages());
+    return languages_[index].first;
   }
 
   // Returns the displayable name for the language at |index|.
   string16 language_name_at(size_t index) const {
-    return ui_delegate_.GetLanguageNameAt(index);
+    // Note: TranslateUIDelegate should be updated if this implementation is
+    // updated.
+    if (index == static_cast<size_t>(kNoIndex))
+      return string16();
+    DCHECK_LT(index, num_languages());
+    return languages_[index].second;
   }
 
   Type infobar_type() const { return infobar_type_; }
 
   TranslateErrors::Type error_type() const { return error_type_; }
 
-  size_t original_language_index() const {
-    return ui_delegate_.GetOriginalLanguageIndex();
-  }
+  size_t original_language_index() const { return original_language_index_; }
+
   void UpdateOriginalLanguageIndex(size_t language_index);
 
-  size_t target_language_index() const {
-    return ui_delegate_.GetTargetLanguageIndex();
-  }
+  size_t target_language_index() const { return target_language_index_; }
+
   void UpdateTargetLanguageIndex(size_t language_index);
 
   // Convenience methods.
   std::string original_language_code() const {
-    return ui_delegate_.GetOriginalLanguageCode();
+    // Note: TranslateUIDelegate should be updated if this implementation is
+    // updated.
+    return (original_language_index() == static_cast<size_t>(kNoIndex)) ?
+        translate::kUnknownLanguageCode :
+        language_code_at(original_language_index());
   }
   std::string target_language_code() const {
-    return ui_delegate_.GetTargetLanguageCode();
+    // Note: TranslateUIDelegate should be updated if this implementation is
+    // updated.
+    return language_code_at(target_language_index());
   }
 
   // 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 77 matching lines @@
   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_;
 
-  TranslateUIDelegate ui_delegate_;
+  // The list supported languages for translation.

[Peter Kasting, 2013/11/08 23:47:47]

Nit: All three of these comments have grammar issues.  Are these the original
comments for these variables, back before the translate delegate?  If not,
restore the original comments.

[hajimehoshi, 2013/11/11 04:01:02]

Done. They were original.: https://codereview.chromium.org/23708029

+  std::vector<LanguageNamePair> languages_;
+
+  // The index for language the page is originally in.
+  size_t original_language_index_;
+
+  // The index for language the page should be translated to.
+  size_t target_language_index_;
 
   // 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_