Merge 280395 "[Translate] Remove the ability to change the langu..."

> [Translate] Remove the ability to change the language for manual translations
> 
> Android only, this was introduced by https://codereview.chromium.org/197683002/
> as part of the Emoji April's fool feature and not reverted later.
> Now it's causing bugs
> 
> BUG=387643
> 
> Review URL: https://codereview.chromium.org/352313005

TBR=miguelg@chromium.org

Review URL: https://codereview.chromium.org/342793004

git-svn-id: svn://svn.chromium.org/chrome/branches/1985/src@280606 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 5 insertions, 7 deletions

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateInfoBar.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateInfoBar.java
index 9ce696d6..9300c01 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateInfoBar.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateInfoBar.java
@@ -47,6 +47,7 @@ public class TranslateInfoBar extends TwoButtonInfoBar implements SubPanelListen
             boolean triggeredFromMenu, String[] languages) {
         super(null, BACKGROUND_TYPE_INFO,
                 R.drawable.infobar_translate);
+
         mTranslateDelegate = delegate;
         mOptions = new TranslateOptions(sourceLanguageIndex, targetLanguageIndex, languages,
                 autoTranslatePair, triggeredFromMenu);
@@ -334,12 +335,10 @@ public class TranslateInfoBar extends TwoButtonInfoBar implements SubPanelListen
         return mInfoBarType;
     }
 
-    void changeInfoBarTypeAndNativePointer(
-            int infoBarType,int newTargetLanguage,  long newNativePointer) {
+    void changeInfoBarTypeAndNativePointer(int infoBarType, long newNativePointer) {
         if (infoBarType >= 0 && infoBarType < MAX_INFOBAR_INDEX) {
             mInfoBarType = infoBarType;
             replaceNativePointer(newNativePointer);
-            mOptions.setTargetLanguage(newTargetLanguage);
             updateViewForCurrentState(createView());
         } else {
             assert false : "Trying to change the InfoBar to a type that is invalid.";
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateInfoBarDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateInfoBarDelegate.java
index 4d63b58..00d9d40 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateInfoBarDelegate.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateInfoBarDelegate.java
@@ -21,9 +21,9 @@ public class TranslateInfoBarDelegate {
 
     @CalledByNative
     boolean changeTranslateInfoBarTypeAndPointer(
-            long newNativeInfoBar, int translateBarType, int new_target_language) {
+            long newNativeInfoBar, int translateBarType) {
         mInfoBar.changeInfoBarTypeAndNativePointer(
-                translateBarType, new_target_language, newNativeInfoBar);
+                translateBarType, newNativeInfoBar);
         return true;
     }
 
diff --git a/chrome/browser/ui/android/infobars/translate_infobar.cc b/chrome/browser/ui/android/infobars/translate_infobar.cc
index ab53bdb..5d5ce52 100644
--- a/chrome/browser/ui/android/infobars/translate_infobar.cc
+++ b/chrome/browser/ui/android/infobars/translate_infobar.cc
@@ -106,11 +106,10 @@ void TranslateInfoBar::ApplyTranslateOptions(JNIEnv* env,
 
 void TranslateInfoBar::TransferOwnership(TranslateInfoBar* destination,
                                          translate::TranslateStep new_type) {
-  int new_target_language = destination->GetDelegate()->target_language_index();
   JNIEnv* env = base::android::AttachCurrentThread();
   if (Java_TranslateInfoBarDelegate_changeTranslateInfoBarTypeAndPointer(
       env, java_translate_delegate_.obj(),
-      reinterpret_cast<intptr_t>(destination), new_type, new_target_language)) {
+      reinterpret_cast<intptr_t>(destination), new_type)) {
     ReassignJavaInfoBar(destination);
     destination->SetJavaDelegate(java_translate_delegate_.Release());
   }