ContentView->ContentViewCore in Shell/ShellManager.

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;
@@ skipping 25 matching lines @@
 
     private static final long COMPLETED_PROGRESS_TIMEOUT_MS = 200;
 
     private final Runnable mClearProgressRunnable = new Runnable() {
         @Override
         public void run() {
             mProgressDrawable.setLevel(0);
         }
     };
 
-    // TODO(jrg): a mContentView.destroy() call is needed, both upstream and downstream.
     private ContentView mContentView;
+    private ContentViewCore mContentViewCore;
     private ContentViewClient mContentViewClient;
     private EditText mUrlTextView;
     private ImageButton mPrevButton;
     private ImageButton mNextButton;
 
     private ClipDrawable mProgressDrawable;
 
     private long mNativeShell;
     private ContentViewRenderView mContentViewRenderView;
     private WindowAndroid mWindow;
@@ skipping 95 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(mContentView.getUrl());
+                    mUrlTextView.setText(mContentViewCore.getUrl());
                 }
             }
         });
     }
 
     /**
      * 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, mContentView.getUrl())) {
-            mContentView.getContentViewCore().reload(true);
+        if (TextUtils.equals(url, mContentViewCore.getUrl())) {
+            mContentViewCore.reload(true);
         } else {
-            mContentView.loadUrl(new LoadUrlParams(sanitizeUrl(url)));
+            mContentViewCore.loadUrl(new LoadUrlParams(sanitizeUrl(url)));
         }
         mUrlTextView.clearFocus();
         // TODO(aurimas): Remove this when crbug.com/174541 is fixed.
         mContentView.clearFocus();
         mContentView.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 url;
         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 (mContentView.canGoBack()) mContentView.goBack();
+                if (mContentViewCore.canGoBack()) mContentViewCore.goBack();
             }
         });
 
         mNextButton = (ImageButton) findViewById(R.id.next);
         mNextButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (mContentView.canGoForward()) mContentView.goForward();
+                if (mContentViewCore.canGoForward()) mContentViewCore.goForward();
             }
         });
     }
 
     @SuppressWarnings("unused")
     @CalledByNative
     private void onUpdateUrl(String url) {
         mUrlTextView.setText(url);
     }
 
@@ skipping 21 matching lines @@
     }
 
     /**
      * Initializes the ContentView based on the native tab contents pointer passed in.
      * @param nativeTabContents The pointer to the native tab contents object.
      */
     @SuppressWarnings("unused")
     @CalledByNative
     private void initFromNativeTabContents(long nativeTabContents) {
         mContentView = ContentView.newInstance(getContext(), nativeTabContents, mWindow);
-        mContentView.setContentViewClient(mContentViewClient);
-        if (getParent() != null) mContentView.onShow();
-        if (mContentView.getUrl() != null) mUrlTextView.setText(mContentView.getUrl());
+        mContentViewCore = mContentView.getContentViewCore();
+        mContentViewCore.setContentViewClient(mContentViewClient);
+
+        if (getParent() != null) mContentViewCore.onShow();
+        if (mContentViewCore.getUrl() != null) mUrlTextView.setText(mContentViewCore.getUrl());
         ((FrameLayout) findViewById(R.id.contentview_holder)).addView(mContentView,
                 new FrameLayout.LayoutParams(
                         FrameLayout.LayoutParams.MATCH_PARENT,
                         FrameLayout.LayoutParams.MATCH_PARENT));
         mContentView.requestFocus();
-        mContentViewRenderView.setCurrentContentViewCore(mContentView.getContentViewCore());
+        mContentViewRenderView.setCurrentContentViewCore(mContentViewCore);
     }
 
     /**
      * @return The {@link ContentView} currently shown by this Shell.
      */
     public ContentView getContentView() {
         return mContentView;
     }
 
+    /**
+     * @return The {@link ContentViewCore} currently managing the view shown by this Shell.
+     */
+    public ContentViewCore getContentViewCore() {
+        return mContentViewCore;
+    }
+
     private void setKeyboardVisibilityForUrl(boolean visible) {
         InputMethodManager imm = (InputMethodManager) getContext().getSystemService(
                 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);
 }