Removing NavigationClient dependencies from Tab.

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 13 matching lines @@
 import org.chromium.chrome.browser.contextmenu.ContextMenuPopulatorWrapper;
 import org.chromium.chrome.browser.contextmenu.EmptyChromeContextMenuItemDelegate;
 import org.chromium.chrome.browser.dom_distiller.DomDistillerFeedbackReporter;
 import org.chromium.chrome.browser.infobar.AutoLoginProcessor;
 import org.chromium.chrome.browser.infobar.InfoBarContainer;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.toolbar.ToolbarModel;
 import org.chromium.content.browser.ContentView;
 import org.chromium.content.browser.ContentViewClient;
 import org.chromium.content.browser.ContentViewCore;
-import org.chromium.content.browser.NavigationClient;
 import org.chromium.content.browser.WebContentsObserver;
 import org.chromium.content_public.browser.LoadUrlParams;
-import org.chromium.content_public.browser.NavigationHistory;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.ui.base.Clipboard;
 import org.chromium.ui.base.WindowAndroid;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * The basic Java representation of a tab.  Contains and manages a {@link ContentView}.
  *
  * Tab provides common functionality for ChromeShell Tab as well as Chrome on Android's
@@ skipping 17 matching lines @@
  *  to the parameter passed to that method.  This should be used when doing things like loading
  *  persisted {@link Tab}s from disk on process start to ensure all new {@link Tab}s don't have id
  *  collision.
  *    Some {@link Activity}s will not call this because they do not persist state, which means those
  *  ids can potentially conflict with the ones restored from persisted state depending on which
  *  {@link Activity} runs first on process start.  If {@link Tab}s are ever shared across
  *  {@link Activity}s or mixed with {@link Tab}s from other {@link Activity}s conflicts can occur
  *  unless special care is taken to make sure {@link Tab#incrementIdCounterTo(int)} is called with
  *  the correct value across all affected {@link Activity}s.
  */
-public class Tab implements NavigationClient {
+public class Tab {
     public static final int INVALID_TAB_ID = -1;
 
     /** Used for automatically generating tab ids. */
     private static final AtomicInteger sIdCounter = new AtomicInteger();
 
     private long mNativeTabAndroid;
 
     /** Unique id of this tab (within its container). */
     private final int mId;
 
@@ skipping 316 matching lines @@
         if (getWebContents() != null) getWebContents().getNavigationController().goBack();
     }
 
     /**
      * Goes to the navigation entry after the current one.
      */
     public void goForward() {
         if (getWebContents() != null) getWebContents().getNavigationController().goForward();
     }
 
-    @Override
-    public NavigationHistory getDirectedNavigationHistory(boolean isForward, int itemLimit) {
-        if (getWebContents() != null) {
-            return getWebContents().getNavigationController()
-                    .getDirectedNavigationHistory(isForward, itemLimit);
-        } else {
-            return new NavigationHistory();
-        }
-    }
-
-    @Override
-    public void goToNavigationIndex(int 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 (getWebContents() != null) getWebContents().getNavigationController().loadIfNecessary();
     }
 
     /**
      * Requests the current navigation to be loaded upon the next call to loadIfNecessary().
      */
@@ skipping 788 matching lines @@
     private native Profile nativeGetProfileAndroid(long nativeTabAndroid);
     private native int nativeLoadUrl(long nativeTabAndroid, String url, String extraHeaders,
             byte[] postData, int transition, String referrerUrl, int referrerPolicy,
             boolean isRendererInitiated);
     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);
 }