Implement Webviewclient.onReceivedSslError

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/bitmap.h>
 #include <sys/system_properties.h>
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_browser_main_parts.h"
 #include "android_webview/browser/net_disk_cache_remover.h"
 #include "android_webview/browser/renderer_host/aw_render_view_host_ext.h"
 #include "android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.h"
 #include "android_webview/common/aw_hit_test_data.h"
 #include "android_webview/common/renderer_picture_map.h"
 #include "android_webview/native/aw_browser_dependency_factory.h"
+#include "android_webview/native/aw_contents_client_bridge.h"
 #include "android_webview/native/aw_contents_io_thread_client_impl.h"
 #include "android_webview/native/aw_web_contents_delegate.h"
 #include "android_webview/native/state_serializer.h"
 #include "android_webview/public/browser/draw_sw.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/debug/trace_event.h"
@@ skipping 141 matching lines @@
       content::RenderViewHost::FromID(render_process_id, render_view_id);
   if (!rvh) return NULL;
   content::WebContents* web_contents =
       content::WebContents::FromRenderViewHost(rvh);
   if (!web_contents) return NULL;
   return FromWebContents(web_contents);
 }
 
 AwContents::AwContents(JNIEnv* env,
                        jobject obj,
-                       jobject web_contents_delegate)
+                       jobject web_contents_delegate,
+                       jobject contents_client_bridge)
     : java_ref_(env, obj),
       web_contents_delegate_(
           new AwWebContentsDelegate(env, web_contents_delegate)),
+      contents_client_bridge_(
+          new AwContentsClientBridge(env, contents_client_bridge)),
       view_visible_(false),
       compositor_visible_(false),
       is_composite_pending_(false),
       dpi_scale_(1.0f),
       on_new_picture_mode_(kOnNewPictureDisabled),
       last_frame_context_(NULL) {
   RendererPictureMap::CreateInstance();
   android_webview::AwBrowserDependencyFactory* dependency_factory =
       android_webview::AwBrowserDependencyFactory::GetInstance();
 
@@ skipping 11 matching lines @@
 
 void AwContents::SetWebContents(content::WebContents* web_contents) {
   web_contents_.reset(web_contents);
   if (find_helper_.get()) {
     find_helper_->SetListener(NULL);
   }
   icon_helper_.reset(new IconHelper(web_contents_.get()));
   icon_helper_->SetListener(this);
   web_contents_->SetUserData(kAwContentsUserDataKey,
                              new AwContentsUserData(this));
+  web_contents_->SetUserData(
+      AwCertificateErrorHandlerBase::UserData::kAwCertificateErrorHandlerBase,
+      new AwCertificateErrorHandlerBase::UserData(
+          contents_client_bridge_.get()));

[joth, 2013/02/22 23:12:41]

yeah this will be much cleaner as:
AwCertificateErrorHandlerBase::Associate(web_contents_.get(),
contents_client_bridge_.get());

[sgurun-gerrit only, 2013/02/23 00:16:14]

Done.

 
   web_contents_->SetDelegate(web_contents_delegate_.get());
   render_view_host_ext_.reset(new AwRenderViewHostExt(web_contents_.get(),
                               this));
   ResetCompositor();
 }
 
 void AwContents::SetWebContents(JNIEnv* env, jobject obj, jint new_wc) {
   SetWebContents(reinterpret_cast<content::WebContents*>(new_wc));
 }
@@ skipping 440 matching lines @@
   if (obj.is_null())
     return;
 
   Java_AwContents_performLongClick(env, obj.obj());
 }
 
 void AwContents::OnReceivedHttpAuthRequest(const JavaRef<jobject>& handler,
                                            const std::string& host,
                                            const std::string& realm) {
   JNIEnv* env = AttachCurrentThread();
+  ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
+  if (obj.is_null())
+    return;
+
   ScopedJavaLocalRef<jstring> jhost = ConvertUTF8ToJavaString(env, host);
   ScopedJavaLocalRef<jstring> jrealm = ConvertUTF8ToJavaString(env, realm);
-  Java_AwContents_onReceivedHttpAuthRequest(env, java_ref_.get(env).obj(),
-                                            handler.obj(), jhost.obj(),
-                                            jrealm.obj());
+  Java_AwContents_onReceivedHttpAuthRequest(env, obj.obj(), handler.obj(),
+      jhost.obj(), jrealm.obj());
 }
 
 void AwContents::SetIoThreadClient(JNIEnv* env, jobject obj, jobject client) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   AwContentsIoThreadClientImpl::Associate(
       web_contents_.get(), ScopedJavaLocalRef<jobject>(env, client));
   int child_id = web_contents_->GetRenderProcessHost()->GetID();
   int route_id = web_contents_->GetRoutingID();
   AwResourceDispatcherHostDelegate::OnIoThreadClientReady(child_id, route_id);
 }
@@ skipping 21 matching lines @@
        ++itr) {
     visited_link_gurls.push_back(GURL(*itr));
   }
 
   AwBrowserContext::FromWebContents(web_contents_.get())
       ->AddVisitedURLs(visited_link_gurls);
 }
 
 static jint Init(JNIEnv* env,
                  jobject obj,
-                 jobject web_contents_delegate) {
-  AwContents* tab = new AwContents(env, obj, web_contents_delegate);
+                 jobject web_contents_delegate,
+                 jobject contents_client_bridge) {
+  AwContents* tab = new AwContents(env, obj, web_contents_delegate,
+      contents_client_bridge);
   return reinterpret_cast<jint>(tab);
 }
 
 bool RegisterAwContents(JNIEnv* env) {
   return RegisterNativesImpl(env) >= 0;
 }
 
 namespace {
 
 void ShowGeolocationPromptHelperTask(const JavaObjectWeakGlobalRef& java_ref,
@@ skipping 430 matching lines @@
   if (!picture) {
     render_view_host_ext_->CapturePictureSync();
     picture = RendererPictureMap::GetInstance()->GetRendererPicture(
         web_contents_->GetRoutingID());
   }
 
   return picture;
 }
 
 }  // namespace android_webview