ContentView->ContentViewCore in Shell/ShellManager.

content/shell/android/java/src/org/chromium/content_shell/ShellManager.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.app.Activity;
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.FrameLayout;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.CommandLine;
 import org.chromium.base.JNINamespace;
 import org.chromium.base.ThreadUtils;
 import org.chromium.content.browser.ActivityContentVideoViewClient;
 import org.chromium.content.browser.ContentVideoViewClient;
-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.common.ContentSwitches;
 import org.chromium.ui.base.WindowAndroid;
 
 /**
  * Container and generator of ShellViews.
  */
 @JNINamespace("content")
 public class ShellManager extends FrameLayout {
 
@@ skipping 112 matching lines @@
 
         showShell(shellView);
         return shellView;
     }
 
     private void showShell(Shell shellView) {
         shellView.setContentViewRenderView(mContentViewRenderView);
         addView(shellView, new FrameLayout.LayoutParams(
                 FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT));
         mActiveShell = shellView;
-        ContentView contentView = mActiveShell.getContentView();
-        if (contentView != null) {
-            mContentViewRenderView.setCurrentContentViewCore(contentView.getContentViewCore());
-            contentView.getContentViewCore().onShow();
+        ContentViewCore contentViewCore = mActiveShell.getContentViewCore();
+        if (contentViewCore != null) {
+            mContentViewRenderView.setCurrentContentViewCore(contentViewCore);
+            contentViewCore.onShow();
         }
     }
 
     @CalledByNative
     private void removeShell(Shell shellView) {
         if (shellView == mActiveShell) mActiveShell = null;
         if (shellView.getParent() == null) return;
-        ContentView contentView = shellView.getContentView();
-        if (contentView != null) contentView.onHide();
+        ContentViewCore contentViewCore = shellView.getContentViewCore();
+        if (contentViewCore != null) contentViewCore.onHide();
         shellView.setContentViewRenderView(null);
         removeView(shellView);
     }
 
     private static native void nativeInit(Object shellManagerInstance);
     private static native void nativeLaunchShell(String url);
 }