Removing ContentViewCore dependencies from few functions which acts as direct wrapper to WebContents

chrome/android/java/src/org/chromium/chrome/browser/Tab.java

 // Copyright 2014 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.Activity;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Color;
@@ skipping 196 matching lines @@
         public void onUpdateUrl(String url) {
             for (TabObserver observer : mObservers) observer.onUpdateUrl(Tab.this, url);
         }
 
         @Override
         public void showRepostFormWarningDialog(final ContentViewCore contentViewCore) {
             RepostFormWarningDialog warningDialog = new RepostFormWarningDialog(
                     new Runnable() {
                         @Override
                         public void run() {
-                            contentViewCore.cancelPendingReload();
+                            getWebContents().getNavigationController().cancelPendingReload();
                         }
                     }, new Runnable() {
                         @Override
                         public void run() {
-                            contentViewCore.continuePendingReload();
+                            getWebContents().getNavigationController().continuePendingReload();
                         }
                     });
             Activity activity = (Activity) mContext;
             warningDialog.show(activity.getFragmentManager(), null);
         }
 
         @Override
         public void toggleFullscreenModeForTab(boolean enableFullscreen) {
             for (TabObserver observer : mObservers) {
                 observer.onToggleFullscreenMode(Tab.this, enableFullscreen);
@@ skipping 123 matching lines @@
      * @param observer The {@link TabObserver} to remove.
      */
     public void removeObserver(TabObserver observer) {
         mObservers.removeObserver(observer);
     }
 
     /**
      * @return Whether or not this tab has a previous navigation entry.
      */
     public boolean canGoBack() {
-        return mContentViewCore != null && mContentViewCore.canGoBack();
+        return getWebContents() != null && getWebContents().getNavigationController().canGoBack();
     }
 
     /**
      * @return Whether or not this tab has a navigation entry after the current one.
      */
     public boolean canGoForward() {
-        return mContentViewCore != null && mContentViewCore.canGoForward();
+        return getWebContents() != null && getWebContents().getNavigationController()
+                .canGoForward();
     }
 
     /**
      * Goes to the navigation entry before the current one.
      */
     public void goBack() {
-        if (mContentViewCore != null) mContentViewCore.goBack();
+        if (getWebContents() != null) getWebContents().getNavigationController().goBack();
     }
 
     /**
      * Goes to the navigation entry after the current one.
      */
     public void goForward() {
-        if (mContentViewCore != null) mContentViewCore.goForward();
+        if (getWebContents() != null) getWebContents().getNavigationController().goForward();
     }
 
     @Override
     public NavigationHistory getDirectedNavigationHistory(boolean isForward, int itemLimit) {
-        if (mContentViewCore != null) {
-            return mContentViewCore.getDirectedNavigationHistory(isForward, itemLimit);
+        if (getWebContents() != null) {
+            return getWebContents().getNavigationController()
+                    .getDirectedNavigationHistory(isForward, itemLimit);
         } else {
             return new NavigationHistory();
         }
     }
 
     @Override
     public void goToNavigationIndex(int index) {
-        if (mContentViewCore != null) mContentViewCore.goToNavigationIndex(index);
+        if (getWebContents() != null) {
+            getWebContents().getNavigationController().goToNavigationIndex(index);
+        }
     }
 
     /**
      * Loads the current navigation if there is a pending lazy load (after tab restore).
      */
     public void loadIfNecessary() {
-        if (mContentViewCore != null) mContentViewCore.loadIfNecessary();
+        if (getWebContents() != null) getWebContents().getNavigationController().loadIfNecessary();
     }
 
     /**
      * Requests the current navigation to be loaded upon the next call to loadIfNecessary().
      */
     protected void requestRestoreLoad() {
-        if (mContentViewCore != null) mContentViewCore.requestRestoreLoad();
+        if (getWebContents() != null) {
+            getWebContents().getNavigationController().requestRestoreLoad();
+        }
     }
 
     /**
      * Causes this tab to navigate to the specified URL.
      * @param params parameters describing the url load. Note that it is important to set correct
      *               page transition as it is used for ranking URLs in the history so the omnibox
      *               can report suggestions correctly.
      * @return FULL_PRERENDERED_PAGE_LOAD or PARTIAL_PRERENDERED_PAGE_LOAD if the page has been
      *         prerendered. DEFAULT_PAGE_LOAD if it had not.
      */
@@ skipping 21 matching lines @@
             observer.onLoadUrl(this, params.getUrl(), loadType);
         }
         return loadType;
     }
 
     /**
      * @return Whether or not the {@link Tab} is currently showing an interstitial page, such as
      *         a bad HTTPS page.
      */
     public boolean isShowingInterstitialPage() {
-        ContentViewCore contentViewCore = getContentViewCore();
-        return contentViewCore != null && contentViewCore.isShowingInterstitialPage();
+        return getWebContents() != null && getWebContents().isShowingInterstitialPage();
     }
 
     /**
      * @return Whether or not the tab has something valid to render.
      */
     public boolean isReady() {
         return mNativePage != null || (mContentViewCore != null && mContentViewCore.isReady());
     }
 
     /**
@@ skipping 57 matching lines @@
     public boolean print() {
         assert mNativeTabAndroid != 0;
         return nativePrint(mNativeTabAndroid);
     }
 
     /**
      * Reloads the current page content.
      */
     public void reload() {
         // TODO(dtrainor): Should we try to rebuild the ContentView if it's frozen?
-        if (mContentViewCore != null) mContentViewCore.reload(true);
+        if (getWebContents() != null) getWebContents().getNavigationController().reload(true);
     }
 
     /**
      * Reloads the current page content.
      * This version ignores the cache and reloads from the network.
      */
     public void reloadIgnoringCache() {
-        if (mContentViewCore != null) mContentViewCore.reloadIgnoringCache(true);
+        if (getWebContents() != null) {
+            getWebContents().getNavigationController().reloadIgnoringCache(true);
+        }
     }
 
     /** Stop the current navigation. */
     public void stopLoading() {
-        if (mContentViewCore != null) mContentViewCore.stopLoading();
+        if (getWebContents() != null) getWebContents().stop();
     }
 
     /**
      * @return The background color of the tab.
      */
     public int getBackgroundColor() {
         if (mNativePage != null) return mNativePage.getBackgroundColor();
-        if (mContentViewCore != null) return mContentViewCore.getBackgroundColor();
+        if (getWebContents() != null) return getWebContents().getBackgroundColor();
         return Color.WHITE;
     }
 
     /**
      * @return The web contents associated with this tab.
      */
     public WebContents getWebContents() {
         if (mNativeTabAndroid == 0) return null;
         return nativeGetWebContents(mNativeTabAndroid);
     }
@@ skipping 47 matching lines @@
         return mNativePage != null;
     }
 
     /**
      * Set whether or not the {@link ContentViewCore} should be using a desktop user agent for the
      * currently loaded page.
      * @param useDesktop     If {@code true}, use a desktop user agent.  Otherwise use a mobile one.
      * @param reloadOnChange Reload the page if the user agent has changed.
      */
     public void setUseDesktopUserAgent(boolean useDesktop, boolean reloadOnChange) {
-        if (mContentViewCore != null) {
-            mContentViewCore.setUseDesktopUserAgent(useDesktop, reloadOnChange);
+        if (getWebContents() != null) {
+            getWebContents().getNavigationController()
+                    .setUseDesktopUserAgent(useDesktop, reloadOnChange);
         }
     }
 
     /**
      * @return Whether or not the {@link ContentViewCore} is using a desktop user agent.
      */
     public boolean getUseDesktopUserAgent() {
-        return mContentViewCore != null && mContentViewCore.getUseDesktopUserAgent();
+        return getWebContents() != null && getWebContents().getNavigationController()
+                .getUseDesktopUserAgent();
     }
 
     /**
      * @return The current {ToolbarModelSecurityLevel} for the tab.
      */
     public int getSecurityLevel() {
         if (mNativeTabAndroid == 0) return ToolbarModelSecurityLevel.NONE;
         return nativeGetSecurityLevel(mNativeTabAndroid);
     }
 
@@ skipping 228 matching lines @@
      */
     public boolean isInitialized() {
         return mNativeTabAndroid != 0;
     }
 
     /**
      * @return The url associated with the tab.
      */
     @CalledByNative
     public String getUrl() {
-        return mContentViewCore != null ? mContentViewCore.getUrl() : "";
+        return getWebContents() != null ? getWebContents().getUrl() : "";
     }
 
     /**
      * @return The tab title.
      */
     @CalledByNative
     public String getTitle() {
         if (mNativePage != null) return mNativePage.getTitle();
-        if (mContentViewCore != null) return mContentViewCore.getTitle();
+        if (getWebContents() != null) return getWebContents().getTitle();
         return "";
     }
 
     /**
      * @return The bitmap of the favicon scaled to 16x16dp. null if no favicon
      *         is specified or it requires the default favicon.
      */
     public Bitmap getFavicon() {
         String url = getUrl();
         // Invalidate our cached values if necessary.
@@ skipping 293 matching lines @@
     private native int nativeLoadUrl(long nativeTabAndroid, String url, String extraHeaders,
             byte[] postData, int transition, String referrerUrl, int referrerPolicy,
             boolean isRendererInitiated);
     private native int nativeGetSecurityLevel(long nativeTabAndroid);
     private native void nativeSetActiveNavigationEntryTitleForUrl(long nativeTabAndroid, String url,
             String title);
     private native boolean nativePrint(long nativeTabAndroid);
     private native Bitmap nativeGetFavicon(long nativeTabAndroid);
     private native boolean nativeIsFaviconValid(long nativeTabAndroid);
 }