Remove all external references to ContentView from Tab/Shell/etc.

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 26 matching lines @@
 
     private static final long COMPLETED_PROGRESS_TIMEOUT_MS = 200;
 
     private final Runnable mClearProgressRunnable = new Runnable() {
         @Override
         public void run() {
             mProgressDrawable.setLevel(0);
         }
     };
 
-    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;
@@ skipping 85 matching lines @@
         mUrlTextView.setOnEditorActionListener(new OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
                 if ((actionId != EditorInfo.IME_ACTION_GO) && (event == null ||
                         event.getKeyCode() != KeyEvent.KEYCODE_ENTER ||
                         event.getAction() != KeyEvent.ACTION_DOWN)) {
                     return false;
                 }
                 loadUrl(mUrlTextView.getText().toString());
                 setKeyboardVisibilityForUrl(false);
-                mContentView.requestFocus();
+                mContentViewCore.getContainerView().requestFocus();
                 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) {
@@ skipping 12 matching lines @@
     public void loadUrl(String url) {
         if (url == null) return;
 
         if (TextUtils.equals(url, mContentViewCore.getUrl())) {
             mContentViewCore.reload(true);
         } else {
             mContentViewCore.loadUrl(new LoadUrlParams(sanitizeUrl(url)));
         }
         mUrlTextView.clearFocus();
         // TODO(aurimas): Remove this when crbug.com/174541 is fixed.
-        mContentView.clearFocus();
-        mContentView.requestFocus();
+        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 url;
         if (url.startsWith("www.") || url.indexOf(":") == -1) url = "http://" + url;
@@ skipping 42 matching lines @@
     }
 
     @SuppressWarnings("unused")
     @CalledByNative
     private void setIsLoading(boolean loading) {
         mLoading = loading;
     }
 
     /**
      * Initializes the ContentView based on the native tab contents pointer passed in.
-     * @param nativeTabContents The pointer to the native tab contents object.
+     * @param nativeWebContents The pointer to the native tab contents object.
      */
     @SuppressWarnings("unused")
     @CalledByNative
-    private void initFromNativeTabContents(long nativeTabContents) {
-        mContentView = ContentView.newInstance(getContext(), nativeTabContents, mWindow);
-        mContentViewCore = mContentView.getContentViewCore();
+    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);
 
         if (getParent() != null) mContentViewCore.onShow();
         if (mContentViewCore.getUrl() != null) mUrlTextView.setText(mContentViewCore.getUrl());
-        ((FrameLayout) findViewById(R.id.contentview_holder)).addView(mContentView,
+        ((FrameLayout) findViewById(R.id.contentview_holder)).addView(cv,
                 new FrameLayout.LayoutParams(
                         FrameLayout.LayoutParams.MATCH_PARENT,
                         FrameLayout.LayoutParams.MATCH_PARENT));
-        mContentView.requestFocus();
+        cv.requestFocus();
         mContentViewRenderView.setCurrentContentViewCore(mContentViewCore);
     }
 
     /**
      * @return The {@link ViewGroup} currently shown by this Shell.
      */
     public ViewGroup getContentView() {
-        return mContentView;
+        return mContentViewCore.getContainerView();
     }
 
     /**
      * @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);
 }