NOT FOR REVIEW: Aura on Android

content/shell/browser/shell_aura.cc

Index: content/shell/browser/shell_aura.cc
diff --git a/content/shell/browser/shell_aura.cc b/content/shell/browser/shell_aura.cc
index edc83efe36d24aab7a38c95e9c74694ce79d0176..1870440b3b3de48ad2eec5a022b861e85d42f1d8 100644
--- a/content/shell/browser/shell_aura.cc
+++ b/content/shell/browser/shell_aura.cc
@@ -11,8 +11,25 @@
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 
+#if defined(OS_ANDROID)
+#include "jni/Shell_jni.h"
+#endif
+
 namespace content {
 
+#if defined(OS_ANDROID)
+
+void CloseShell(JNIEnv* env, jclass clazz, jlong shellPtr) {
+  Shell* shell = reinterpret_cast<Shell*>(shellPtr);
+  shell->Close();
+}
+
+// static
+bool Shell::Register(JNIEnv* env) {
+  return RegisterNativesImpl(env);
+}
+#endif
+
 // static
 void Shell::PlatformInitialize(const gfx::Size& default_window_size) {
   CHECK(!platform_);
@@ -29,6 +46,13 @@ void Shell::PlatformExit() {
 }
 
 void Shell::PlatformCleanUp() {
+#if defined(OS_ANDROID)
+  JNIEnv* env = base::android::AttachCurrentThread();
+  if (java_object_.is_null())
+    return;
+
+  Java_Shell_onNativeDestroyed(env, java_object_.obj());
+#endif
 }
 
 void Shell::PlatformEnableUIControl(UIControl control, bool is_enabled) {