Implement DocuementHasImages

android_webview/native/aw_contents.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 "android_webview/native/aw_contents.h"
 
+#include "android_webview/browser/renderer_host/aw_render_view_host_ext.h"
 #include "android_webview/native/aw_browser_dependency_factory.h"
 #include "android_webview/native/aw_contents_container.h"
 #include "android_webview/native/aw_web_contents_delegate.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
+#include "base/bind.h"
+#include "base/callback.h"
 #include "base/supports_user_data.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/AwContents_jni.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertUTF16ToJavaString;
+using base::android::ScopedJavaGlobalRef;
+using base::android::ScopedJavaLocalRef;
 using content::ContentViewCore;
 using content::WebContents;
 
 namespace android_webview {
 
 namespace {
 
 const void* kAwContentsUserDataKey = &kAwContentsUserDataKey;
 
 class AwContentsUserData : public base::SupportsUserData::Data {
@@ skipping 28 matching lines @@
       android_webview::AwBrowserDependencyFactory::GetInstance();
   content::WebContents* web_contents =
       dependency_factory->CreateWebContents(private_browsing);
   contents_container_.reset(dependency_factory->CreateContentsContainer(
       web_contents));
   web_contents->SetDelegate(web_contents_delegate_.get());
   web_contents_delegate_->SetJavaScriptDialogCreator(
       dependency_factory->GetJavaScriptDialogCreator());
   web_contents->SetUserData(kAwContentsUserDataKey,
                             new AwContentsUserData(this));
+  render_view_host_ext_.reset(new AwRenderViewHostExt(web_contents));
 }
 
 AwContents::~AwContents() {
   content::WebContents* web_contents = contents_container_->GetWebContents();
   DCHECK(AwContents::FromWebContents(web_contents) == this);
   web_contents->RemoveUserData(kAwContentsUserDataKey);
 }
 
 jint AwContents::GetWebContents(JNIEnv* env, jobject obj) {
   return reinterpret_cast<jint>(contents_container_->GetWebContents());
 }
 
 void AwContents::Destroy(JNIEnv* env, jobject obj) {
   delete this;
 }
 
+namespace {
+// |message| is passed as base::Owned, so it will automatically be deleted
+// when the callback goes out of scope.
+void DocumentHasImagesCallback(ScopedJavaGlobalRef<jobject>* message,
+                               bool has_images) {
+  Java_AwContents_onDocumentHasImagesResponse(AttachCurrentThread(),
+                                              has_images,
+                                              message->obj());
+}
+}  // namespace
+
+void AwContents::DocumentHasImages(JNIEnv* env, jobject obj, jobject message) {
+  render_view_host_ext_->DocumentHasImages(
+      base::Bind(&DocumentHasImagesCallback,
+                 base::Owned(new ScopedJavaGlobalRef<jobject>(

[mkosiba (inactive), 2012/08/31 09:29:35]

ok, this just looks like ScopedJavaGlobalRef is missing a constructor. up to you
if you want to make that part of this change, but I don't think the compiler is
smart enough to optimize away the ScopedJavaLocalRef..

+                    ScopedJavaLocalRef<jobject>(env, message)))));
+}
+
 static jint Init(JNIEnv* env,
                  jobject obj,
                  jobject web_contents_delegate,
                  jboolean private_browsing) {
   AwContents* tab = new AwContents(env, obj, web_contents_delegate,
                                    private_browsing);
   return reinterpret_cast<jint>(tab);
 }
 
 bool RegisterAwContents(JNIEnv* env) {
   return RegisterNativesImpl(env) >= 0;
 }
 
 
 }  // namespace android_webview