Straighten up life cycle of native InfoBar pointers

chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateInfoBar.java

 // 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.
 
 package org.chromium.chrome.browser.infobar;
 
 import android.content.Context;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.text.style.ClickableSpan;
 import android.view.View;
 import android.widget.CheckBox;
 
+import org.chromium.base.CalledByNative;
 import org.chromium.chrome.R;
 import org.chromium.ui.base.DeviceFormFactor;
 
 /**
  * Java version of the translate infobar
  */
 public class TranslateInfoBar extends InfoBar implements SubPanelListener {
     // Needs to be kept in sync with the Type enum in translate_infobar_delegate.h.
     public static final int BEFORE_TRANSLATE_INFOBAR = 0;
     public static final int TRANSLATING_INFOBAR = 1;
     public static final int AFTER_TRANSLATE_INFOBAR = 2;
     public static final int TRANSLATE_ERROR_INFOBAR = 3;
     public static final int MAX_INFOBAR_INDEX = 4;
 
     // Defines what subpanel needs to be shown, if any
     public static final int NO_PANEL = 0;
     public static final int LANGUAGE_PANEL = 1;
     public static final int NEVER_PANEL = 2;
     public static final int ALWAYS_PANEL = 3;
     public static final int MAX_PANEL_INDEX = 4;
 
+    private long mNativeTranslateInfoBarPtr;
     private int mInfoBarType;
     private final TranslateOptions mOptions;
     private int mOptionsPanelViewType;
     private TranslateSubPanel mSubPanel;
     private final boolean mShouldShowNeverBar;
-    private final TranslateInfoBarDelegate mTranslateDelegate;
 
-    public TranslateInfoBar(long nativeInfoBarPtr, TranslateInfoBarDelegate delegate,
-            int infoBarType, int sourceLanguageIndex, int targetLanguageIndex,
-            boolean autoTranslatePair, boolean shouldShowNeverBar,
+    @CalledByNative
+    private static InfoBar show(int translateBarType, int sourceLanguageIndex,
+            int targetLanguageIndex, boolean autoTranslatePair, boolean showNeverInfobar,
             boolean triggeredFromMenu, String[] languages) {
+        return new TranslateInfoBar(translateBarType, sourceLanguageIndex, targetLanguageIndex,
+                autoTranslatePair, showNeverInfobar, triggeredFromMenu, languages);
+    }
+
+    public TranslateInfoBar(int infoBarType, int sourceLanguageIndex, int targetLanguageIndex,

[David Trainor- moved to gerrit, 2015/06/03 19:38:45]

Javadoc.  Or make private because it's built from the static anyway.

[Changwan Ryu, 2015/06/04 01:42:27]

Changed to private.

+            boolean autoTranslatePair, boolean shouldShowNeverBar, boolean triggeredFromMenu,
+            String[] languages) {
         super(null, R.drawable.infobar_translate, null, null);
-        mTranslateDelegate = delegate;
         mOptions = new TranslateOptions(sourceLanguageIndex, targetLanguageIndex, languages,
                 autoTranslatePair, triggeredFromMenu);
         mInfoBarType = infoBarType;
         mShouldShowNeverBar = shouldShowNeverBar;
         mOptionsPanelViewType = NO_PANEL;
-        setNativeInfoBar(nativeInfoBarPtr);
     }
 
     @Override
     public void onCloseButtonClicked() {
         if (getInfoBarType() == BEFORE_TRANSLATE_INFOBAR && mOptionsPanelViewType == NO_PANEL) {
             // Make it behave exactly as the Nope Button.
             onButtonClicked(false);
         } else {
-            nativeOnCloseButtonClicked(mNativeInfoBarPtr);
+            super.onCloseButtonClicked();
         }
     }
 
     @Override
     public void onButtonClicked(boolean isPrimaryButton) {
         if (mSubPanel != null) {
             mSubPanel.onButtonClicked(isPrimaryButton);
             return;
         }
 
@@ skipping 126 matching lines @@
             // Apply options and close the infobar.
             onTranslateInfoBarButtonClicked(action);
         }
     }
 
     private void onTranslateInfoBarButtonClicked(int action) {
         onOptionsChanged();
 
         // We need to re-check if the pointer is null now because applying options (like never
         // translate this site) can sometimes trigger closing the InfoBar.
-        if (mNativeInfoBarPtr == 0) return;
-        nativeOnButtonClicked(mNativeInfoBarPtr, action, "");
+        onButtonClicked(action, "");
     }
 
     @Override
     public void setControlsEnabled(boolean state) {
         super.setControlsEnabled(state);
 
         // Handle the "Always Translate" checkbox.
         ContentWrapperView wrapper = getContentWrapper(false);
         if (wrapper != null) {
             CheckBox checkBox = (CheckBox) wrapper.findViewById(R.id.infobar_extra_check);
             if (checkBox != null) checkBox.setEnabled(state);
         }
     }
 
     @Override
     public void onOptionsChanged() {
-        if (mNativeInfoBarPtr == 0) return;
+        if (mNativeTranslateInfoBarPtr == 0) return;
 
         if (mOptions.optionsChanged()) {
-            mTranslateDelegate.applyTranslateOptions(mNativeInfoBarPtr,
-                    mOptions.sourceLanguageIndex(),
-                    mOptions.targetLanguageIndex(),
-                    mOptions.alwaysTranslateLanguageState(),
-                    mOptions.neverTranslateLanguageState(),
-                    mOptions.neverTranslateDomainState());
+            nativeApplyTranslateOptions(mNativeTranslateInfoBarPtr, mOptions.sourceLanguageIndex(),
+                    mOptions.targetLanguageIndex(), mOptions.alwaysTranslateLanguageState(),
+                    mOptions.neverTranslateLanguageState(), mOptions.neverTranslateDomainState());
         }
     }
 
     private boolean needsNeverPanel() {
         return (getInfoBarType() == TranslateInfoBar.BEFORE_TRANSLATE_INFOBAR
                 && mShouldShowNeverBar);
     }
 
     private boolean needsAlwaysPanel() {
         return (getInfoBarType() == TranslateInfoBar.AFTER_TRANSLATE_INFOBAR
@@ skipping 76 matching lines @@
             }
         }, 0, linkText.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
         result.append(formattedChange);
         return result;
     }
 
     int getInfoBarType() {
         return mInfoBarType;
     }
 
-    void changeInfoBarTypeAndNativePointer(int infoBarType, long newNativePointer) {
+    @CalledByNative
+    private void setNativePtr(long nativePtr) {
+        mNativeTranslateInfoBarPtr = nativePtr;
+    }
+
+    @CalledByNative
+    private void onNativeDestroyed() {

[David Trainor- moved to gerrit, 2015/06/03 19:38:45]

Same comment as before

[Changwan Ryu, 2015/06/04 01:42:27]

Done.

+        mNativeTranslateInfoBarPtr = 0;
+    }
+
+    @CalledByNative
+    private void changeTranslateInfoBarType(int infoBarType) {
         if (infoBarType >= 0 && infoBarType < MAX_INFOBAR_INDEX) {
             mInfoBarType = infoBarType;
-            replaceNativePointer(newNativePointer);
             updateViewForCurrentState(createView());
         } else {
             assert false : "Trying to change the InfoBar to a type that is invalid.";
         }
     }
+
+    @Override
+    protected void finalize() throws Throwable {

[David Trainor- moved to gerrit, 2015/06/03 19:38:45]

Same comment as before

[Changwan Ryu, 2015/06/04 01:42:27]

Done.

+        assert mNativeTranslateInfoBarPtr == 0;
+        super.finalize();
+    }
+
+    private native void nativeApplyTranslateOptions(long nativeTranslateInfoBar,
+            int sourceLanguageIndex, int targetLanguageIndex, boolean alwaysTranslate,
+            boolean neverTranslateLanguage, boolean neverTranslateSite);
 }