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

This patch implements the Shell::Close() method for Content Shell on Android.

BUG=138226

Review URL: https://chromiumcodereview.appspot.com/14977010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202852 0039d316-1c4b-4281-b951-d872f2087c98

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

@@ -92,12 +92,7 @@ public class ShellManager extends FrameLayout {
         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(
@@ -112,6 +107,17 @@ public class ShellManager extends FrameLayout {
         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);
 }

content/shell/android/shell_manager.cc

@@ -38,6 +38,12 @@ jobject CreateShellView(Shell* shell) {
   return Java_ShellManager_createShell(env, j_shell_manager).Release();
 }
 
+void CloseShellView(jobject shell_view) {
+  JNIEnv* env = base::android::AttachCurrentThread();
+  jobject j_shell_manager = g_global_state.Get().j_shell_manager.obj();
+  Java_ShellManager_closeShell(env, j_shell_manager, shell_view);
+}
+
 // Register native methods
 bool RegisterShellManager(JNIEnv* env) {
   return RegisterNativesImpl(env);

content/shell/android/shell_manager.h

@@ -24,6 +24,9 @@ namespace content {
 // object.
 jobject CreateShellView(Shell* shell);
 
+// Closes a previously created shell view.
+void CloseShellView(jobject shell_view);
+
 // Registers the ShellManager native methods.
 bool RegisterShellManager(JNIEnv* env);
 

content/shell/shell_android.cc

@@ -80,8 +80,9 @@ bool Shell::PlatformIsFullscreenForTabOrPending(
 }
 
 void Shell::Close() {
-  // TODO(tedchoc): Implement Close method for android shell
-  NOTIMPLEMENTED();
+  CloseShellView(java_object_.obj());
+  java_object_.Reset();
+  delete this;
 }
 
 // static