Revert "Changed NavigationController access to through tab in Java code"

chrome/android/java/src/org/chromium/chrome/browser/tab/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.tab;
 
 import android.app.Activity;
 import android.app.Application;
 import android.content.Context;
 import android.content.Intent;
@@ skipping 48 matching lines @@
 import org.chromium.chrome.browser.contextmenu.ContextMenuPopulator;
 import org.chromium.chrome.browser.contextualsearch.ContextualSearchTabHelper;
 import org.chromium.chrome.browser.crash.MinidumpDirectoryObserver;
 import org.chromium.chrome.browser.crash.MinidumpUploadService;
 import org.chromium.chrome.browser.customtabs.CustomTabActivity;
 import org.chromium.chrome.browser.download.ChromeDownloadDelegate;
 import org.chromium.chrome.browser.fullscreen.FullscreenManager;
 import org.chromium.chrome.browser.help.HelpAndFeedback;
 import org.chromium.chrome.browser.infobar.InfoBarContainer;
 import org.chromium.chrome.browser.media.ui.MediaSessionTabHelper;
-import org.chromium.chrome.browser.navigation.NavigationHandler;
-import org.chromium.chrome.browser.navigation.TabWebContentsNavigationHandler;
 import org.chromium.chrome.browser.ntp.NativePageAssassin;
 import org.chromium.chrome.browser.ntp.NativePageFactory;
 import org.chromium.chrome.browser.omnibox.geo.GeolocationHeader;
 import org.chromium.chrome.browser.policy.PolicyAuditor;
 import org.chromium.chrome.browser.prerender.ExternalPrerenderHandler;
 import org.chromium.chrome.browser.printing.TabPrinter;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.rlz.RevenueStats;
 import org.chromium.chrome.browser.search_engines.TemplateUrlService;
 import org.chromium.chrome.browser.snackbar.LofiBarController;
@@ skipping 300 matching lines @@
 
     private ChromeDownloadDelegate mDownloadDelegate;
 
     protected Handler mHandler;
 
     private LofiBarController mLoFiBarController;
 
     /** Whether or not the tab closing the tab can send the user back to the app that opened it. */
     private boolean mIsAllowedToReturnToExternalApp;
 
-    private NavigationHandler mNavigationHandler;
-
-    /**
-     * Method to access navigation handler for a tab.
-     * @return navigation handler.
-     */
-    public NavigationHandler getNavigationHandler() {
-        return mNavigationHandler;
-    }
-
     private class TabContentViewClient extends ContentViewClient {
         @Override
         public void onBackgroundColorChanged(int color) {
             Tab.this.onBackgroundColorChanged(color);
         }
 
         @Override
         public void onOffsetsForFullscreenChanged(
                 float topControlsOffsetY, float contentOffsetY) {
             onOffsetsChanged(topControlsOffsetY, contentOffsetY, isShowingSadTab());
@@ skipping 328 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 getNavigationHandler() != null && getNavigationHandler().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 getNavigationHandler() != null && getNavigationHandler().canGoForward();
+        return getWebContents() != null && getWebContents().getNavigationController()
+                .canGoForward();
     }
 
     /**
      * Goes to the navigation entry before the current one.
      */
     public void goBack() {
-        if (getNavigationHandler() != null) getNavigationHandler().goBack();
+        if (getWebContents() != null) getWebContents().getNavigationController().goBack();
     }
 
     /**
      * Goes to the navigation entry after the current one.
      */
     public void goForward() {
-        if (getNavigationHandler() != null) getNavigationHandler().goForward();
+        if (getWebContents() != null) getWebContents().getNavigationController().goForward();
     }
 
     /**
      * Loads the current navigation if there is a pending lazy load (after tab restore).
      */
     public void loadIfNecessary() {
-        if (getNavigationHandler() != null) getNavigationHandler().loadIfNecessary();
+        if (getWebContents() != null) getWebContents().getNavigationController().loadIfNecessary();
     }
 
     /**
      * Requests the current navigation to be loaded upon the next call to loadIfNecessary().
      */
     protected void requestRestoreLoad() {
-        if (getNavigationHandler() != null) {
-            getNavigationHandler().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 199 matching lines @@
 
         printingController.setPendingPrint(new TabPrinter(this),
                 new PrintManagerDelegateImpl(getActivity()));
     }
 
     /**
      * Reloads the current page content.
      */
     public void reload() {
         // TODO(dtrainor): Should we try to rebuild the ContentView if it's frozen?
-        if (getNavigationHandler() != null) getNavigationHandler().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 (getNavigationHandler() != null) {
-            getNavigationHandler().reloadBypassingCache(true);
+        if (getWebContents() != null) {
+            getWebContents().getNavigationController().reloadBypassingCache(true);
         }
     }
 
     /**
      * Reloads the current page content with Lo-Fi off.
      * This version ignores the cache and reloads from the network.
      */
     public void reloadDisableLoFi() {
-        if (getNavigationHandler() != null) {
-            getNavigationHandler().reloadDisableLoFi(true);
+        if (getWebContents() != null) {
+            getWebContents().getNavigationController().reloadDisableLoFi(true);
         }
     }
 
     /**
      * Reloads all the Lo-Fi images in this Tab's WebContents.
      * This version ignores the cache and reloads from the network.
      */
     public void reloadLoFiImages() {
         if (getWebContents() != null) {
             getWebContents().reloadLoFiImages();
@@ skipping 156 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 (getNavigationHandler() != null) {
-            getNavigationHandler().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 getNavigationHandler() != null
-                && getNavigationHandler().getUseDesktopUserAgent();
+        return getWebContents() != null && getWebContents().getNavigationController()
+                .getUseDesktopUserAgent();
     }
 
     /**
      * @return The current {@link ConnectionSecurityLevel} for the tab.
      */
     // TODO(tedchoc): Remove this and transition all clients to use ToolbarModel directly.
     public int getSecurityLevel() {
         return SecurityStateModel.getSecurityLevelForWebContents(getWebContents());
     }
 
@@ skipping 633 matching lines @@
             }
 
             mDownloadDelegate = new ChromeDownloadDelegate(mThemedApplicationContext, this);
 
             assert mNativeTabAndroid != 0;
             nativeInitWebContents(mNativeTabAndroid, mIncognito, mContentViewCore.getWebContents(),
                     mWebContentsDelegate,
                     new TabContextMenuPopulator(
                             mDelegateFactory.createContextMenuPopulator(this), this));
 
-            // TODO(shaktisahu): Add logic for blimp version of navigation handler.
-            mNavigationHandler = new TabWebContentsNavigationHandler(getWebContents());
-
             // In the case where restoring a Tab or showing a prerendered one we already have a
             // valid infobar container, no need to recreate one.
             if (mInfoBarContainer == null) {
                 // The InfoBarContainer needs to be created after the ContentView has been natively
                 // initialized.
                 mInfoBarContainer =  new InfoBarContainer(
                         mThemedApplicationContext, getId(), mContentViewParent, this);
             } else {
                 mInfoBarContainer.onParentViewChanged(getId(), mContentViewParent);
             }
             mInfoBarContainer.setContentViewCore(mContentViewCore);
 
             mSwipeRefreshHandler = new SwipeRefreshHandler(mThemedApplicationContext);
-            mSwipeRefreshHandler.setContentViewCore(mContentViewCore, getNavigationHandler());
+            mSwipeRefreshHandler.setContentViewCore(mContentViewCore);
 
             updateThemeColorIfNeeded(false);
             notifyContentChanged();
 
             // For browser tabs, we want to set accessibility focus to the page
             // when it loads. This is not the default behavior for embedded
             // web views.
             mContentViewCore.setShouldSetAccessibilityFocusOnPageLoad(true);
 
             setInterceptNavigationDelegate(mDelegateFactory.createInterceptNavigationDelegate(
@@ skipping 480 matching lines @@
         mContentViewCore.getContainerView().setOnSystemUiVisibilityChangeListener(null);
         if (mGestureStateListener != null) {
             mContentViewCore.removeGestureStateListener(mGestureStateListener);
         }
 
         if (mInfoBarContainer != null && mInfoBarContainer.getParent() != null) {
             mInfoBarContainer.removeFromParentView();
             mInfoBarContainer.setContentViewCore(null);
         }
         if (mSwipeRefreshHandler != null) {
-            mSwipeRefreshHandler.setContentViewCore(null, null);
+            mSwipeRefreshHandler.setContentViewCore(null);
             mSwipeRefreshHandler = null;
         }
-
-        mNavigationHandler = null;
-
         mContentViewParent = null;
         mContentViewCore.destroy();
         mContentViewCore = null;
 
         mWebContentsDelegate = null;
 
         if (mWebContentsObserver != null) {
             mWebContentsObserver.destroy();
             mWebContentsObserver = null;
         }
@@ skipping 892 matching lines @@
     private native void nativeSetInterceptNavigationDelegate(long nativeTabAndroid,
             InterceptNavigationDelegate delegate);
     private native void nativeAttachToTabContentManager(long nativeTabAndroid,
             TabContentManager tabContentManager);
     private native void nativeAttachOverlayWebContents(
             long nativeTabAndroid, WebContents webContents, boolean visible);
     private native void nativeDetachOverlayWebContents(
             long nativeTabAndroid, WebContents webContents);
     private native boolean nativeHasPrerenderedUrl(long nativeTabAndroid, String url);
 }