Fix a crash of the Content Shell for Android when showing videos in a ContentVideoView.

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.content.Context;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.widget.FrameLayout;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
 import org.chromium.base.ThreadUtils;
 import org.chromium.content.browser.ContentView;
+import org.chromium.content.browser.ContentViewClient;
 import org.chromium.content.browser.ContentViewRenderView;
 import org.chromium.ui.base.WindowAndroid;
 
 /**
  * Container and generator of ShellViews.
  */
 @JNINamespace("content")
 public class ShellManager extends FrameLayout {
 
     public static final String DEFAULT_SHELL_URL = "http://www.google.com";
     private static boolean sStartup = true;
     private WindowAndroid mWindow;
     private Shell mActiveShell;
 
     private String mStartupUrl = DEFAULT_SHELL_URL;
 
     // The target for all content rendering.
     private ContentViewRenderView mContentViewRenderView;
+    private ContentViewClient mContentViewClient;
 
     /**
      * Constructor for inflating via XML.
      */
     public ShellManager(Context context, AttributeSet attrs) {
         super(context, attrs);
         nativeInit(this);
     }
 
     /**
@@ skipping 47 matching lines @@
 
     /**
      * Enter or leave overlay video mode.
      * @param enabled Whether overlay mode is enabled.
      */
     public void setOverlayVideoMode(boolean enabled) {
         if (mContentViewRenderView == null) return;
         mContentViewRenderView.setOverlayVideoMode(enabled);
     }
 
+    public void setContentViewClient(ContentViewClient client) {

[Ted C, 2014/02/20 00:54:08]

I would just have ShellManager build the ContentViewClient instead of the
Activity (getContext() can be cast to an Activity to construct the
ContentVideoViewClient).

Then you can get rid of this plumbing.

+        mContentViewClient = client;
+    }
+
     @SuppressWarnings("unused")
     @CalledByNative
     private Object createShell(long nativeShellPtr) {
         assert mContentViewRenderView != null;
         LayoutInflater inflater =
                 (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
         Shell shellView = (Shell) inflater.inflate(R.layout.shell_view, null);
         shellView.initialize(nativeShellPtr, mWindow);
+        shellView.setContentViewClient(mContentViewClient);

[Ted C, 2014/02/20 00:54:08]

just pass this param with initialize above.

 
         // TODO(tedchoc): Allow switching back to these inactive shells.
         if (mActiveShell != null) removeShell(mActiveShell);
 
         showShell(shellView);
         return shellView;
     }
 
     private void showShell(Shell shellView) {
         shellView.setContentViewRenderView(mContentViewRenderView);
@@ skipping 13 matching lines @@
         if (shellView.getParent() == null) return;
         ContentView contentView = shellView.getContentView();
         if (contentView != null) contentView.onHide();
         shellView.setContentViewRenderView(null);
         removeView(shellView);
     }
 
     private static native void nativeInit(Object shellManagerInstance);
     private static native void nativeLaunchShell(String url);
 }