Migration of code from ContentViewCore to NavigationController to avoid ContentViewCore abstraction…

content/public/android/java/src/org/chromium/content/browser/framehost/NavigationControllerImpl.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.content.browser.framehost;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
 import org.chromium.content_public.browser.NavigationController;
 
@@ skipping 61 matching lines @@
         }
     }
 
     @Override
     public void goForward() {
         if (mNativeNavigationControllerAndroid != 0) {
             nativeGoForward(mNativeNavigationControllerAndroid);
         }
     }
 
+    /**
+     * Loads the current navigation if there is a pending lazy load (after tab restore).
+     */

[Yaron, 2014/07/02 17:32:39]

Please remove function comments and replace them with @Override (for all new
functions)

[AKVT, 2014/07/05 10:32:17]

Done.

+    public void loadIfNecessary() {
+        if (mNativeNavigationControllerAndroid != 0) {
+            nativeLoadIfNecessary(mNativeNavigationControllerAndroid);
+        }
+    }
+
+    /**
+     * Requests the current navigation to be loaded upon the next call to loadIfNecessary().
+     */
+    public void requestRestoreLoad() {
+        if (mNativeNavigationControllerAndroid != 0) {
+            nativeRequestRestoreLoad(mNativeNavigationControllerAndroid);
+        }
+    }
+
+    /**
+     * Reload the current page.
+     */
+    public void reload(boolean checkForRepost) {
+        if (mNativeNavigationControllerAndroid != 0) {
+            nativeReload(mNativeNavigationControllerAndroid, checkForRepost);
+        }
+    }
+
+    /**
+     * Reload the current page, ignoring the contents of the cache.
+     */
+    public void reloadIgnoringCache(boolean checkForRepost) {
+        if (mNativeNavigationControllerAndroid != 0) {
+            nativeReloadIgnoringCache(mNativeNavigationControllerAndroid, checkForRepost);
+        }
+    }
+
+    /**
+     * Cancel the pending reload.
+     */
+    public void cancelPendingReload() {
+        if (mNativeNavigationControllerAndroid != 0) {
+            nativeCancelPendingReload(mNativeNavigationControllerAndroid);
+        }
+    }
+
+    /**
+     * Continue the pending reload.
+     */
+    public void continuePendingReload() {
+        if (mNativeNavigationControllerAndroid != 0) {
+            nativeContinuePendingReload(mNativeNavigationControllerAndroid);
+        }
+    }
+
     private native boolean nativeCanGoBack(long nativeNavigationControllerAndroid);
     private native boolean nativeCanGoForward(long nativeNavigationControllerAndroid);
+    private native void nativeLoadIfNecessary(long nativeNavigationControllerAndroid);
+    private native void nativeRequestRestoreLoad(long nativeNavigationControllerAndroid);
     private native boolean nativeCanGoToOffset(
             long nativeNavigationControllerAndroid, int offset);
     private native void nativeGoBack(long nativeNavigationControllerAndroid);
     private native void nativeGoForward(long nativeNavigationControllerAndroid);
     private native void nativeGoToOffset(long nativeNavigationControllerAndroid, int offset);
     private native void nativeGoToNavigationIndex(
             long nativeNavigationControllerAndroid, int index);
+    private native void nativeCancelPendingReload(long nativeNavigationControllerAndroid);
+    private native void nativeContinuePendingReload(long nativeNavigationControllerAndroid);
+    private native void nativeReload(long nativeNavigationControllerAndroid,
+            boolean checkForRepost);
+    private native void nativeReloadIgnoringCache(long nativeNavigationControllerAndroid,
+            boolean checkForRepost);
 }