Revert 158067 - Remove native side of content_view_client

content/browser/android/content_view_core_impl.cc

Index: content/browser/android/content_view_core_impl.cc
===================================================================
--- content/browser/android/content_view_core_impl.cc	(revision 158070)
+++ content/browser/android/content_view_core_impl.cc	(working copy)
@@ -9,6 +9,7 @@
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/json/json_writer.h"
+#include "content/browser/android/content_view_client.h"
 #include "content/browser/android/load_url_params.h"
 #include "content/browser/android/touch_point.h"
 #include "content/browser/renderer_host/java/java_bound_object.h"
@@ -463,6 +464,13 @@
   return web_contents_->GetController().NeedsReload();
 }
 
+void ContentViewCoreImpl::SetClient(JNIEnv* env, jobject obj, jobject jclient) {
+  scoped_ptr<ContentViewClient> client(
+      ContentViewClient::CreateNativeContentViewClient(env, jclient));
+
+  content_view_client_.swap(client);
+}
+
 void ContentViewCoreImpl::AddJavascriptInterface(
     JNIEnv* env,
     jobject /* obj */,
Property changes on: content/browser/android/content_view_core_impl.cc
___________________________________________________________________
Deleted: svn:mergeinfo