NOT FOR REVIEW: Aura on Android

chrome/browser/android/chrome_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 "chrome/browser/android/chrome_web_contents_delegate_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/command_line.h"
 #include "chrome/browser/android/feature_utilities.h"
@@ skipping 29 matching lines @@
 #include "chrome/browser/pepper_broker_infobar_delegate.h"
 #endif
 
 using base::android::AttachCurrentThread;
 using base::android::ScopedJavaLocalRef;
 using content::FileChooserParams;
 using content::WebContents;
 
 namespace {
 
-ScopedJavaLocalRef<jobject> CreateJavaRectF(
-    JNIEnv* env,
-    const gfx::RectF& rect) {
-  return ScopedJavaLocalRef<jobject>(
-      Java_ChromeWebContentsDelegateAndroid_createRectF(env,
-                                                        rect.x(),
-                                                        rect.y(),
-                                                        rect.right(),
-                                                        rect.bottom()));
-}
+//ScopedJavaLocalRef<jobject> CreateJavaRectF(
+//    JNIEnv* env,
+//    const gfx::RectF& rect) {
+//  return ScopedJavaLocalRef<jobject>(
+//      Java_ChromeWebContentsDelegateAndroid_createRectF(env,
+//                                                        rect.x(),
+//                                                        rect.y(),
+//                                                        rect.right(),
+//                                                        rect.bottom()));
+//}
 
 ScopedJavaLocalRef<jobject> CreateJavaRect(
     JNIEnv* env,
     const gfx::Rect& rect) {
   return ScopedJavaLocalRef<jobject>(
       Java_ChromeWebContentsDelegateAndroid_createRect(
           env,
           static_cast<int>(rect.x()),
           static_cast<int>(rect.y()),
           static_cast<int>(rect.right()),
@@ skipping 247 matching lines @@
       obj.obj());
 }
 
 void ChromeWebContentsDelegateAndroid::AddNewContents(
     WebContents* source,
     WebContents* new_contents,
     WindowOpenDisposition disposition,
     const gfx::Rect& initial_rect,
     bool user_gesture,
     bool* was_blocked) {
+#if !defined(USE_AURA)
   // No code for this yet.
   DCHECK_NE(disposition, SAVE_TO_DISK);
   // Can't create a new contents for the current tab - invalid case.
   DCHECK_NE(disposition, CURRENT_TAB);
 
   TabHelpers::AttachTabHelpers(new_contents);
 
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env);
   bool handled = false;
@@ skipping 12 matching lines @@
         jnew_contents.obj(),
         static_cast<jint>(disposition),
         NULL,
         user_gesture);
   }
 
   if (was_blocked)
     *was_blocked = !handled;
   if (!handled)
     delete new_contents;
+#endif
 }
 
 }  // namespace android
 }  // namespace chrome
 
 jboolean IsCapturingAudio(JNIEnv* env,
                           jclass clazz,
                           jobject java_web_contents) {
+#if !defined(USE_AURA)
   content::WebContents* web_contents =
       content::WebContents::FromJavaWebContents(java_web_contents);
   scoped_refptr<MediaStreamCaptureIndicator> indicator =
       MediaCaptureDevicesDispatcher::GetInstance()->
           GetMediaStreamCaptureIndicator();
   return indicator->IsCapturingAudio(web_contents);
+#else
+  return true;
+#endif
 }
 
 jboolean IsCapturingVideo(JNIEnv* env,
                           jclass clazz,
                           jobject java_web_contents) {
+#if !defined(USE_AURA)
   content::WebContents* web_contents =
       content::WebContents::FromJavaWebContents(java_web_contents);
   scoped_refptr<MediaStreamCaptureIndicator> indicator =
       MediaCaptureDevicesDispatcher::GetInstance()->
           GetMediaStreamCaptureIndicator();
   return indicator->IsCapturingVideo(web_contents);
+#else
+  return true;
+#endif
 }
 
 jboolean HasAudibleAudio(JNIEnv* env,
                          jclass clazz,
                          jobject java_web_contents) {
+#if !defined(USE_AURA)
   content::WebContents* web_contents =
       content::WebContents::FromJavaWebContents(java_web_contents);
   return web_contents->WasRecentlyAudible();
+#else
+  return true;
+#endif
 }