NOT FOR REVIEW: Aura on Android

components/web_contents_delegate_android/web_contents_delegate_android.cc

 // 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.
 
 #include "components/web_contents_delegate_android/web_contents_delegate_android.h"
 
 #include <android/keycodes.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
@@ skipping 230 matching lines @@
   if (obj.is_null())
     return true;
   return Java_WebContentsDelegateAndroid_onGoToEntryOffset(env, obj.obj(),
       offset);
 }
 
 void WebContentsDelegateAndroid::WebContentsCreated(
     WebContents* source_contents, int opener_render_frame_id,
     const std::string& frame_name, const GURL& target_url,
     WebContents* new_contents) {
+#if !defined(USE_AURA)
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env);
   if (obj.is_null())
     return;
 
   ScopedJavaLocalRef<jobject> jsource_contents;
   if (source_contents)
     jsource_contents = source_contents->GetJavaWebContents();
   ScopedJavaLocalRef<jobject> jnew_contents;
   if (new_contents)
     jnew_contents = new_contents->GetJavaWebContents();
 
   Java_WebContentsDelegateAndroid_webContentsCreated(
       env,
       obj.obj(),
       jsource_contents.obj(),
       opener_render_frame_id,
       base::android::ConvertUTF8ToJavaString(env, frame_name).Release(),
       base::android::ConvertUTF8ToJavaString(env, target_url.spec()).Release(),
       jnew_contents.obj());
+#endif
 }
 
 void WebContentsDelegateAndroid::CloseContents(WebContents* source) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env);
   if (obj.is_null())
     return;
   Java_WebContentsDelegateAndroid_closeContents(env, obj.obj());
 }
 
@@ skipping 58 matching lines @@
   ScopedJavaLocalRef<jstring> java_url =
       ConvertUTF8ToJavaString(env, source->GetURL().spec());
   Java_WebContentsDelegateAndroid_onUpdateUrl(env,
                                               obj.obj(),
                                               java_url.obj());
 }
 
 void WebContentsDelegateAndroid::HandleKeyboardEvent(
     WebContents* source,
     const content::NativeWebKeyboardEvent& event) {
-  jobject key_event = event.os_event;
+  jobject key_event = (jobject)event.os_event;
   if (key_event) {
     JNIEnv* env = AttachCurrentThread();
     ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env);
     if (obj.is_null())
       return;
     Java_WebContentsDelegateAndroid_handleKeyboardEvent(
         env, obj.obj(), key_event);
   }
 }
 
@@ skipping 81 matching lines @@
 // Native JNI methods
 // ----------------------------------------------------------------------------
 
 // Register native methods
 
 bool RegisterWebContentsDelegateAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace web_contents_delegate_android