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

content/shell/android/java/src/org/chromium/content_shell/Shell.java

 // Copyright 2012 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_shell;
 
 import android.content.Context;
 import android.graphics.drawable.ClipDrawable;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
 import org.chromium.content.browser.ContentView;
 import org.chromium.content.browser.ContentViewClient;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.browser.ContentViewRenderView;
 import org.chromium.content_public.browser.LoadUrlParams;
+import org.chromium.content_public.browser.NavigationController;
+import org.chromium.content_public.browser.WebContents;
 import org.chromium.ui.base.WindowAndroid;
 
 /**
  * Container for the various UI components that make up a shell window.
  */
 @JNINamespace("content")
 public class Shell extends LinearLayout {
 
     private static final long COMPLETED_PROGRESS_TIMEOUT_MS = 200;
 
     private final Runnable mClearProgressRunnable = new Runnable() {
         @Override
         public void run() {
             mProgressDrawable.setLevel(0);
         }
     };
 
     private ContentViewCore mContentViewCore;
+    private WebContents mWebContents;
+    private NavigationController mNavigationController;
     private ContentViewClient mContentViewClient;
     private EditText mUrlTextView;
     private ImageButton mPrevButton;
     private ImageButton mNextButton;
     private ImageButton mStopButton;
     private ImageButton mReloadButton;
 
     private ClipDrawable mProgressDrawable;
 
     private long mNativeShell;
@@ skipping 97 matching lines @@
                 return true;
             }
         });
         mUrlTextView.setOnFocusChangeListener(new OnFocusChangeListener() {
             @Override
             public void onFocusChange(View v, boolean hasFocus) {
                 setKeyboardVisibilityForUrl(hasFocus);
                 mNextButton.setVisibility(hasFocus ? GONE : VISIBLE);
                 mPrevButton.setVisibility(hasFocus ? GONE : VISIBLE);
                 if (!hasFocus) {
-                    mUrlTextView.setText(mContentViewCore.getUrl());
+                    mUrlTextView.setText(mWebContents.getUrl());
                 }
             }
         });
         mUrlTextView.setOnKeyListener(new OnKeyListener() {
             @Override
             public boolean onKey(View v, int keyCode, KeyEvent event) {
                 if (keyCode == KeyEvent.KEYCODE_BACK) {
                     mContentViewCore.getContainerView().requestFocus();
                     return true;
                 }
                 return false;
             }
         });
     }
 
     /**
      * Loads an URL.  This will perform minimal amounts of sanitizing of the URL to attempt to
      * make it valid.
      *
      * @param url The URL to be loaded by the shell.
      */
     public void loadUrl(String url) {
         if (url == null) return;
 
-        if (TextUtils.equals(url, mContentViewCore.getUrl())) {
-            mContentViewCore.reload(true);
+        if (TextUtils.equals(url, mWebContents.getUrl())) {
+            mNavigationController.reload(true);
         } else {
-            mContentViewCore.loadUrl(new LoadUrlParams(sanitizeUrl(url)));
+            mNavigationController.loadUrl(new LoadUrlParams(sanitizeUrl(url)));
         }
         mUrlTextView.clearFocus();
         // TODO(aurimas): Remove this when crbug.com/174541 is fixed.
         mContentViewCore.getContainerView().clearFocus();
         mContentViewCore.getContainerView().requestFocus();
     }
 
     /**
      * Given an URL, this performs minimal sanitizing to ensure it will be valid.
      * @param url The url to be sanitized.
      * @return The sanitized URL.
      */
     public static String sanitizeUrl(String url) {
         if (url == null) return null;
         if (url.startsWith("www.") || url.indexOf(":") == -1) url = "http://" + url;
         return url;
     }
 
     private void initializeNavigationButtons() {
         mPrevButton = (ImageButton) findViewById(R.id.prev);
         mPrevButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (mContentViewCore.canGoBack()) mContentViewCore.goBack();
+                if (mNavigationController.canGoBack()) mNavigationController.goBack();
             }
         });
 
         mNextButton = (ImageButton) findViewById(R.id.next);
         mNextButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (mContentViewCore.canGoForward()) mContentViewCore.goForward();
+                if (mNavigationController.canGoForward()) mNavigationController.goForward();
             }
         });
         mStopButton = (ImageButton)findViewById(R.id.stop);
         mStopButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (mLoading) mContentViewCore.stopLoading();
+                if (mLoading) mWebContents.stop();
             }
         });
         mReloadButton = (ImageButton)findViewById(R.id.reload);
         mReloadButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
-                mContentViewCore.reload(true);
+                mNavigationController.reload(true);
             }
         });
     }
 
     @SuppressWarnings("unused")
     @CalledByNative
     private void onUpdateUrl(String url) {
         mUrlTextView.setText(url);
     }
 
@@ skipping 25 matching lines @@
      * @param nativeWebContents The pointer to the native tab contents object.
      */
     @SuppressWarnings("unused")
     @CalledByNative
     private void initFromNativeTabContents(long nativeWebContents) {
         Context context = getContext();
         mContentViewCore = new ContentViewCore(context);
         ContentView cv = ContentView.newInstance(context, mContentViewCore);
         mContentViewCore.initialize(cv, cv, nativeWebContents, mWindow);
         mContentViewCore.setContentViewClient(mContentViewClient);
-
+        mWebContents = mContentViewCore.getWebContents();
+        mNavigationController = mWebContents.getNavigationController();
         if (getParent() != null) mContentViewCore.onShow();
-        if (mContentViewCore.getUrl() != null) mUrlTextView.setText(mContentViewCore.getUrl());
+        if (mWebContents.getUrl() != null) {
+            mUrlTextView.setText(mWebContents.getUrl());
+        }
         ((FrameLayout) findViewById(R.id.contentview_holder)).addView(cv,
                 new FrameLayout.LayoutParams(
                         FrameLayout.LayoutParams.MATCH_PARENT,
                         FrameLayout.LayoutParams.MATCH_PARENT));
         cv.requestFocus();
         mContentViewRenderView.setCurrentContentViewCore(mContentViewCore);
     }
 
     /**
      * Enable/Disable navigation(Prev/Next) button if navigation is allowed/disallowed
@@ skipping 30 matching lines @@
                 Context.INPUT_METHOD_SERVICE);
         if (visible) {
             imm.showSoftInput(mUrlTextView, InputMethodManager.SHOW_IMPLICIT);
         } else {
             imm.hideSoftInputFromWindow(mUrlTextView.getWindowToken(), 0);
         }
     }
 
     private static native void nativeCloseShell(long shellPtr);
 }