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

chrome/android/java/src/org/chromium/chrome/browser/NavigationPopup.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.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Color;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.HeaderViewListAdapter;
 import android.widget.ListPopupWindow;
 import android.widget.PopupWindow;
 import android.widget.TextView;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.favicon.FaviconHelper;
 import org.chromium.chrome.browser.favicon.FaviconHelper.FaviconImageCallback;
-import org.chromium.chrome.browser.navigation.NavigationHandler;
 import org.chromium.chrome.browser.profiles.Profile;
+import org.chromium.content_public.browser.NavigationController;
 import org.chromium.content_public.browser.NavigationEntry;
 import org.chromium.content_public.browser.NavigationHistory;
 import org.chromium.ui.base.LocalizationUtils;
 
 import java.util.HashSet;
 import java.util.Set;
 
 /**
  * A popup that handles displaying the navigation history for a given tab.
  */
 public class NavigationPopup extends ListPopupWindow implements AdapterView.OnItemClickListener {
 
     private static final int MAXIMUM_HISTORY_ITEMS = 8;
 
     private final Profile mProfile;
     private final Context mContext;
-    private final NavigationHandler mNavigationHandler;
+    private final NavigationController mNavigationController;
     private final NavigationHistory mHistory;
     private final NavigationAdapter mAdapter;
     private final ListItemFactory mListItemFactory;
 
     private final int mFaviconSize;
 
     private Bitmap mDefaultFavicon;
 
     /**
       * Loads the favicons asynchronously.
       */
     private FaviconHelper mFaviconHelper;
 
     private boolean mInitialized;
 
     /**
      * Constructs a new popup with the given history information.
      *
      * @param profile The profile used for fetching favicons.
      * @param context The context used for building the popup.
      * @param navigationController The controller which takes care of page navigations.
      * @param isForward Whether to request forward navigation entries.
      */
     public NavigationPopup(Profile profile, Context context,
-            NavigationHandler navigationController, boolean isForward) {
+            NavigationController navigationController, boolean isForward) {
         super(context, null, android.R.attr.popupMenuStyle);
         mProfile = profile;
         mContext = context;
-        mNavigationHandler = navigationController;
-        mHistory = mNavigationHandler.getDirectedNavigationHistory(
+        mNavigationController = navigationController;
+        mHistory = mNavigationController.getDirectedNavigationHistory(
                 isForward, MAXIMUM_HISTORY_ITEMS);
         mAdapter = new NavigationAdapter();
 
         mFaviconSize = mContext.getResources().getDimensionPixelSize(R.dimen.default_favicon_size);
 
         setModal(true);
         setInputMethodMode(PopupWindow.INPUT_METHOD_NOT_NEEDED);
         setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
         setOnItemClickListener(this);
 
@@ skipping 71 matching lines @@
         for (int i = 0; i < mHistory.getEntryCount(); i++) {
             NavigationEntry entry = mHistory.getEntryAtIndex(i);
             if (TextUtils.equals(pageUrl, entry.getUrl())) entry.updateFavicon((Bitmap) favicon);
         }
         mAdapter.notifyDataSetChanged();
     }
 
     @Override
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
         NavigationEntry entry = (NavigationEntry) parent.getItemAtPosition(position);
-        mNavigationHandler.goToNavigationIndex(entry.getIndex());
+        mNavigationController.goToNavigationIndex(entry.getIndex());
         dismiss();
     }
 
     private void updateBitmapForTextView(TextView view, Bitmap bitmap) {
         Drawable faviconDrawable = null;
         if (bitmap != null) {
             faviconDrawable = new BitmapDrawable(mContext.getResources(), bitmap);
             ((BitmapDrawable) faviconDrawable).setGravity(Gravity.FILL);
         } else {
             faviconDrawable = new ColorDrawable(Color.TRANSPARENT);
@@ skipping 80 matching lines @@
             String entryText = entry.getTitle();
             if (TextUtils.isEmpty(entryText)) entryText = entry.getVirtualUrl();
             if (TextUtils.isEmpty(entryText)) entryText = entry.getUrl();
             view.setText(entryText);
             updateBitmapForTextView(view, entry.getFavicon());
 
             return view;
         }
     }
 }