Refactor ShortcutHelper (Java/C++) to allow asynchronous init.

chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.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;
 
 import android.app.ActivityManager;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
@@ skipping 20 matching lines @@
 
     /**
      * Sets the class name used when launching the shortcuts.
      * @param fullScreenAction Class name of the fullscreen Activity.
      */
     public static void setFullScreenAction(String fullScreenAction) {
         sFullScreenAction = fullScreenAction;
     }
 
     /**
+     * Callback to be passed to the initialized() method.
+     */
+    public interface OnInitialized {
+        public void onInitialized(String title);
+    }
+
+    private final Context mAppContext;
+    private final Tab mTab;
+
+    private OnInitialized mCallback;
+    private boolean mIsInitialized = false;

[gone, 2014/09/11 20:32:21]

defaults to false

[mlamouri (slow - plz ping), 2014/09/12 10:15:16]

Interesting.

+    private long mNativeShortcutHelper = 0;

[gone, 2014/09/11 20:32:21]

defaults to 0

[mlamouri (slow - plz ping), 2014/09/12 10:15:16]

Done.

+
+    public ShortcutHelper(Context appContext, Tab tab) {
+        mAppContext = appContext;
+        mTab = tab;
+    }
+
+    /**
+     * Gets all the information required to initialize the UI, the passed
+     * callback will be run when those information will be available.
+     * @param callback Callback to be run when initialized.
+     */
+    public void initialize(OnInitialized callback) {
+        mCallback = callback;
+        mNativeShortcutHelper = nativeInitialize(mTab.getNativePtr());
+    }
+
+    /**
+     * Returns whether the object is initialized.
+     */
+    public boolean isInitialized() {
+        return mIsInitialized;
+    }
+
+    /**
+     * Puts the object in a state where it is safe to be destroyed.
+     */
+    public void tearDown() {
+        nativeTearDown(mNativeShortcutHelper);
+
+        // Make sure the callback isn't run if the tear down happens before
+        // onInitialized() is called.
+        mCallback = null;
+        mNativeShortcutHelper = 0;
+    }
+
+    @CalledByNative
+    private void onInitialized(String title) {
+        mIsInitialized = true;
+
+        if (mCallback != null) {
+            mCallback.onInitialized(title);
+        }
+    }
+
+    /**
      * Adds a shortcut for the current Tab.
-     * @param appContext The application context.
-     * @param tab Tab to create a shortcut for.
      * @param userRequestedTitle Updated title for the shortcut.
      */
-    public static void addShortcut(Context appContext, Tab tab, String userRequestedTitle) {
+    public void addShortcut(String userRequestedTitle) {
         if (TextUtils.isEmpty(sFullScreenAction)) {
             Log.e("ShortcutHelper", "ShortcutHelper is uninitialized.  Aborting.");
             return;
         }
-        ActivityManager am = (ActivityManager) appContext.getSystemService(
+        ActivityManager am = (ActivityManager) mAppContext.getSystemService(
                 Context.ACTIVITY_SERVICE);
-        nativeAddShortcut(tab.getNativePtr(), userRequestedTitle, am.getLauncherLargeIconSize());
+        nativeAddShortcut(mNativeShortcutHelper, userRequestedTitle, am.getLauncherLargeIconSize());
+
+        // The C++ instance is no longer owned by the Java object.
+        mCallback = null;
+        mNativeShortcutHelper = 0;
     }
 
     /**
      * Called when we have to fire an Intent to add a shortcut to the homescreen.
      * If the webpage indicated that it was capable of functioning as a webapp, it is added as a
      * shortcut to a webapp Activity rather than as a general bookmark. User is sent to the
      * homescreen as soon as the shortcut is created.
      */
     @SuppressWarnings("unused")
     @CalledByNative
@@ skipping 35 matching lines @@
         context.sendBroadcast(BookmarkUtils.createAddToHomeIntent(context, shortcutIntent, title,
                 favicon, red, green, blue));
 
         // User is sent to the homescreen as soon as the shortcut is created.
         Intent homeIntent = new Intent(Intent.ACTION_MAIN);
         homeIntent.addCategory(Intent.CATEGORY_HOME);
         homeIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         context.startActivity(homeIntent);
     }
 
-    private static native void nativeAddShortcut(long tabAndroidPtr, String userRequestedTitle,
+    private native long nativeInitialize(long tabAndroidPtr);
+    private native void nativeAddShortcut(long nativeShortcutHelper, String userRequestedTitle,
             int launcherLargeIconSize);
+    private native void nativeTearDown(long nativeShortcutHelper);
 }