Android: implement content::Shell::Close()

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

 // Copyright (c) 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;
@@ skipping 74 matching lines @@
     }
 
     @SuppressWarnings("unused")
     @CalledByNative
     private Object createShell() {
         LayoutInflater inflater =
                 (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
         Shell shellView = (Shell) inflater.inflate(R.layout.shell_view, null);
         shellView.setWindow(mWindow);
 
-        removeAllViews();
-        if (mActiveShell != null) {
-            ContentView contentView = mActiveShell.getContentView();
-            if (contentView != null) contentView.onHide();
-            mActiveShell.setContentViewRenderView(null);
-        }
+        if (mActiveShell != null) closeShell(mActiveShell);
 
         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.setCurrentContentView(contentView);
             contentView.onShow();
         }
 
         return shellView;
     }
 
+    @SuppressWarnings("unused")
+    @CalledByNative
+    private void closeShell(Shell shellView) {
+        if (shellView == mActiveShell) mActiveShell = null;
+        ContentView contentView = shellView.getContentView();
+        if (contentView != null) contentView.onHide();
+        shellView.setContentViewRenderView(null);
+        shellView.setWindow(null);
+        removeView(shellView);
+    }
+
     private static native void nativeInit(Object shellManagerInstance);
     private static native void nativeLaunchShell(String url);
 }