Make the TranslateInfoBarDelegate once again use the TranslateUIDelegate.

chrome/browser/translate/translate_ui_delegate.h

 // Copyright 2013 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_UI_DELEGATE_H_
 #define CHROME_BROWSER_TRANSLATE_TRANSLATE_UI_DELEGATE_H_
 
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/translate/translate_errors.h"
 
 class TranslatePrefs;
 
 namespace content {
 class WebContents;
 }  // namespace content
 
 // The TranslateUIDelegate is a generic delegate for UI which offers Translate
 // feature to the user.
-//
-// Note: TranslateInfobarDelegate should be updated if this implementation is
-// updated.
 class TranslateUIDelegate {
  public:
   enum {
     NO_INDEX = -1,
   };
 
-  // A pair whose key is a language code and value is the language's
-  // displayable name.
-  typedef std::pair<std::string, string16> LanguageNamePair;
-
   TranslateUIDelegate(content::WebContents* web_contents,
                       const std::string& original_language,
                       const std::string& target_language,
                       TranslateErrors::Type error_type);
   virtual ~TranslateUIDelegate();
 
-  // Retrieves the displayable names of the supported languages, based on
-  // |locale|. The returned names are sorted in alphabetical order.
-  static std::vector<LanguageNamePair> GetSortedLanguageNames(
-      const std::string& locale);
-
-  // Gets the host of the page of |web_contents|, or an empty string if no URL
-  // is associated with the current page.
-  static std::string GetPageHost(content::WebContents* web_contents);
-
   content::WebContents* web_contents() { return web_contents_; }
 
   TranslateErrors::Type error_type() const { return error_type_; }
 
   void set_error_type(TranslateErrors::Type error_type) {
     error_type_ = error_type;
   }
 
   // Returns the number of languages supported.
   size_t GetNumberOfLanguages() const;
@@ skipping 45 matching lines @@
 
   // Returns true if the webpage in the current original language should be
   // translated into the current target language automatically.
   bool ShouldAlwaysTranslate();
 
   // Sets the value if the webpage in the current original language should be
   // translated into the current target language automatically.
   void SetAlwaysTranslate(bool value);
 
  private:
+  // Gets the host of the page being translated, or an empty string if no URL is
+  // associated with the current page.
+  std::string GetPageHost();
+
   content::WebContents* web_contents_;
 
+  typedef std::pair<std::string, string16> LanguageNamePair;
+
   // The list supported languages for translation.
   // The pair first string is the language ISO code (ex: en, fr...), the second
   // string is the displayable name on the current locale.
   // The languages are sorted alphabetically based on the displayable name.
   std::vector<LanguageNamePair> languages_;
 
   // The index for language the page is originally in.
   size_t original_language_index_;
 
+  // The index for language the page is originally in that was originally
+  // reported (original_language_index_ changes if the user selects a new
+  // original language, but this one does not).  This is necessary to report
+  // language detection errors with the right original language even if the user
+  // changed the original language.
+  size_t initial_original_language_index_;
+
   // The index for language the page should be translated to.
   size_t target_language_index_;
 
   // The translation related preferences.
   scoped_ptr<TranslatePrefs> prefs_;
 
   // The error type.
   TranslateErrors::Type error_type_;
 
   DISALLOW_COPY_AND_ASSIGN(TranslateUIDelegate);
 };
 
 #endif  // CHROME_BROWSER_TRANSLATE_TRANSLATE_UI_DELEGATE_H_